Skip to content

Commit

Permalink
Move common code from gluon-mesh-babel and -batman-adv respondd provi…
Browse files Browse the repository at this point in the history 
…ders to gluon-respondd

In addition this PR contains:
- split of gluon-respondd provider into multiple source files
- minor additional cleanups in gluon-mesh-babel respondd provider
  (untested, as the babel respondd provider already doesn't compile prior
  to these changes...)
  • Loading branch information
@neocturne
neocturne committed Nov 24, 2019
1 parent f34b302 commit 0f1fa24
Show file tree
Hide file tree
Showing 10 changed files with 649 additions and 679 deletions.
2 changes: 1 addition & 1 deletion package/gluon-mesh-babel/src/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ LDFLAGS_JSONC = $(shell pkg-config --libs json-c)


respondd.so: respondd.c handle_neighbour.c
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LDLIBS) -shared $(LDFLAGS_JSONC) -o $@ $^ -lgluonutil -lblobmsg_json -lubox -lubus -liwinfo -luci
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LDLIBS) -shared $(LDFLAGS_JSONC) -o $@ $^ -lgluonutil -lblobmsg_json -lubox -lubus -luci

neighbours-babel: neighbours-babel.c handle_neighbour.c
$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_JSONC) $(LDFLAGS) $(LDLIBS) $(LDFLAGS_JSONC) -o $@ $^
230 changes: 29 additions & 201 deletions package/gluon-mesh-babel/src/respondd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,15 @@

#include <respondd.h>

#include <iwinfo.h>
#include <json-c/json.h>
#include <libgluonutil.h>
#include <uci.h>

#include <alloca.h>
#include <glob.h>
#include <inttypes.h>
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>

#include <arpa/inet.h>
Expand All @@ -49,29 +47,15 @@
#include <sys/un.h>
#include <ifaddrs.h>

#include <linux/ethtool.h>
#include <linux/if_addr.h>
#include <linux/sockios.h>

#include <netdb.h>
#include "errno.h"
#include <errno.h>
#include <libbabelhelper/babelhelper.h>

#include <libubox/blobmsg_json.h>
#include "libubus.h"

#define _STRINGIFY(s) #s
#define STRINGIFY(s) _STRINGIFY(s)
#include <stdlib.h>

#define MAX_INACTIVITY 60000
#include <libubus.h>

#define SOCKET_INPUT_BUFFER_SIZE 255
#define BABEL_PORT 33123
#define VPN_INTERFACE "mesh-vpn"
#define l3rdctl "/var/run/l3roamd.sock"

#define IFNAMELEN 32
#define PROTOLEN 32

#define UBUS_TIMEOUT 30000
Expand Down Expand Up @@ -257,9 +241,9 @@ static void blobmsg_handle_element(struct blob_attr *attr, bool head, char **ifn

switch (blob_id(attr)) {
case BLOBMSG_TYPE_STRING:
if (!strncmp(blobmsg_name(attr),"device", 6)) {
if (!strncmp(blobmsg_name(attr), "device", 6)) {
free(*ifname);
*ifname = strndup(data, IFNAMELEN);
*ifname = strndup(data, IF_NAMESIZE);
} else if (!strncmp(blobmsg_name(attr), "proto", 5)) {
free(*proto);
*proto = strndup(data, PROTOLEN);
Expand Down Expand Up @@ -385,34 +369,40 @@ static struct json_object * respondd_provider_nodeinfo(void) {
return ret;
}

static uint64_t getnumber(const char *ifname, const char *stat) {
static struct json_object * read_number(const char *ifname, const char *stat) {
const char *format = "/sys/class/net/%s/statistics/%s";

struct json_object *ret = NULL;
int64_t i;

char path[strlen(format) + strlen(ifname) + strlen(stat) + 1];
snprintf(path, sizeof(path), format, ifname, stat);
if (! access(path, F_OK)) {
char *line=gluonutil_read_line(path);
long long i = atoll(line);
free(line);
return(i);
}
return 0;

FILE *f = fopen(path, "r");
if (!f)
return NULL;

if (fscanf(f, "%"SCNd64, &i) == 1)
ret = json_object_new_int64(i);

fclose(f);

return ret;
}

static struct json_object * get_traffic(void) {
char ifname[16];

strncpy(ifname, "br-client", 16);
const char *ifname = "br-client";

struct json_object *ret = NULL;
struct json_object *rx = json_object_new_object();
struct json_object *tx = json_object_new_object();

json_object_object_add(rx, "packets", json_object_new_int64(getnumber(ifname, "rx_packets")));
json_object_object_add(rx, "bytes", json_object_new_int64(getnumber(ifname, "rx_bytes")));
json_object_object_add(rx, "dropped", json_object_new_int64(getnumber(ifname, "rx_dropped")));
json_object_object_add(tx, "packets", json_object_new_int64(getnumber(ifname, "tx_packets")));
json_object_object_add(tx, "dropped", json_object_new_int64(getnumber(ifname, "tx_dropped")));
json_object_object_add(tx, "bytes", json_object_new_int64(getnumber(ifname, "tx_bytes")));
json_object_object_add(rx, "packets", read_number(ifname, "rx_packets"));
json_object_object_add(rx, "bytes", read_number(ifname, "rx_bytes"));
json_object_object_add(rx, "dropped", read_number(ifname, "rx_dropped"));
json_object_object_add(tx, "packets", read_number(ifname, "tx_packets"));
json_object_object_add(tx, "dropped", read_number(ifname, "tx_dropped"));
json_object_object_add(tx, "bytes", read_number(ifname, "tx_bytes"));

ret = json_object_new_object();
json_object_object_add(ret, "rx", rx);
Expand All @@ -421,72 +411,6 @@ static struct json_object * get_traffic(void) {
return ret;
}

static void count_iface_stations(size_t *wifi24, size_t *wifi5, const char *ifname) {
const struct iwinfo_ops *iw = iwinfo_backend(ifname);
if (!iw)
return;

int freq;
if (iw->frequency(ifname, &freq) < 0)
return;

size_t *wifi;
if (freq >= 2400 && freq < 2500)
wifi = wifi24;
else if (freq >= 5000 && freq < 6000)
wifi = wifi5;
else
return;

int len;
char buf[IWINFO_BUFSIZE];
if (iw->assoclist(ifname, buf, &len) < 0)
return;

struct iwinfo_assoclist_entry *entry;
for (entry = (struct iwinfo_assoclist_entry *)buf; (char*)(entry+1) <= buf + len; entry++) {
if (entry->inactive > MAX_INACTIVITY)
continue;

(*wifi)++;
}
}

static void count_stations(size_t *wifi24, size_t *wifi5) {
struct uci_context *ctx = uci_alloc_context();
ctx->flags &= ~UCI_FLAG_STRICT;


struct uci_package *p;
if (uci_load(ctx, "wireless", &p))
goto end;


struct uci_element *e;
uci_foreach_element(&p->sections, e) {
struct uci_section *s = uci_to_section(e);
if (strcmp(s->type, "wifi-iface"))
continue;

const char *network = uci_lookup_option_string(ctx, s, "network");
if (!network || strcmp(network, "client"))
continue;

const char *mode = uci_lookup_option_string(ctx, s, "mode");
if (!mode || strcmp(mode, "ap"))
continue;

const char *ifname = uci_lookup_option_string(ctx, s, "ifname");
if (!ifname)
continue;

count_iface_stations(wifi24, wifi5, ifname);
}

end:
uci_free_context(ctx);
}

static bool handle_route_addgw_nexthop(char **data, void *arg) {
struct json_object *obj = (struct json_object*) arg;
if (data[PREFIX] && data[FROM] && data[VIA] && data[IF]) {
Expand Down Expand Up @@ -568,21 +492,12 @@ static int ask_l3roamd_for_client_count() {
}

static struct json_object * get_clients(void) {
size_t wifi24 = 0, wifi5 = 0;

count_stations(&wifi24, &wifi5);

int total = ask_l3roamd_for_client_count();

size_t wifi = wifi24 + wifi5;
struct json_object *ret = json_object_new_object();

int total = ask_l3roamd_for_client_count();
if (total >= 0)
json_object_object_add(ret, "total", json_object_new_int(total));

json_object_object_add(ret, "wifi", json_object_new_int(wifi));
json_object_object_add(ret, "wifi24", json_object_new_int(wifi24));
json_object_object_add(ret, "wifi5", json_object_new_int(wifi5));
return ret;
}

Expand All @@ -597,89 +512,6 @@ static struct json_object * respondd_provider_statistics(void) {
return ret;
}

static struct json_object * get_wifi_neighbours(const char *ifname) {
const struct iwinfo_ops *iw = iwinfo_backend(ifname);
if (!iw)
return NULL;

int len;
char buf[IWINFO_BUFSIZE];
if (iw->assoclist(ifname, buf, &len) < 0)
return NULL;

struct json_object *neighbours = json_object_new_object();

struct iwinfo_assoclist_entry *entry;
for (entry = (struct iwinfo_assoclist_entry *)buf; (char*)(entry+1) <= buf + len; entry++) {
if (entry->inactive > MAX_INACTIVITY)
continue;

struct json_object *obj = json_object_new_object();

json_object_object_add(obj, "signal", json_object_new_int(entry->signal));
json_object_object_add(obj, "noise", json_object_new_int(entry->noise));
json_object_object_add(obj, "inactive", json_object_new_int(entry->inactive));

char mac[18];
snprintf(mac, sizeof(mac), "%02x:%02x:%02x:%02x:%02x:%02x",
entry->mac[0], entry->mac[1], entry->mac[2],
entry->mac[3], entry->mac[4], entry->mac[5]);

json_object_object_add(neighbours, mac, obj);
}

struct json_object *ret = json_object_new_object();

if (json_object_object_length(neighbours))
json_object_object_add(ret, "neighbours", neighbours);
else
json_object_put(neighbours);

return ret;
}

static struct json_object * get_wifi(void) {

struct uci_context *ctx = uci_alloc_context();
ctx->flags &= ~UCI_FLAG_STRICT;

struct json_object *ret = json_object_new_object();

struct uci_package *p;
if (uci_load(ctx, "network", &p))
goto end;


struct uci_element *e;
uci_foreach_element(&p->sections, e) {
struct uci_section *s = uci_to_section(e);
if (strcmp(s->type, "interface"))
continue;

const char *proto = uci_lookup_option_string(ctx, s, "proto");
if (!proto || strcmp(proto, "gluon_mesh"))
continue;

const char *ifname = uci_lookup_option_string(ctx, s, "ifname");
if (!ifname)
continue;

char *ifaddr = gluonutil_get_interface_address(ifname);
if (!ifaddr)
continue;

struct json_object *neighbours = get_wifi_neighbours(ifname);
if (neighbours)
json_object_object_add(ret, ifaddr, neighbours);

free(ifaddr);
}

end:
uci_free_context(ctx);
return ret;
}

static struct json_object * respondd_provider_neighbours(void) {
struct json_object *ret = json_object_new_object();

Expand All @@ -688,10 +520,6 @@ static struct json_object * respondd_provider_neighbours(void) {
json_object_object_add(ret, "babel", babel);


struct json_object *wifi = get_wifi();
if (wifi)
json_object_object_add(ret, "wifi", wifi);

return ret;
}

Expand Down
2 changes: 1 addition & 1 deletion package/gluon-mesh-batman-adv/src/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ CFLAGS += $(LIBBATADV_CFLAGS)
LDLIBS += $(LIBBATADV_LDLIBS)

respondd.so: respondd.c
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -fPIC -D_GNU_SOURCE -o $@ $^ $(LDLIBS) -lgluonutil -liwinfo -luci
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -fPIC -D_GNU_SOURCE -o $@ $^ $(LDLIBS) -lgluonutil -luci
Loading

0 comments on commit 0f1fa24

Please sign in to comment.