mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2025-12-10 07:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ubus api: remove unused code and use libubus api by default

Browse source
This commit is contained in:
Amin Ben Ramdhane 2020-05-20 11:05:31 +01:00
parent e442cd1a82
commit 5f4659f054
2 changed files with 0 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -77,7 +77,6 @@ AC_SUBST([LIBUBUS_LDFLAGS])
LIBUBUS_LIBS='-lubus' LIBUBUS_LIBS='-lubus'
AC_SUBST([LIBUBUS_LIBS]) AC_SUBST([LIBUBUS_LIBS])
AC_DEFINE(DM_USE_LIBUBUS)
LBLOBMSG_LIBS='-lblobmsg_json' LBLOBMSG_LIBS='-lblobmsg_json'
AC_SUBST([LBLOBMSG_LIBS]) AC_SUBST([LBLOBMSG_LIBS])

73
libbbf_api/dmubus.c
View file

@ -32,7 +32,6 @@ struct dm_ubus_req {
unsigned n_args; unsigned n_args;
}; };
#if DM_USE_LIBUBUS
static struct blob_buf b; static struct blob_buf b;
static struct ubus_context *ubus_ctx; static struct ubus_context *ubus_ctx;
static int timeout = 1000; static int timeout = 1000;
@ -102,41 +101,8 @@ static int __dm_ubus_call(const char *obj, const char *method, const struct ubus
return rc; return rc;
} }
#else
static void dm_libubus_free() {}
#endif
int dmubus_call_set(char *obj, char *method, struct ubus_arg u_args[], int u_args_size) int dmubus_call_set(char *obj, char *method, struct ubus_arg u_args[], int u_args_size)
{ {
#if !DM_USE_LIBUBUS
char bufargs[256], *p;
int i;
p = bufargs;
if (u_args_size) {
sprintf(p, "{");
for (i = 0; i < u_args_size; i++) {
p += strlen(p);
if (i == 0) {
if(u_args[i].type != Integer)
sprintf(p, "\"%s\": \"%s\"", u_args[i].key, u_args[i].val);
else
sprintf(p, "\"%s\": %s", u_args[i].key, u_args[i].val);
} else {
if(u_args[i].type != Integer)
sprintf(p, ", \"%s\": \"%s\"", u_args[i].key, u_args[i].val);
else
sprintf(p, ", \"%s\": %s", u_args[i].key, u_args[i].val);
}
}
p += strlen(p);
sprintf(p, "}");
DMCMD("ubus", 7, "-S", "-t", "1", "call", obj, method, bufargs);
} else {
DMCMD("ubus", 6, "-S", "-t", "1", "call", obj, method);
}
return 0;
#else
int rc = __dm_ubus_call(obj, method, u_args, u_args_size); int rc = __dm_ubus_call(obj, method, u_args, u_args_size);
if (json_res != NULL) { if (json_res != NULL) {
@ -144,51 +110,12 @@ int dmubus_call_set(char *obj, char *method, struct ubus_arg u_args[], int u_arg
json_res = NULL; json_res = NULL;
} }
return rc; return rc;
#endif
} }
static inline json_object *ubus_call_req(char *obj, char *method, struct ubus_arg u_args[], int u_args_size) static inline json_object *ubus_call_req(char *obj, char *method, struct ubus_arg u_args[], int u_args_size)
{ {
#if !DM_USE_LIBUBUS
json_object *res = NULL;
char *ubus_return, bufargs[256], *p;
int i, pp = 0;
p = bufargs;
if (u_args_size) {
sprintf(p, "{");
for (i = 0; i < u_args_size; i++) {
p += strlen(p);
if (i == 0) {
if(u_args[i].type != Integer)
sprintf(p, "\"%s\": \"%s\"", u_args[i].key, u_args[i].val);
else
sprintf(p, "\"%s\": %s", u_args[i].key, u_args[i].val);
} else {
if(u_args[i].type != Integer)
sprintf(p, ", \"%s\": \"%s\"", u_args[i].key, u_args[i].val);
else
sprintf(p, ", \"%s\": %s", u_args[i].key, u_args[i].val);
}
}
p += strlen(p);
sprintf(p, "}");
pp = dmcmd("ubus", 7, "-S", "-t", "3", "call", obj, method, bufargs);
} else {
pp = dmcmd("ubus", 6, "-S", "-t", "3", "call", obj, method);
}
if (pp) {
dmcmd_read_alloc(pp, &ubus_return);
close(pp);
if (ubus_return)
res = json_tokener_parse(ubus_return);
}
return res;
#else
__dm_ubus_call(obj, method, u_args, u_args_size); __dm_ubus_call(obj, method, u_args, u_args_size);
return json_res; return json_res;
#endif
} }
/* Based on an efficient hash function published by D. J. Bernstein /* Based on an efficient hash function published by D. J. Bernstein