gluon-mesh-babel: remove explicit ubus socket specification, convert …

…timeout to expected units
lemoer · Nov 24, 2019 · f34b302 · f34b302
1 parent b4101e5
commit f34b302
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/package/gluon-mesh-babel/src/respondd.c b/package/gluon-mesh-babel/src/respondd.c
@@ -74,8 +74,7 @@
 #define IFNAMELEN 32
 #define PROTOLEN 32
 
-#define UBUS_TIMEOUT 30
-#define UBUS_SOCKET "/var/run/ubus.sock"
+#define UBUS_TIMEOUT 30000
 
 static struct babelhelper_ctx bhelper_ctx = {};
 
@@ -330,15 +329,15 @@ static struct json_object * get_mesh_ifs() {
 
 	unsigned int id=8;
 
-	ubus_ctx = ubus_connect(UBUS_SOCKET);
+	ubus_ctx = ubus_connect(NULL);
 	if (!ubus_ctx) {
 		fprintf(stderr,"could not connect to ubus, not providing mesh-data\n");
 		goto end;
 	}
 
 	blob_buf_init(&b, 0);
 	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)
 		fprintf(stderr, "ubus command failed: %s\n", ubus_strerror(uret));