nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 5892f399d3 into 9711afaf69

Browse Source
This commit is contained in:
Christof Schulze 2018-02-16 19:45:07 +00:00 committed by GitHub
commit d76a859d50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 122 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/gluon-mesh-batman-adv/Makefile
View File

@ -13,7 +13,7 @@ define Package/gluon-mesh-batman-adv/common
SECTION:=gluon
CATEGORY:=Gluon
PROVIDES:=gluon-mesh-batman-adv
DEPENDS:=+gluon-core +libgluonutil +gluon-client-bridge +gluon-ebtables +firewall +libiwinfo +kmod-dummy +libnl-tiny +libbatadv
DEPENDS:=+gluon-core +libgluonutil +gluon-client-bridge +gluon-ebtables +firewall +libiwinfo +kmod-dummy +libnl-tiny +libbatadv +libjson-c
endef
define Package/gluon-mesh-batman-adv-14
@ -43,6 +43,8 @@ define Package/gluon-mesh-batman-adv/common/install
$(CP) ./files/* $(1)/
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
$(INSTALL_DIR) $(1)/lib/gluon/respondd
$(INSTALL_DIR) $(1)/lib/gluon/status-page/providers
$(INSTALL_BIN) $(PKG_BUILD_DIR)/neighbours-batadv $(1)/lib/gluon/status-page/providers/
$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/mesh-batman-adv.so
$(INSTALL_DIR) $(1)/lib/gluon/mesh-batman-adv

17
package/gluon-mesh-batman-adv/src/Makefile
View File

@ -1,4 +1,4 @@
all: respondd.so
all: neighbours-batadv respondd.so
CFLAGS += -Wall
@ -9,6 +9,17 @@ ifeq ($(origin PKG_CONFIG), undefined)
endif
endif
ifeq ($(origin LIBJSONC_CFLAGS) $(origin LIBJSONC_LDLIBS), undefined undefined)
LIBJSONC_NAME ?= json-c
ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBJSONC_NAME) 2>/dev/null),)
$(error No $(LIBJSONC_NAME) development libraries found!)
endif
LIBJSONC_CFLAGS += $(shell $(PkG_CONFIG) --cflags $(LIBJSONC_NAME))
LIBJSONC_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBJSONC_NAME))
endif
CFLAGS += $(LIBJSONC_CFLAGS)
LDLIBS += $(LIBJSONC_LDLIBS)
ifeq ($(origin LIBNL_CFLAGS) $(origin LIBNL_LDLIBS), undefined undefined)
LIBNL_NAME ?= libnl-tiny
ifeq ($(shell $(PKG_CONFIG) --modversion $(LIBNL_NAME) 2>/dev/null),)
@ -33,3 +44,7 @@ LDLIBS += $(LIBBATADV_LDLIBS)
respondd.so: respondd.c
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared -fPIC -D_GNU_SOURCE -o $@ $^ $(LDLIBS) -lgluonutil -liwinfo -luci
neighbours-batadv: neighbours-batadv.c
$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -D_GNU_SOURCE -o $@ $^ $(LDLIBS)

0
package/gluon-status-page-api/src/neighbours-batadv.c → package/gluon-mesh-batman-adv/src/neighbours-batadv.c
View File

1
package/gluon-status-page-api/Makefile
View File

@ -29,7 +29,6 @@ endef
define Package/gluon-status-page-api/install
$(INSTALL_DIR) $(1)/lib/gluon/status-page/providers
$(INSTALL_BIN) $(PKG_BUILD_DIR)/neighbours-batadv $(1)/lib/gluon/status-page/providers/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/stations $(1)/lib/gluon/status-page/providers/
$(INSTALL_DIR) $(1)/lib/gluon/respondd

7
package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-babel Executable file
View File

@ -0,0 +1,7 @@
#!/bin/sh
echo 'Access-Control-Allow-Origin: *'
CMD='exec /lib/gluon/status-page/providers/neighbours-babel'
exec /usr/sbin/sse-multiplex "$CMD"

2
package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/neighbours-nodeinfo
View File

@ -8,6 +8,6 @@ badrequest() {
echo 'Access-Control-Allow-Origin: *'
batctl if | cut -d: -f1 | grep -qxF "$QUERY_STRING" || badrequest
ubus call network.interface dump | jsonfilter -e "@.interface[@.proto='gluon_mesh' && @.up=true].device"| grep -qxF "$QUERY_STRING" || badrequest
exec /usr/bin/gluon-neighbour-info -s neighbour -i "$QUERY_STRING" -d ff02::2:1001 -p 1001 -r nodeinfo

2
package/gluon-status-page-api/files/lib/gluon/status-page/www/cgi-bin/dyn/stations
View File

@ -8,7 +8,7 @@ badrequest() {
echo 'Access-Control-Allow-Origin: *'
batctl if | cut -d: -f1 | grep -qxF "$QUERY_STRING" || badrequest
ubus call network.interface dump | jsonfilter -e "@.interface[@.proto='gluon_mesh' && @.up=true].device"| grep -qxF "$QUERY_STRING" || badrequest
CMD="exec /lib/gluon/status-page/providers/stations '$QUERY_STRING'"

5
package/gluon-status-page-api/src/Makefile
View File

@ -29,10 +29,7 @@ ifeq ($(origin LIBBATADV_CFLAGS) $(origin LIBBATADV_LDLIBS), undefined undefined
LIBBATADV_LDLIBS += $(shell $(PKG_CONFIG) --libs $(LIBBATADV_NAME))
endif
all: neighbours-batadv stations respondd.so
neighbours-batadv: neighbours-batadv.c
$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_JSONC) $(LIBNL_CFLAGS) $(LIBBATADV_CFLAGS) $(LDFLAGS) $(LDFLAGS_JSONC) $(LIBNL_LDLIBS) $(LIBBATADV_LDLIBS) -Wall -o $@ $^ $(LDLIBS)
all: stations respondd.so
stations: stations.c
$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_JSONC) $(LDFLAGS) $(LDFLAGS_JSONC) -Wall -o $@ $^ $(LDLIBS) -liwinfo

2
package/gluon-status-page-api/src/stations.c
View File

@ -27,6 +27,8 @@ static struct json_object *get_stations(const struct iwinfo_ops *iw, const char
json_object_object_add(station, "signal", json_object_new_int(entry->signal));
json_object_object_add(station, "noise", json_object_new_int(entry->noise));
json_object_object_add(station, "inactive", json_object_new_int(entry->inactive));
json_object_object_add(station, "rx_rate", json_object_new_int(entry->rx_rate.rate));
json_object_object_add(station, "tx_rate", json_object_new_int(entry->tx_rate.rate));
char macstr[18];

19
package/gluon-status-page/src/js/lib/gui/neighbours.js
View File

@ -77,11 +77,15 @@ function (Helper, SignalGraph, Signal) {
tdSignal.textContent = signal
tdInactive.textContent = Math.round(inactive / 1000) + " s"
}
if ("batadv" in d)
tdTQ.textContent = Math.round(d.batadv.tq / 2.55) + " %"
else
tdTQ.textContent = "‒"
if ("batman-adv" in nodeInfo.software) {
tdTQ.textContent = "TQ: " + Math.round(d.routingMetrics.tq / 2.55) + " %"
}
else if ("babeld" in nodeInfo.software) {
tdTQ.textContent = "Cost: " + Math.round(d.routingMetrics.cost / 653.53) + " %"
}
else {
tdTQ.textContent = "Unable to extract routing protocol from nodeInfo"
}
if (infoSet)
return
@ -111,10 +115,11 @@ function (Helper, SignalGraph, Signal) {
} catch (e) {
tdDistance.textContent = "‒"
}
} else
} else {
hostname.textContent = d.id
}
}
}
function Interface(parent, nodeInfo, iface, stream, mgmtBus) {
var colors = graphColors.slice(0)
@ -136,7 +141,7 @@ function (Helper, SignalGraph, Signal) {
tr.appendChild(th)
th = document.createElement("th")
th.textContent = "TQ"
th.textContent = "Metrik"
tr.appendChild(th)
th = document.createElement("th")

4
package/gluon-status-page/src/js/lib/gui/statistics.js
View File

@ -184,6 +184,10 @@ define(["lib/helper"], function (Helper) {
function prettyPrefix(prefixes, step, d) {
var prefix = 0
if (d == undefined) {
d = 0
}
while (d > step && prefix < prefixes.length - 1) {
d /= step
prefix++

19
package/gluon-status-page/src/js/lib/neighbourstream.js
View File

@ -64,15 +64,16 @@ define([ "bacon"
})
var batadvStream = new Streams.Batadv(ip).toProperty({})
var babelStream = new Streams.Babel(ip).toProperty({})
return Bacon.combineWith(combine, wifiStream
, batadvStream.map(extractIfname)
, Bacon.combineWith(Object.assign, batadvStream, babelStream).map(extractIfname)
, nodesBus.map(".macs")
)
}
function combine(wifi, batadv, macs) {
var interfaces = combineWithIfnames(wifi, batadv)
function combine(wifi, routingMetrics, macs) {
var interfaces = combineWithIfnames(wifi, routingMetrics)
for (var ifname in interfaces) {
var stations = interfaces[ifname]
@ -89,8 +90,8 @@ define([ "bacon"
return interfaces
}
function combineWithIfnames(wifi, batadv) {
var ifnames = Object.keys(wifi).concat(Object.keys(batadv))
function combineWithIfnames(wifi, routingMetrics) {
var ifnames = Object.keys(wifi).concat(Object.keys(routingMetrics))
// remove duplicates
ifnames.filter(function(e, i) {
@ -100,21 +101,21 @@ define([ "bacon"
var out = {}
ifnames.forEach(function (ifname) {
out[ifname] = combineWifiBatadv(wifi[ifname], batadv[ifname])
out[ifname] = combineWifiRoutingMetrics(wifi[ifname], routingMetrics[ifname])
})
return out
}
function combineWifiBatadv(wifi, batadv) {
function combineWifiRoutingMetrics(wifi, routingMetrics) {
var station
var out = {}
for (station in batadv) {
for (station in routingMetrics) {
if (!(station in out))
out[station] = {}
out[station].batadv = batadv[station]
out[station].routingMetrics = routingMetrics[station]
}
for (station in wifi) {

11
package/gluon-status-page/src/js/lib/streams.js
View File

@ -1,4 +1,7 @@
"use strict"
define(["bacon", "lib/helper"], function(Bacon, Helper) {
function nodeInfo(ip, ifname) {
return Bacon.fromBinder(function (sink) {
@ -43,6 +46,11 @@ define(["bacon", "lib/helper"], function(Bacon, Helper) {
})
}
function babel(ip) {
var url = Helper.buildUrl(ip, "dyn/neighbours-babel")
return simpleStream(url)
}
function batadv(ip) {
var url = Helper.buildUrl(ip, "dyn/neighbours-batadv")
return simpleStream(url)
@ -59,8 +67,9 @@ define(["bacon", "lib/helper"], function(Bacon, Helper) {
}
return { nodeInfo: nodeInfo
, Batadv: batadv
, Stations: stations
, Batadv: batadv
, Babel: babel
, Statistics: statistics
}
})