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

gluon-mesh-babel: remove explicit ubus socket specification, convert timeout to expected units

Browse Source
This commit is contained in:
Matthias Schiffer 2019-11-23 19:01:24 +01:00
parent b4101e54e0
commit f34b302b22
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/gluon-mesh-babel/src/respondd.c
View File

@ -74,8 +74,7 @@
#define IFNAMELEN 32 #define IFNAMELEN 32
#define PROTOLEN 32 #define PROTOLEN 32
#define UBUS_TIMEOUT 30 #define UBUS_TIMEOUT 30000
#define UBUS_SOCKET "/var/run/ubus.sock"
static struct babelhelper_ctx bhelper_ctx = {}; static struct babelhelper_ctx bhelper_ctx = {};
@ -330,7 +329,7 @@ static struct json_object * get_mesh_ifs() {
unsigned int id=8; unsigned int id=8;
ubus_ctx = ubus_connect(UBUS_SOCKET); ubus_ctx = ubus_connect(NULL);
if (!ubus_ctx) { if (!ubus_ctx) {
fprintf(stderr,"could not connect to ubus, not providing mesh-data\n"); fprintf(stderr,"could not connect to ubus, not providing mesh-data\n");
goto end; goto end;
@ -338,7 +337,7 @@ static struct json_object * get_mesh_ifs() {
blob_buf_init(&b, 0); blob_buf_init(&b, 0);
ubus_lookup_id(ubus_ctx, "network.interface", &id); ubus_lookup_id(ubus_ctx, "network.interface", &id);
int uret = ubus_invoke(ubus_ctx, id, "dump", b.head, receive_call_result_data, &ret, UBUS_TIMEOUT * 1000); int uret = ubus_invoke(ubus_ctx, id, "dump", b.head, receive_call_result_data, &ret, UBUS_TIMEOUT);
if (uret > 0) if (uret > 0)
fprintf(stderr, "ubus command failed: %s\n", ubus_strerror(uret)); fprintf(stderr, "ubus command failed: %s\n", ubus_strerror(uret));