ubus_lua_parse_blob(lua_State *L, struct blob_attr *attr, bool table);
static int
-ubus_lua_parse_blob_array(lua_State *L, struct blob_attr *attr, int len, bool table)
+ubus_lua_parse_blob_array(lua_State *L, struct blob_attr *attr, size_t len, bool table)
{
int rv;
int idx = 1;
- int rem = len;
+ size_t rem = len;
struct blob_attr *pos;
lua_newtable(L);
lua_pushnumber(L, (double) be64_to_cpu(*(uint64_t *)data));
break;
+ case BLOBMSG_TYPE_DOUBLE:
+ {
+ union {
+ double d;
+ uint64_t u64;
+ } v;
+ v.u64 = be64_to_cpu(*(uint64_t *)data);
+ lua_pushnumber(L, v.d);
+ }
+ break;
+
case BLOBMSG_TYPE_STRING:
lua_pushstring(L, data);
break;
case LUA_TINT:
#endif
case LUA_TNUMBER:
- blobmsg_add_u32(b, key, (uint32_t)lua_tointeger(L, -1));
+ if ((uint64_t)lua_tonumber(L, -1) > INT_MAX)
+ blobmsg_add_u64(b, key, (uint64_t)lua_tonumber(L, -1));
+ else
+ blobmsg_add_u32(b, key, (uint32_t)lua_tointeger(L, -1));
break;
case LUA_TSTRING:
{
int rv;
struct ubus_lua_connection *c = luaL_checkudata(L, 1, METANAME);
+ const char *path = (lua_gettop(L) >= 2) ? luaL_checkstring(L, 2) : NULL;
lua_newtable(L);
- rv = ubus_lookup(c->ctx, NULL, ubus_lua_objects_cb, L);
+ rv = ubus_lookup(c->ctx, path, ubus_lua_objects_cb, L);
if (rv != UBUS_STATUS_OK)
{
}
/* setup the policy pointers */
- p = malloc(sizeof(struct blobmsg_policy) * plen);
+ p = calloc(plen, sizeof(struct blobmsg_policy));
if (!p)
return 1;
- memset(p, 0, sizeof(struct blobmsg_policy) * plen);
m->policy = p;
lua_pushnil(L);
while (lua_next(L, -2) != 0) {
int midx = 0;
/* setup object pointers */
- obj = malloc(sizeof(struct ubus_lua_object));
+ obj = calloc(1, sizeof(struct ubus_lua_object));
if (!obj)
return NULL;
- memset(obj, 0, sizeof(struct ubus_lua_object));
obj->o.name = lua_tostring(L, -2);
/* setup method pointers */
- m = malloc(sizeof(struct ubus_method) * mlen);
- memset(m, 0, sizeof(struct ubus_method) * mlen);
+ m = calloc(mlen, sizeof(struct ubus_method));
obj->o.methods = m;
/* setup type pointers */
- obj->o.type = malloc(sizeof(struct ubus_object_type));
+ obj->o.type = calloc(1, sizeof(struct ubus_object_type));
if (!obj->o.type) {
free(obj);
return NULL;
}
- memset(obj->o.type, 0, sizeof(struct ubus_object_type));
obj->o.type->name = lua_tostring(L, -2);
obj->o.type->id = 0;
obj->o.type->methods = obj->o.methods;
/* verify top level object */
if (lua_istable(L, 1)) {
lua_pushstring(L, "you need to pass a table");
- lua_error(L);
- return 0;
+ return lua_error(L);
}
/* scan each object */
if( !lua_islightuserdata( L, 2 ) ){
lua_pushfstring( L, "Invald 2nd parameter, expected ubus obj ref" );
- lua_error( L );
+ return lua_error( L );
}
obj = lua_touserdata( L, 2 );
blob_buf_init(&c->buf, 0);
if( !ubus_lua_format_blob_array( L, &c->buf, true ) ){
lua_pushfstring( L, "Invalid 4th parameter, expected table of arguments" );
- lua_error( L );
+ return lua_error( L );
}
ubus_notify( c->ctx, obj, method, c->buf.head, -1 );
{
struct ubus_lua_event* event = NULL;
- event = malloc(sizeof(struct ubus_lua_event));
+ event = calloc(1, sizeof(struct ubus_lua_event));
if (!event)
return NULL;
- memset(event, 0, sizeof(struct ubus_lua_event));
event->e.cb = ubus_event_handler;
/* update the he callback lookup table */
if (lua_isfunction(state, -1)) {
if( msg ){
ubus_lua_parse_blob_array(state, blob_data(msg), blob_len(msg), true);
- lua_call(state, 1, 0);
} else {
- lua_call(state, 0, 0);
+ lua_pushnil(state);
}
+ lua_pushstring(state, method);
+ lua_call(state, 2, 0);
} else {
lua_pop(state, 1);
}
-static void
+static int
ubus_lua_do_subscribe( struct ubus_context *ctx, lua_State *L, const char* target,
int idxnotify, int idxremove )
{
if( ( status = ubus_lookup_id( ctx, target, &id ) ) ){
lua_pushfstring( L, "Unable find target, status=%d", status );
- lua_error( L );
+ return lua_error( L );
}
- sub = malloc( sizeof( struct ubus_lua_subscriber ) );
- memset( sub, 0, sizeof( struct ubus_lua_subscriber ) );
+ sub = calloc( 1, sizeof( struct ubus_lua_subscriber ) );
if( !sub ){
lua_pushstring( L, "Out of memory" );
- lua_error( L );
+ return lua_error( L );
}
if( idxnotify ){
if( idxremove ){
lua_getglobal(L, "__ubus_cb_subscribe");
- lua_pushvalue(L, idxnotify);
- sub->rnotify = luaL_ref(L, -2);
+ lua_pushvalue(L, idxremove);
+ sub->rremove = luaL_ref(L, -2);
lua_pop(L, 1);
sub->s.remove_cb = ubus_sub_remove_handler;
}
if( ( status = ubus_register_subscriber( ctx, &sub->s ) ) ){
lua_pushfstring( L, "Failed to register subscriber, status=%d", status );
- lua_error( L );
+ return lua_error( L );
}
if( ( status = ubus_subscribe( ctx, &sub->s, id) ) ){
lua_pushfstring( L, "Failed to register subscriber, status=%d", status );
- lua_error( L );
+ return lua_error( L );
}
+
+ return 0;
}
static int
lua_setfield(L, -2, "INT16");
lua_pushinteger(L, BLOBMSG_TYPE_INT8);
lua_setfield(L, -2, "INT8");
+ lua_pushinteger(L, BLOBMSG_TYPE_DOUBLE);
+ lua_setfield(L, -2, "DOUBLE");
lua_pushinteger(L, BLOBMSG_TYPE_BOOL);
lua_setfield(L, -2, "BOOLEAN");