From 04f90247b14fdc8f40653cc0c0f45c861a6f4d6c Mon Sep 17 00:00:00 2001
From: Martin/Geno <geno+dev@fireorbit.de>
Date: Sun, 1 Jul 2018 16:49:55 +0200
Subject: [PATCH 1/6] add respondd-module-wifisettings

---
 net/respondd-module-wifisettings/Makefile     |  25 ++++
 net/respondd-module-wifisettings/README.md    |  13 +++
 net/respondd-module-wifisettings/src/Makefile |   9 ++
 .../src/respondd.c                            | 109 ++++++++++++++++++
 4 files changed, 156 insertions(+)
 create mode 100644 net/respondd-module-wifisettings/Makefile
 create mode 100644 net/respondd-module-wifisettings/README.md
 create mode 100644 net/respondd-module-wifisettings/src/Makefile
 create mode 100644 net/respondd-module-wifisettings/src/respondd.c

diff --git a/net/respondd-module-wifisettings/Makefile b/net/respondd-module-wifisettings/Makefile
new file mode 100644
index 0000000..54739aa
--- /dev/null
+++ b/net/respondd-module-wifisettings/Makefile
@@ -0,0 +1,25 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=respondd-module-wifisettings
+PKG_VERSION:=1
+PKG_RELEASE:=1
+
+PKG_LICENSE:=BSD-2-Clause
+
+PKG_BUILD_DEPENDS := respondd
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/respondd-module-wifisettings
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Add wifisettings to respondd
+  DEPENDS:=+respondd +libuci
+endef
+
+define Package/respondd-module-wifisettings/install
+	$(INSTALL_DIR) $(1)/usr/lib/respondd
+	$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/usr/lib/respondd/wifi-settings.so
+endef
+
+$(eval $(call BuildPackage,respondd-module-wifisettings))
diff --git a/net/respondd-module-wifisettings/README.md b/net/respondd-module-wifisettings/README.md
new file mode 100644
index 0000000..3ed26ac
--- /dev/null
+++ b/net/respondd-module-wifisettings/README.md
@@ -0,0 +1,13 @@
+This module adds a respondd wifisettings usage nodeinfo provider.
+The format is the following:
+
+```json
+{
+  "nodeinfo": {
+    "channel24": 11,
+    "txpower24": 22,
+    "channel5": 44,
+    "txpower5": 18,
+  }
+}
+```
diff --git a/net/respondd-module-wifisettings/src/Makefile b/net/respondd-module-wifisettings/src/Makefile
new file mode 100644
index 0000000..e7b64b1
--- /dev/null
+++ b/net/respondd-module-wifisettings/src/Makefile
@@ -0,0 +1,9 @@
+all: respondd.so
+
+CFLAGS += -Wall
+
+respondd.so: respondd.c
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -fPIC -D_GNU_SOURCE -o $@ $^ $(LDLIBS) -luci
+
+clean:
+	rm -rf *.so
diff --git a/net/respondd-module-wifisettings/src/respondd.c b/net/respondd-module-wifisettings/src/respondd.c
new file mode 100644
index 0000000..3a44f45
--- /dev/null
+++ b/net/respondd-module-wifisettings/src/respondd.c
@@ -0,0 +1,109 @@
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <limits.h>
+
+#include <json-c/json.h>
+#include <uci.h>
+
+#include <respondd.h>
+
+const unsigned int INVALID_CHANNEL = 0;
+const unsigned int INVALID_TXPOWER = 0;
+
+static inline unsigned char parse_option(const char *s, unsigned char invalid) {
+	char *endptr = NULL;
+	long int result;
+
+	if (!s)
+		return invalid;
+
+	result = strtol(s, &endptr, 10);
+
+	if (!endptr)
+		return invalid;
+	if ('\0' != *endptr)
+		return invalid;
+	if (result > UCHAR_MAX)
+		return invalid;
+	if (result < 0)
+		return invalid;
+
+	return (unsigned char)(result % UCHAR_MAX);
+}
+
+static struct json_object *respondd_provider_nodeinfo(void) {
+	struct uci_context *ctx = NULL;
+	struct uci_package *p = NULL;
+	struct uci_section *s;
+	struct uci_element *e;
+	struct json_object *ret = NULL, *wireless = NULL, *v;
+	unsigned char tmp;
+
+	ctx = uci_alloc_context();
+	if (!ctx)
+		goto end;
+	ctx->flags &= ~UCI_FLAG_STRICT;
+
+	wireless = json_object_new_object();
+	if (!wireless)
+		goto end;
+
+	ret = json_object_new_object();
+	if (!ret)
+		goto end;
+
+	if (uci_load(ctx, "wireless", &p))
+		goto end;
+
+	uci_foreach_element(&p->sections, e) {
+		s = uci_to_section(e);
+
+		if(!strncmp(s->type,"wifi-device",11)){
+			tmp = parse_option(uci_lookup_option_string(ctx, s, "channel"), INVALID_CHANNEL);
+			if (tmp != INVALID_CHANNEL) {
+				v = json_object_new_int64(tmp);
+				if (!v)
+					goto end;
+				if (tmp >= 1 && tmp <= 14){
+					json_object_object_add(wireless, "channel24", v);
+					tmp = parse_option(uci_lookup_option_string(ctx, s, "txpower"), INVALID_TXPOWER);
+					if (tmp != INVALID_TXPOWER) {
+						v = json_object_new_int64(tmp);
+						if (!v)
+							goto end;
+						json_object_object_add(wireless, "txpower24", v);
+					}
+				// FIXME lowes is 7, but i was able to differ between 2.4 Ghz and 5 Ghz by iwinfo_ops->frequency
+				// In EU and US it is 36, so it would be okay for the moment (https://en.wikipedia.org/wiki/List_of_WLAN_channels)
+				} else if (tmp >= 36 && tmp < 196){
+					json_object_object_add(wireless, "channel5", v);
+					tmp = parse_option(uci_lookup_option_string(ctx, s, "txpower"), INVALID_TXPOWER);
+					if (tmp != INVALID_TXPOWER) {
+						v = json_object_new_int64(tmp);
+						if (!v)
+							goto end;
+						json_object_object_add(wireless, "txpower5", v);
+					}
+				} else
+					json_object_object_add(wireless, "ErrorChannel", v);
+			}
+		}
+	}
+
+	json_object_object_add(ret, "wireless", wireless);
+end:
+	if (ctx) {
+		if (p)
+			uci_unload(ctx, p);
+			uci_free_context(ctx);
+	}
+	return ret;
+
+}
+
+const struct respondd_provider_info respondd_providers[] = {
+	{"nodeinfo", respondd_provider_nodeinfo},
+	{0,0},
+};

From ca1448f6a092f77bd3dee205f1e38abc7921b4b9 Mon Sep 17 00:00:00 2001
From: Martin/Geno <geno+dev@fireorbit.de>
Date: Wed, 8 Aug 2018 06:17:23 +0200
Subject: [PATCH 2/6] merge wifi respondd modules to one wifi statistics modul

---
 net/respondd-module-airtime/src/respondd.c    |  39 -------
 net/respondd-module-wifi/Makefile             |  39 +++++++
 .../README.md                                 |  24 +++-
 .../src/Makefile                              |   2 +-
 .../src/airtime.c                             |  23 +---
 .../src/airtime.h                             |   0
 net/respondd-module-wifi/src/clients.c        |  16 +++
 net/respondd-module-wifi/src/clients.h        |   6 +
 .../src/ifaces.c                              |  18 +--
 .../src/ifaces.h                              |   4 +-
 .../src/netlink.c                             |   3 +-
 .../src/netlink.h                             |   0
 net/respondd-module-wifi/src/respondd.c       |  69 +++++++++++
 net/respondd-module-wifisettings/Makefile     |  25 ----
 net/respondd-module-wifisettings/README.md    |  13 ---
 net/respondd-module-wifisettings/src/Makefile |   9 --
 .../src/respondd.c                            | 109 ------------------
 17 files changed, 173 insertions(+), 226 deletions(-)
 delete mode 100644 net/respondd-module-airtime/src/respondd.c
 create mode 100644 net/respondd-module-wifi/Makefile
 rename net/{respondd-module-airtime => respondd-module-wifi}/README.md (64%)
 rename net/{respondd-module-airtime => respondd-module-wifi}/src/Makefile (82%)
 rename net/{respondd-module-airtime => respondd-module-wifi}/src/airtime.c (85%)
 rename net/{respondd-module-airtime => respondd-module-wifi}/src/airtime.h (100%)
 create mode 100644 net/respondd-module-wifi/src/clients.c
 create mode 100644 net/respondd-module-wifi/src/clients.h
 rename net/{respondd-module-airtime => respondd-module-wifi}/src/ifaces.c (70%)
 rename net/{respondd-module-airtime => respondd-module-wifi}/src/ifaces.h (83%)
 rename net/{respondd-module-airtime => respondd-module-wifi}/src/netlink.c (94%)
 rename net/{respondd-module-airtime => respondd-module-wifi}/src/netlink.h (100%)
 create mode 100644 net/respondd-module-wifi/src/respondd.c
 delete mode 100644 net/respondd-module-wifisettings/Makefile
 delete mode 100644 net/respondd-module-wifisettings/README.md
 delete mode 100644 net/respondd-module-wifisettings/src/Makefile
 delete mode 100644 net/respondd-module-wifisettings/src/respondd.c

diff --git a/net/respondd-module-airtime/src/respondd.c b/net/respondd-module-airtime/src/respondd.c
deleted file mode 100644
index 4648bd4..0000000
--- a/net/respondd-module-airtime/src/respondd.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <string.h>
-#include <stdio.h>
-#include <json-c/json.h>
-#include <respondd.h>
-
-#include "airtime.h"
-#include "ifaces.h"
-
-static struct json_object *respondd_provider_statistics(void) {
-	struct json_object *result, *wireless;
-	struct iface_list *ifaces;
-
-	result = json_object_new_object();
-	if (!result)
-		return NULL;
-
-	wireless = json_object_new_array();
-	if (!wireless) {
-		json_object_put(result);
-		return NULL;
-	}
-
-	ifaces = get_ifaces();
-	while (ifaces != NULL) {
-		get_airtime(wireless, ifaces->ifx);
-
-		void *freeptr = ifaces;
-		ifaces = ifaces->next;
-		free(freeptr);
-	}
-
-	json_object_object_add(result, "wireless", wireless);
-	return result;
-}
-
-const struct respondd_provider_info respondd_providers[] = {
-	{"statistics", respondd_provider_statistics},
-	{0, 0},
-};
diff --git a/net/respondd-module-wifi/Makefile b/net/respondd-module-wifi/Makefile
new file mode 100644
index 0000000..36aa9fa
--- /dev/null
+++ b/net/respondd-module-wifi/Makefile
@@ -0,0 +1,39 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=respondd-module-wifi
+PKG_VERSION:=1
+PKG_RELEASE:=1
+
+PKG_LICENSE:=BSD-2-Clause
+
+PKG_BUILD_DEPENDS := respondd
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/respondd-module-wifi/Default
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Add wifi statistics to respondd
+  DEPENDS:=+respondd +libnl-tiny
+endef
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny
+
+define Package/respondd-module-wifi
+	$(call Package/respondd-module-wifi/Default)
+endef
+
+define Package/respondd-module-gluonwifi
+	$(call Package/respondd-module-wifi/Default)
+	VARIANT:=gluon
+	TARGET_CFLAGS += -DGLUON
+endef
+
+define Package/respondd-module-wifi/install
+	$(INSTALL_DIR) $(1)/usr/lib/respondd
+	$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/usr/lib/respondd/wifi.so
+endef
+
+Package/respondd-module-gluonwifi/install = $(Package/respondd-module-wifi/install)
+
+$(eval $(call BuildPackage,respondd-module-wifi))
diff --git a/net/respondd-module-airtime/README.md b/net/respondd-module-wifi/README.md
similarity index 64%
rename from net/respondd-module-airtime/README.md
rename to net/respondd-module-wifi/README.md
index eb82b0c..3a9423c 100644
--- a/net/respondd-module-airtime/README.md
+++ b/net/respondd-module-wifi/README.md
@@ -1,25 +1,43 @@
-This module adds a respondd airtime usage statistics provider.
+This module adds a respondd wifi usage statistics provider.
 The format is the following:
 
 ```json
 {
   "statistics": {
+    "clients":{
+      "wifi24": 3,
+      "wifi5": 7
+    },
     "wireless": [
       {
         "frequency": 5220,
+        "txpower": 1700,
         "active": 366561161,
         "busy": 46496566,
         "rx": 808415,
         "tx": 41711344,
-        "noise": 162
+        "noise": 162,
+        "clients": 5
+      },
+      {
+        "frequency": 5220,
+        "txpower": 1700,
+        "active": 366561161,
+        "busy": 46496566,
+        "rx": 808415,
+        "tx": 41711344,
+        "noise": 162,
+        "clients": 2
       },
       {
         "frequency": 2437,
+        "txpower": 2000,
         "active": 366649704,
         "busy": 205221222,
         "rx": 108121446,
         "tx": 85453679,
-        "noise": 161
+        "noise": 161,
+        "clients": 3
       }
     ]
   }
diff --git a/net/respondd-module-airtime/src/Makefile b/net/respondd-module-wifi/src/Makefile
similarity index 82%
rename from net/respondd-module-airtime/src/Makefile
rename to net/respondd-module-wifi/src/Makefile
index 61f6da5..1d07977 100644
--- a/net/respondd-module-airtime/src/Makefile
+++ b/net/respondd-module-wifi/src/Makefile
@@ -9,7 +9,7 @@ all: respondd.so
 
 %.c: %.h
 
-respondd.so: netlink.c airtime.c ifaces.c respondd.c
+respondd.so: netlink.c clients.c airtime.c ifaces.c respondd.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -fPIC -D_GNU_SOURCE -lnl-tiny -o $@ $^ $(LDLIBS)
 
 clean:
diff --git a/net/respondd-module-airtime/src/airtime.c b/net/respondd-module-wifi/src/airtime.c
similarity index 85%
rename from net/respondd-module-airtime/src/airtime.c
rename to net/respondd-module-wifi/src/airtime.c
index 7e27ee0..989057a 100644
--- a/net/respondd-module-airtime/src/airtime.c
+++ b/net/respondd-module-wifi/src/airtime.c
@@ -57,8 +57,7 @@
  * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use
  */
 
-static const char const* msg_names[NL80211_SURVEY_INFO_MAX + 1] = {
-	[NL80211_SURVEY_INFO_FREQUENCY] = "frequency",
+static const char * msg_names[NL80211_SURVEY_INFO_MAX + 1] = {
 	[NL80211_SURVEY_INFO_CHANNEL_TIME] = "active",
 	[NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY] = "busy",
 	[NL80211_SURVEY_INFO_CHANNEL_TIME_RX] = "rx",
@@ -67,19 +66,13 @@ static const char const* msg_names[NL80211_SURVEY_INFO_MAX + 1] = {
 };
 
 static int survey_airtime_handler(struct nl_msg *msg, void *arg) {
-	struct json_object *parent_json = (struct json_object *) arg;
+	struct json_object *json = (struct json_object *) arg;
 
 	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
 	struct nlattr *survey_info = nla_find(genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NL80211_ATTR_SURVEY_INFO);
 
 	if (!survey_info) {
-		fprintf(stderr, "respondd-module-airtime: survey data missing in netlink message\n");
-		goto abort;
-	}
-
-	struct json_object *freq_json = json_object_new_object();
-	if (!freq_json) {
-		fprintf(stderr, "respondd-module-airtime: failed allocating JSON object\n");
+		fputs("respondd-module-wifi: survey data missing in netlink message\n", stderr);
 		goto abort;
 	}
 
@@ -99,7 +92,6 @@ static int survey_airtime_handler(struct nl_msg *msg, void *arg) {
 		switch (type) {
 			// these are the required fields
 			case NL80211_SURVEY_INFO_IN_USE:
-			case NL80211_SURVEY_INFO_FREQUENCY:
 			case NL80211_SURVEY_INFO_CHANNEL_TIME:
 				req_fields++;
 		}
@@ -122,18 +114,13 @@ static int survey_airtime_handler(struct nl_msg *msg, void *arg) {
 					data_json = json_object_new_int(nla_get_u8(nla));
 				break;
 			default:
-				fprintf(stderr, "respondd-module-airtime: Unexpected NL attribute length: %d\n", nla_len(nla));
+				fprintf(stderr, "respondd-module-wifi: Unexpected NL attribute length: %d\n", nla_len(nla));
 		}
 
 		if (data_json)
-			json_object_object_add(freq_json, msg_names[type], data_json);
+			json_object_object_add(json, msg_names[type], data_json);
 	}
 
-	if (req_fields == 3)
-		json_object_array_add(parent_json, freq_json);
-	else
-		json_object_put(freq_json);
-
 abort:
 	return NL_SKIP;
 }
diff --git a/net/respondd-module-airtime/src/airtime.h b/net/respondd-module-wifi/src/airtime.h
similarity index 100%
rename from net/respondd-module-airtime/src/airtime.h
rename to net/respondd-module-wifi/src/airtime.h
diff --git a/net/respondd-module-wifi/src/clients.c b/net/respondd-module-wifi/src/clients.c
new file mode 100644
index 0000000..f87433a
--- /dev/null
+++ b/net/respondd-module-wifi/src/clients.c
@@ -0,0 +1,16 @@
+#include <linux/nl80211.h>
+#include <netlink/genl/genl.h>
+
+#include "netlink.h"
+#include "clients.h"
+
+static int station_client_handler(struct nl_msg *msg, void *arg) {
+	int *count = (int *) arg;
+
+	(*count)++;
+
+	return NL_SKIP;
+}
+bool get_client_counts(int *count, int ifx) {
+	return nl_send_dump(station_client_handler, count, NL80211_CMD_GET_STATION, ifx);
+}
diff --git a/net/respondd-module-wifi/src/clients.h b/net/respondd-module-wifi/src/clients.h
new file mode 100644
index 0000000..a3ce848
--- /dev/null
+++ b/net/respondd-module-wifi/src/clients.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include <stdbool.h>
+#include <stdint.h>
+
+__attribute__((visibility("hidden"))) bool get_client_counts(int *count, int ifx);
diff --git a/net/respondd-module-airtime/src/ifaces.c b/net/respondd-module-wifi/src/ifaces.c
similarity index 70%
rename from net/respondd-module-airtime/src/ifaces.c
rename to net/respondd-module-wifi/src/ifaces.c
index 926d3e4..7f8edc1 100644
--- a/net/respondd-module-airtime/src/ifaces.c
+++ b/net/respondd-module-wifi/src/ifaces.c
@@ -7,7 +7,6 @@
 static int iface_dump_handler(struct nl_msg *msg, void *arg) {
 	struct nlattr *tb[NL80211_ATTR_MAX + 1];
 	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
-	int wiphy;
 	struct iface_list **last_next;
 
 	nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL);
@@ -15,17 +14,22 @@ static int iface_dump_handler(struct nl_msg *msg, void *arg) {
 	if (!tb[NL80211_ATTR_WIPHY] || !tb[NL80211_ATTR_IFINDEX])
 		goto skip;
 
-	wiphy = nla_get_u32(tb[NL80211_ATTR_WIPHY]);
-	for (last_next = arg; *last_next != NULL; last_next = &(*last_next)->next) {
-		if ((*last_next)->wiphy == wiphy)
-			goto skip;
-	}
+	#ifdef GLUON
+	if(nla_strcmp(tb[NL80211_ATTR_IFNAME], "client") == -1)
+	  goto skip;
+	#endif
+
+	// TODO fix add to head list - instatt find last item
+	for (last_next = arg; *last_next != NULL; last_next = &(*last_next)->next) {}
+
 	*last_next = malloc(sizeof(**last_next));
 	if (!*last_next)
 		goto skip;
 	(*last_next)->next = NULL;
+	(*last_next)->wiphy = nla_get_u32(tb[NL80211_ATTR_WIPHY]);
 	(*last_next)->ifx = nla_get_u32(tb[NL80211_ATTR_IFINDEX]);
-	(*last_next)->wiphy = wiphy;
+	(*last_next)->frequency = nla_get_u32(tb[NL80211_ATTR_WIPHY_FREQ]);
+	(*last_next)->txpower = nla_get_u32(tb[NL80211_ATTR_WIPHY_TX_POWER_LEVEL]);
 
 skip:
 	return NL_SKIP;
diff --git a/net/respondd-module-airtime/src/ifaces.h b/net/respondd-module-wifi/src/ifaces.h
similarity index 83%
rename from net/respondd-module-airtime/src/ifaces.h
rename to net/respondd-module-wifi/src/ifaces.h
index e873087..5f2021d 100644
--- a/net/respondd-module-airtime/src/ifaces.h
+++ b/net/respondd-module-wifi/src/ifaces.h
@@ -1,8 +1,10 @@
 #pragma once
 
 struct iface_list {
-	int ifx;
 	int wiphy;
+	int ifx;
+	int frequency;
+	int txpower;
 	struct iface_list *next;
 };
 
diff --git a/net/respondd-module-airtime/src/netlink.c b/net/respondd-module-wifi/src/netlink.c
similarity index 94%
rename from net/respondd-module-airtime/src/netlink.c
rename to net/respondd-module-wifi/src/netlink.c
index 2030193..ac707d0 100644
--- a/net/respondd-module-airtime/src/netlink.c
+++ b/net/respondd-module-wifi/src/netlink.c
@@ -6,6 +6,7 @@
 
 #include "netlink.h"
 
+
 bool nl_send_dump(nl_recvmsg_msg_cb_t cb, void *cb_arg, int cmd, uint32_t cmd_arg) {
 	bool ok = false;
 	int ret;
@@ -14,7 +15,7 @@ bool nl_send_dump(nl_recvmsg_msg_cb_t cb, void *cb_arg, int cmd, uint32_t cmd_ar
 	struct nl_msg *msg = NULL;
 
 
-#define ERR(...) { fprintf(stderr, "respondd-module-airtime: " __VA_ARGS__); goto out; }
+#define ERR(...) { fprintf(stderr, "respondd-module-wifi: " __VA_ARGS__); goto out; }
 
 	sk = nl_socket_alloc();
 	if (!sk)
diff --git a/net/respondd-module-airtime/src/netlink.h b/net/respondd-module-wifi/src/netlink.h
similarity index 100%
rename from net/respondd-module-airtime/src/netlink.h
rename to net/respondd-module-wifi/src/netlink.h
diff --git a/net/respondd-module-wifi/src/respondd.c b/net/respondd-module-wifi/src/respondd.c
new file mode 100644
index 0000000..74a8cc3
--- /dev/null
+++ b/net/respondd-module-wifi/src/respondd.c
@@ -0,0 +1,69 @@
+#include <string.h>
+#include <stdio.h>
+#include <json-c/json.h>
+#include <respondd.h>
+
+#include "airtime.h"
+#include "clients.h"
+#include "ifaces.h"
+
+static struct json_object *respondd_provider_statistics(void) {
+	struct json_object *result, *wireless, *clients, *interface;
+	struct iface_list *ifaces;
+	int wifi24 = 0, wifi5 = 0, clients_count;
+
+	result = json_object_new_object();
+	if (!result)
+		return NULL;
+
+	wireless = json_object_new_array();
+	if (!wireless) {
+		//TODO why needed? : json_object_put(result);
+		return NULL;
+	}
+
+	clients = json_object_new_object();
+	if (!clients) {
+		return NULL;
+	}
+
+	ifaces = get_ifaces();
+	while (ifaces != NULL) {
+		clients_count = 0;
+		get_client_counts(&clients_count, ifaces->ifx);
+		if (ifaces->frequency < 5000)
+			wifi24 += clients_count;
+		if (ifaces->frequency > 5000)
+			wifi5 += clients_count;
+
+		//TODO wiphy only one radio added? (no necessary on gluon - only one ap-ssid at radio)
+		interface = json_object_new_object();
+		if (!interface) {
+			continue;
+		}
+		json_object_object_add(interface, "frequency", json_object_new_int(ifaces->frequency));
+		json_object_object_add(interface, "txpower", json_object_new_int(ifaces->txpower));
+		get_airtime(interface, ifaces->ifx);
+		//TODO remove at merge radios (one wiphy radio)
+		json_object_object_add(interface, "clients", json_object_new_int(clients_count));
+		json_object_array_add(wireless, interface);
+
+		void *freeptr = ifaces;
+		ifaces = ifaces->next;
+		free(freeptr);
+	}
+
+	//TODO maybe skip: if (wifi24 >  0 || wifi5 > 0) {
+	json_object_object_add(clients, "wifi24", json_object_new_int(wifi24));
+	json_object_object_add(clients, "wifi5", json_object_new_int(wifi5));
+	json_object_object_add(result, "clients", clients);
+	//}
+
+	json_object_object_add(result, "wireless", wireless);
+	return result;
+}
+
+const struct respondd_provider_info respondd_providers[] = {
+	{"statistics", respondd_provider_statistics},
+	{0, 0},
+};
diff --git a/net/respondd-module-wifisettings/Makefile b/net/respondd-module-wifisettings/Makefile
deleted file mode 100644
index 54739aa..0000000
--- a/net/respondd-module-wifisettings/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=respondd-module-wifisettings
-PKG_VERSION:=1
-PKG_RELEASE:=1
-
-PKG_LICENSE:=BSD-2-Clause
-
-PKG_BUILD_DEPENDS := respondd
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/respondd-module-wifisettings
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Add wifisettings to respondd
-  DEPENDS:=+respondd +libuci
-endef
-
-define Package/respondd-module-wifisettings/install
-	$(INSTALL_DIR) $(1)/usr/lib/respondd
-	$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/usr/lib/respondd/wifi-settings.so
-endef
-
-$(eval $(call BuildPackage,respondd-module-wifisettings))
diff --git a/net/respondd-module-wifisettings/README.md b/net/respondd-module-wifisettings/README.md
deleted file mode 100644
index 3ed26ac..0000000
--- a/net/respondd-module-wifisettings/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-This module adds a respondd wifisettings usage nodeinfo provider.
-The format is the following:
-
-```json
-{
-  "nodeinfo": {
-    "channel24": 11,
-    "txpower24": 22,
-    "channel5": 44,
-    "txpower5": 18,
-  }
-}
-```
diff --git a/net/respondd-module-wifisettings/src/Makefile b/net/respondd-module-wifisettings/src/Makefile
deleted file mode 100644
index e7b64b1..0000000
--- a/net/respondd-module-wifisettings/src/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-all: respondd.so
-
-CFLAGS += -Wall
-
-respondd.so: respondd.c
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -fPIC -D_GNU_SOURCE -o $@ $^ $(LDLIBS) -luci
-
-clean:
-	rm -rf *.so
diff --git a/net/respondd-module-wifisettings/src/respondd.c b/net/respondd-module-wifisettings/src/respondd.c
deleted file mode 100644
index 3a44f45..0000000
--- a/net/respondd-module-wifisettings/src/respondd.c
+++ /dev/null
@@ -1,109 +0,0 @@
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <limits.h>
-
-#include <json-c/json.h>
-#include <uci.h>
-
-#include <respondd.h>
-
-const unsigned int INVALID_CHANNEL = 0;
-const unsigned int INVALID_TXPOWER = 0;
-
-static inline unsigned char parse_option(const char *s, unsigned char invalid) {
-	char *endptr = NULL;
-	long int result;
-
-	if (!s)
-		return invalid;
-
-	result = strtol(s, &endptr, 10);
-
-	if (!endptr)
-		return invalid;
-	if ('\0' != *endptr)
-		return invalid;
-	if (result > UCHAR_MAX)
-		return invalid;
-	if (result < 0)
-		return invalid;
-
-	return (unsigned char)(result % UCHAR_MAX);
-}
-
-static struct json_object *respondd_provider_nodeinfo(void) {
-	struct uci_context *ctx = NULL;
-	struct uci_package *p = NULL;
-	struct uci_section *s;
-	struct uci_element *e;
-	struct json_object *ret = NULL, *wireless = NULL, *v;
-	unsigned char tmp;
-
-	ctx = uci_alloc_context();
-	if (!ctx)
-		goto end;
-	ctx->flags &= ~UCI_FLAG_STRICT;
-
-	wireless = json_object_new_object();
-	if (!wireless)
-		goto end;
-
-	ret = json_object_new_object();
-	if (!ret)
-		goto end;
-
-	if (uci_load(ctx, "wireless", &p))
-		goto end;
-
-	uci_foreach_element(&p->sections, e) {
-		s = uci_to_section(e);
-
-		if(!strncmp(s->type,"wifi-device",11)){
-			tmp = parse_option(uci_lookup_option_string(ctx, s, "channel"), INVALID_CHANNEL);
-			if (tmp != INVALID_CHANNEL) {
-				v = json_object_new_int64(tmp);
-				if (!v)
-					goto end;
-				if (tmp >= 1 && tmp <= 14){
-					json_object_object_add(wireless, "channel24", v);
-					tmp = parse_option(uci_lookup_option_string(ctx, s, "txpower"), INVALID_TXPOWER);
-					if (tmp != INVALID_TXPOWER) {
-						v = json_object_new_int64(tmp);
-						if (!v)
-							goto end;
-						json_object_object_add(wireless, "txpower24", v);
-					}
-				// FIXME lowes is 7, but i was able to differ between 2.4 Ghz and 5 Ghz by iwinfo_ops->frequency
-				// In EU and US it is 36, so it would be okay for the moment (https://en.wikipedia.org/wiki/List_of_WLAN_channels)
-				} else if (tmp >= 36 && tmp < 196){
-					json_object_object_add(wireless, "channel5", v);
-					tmp = parse_option(uci_lookup_option_string(ctx, s, "txpower"), INVALID_TXPOWER);
-					if (tmp != INVALID_TXPOWER) {
-						v = json_object_new_int64(tmp);
-						if (!v)
-							goto end;
-						json_object_object_add(wireless, "txpower5", v);
-					}
-				} else
-					json_object_object_add(wireless, "ErrorChannel", v);
-			}
-		}
-	}
-
-	json_object_object_add(ret, "wireless", wireless);
-end:
-	if (ctx) {
-		if (p)
-			uci_unload(ctx, p);
-			uci_free_context(ctx);
-	}
-	return ret;
-
-}
-
-const struct respondd_provider_info respondd_providers[] = {
-	{"nodeinfo", respondd_provider_nodeinfo},
-	{0,0},
-};

From 32b2b4216af81e4e8deb2a9946eb5b1b22c32c7d Mon Sep 17 00:00:00 2001
From: Martin/Geno <geno+dev@fireorbit.de>
Date: Fri, 17 Aug 2018 18:19:11 +0200
Subject: [PATCH 3/6] add neighbours support

---
 net/respondd-module-airtime/Makefile      | 27 --------
 net/respondd-module-wifi/README.md        | 16 +++++
 net/respondd-module-wifi/src/Makefile     |  2 +-
 net/respondd-module-wifi/src/airtime.c    | 14 +---
 net/respondd-module-wifi/src/airtime.h    |  1 -
 net/respondd-module-wifi/src/clients.h    |  1 -
 net/respondd-module-wifi/src/ifaces.c     | 29 +++++++-
 net/respondd-module-wifi/src/ifaces.h     |  5 ++
 net/respondd-module-wifi/src/neighbours.c | 83 +++++++++++++++++++++++
 net/respondd-module-wifi/src/neighbours.h |  6 ++
 net/respondd-module-wifi/src/netlink.c    | 17 +++++
 net/respondd-module-wifi/src/netlink.h    |  1 +
 net/respondd-module-wifi/src/respondd.c   | 79 +++++++++++++++++----
 13 files changed, 225 insertions(+), 56 deletions(-)
 delete mode 100644 net/respondd-module-airtime/Makefile
 create mode 100644 net/respondd-module-wifi/src/neighbours.c
 create mode 100644 net/respondd-module-wifi/src/neighbours.h

diff --git a/net/respondd-module-airtime/Makefile b/net/respondd-module-airtime/Makefile
deleted file mode 100644
index 6a6e450..0000000
--- a/net/respondd-module-airtime/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=respondd-module-airtime
-PKG_VERSION:=1
-PKG_RELEASE:=2
-
-PKG_LICENSE:=BSD-2-Clause
-
-PKG_BUILD_DEPENDS := respondd
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/respondd-module-airtime
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Add airtime to respondd
-  DEPENDS:=+respondd +libnl-tiny
-endef
-
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny
-
-define Package/respondd-module-airtime/install
-	$(INSTALL_DIR) $(1)/usr/lib/respondd
-	$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/usr/lib/respondd/airtime.so
-endef
-
-$(eval $(call BuildPackage,respondd-module-airtime))
diff --git a/net/respondd-module-wifi/README.md b/net/respondd-module-wifi/README.md
index 3a9423c..df05639 100644
--- a/net/respondd-module-wifi/README.md
+++ b/net/respondd-module-wifi/README.md
@@ -11,6 +11,7 @@ The format is the following:
     "wireless": [
       {
         "frequency": 5220,
+        "channel_width": 40,
         "txpower": 1700,
         "active": 366561161,
         "busy": 46496566,
@@ -21,6 +22,7 @@ The format is the following:
       },
       {
         "frequency": 5220,
+        "channel_width": 40,
         "txpower": 1700,
         "active": 366561161,
         "busy": 46496566,
@@ -31,6 +33,7 @@ The format is the following:
       },
       {
         "frequency": 2437,
+        "channel_width": 20,
         "txpower": 2000,
         "active": 366649704,
         "busy": 205221222,
@@ -40,6 +43,19 @@ The format is the following:
         "clients": 3
       }
     ]
+  },
+  "neighbours": {
+    "wifi":{
+      "00:11:22:33:44:55:66":{
+        "frequency": 5220,
+        "neighbours":{
+          "33:22:33:11:22:44":{
+            "signal": 191,
+            "inactive": 50
+          }
+        }
+      }
+    }
   }
 }
 ```
diff --git a/net/respondd-module-wifi/src/Makefile b/net/respondd-module-wifi/src/Makefile
index 1d07977..8afb817 100644
--- a/net/respondd-module-wifi/src/Makefile
+++ b/net/respondd-module-wifi/src/Makefile
@@ -9,7 +9,7 @@ all: respondd.so
 
 %.c: %.h
 
-respondd.so: netlink.c clients.c airtime.c ifaces.c respondd.c
+respondd.so: netlink.c ifaces.c airtime.c clients.c neighbours.c respondd.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -fPIC -D_GNU_SOURCE -lnl-tiny -o $@ $^ $(LDLIBS)
 
 clean:
diff --git a/net/respondd-module-wifi/src/airtime.c b/net/respondd-module-wifi/src/airtime.c
index 989057a..1c1288b 100644
--- a/net/respondd-module-wifi/src/airtime.c
+++ b/net/respondd-module-wifi/src/airtime.c
@@ -57,7 +57,7 @@
  * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use
  */
 
-static const char * msg_names[NL80211_SURVEY_INFO_MAX + 1] = {
+static const char * airtime_names[NL80211_SURVEY_INFO_MAX + 1] = {
 	[NL80211_SURVEY_INFO_CHANNEL_TIME] = "active",
 	[NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY] = "busy",
 	[NL80211_SURVEY_INFO_CHANNEL_TIME_RX] = "rx",
@@ -79,7 +79,6 @@ static int survey_airtime_handler(struct nl_msg *msg, void *arg) {
 	// This variable counts the number of required attributes that are
 	// found in the message and is afterwards checked against the number of
 	// required attributes.
-	unsigned int req_fields = 0;
 
 	int rem;
 	struct nlattr *nla;
@@ -89,14 +88,7 @@ static int survey_airtime_handler(struct nl_msg *msg, void *arg) {
 		if (type > NL80211_SURVEY_INFO_MAX)
 			continue;
 
-		switch (type) {
-			// these are the required fields
-			case NL80211_SURVEY_INFO_IN_USE:
-			case NL80211_SURVEY_INFO_CHANNEL_TIME:
-				req_fields++;
-		}
-
-		if (!msg_names[type])
+		if (!airtime_names[type])
 			continue;
 
 		struct json_object *data_json = NULL;
@@ -118,7 +110,7 @@ static int survey_airtime_handler(struct nl_msg *msg, void *arg) {
 		}
 
 		if (data_json)
-			json_object_object_add(json, msg_names[type], data_json);
+			json_object_object_add(json, airtime_names[type], data_json);
 	}
 
 abort:
diff --git a/net/respondd-module-wifi/src/airtime.h b/net/respondd-module-wifi/src/airtime.h
index 7adc91e..d0bc56c 100644
--- a/net/respondd-module-wifi/src/airtime.h
+++ b/net/respondd-module-wifi/src/airtime.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <stdbool.h>
-#include <stdint.h>
 #include <json-c/json.h>
 
 __attribute__((visibility("hidden"))) bool get_airtime(struct json_object *result, int ifx);
diff --git a/net/respondd-module-wifi/src/clients.h b/net/respondd-module-wifi/src/clients.h
index a3ce848..d946aef 100644
--- a/net/respondd-module-wifi/src/clients.h
+++ b/net/respondd-module-wifi/src/clients.h
@@ -1,6 +1,5 @@
 #pragma once
 
 #include <stdbool.h>
-#include <stdint.h>
 
 __attribute__((visibility("hidden"))) bool get_client_counts(int *count, int ifx);
diff --git a/net/respondd-module-wifi/src/ifaces.c b/net/respondd-module-wifi/src/ifaces.c
index 7f8edc1..cd0f810 100644
--- a/net/respondd-module-wifi/src/ifaces.c
+++ b/net/respondd-module-wifi/src/ifaces.c
@@ -4,6 +4,19 @@
 #include "ifaces.h"
 #include "netlink.h"
 
+
+//https://github.com/torvalds/linux/blob/master/include/uapi/linux/nl80211.h#L4031
+static const int chanwidth[NL80211_SURVEY_INFO_MAX + 1] = {
+	[NL80211_CHAN_WIDTH_20_NOHT] = 20,
+	[NL80211_CHAN_WIDTH_20] = 20,
+	[NL80211_CHAN_WIDTH_40] = 40,
+	[NL80211_CHAN_WIDTH_80] = 80,
+	[NL80211_CHAN_WIDTH_80P80] = 160,
+	[NL80211_CHAN_WIDTH_160] = 160,
+	[NL80211_CHAN_WIDTH_5] = 5,
+	[NL80211_CHAN_WIDTH_10] = 10,
+};
+
 static int iface_dump_handler(struct nl_msg *msg, void *arg) {
 	struct nlattr *tb[NL80211_ATTR_MAX + 1];
 	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
@@ -15,7 +28,7 @@ static int iface_dump_handler(struct nl_msg *msg, void *arg) {
 		goto skip;
 
 	#ifdef GLUON
-	if(nla_strcmp(tb[NL80211_ATTR_IFNAME], "client") == -1)
+	if(nla_strcmp(tb[NL80211_ATTR_IFNAME], "client") == -1 || nla_strcmp(tb[NL80211_ATTR_IFNAME], "ibss") == -1 || nla_strcmp(tb[NL80211_ATTR_IFNAME], "mesh") == -1)
 	  goto skip;
 	#endif
 
@@ -28,8 +41,18 @@ static int iface_dump_handler(struct nl_msg *msg, void *arg) {
 	(*last_next)->next = NULL;
 	(*last_next)->wiphy = nla_get_u32(tb[NL80211_ATTR_WIPHY]);
 	(*last_next)->ifx = nla_get_u32(tb[NL80211_ATTR_IFINDEX]);
-	(*last_next)->frequency = nla_get_u32(tb[NL80211_ATTR_WIPHY_FREQ]);
-	(*last_next)->txpower = nla_get_u32(tb[NL80211_ATTR_WIPHY_TX_POWER_LEVEL]);
+	(*last_next)->frequency = tb[NL80211_ATTR_WIPHY_FREQ] ? nla_get_u32(tb[NL80211_ATTR_WIPHY_FREQ]) : 0;
+	(*last_next)->txpower = tb[NL80211_ATTR_WIPHY_TX_POWER_LEVEL] ? nla_get_u32(tb[NL80211_ATTR_WIPHY_TX_POWER_LEVEL]) : 0;
+	(*last_next)->type = tb[NL80211_ATTR_IFTYPE] ? nla_get_u32(tb[NL80211_ATTR_IFTYPE]) : 0;
+
+	if(tb[NL80211_ATTR_MAC]) {
+		mac_addr_n2a((*last_next)->mac_addr, nla_data(tb[NL80211_ATTR_MAC]));
+	}
+
+	int chanwidth_id = nla_get_u32(tb[NL80211_ATTR_CHANNEL_WIDTH]);
+
+	if(chanwidth[chanwidth_id])
+		(*last_next)->chanwidth = tb[NL80211_ATTR_CHANNEL_WIDTH] ? chanwidth[chanwidth_id] : 0;
 
 skip:
 	return NL_SKIP;
diff --git a/net/respondd-module-wifi/src/ifaces.h b/net/respondd-module-wifi/src/ifaces.h
index 5f2021d..fb88411 100644
--- a/net/respondd-module-wifi/src/ifaces.h
+++ b/net/respondd-module-wifi/src/ifaces.h
@@ -1,9 +1,14 @@
 #pragma once
 
+#include <stdbool.h>
+
 struct iface_list {
 	int wiphy;
 	int ifx;
+	char mac_addr[20];
+	int type;
 	int frequency;
+	int chanwidth;
 	int txpower;
 	struct iface_list *next;
 };
diff --git a/net/respondd-module-wifi/src/neighbours.c b/net/respondd-module-wifi/src/neighbours.c
new file mode 100644
index 0000000..f097908
--- /dev/null
+++ b/net/respondd-module-wifi/src/neighbours.c
@@ -0,0 +1,83 @@
+#include <linux/nl80211.h>
+#include <netlink/genl/genl.h>
+
+#include "netlink.h"
+#include "neighbours.h"
+
+static const char * neighbours_names[NL80211_STA_INFO_MAX + 1] = {
+	[NL80211_STA_INFO_SIGNAL] = "signal",
+	[NL80211_STA_INFO_INACTIVE_TIME] = "inactive",
+};
+
+static int station_neighbours_handler(struct nl_msg *msg, void *arg) {
+	struct json_object *neighbour, *json = (struct json_object *) arg;
+
+	neighbour = json_object_new_object();
+	if (!neighbour) {
+		//TODO why needed? : json_object_put(result);
+		goto abort;
+	}
+
+	struct nlattr *tb[NL80211_ATTR_MAX + 1];
+
+	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
+	struct nlattr *station_info = nla_find(genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NL80211_ATTR_STA_INFO);
+
+	nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), genlmsg_attrlen(gnlh, 0), NULL);
+
+	if (!station_info) {
+		fputs("respondd-module-wifi: station data missing in netlink message\n", stderr);
+		goto abort;
+	}
+
+	char mac_addr[20];
+
+	if (!tb[NL80211_ATTR_MAC])
+		goto abort;
+	mac_addr_n2a(mac_addr, nla_data(tb[NL80211_ATTR_MAC]));
+
+	int rem;
+	struct nlattr *nla;
+	nla_for_each_nested(nla, station_info, rem) {
+		int type = nla_type(nla);
+
+		if (type > NL80211_STA_INFO_MAX)
+			continue;
+
+		if (!neighbours_names[type])
+			continue;
+
+		struct json_object *data_json = NULL;
+		switch (nla_len(nla)) {
+			case sizeof(uint64_t):
+				data_json = json_object_new_int64(nla_get_u64(nla));
+				break;
+			case sizeof(uint32_t):
+				data_json = json_object_new_int(nla_get_u32(nla));
+				break;
+			case sizeof(uint8_t):
+					data_json = json_object_new_int(nla_get_u8(nla));
+				break;
+			default:
+				fprintf(stderr, "respondd-module-wifi: Unexpected NL attribute length: %d\n", nla_len(nla));
+		}
+		if (data_json)
+			json_object_object_add(neighbour, neighbours_names[type], data_json);
+	}
+	json_object_object_add(json, mac_addr, neighbour);
+
+abort:
+	return NL_SKIP;
+}
+
+bool get_neighbours(struct json_object *result, int ifx) {
+	struct json_object *neighbours;
+	neighbours = json_object_new_object();
+	if (!neighbours)
+		return false;
+  if(!nl_send_dump(station_neighbours_handler, neighbours, NL80211_CMD_GET_STATION, ifx))
+		return false;
+	json_object_object_add(result, "neighbours", neighbours);
+	return true;
+
+}
diff --git a/net/respondd-module-wifi/src/neighbours.h b/net/respondd-module-wifi/src/neighbours.h
new file mode 100644
index 0000000..28dcf49
--- /dev/null
+++ b/net/respondd-module-wifi/src/neighbours.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#include <stdbool.h>
+#include <json-c/json.h>
+
+__attribute__((visibility("hidden"))) bool get_neighbours(struct json_object *result, int ifx);
diff --git a/net/respondd-module-wifi/src/netlink.c b/net/respondd-module-wifi/src/netlink.c
index ac707d0..3d62536 100644
--- a/net/respondd-module-wifi/src/netlink.c
+++ b/net/respondd-module-wifi/src/netlink.c
@@ -1,12 +1,29 @@
 #include <inttypes.h>
 
 #include <linux/nl80211.h>
+#include <linux/if_ether.h>
 #include <netlink/genl/genl.h>
 #include <netlink/genl/ctrl.h>
 
 #include "netlink.h"
 
 
+void mac_addr_n2a(char *mac_addr, unsigned char *arg) {
+	int i, l;
+
+	l = 0;
+	for (i = 0; i < ETH_ALEN ; i++) {
+		if (i == 0) {
+			sprintf(mac_addr+l, "%02x", arg[i]);
+			l += 2;
+		} else {
+			sprintf(mac_addr+l, ":%02x", arg[i]);
+			l += 3;
+		}
+	}
+}
+
+
 bool nl_send_dump(nl_recvmsg_msg_cb_t cb, void *cb_arg, int cmd, uint32_t cmd_arg) {
 	bool ok = false;
 	int ret;
diff --git a/net/respondd-module-wifi/src/netlink.h b/net/respondd-module-wifi/src/netlink.h
index 022765e..c8f6898 100644
--- a/net/respondd-module-wifi/src/netlink.h
+++ b/net/respondd-module-wifi/src/netlink.h
@@ -4,4 +4,5 @@
 #include <stdint.h>
 #include <netlink/handlers.h>
 
+__attribute__((visibility("hidden"))) void mac_addr_n2a(char *mac_addr, unsigned char *arg);
 __attribute__((visibility("hidden"))) bool nl_send_dump(nl_recvmsg_msg_cb_t cb, void *cb_arg, int cmd, uint32_t cmd_arg);
diff --git a/net/respondd-module-wifi/src/respondd.c b/net/respondd-module-wifi/src/respondd.c
index 74a8cc3..03fe015 100644
--- a/net/respondd-module-wifi/src/respondd.c
+++ b/net/respondd-module-wifi/src/respondd.c
@@ -3,8 +3,11 @@
 #include <json-c/json.h>
 #include <respondd.h>
 
+#include <linux/nl80211.h>
+
 #include "airtime.h"
 #include "clients.h"
+#include "neighbours.h"
 #include "ifaces.h"
 
 static struct json_object *respondd_provider_statistics(void) {
@@ -31,23 +34,30 @@ static struct json_object *respondd_provider_statistics(void) {
 	while (ifaces != NULL) {
 		clients_count = 0;
 		get_client_counts(&clients_count, ifaces->ifx);
-		if (ifaces->frequency < 5000)
-			wifi24 += clients_count;
-		if (ifaces->frequency > 5000)
-			wifi5 += clients_count;
-
-		//TODO wiphy only one radio added? (no necessary on gluon - only one ap-ssid at radio)
-		interface = json_object_new_object();
-		if (!interface) {
-			continue;
+		if(ifaces->type == NL80211_IFTYPE_AP) {
+			if (ifaces->frequency < 5000)
+				wifi24 += clients_count;
+			if (ifaces->frequency > 5000)
+				wifi5 += clients_count;
 		}
-		json_object_object_add(interface, "frequency", json_object_new_int(ifaces->frequency));
-		json_object_object_add(interface, "txpower", json_object_new_int(ifaces->txpower));
+
+		//TODO wiphy only one radio added? (not necessary on gluon - only one ap-ssid at radio)
+		interface = json_object_new_object();
+		if (!interface)
+			goto next_statistics;
+
+		if (ifaces->frequency)
+			json_object_object_add(interface, "frequency", json_object_new_int(ifaces->frequency));
+		if (ifaces->chanwidth)
+			json_object_object_add(interface, "channel_width", json_object_new_int(ifaces->chanwidth));
+		if (ifaces->txpower)
+			json_object_object_add(interface, "txpower", json_object_new_int(ifaces->txpower));
 		get_airtime(interface, ifaces->ifx);
 		//TODO remove at merge radios (one wiphy radio)
 		json_object_object_add(interface, "clients", json_object_new_int(clients_count));
-		json_object_array_add(wireless, interface);
 
+		json_object_array_add(wireless, interface);
+next_statistics: ;
 		void *freeptr = ifaces;
 		ifaces = ifaces->next;
 		free(freeptr);
@@ -63,7 +73,52 @@ static struct json_object *respondd_provider_statistics(void) {
 	return result;
 }
 
+static struct json_object *respondd_provider_neighbours(void) {
+	struct json_object *result, *wireless, *station;
+	struct iface_list *ifaces;
+
+	result = json_object_new_object();
+	if (!result)
+		return NULL;
+
+	wireless = json_object_new_object();
+	if (!wireless) {
+		//TODO why needed? : json_object_put(result);
+		return NULL;
+	}
+
+	ifaces = get_ifaces();
+
+	while (ifaces != NULL) {
+
+		if(ifaces->type != NL80211_IFTYPE_ADHOC)
+			goto next_neighbours;
+
+		station = json_object_new_object();
+		if (!station)
+			goto next_neighbours;
+
+		if (!get_neighbours(station, ifaces->ifx))
+			goto next_neighbours;
+
+		if (ifaces->frequency)
+			json_object_object_add(station, "frequency", json_object_new_int(ifaces->frequency));
+
+		json_object_object_add(wireless, ifaces->mac_addr, station);
+
+next_neighbours: ;
+		void *freeptr = ifaces;
+		ifaces = ifaces->next;
+		free(freeptr);
+	}
+
+
+	json_object_object_add(result, "wifi", wireless);
+	return result;
+}
+
 const struct respondd_provider_info respondd_providers[] = {
 	{"statistics", respondd_provider_statistics},
+	{"neighbours", respondd_provider_neighbours},
 	{0, 0},
 };

From 8247f333e400a148644b7493df1ccb5823df78a8 Mon Sep 17 00:00:00 2001
From: Martin/Geno <geno+dev@fireorbit.de>
Date: Wed, 22 Aug 2018 02:56:49 +0200
Subject: [PATCH 4/6] fix guild gluon version

---
 net/respondd-module-wifi/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net/respondd-module-wifi/Makefile b/net/respondd-module-wifi/Makefile
index 36aa9fa..1d5a3a1 100644
--- a/net/respondd-module-wifi/Makefile
+++ b/net/respondd-module-wifi/Makefile
@@ -37,3 +37,4 @@ endef
 Package/respondd-module-gluonwifi/install = $(Package/respondd-module-wifi/install)
 
 $(eval $(call BuildPackage,respondd-module-wifi))
+$(eval $(call BuildPackage,respondd-module-gluonwifi))

From 03763769457fbfd24acb4d9a2cf10db1ad54f4c1 Mon Sep 17 00:00:00 2001
From: Martin/Geno <geno+dev@fireorbit.de>
Date: Tue, 25 Sep 2018 21:48:19 +0200
Subject: [PATCH 5/6] respondd-module-wifi: free json_object by json_object_put

---
 net/respondd-module-wifi/src/neighbours.c | 13 ++++++++-----
 net/respondd-module-wifi/src/respondd.c   | 10 +++++++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/net/respondd-module-wifi/src/neighbours.c b/net/respondd-module-wifi/src/neighbours.c
index f097908..fbbcf40 100644
--- a/net/respondd-module-wifi/src/neighbours.c
+++ b/net/respondd-module-wifi/src/neighbours.c
@@ -13,10 +13,8 @@ static int station_neighbours_handler(struct nl_msg *msg, void *arg) {
 	struct json_object *neighbour, *json = (struct json_object *) arg;
 
 	neighbour = json_object_new_object();
-	if (!neighbour) {
-		//TODO why needed? : json_object_put(result);
+	if (!neighbour)
 		goto abort;
-	}
 
 	struct nlattr *tb[NL80211_ATTR_MAX + 1];
 
@@ -27,13 +25,16 @@ static int station_neighbours_handler(struct nl_msg *msg, void *arg) {
 
 	if (!station_info) {
 		fputs("respondd-module-wifi: station data missing in netlink message\n", stderr);
+		json_object_put(neighbour);
 		goto abort;
 	}
 
 	char mac_addr[20];
 
-	if (!tb[NL80211_ATTR_MAC])
+	if (!tb[NL80211_ATTR_MAC]) {
+		json_object_put(neighbour);
 		goto abort;
+	}
 	mac_addr_n2a(mac_addr, nla_data(tb[NL80211_ATTR_MAC]));
 
 	int rem;
@@ -75,8 +76,10 @@ bool get_neighbours(struct json_object *result, int ifx) {
 	neighbours = json_object_new_object();
 	if (!neighbours)
 		return false;
-  if(!nl_send_dump(station_neighbours_handler, neighbours, NL80211_CMD_GET_STATION, ifx))
+  if(!nl_send_dump(station_neighbours_handler, neighbours, NL80211_CMD_GET_STATION, ifx)) {
+		json_object_put(neighbours);
 		return false;
+	}
 	json_object_object_add(result, "neighbours", neighbours);
 	return true;
 
diff --git a/net/respondd-module-wifi/src/respondd.c b/net/respondd-module-wifi/src/respondd.c
index 03fe015..212e1c0 100644
--- a/net/respondd-module-wifi/src/respondd.c
+++ b/net/respondd-module-wifi/src/respondd.c
@@ -21,12 +21,14 @@ static struct json_object *respondd_provider_statistics(void) {
 
 	wireless = json_object_new_array();
 	if (!wireless) {
-		//TODO why needed? : json_object_put(result);
+		json_object_put(result);
 		return NULL;
 	}
 
 	clients = json_object_new_object();
 	if (!clients) {
+		json_object_put(wireless);
+		json_object_put(result);
 		return NULL;
 	}
 
@@ -83,7 +85,7 @@ static struct json_object *respondd_provider_neighbours(void) {
 
 	wireless = json_object_new_object();
 	if (!wireless) {
-		//TODO why needed? : json_object_put(result);
+		json_object_put(result);
 		return NULL;
 	}
 
@@ -98,8 +100,10 @@ static struct json_object *respondd_provider_neighbours(void) {
 		if (!station)
 			goto next_neighbours;
 
-		if (!get_neighbours(station, ifaces->ifx))
+		if (!get_neighbours(station, ifaces->ifx)) {
+			json_object_put(station);
 			goto next_neighbours;
+		}
 
 		if (ifaces->frequency)
 			json_object_object_add(station, "frequency", json_object_new_int(ifaces->frequency));

From f70362677f77a73cd826ea8487a9a9f25217bf4e Mon Sep 17 00:00:00 2001
From: Martin/Geno <geno+dev@fireorbit.de>
Date: Tue, 25 Sep 2018 21:48:47 +0200
Subject: [PATCH 6/6] respondd-module-wifi: replace mac_addr_n2a implementation

---
 net/respondd-module-wifi/src/netlink.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/net/respondd-module-wifi/src/netlink.c b/net/respondd-module-wifi/src/netlink.c
index 3d62536..b5b81d8 100644
--- a/net/respondd-module-wifi/src/netlink.c
+++ b/net/respondd-module-wifi/src/netlink.c
@@ -9,18 +9,7 @@
 
 
 void mac_addr_n2a(char *mac_addr, unsigned char *arg) {
-	int i, l;
-
-	l = 0;
-	for (i = 0; i < ETH_ALEN ; i++) {
-		if (i == 0) {
-			sprintf(mac_addr+l, "%02x", arg[i]);
-			l += 2;
-		} else {
-			sprintf(mac_addr+l, ":%02x", arg[i]);
-			l += 3;
-		}
-	}
+	sprintf(mac_addr, "%02x:%02x:%02x:%02x:%02x:%02x", arg[0], arg[1], arg[2], arg[3], arg[4], arg[5]);
 }