#include <lauxlib.h>
#include <lua.h>
-#define MODNAME "ubus"
-#define METANAME MODNAME ".meta"
+#define MODNAME "ubus"
+#define METANAME MODNAME ".meta"
static lua_State *state;
struct blob_attr *msg)
{
struct ubus_lua_object *o = container_of(obj, struct ubus_lua_object, o);
+ int rv = 0;
lua_getglobal(state, "__ubus_cb");
lua_rawgeti(state, -1, o->r);
lua_getfield(state, -1, method);
+ lua_remove(state, -2);
+ lua_remove(state, -2);
if (lua_isfunction(state, -1)) {
lua_pushlightuserdata(state, req);
lua_pushnil(state);
else
ubus_lua_parse_blob_array(state, blob_data(msg), blob_len(msg), true);
- lua_call(state, 2, 0);
- }
- return 0;
+ lua_call(state, 2, 1);
+ if (lua_isnumber(state, -1))
+ rv = lua_tonumber(state, -1);
+ } else
+ lua_pop(state, 1);
+
+ return rv;
}
static int lua_gettablelen(lua_State *L, int index)
/* get the policy table */
lua_pushinteger(L, 2);
lua_gettable(L, -3);
- plen = lua_gettablelen(L, -1);
/* check if the method table is valid */
if ((lua_type(L, -2) != LUA_TFUNCTION) ||
(lua_type(L, -1) != LUA_TTABLE) ||
- lua_objlen(L, -1) || !plen) {
+ lua_objlen(L, -1)) {
lua_pop(L, 2);
return 1;
}
lua_pushvalue(L, -2);
lua_setfield(L, -6, lua_tostring(L, -5));
+ m->name = lua_tostring(L, -4);
+ m->handler = ubus_method_handler;
+
+ plen = lua_gettablelen(L, -1);
+
+ /* exit if policy table is empty */
+ if (!plen) {
+ lua_pop(L, 2);
+ return 0;
+ }
+
/* setup the policy pointers */
p = malloc(sizeof(struct blobmsg_policy) * plen);
+ if (!p)
+ return 1;
+
memset(p, 0, sizeof(struct blobmsg_policy) * plen);
m->policy = p;
lua_pushnil(L);
}
m->n_policy = pidx;
- m->name = lua_tostring(L, -4);
- m->handler = ubus_method_handler;
lua_pop(L, 2);
return 0;
/* setup object pointers */
obj = malloc(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 type pointers */
obj->o.type = malloc(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;
- /* create the he callback lookup table */
+ /* create the callback lookup table */
lua_createtable(L, 1, 0);
lua_getglobal(L, "__ubus_cb");
lua_pushvalue(L, -2);
{
lua_State *L = (lua_State *)req->priv;
- if (!msg)
+ if (!msg && L)
lua_pushnil(L);
- ubus_lua_parse_blob_array(L, blob_data(msg), blob_len(msg), true);
+ if (msg && L)
+ ubus_lua_parse_blob_array(L, blob_data(msg), blob_len(msg), true);
}
static int
struct ubus_lua_event* event = NULL;
event = malloc(sizeof(struct ubus_lua_event));
+ if (!event)
+ return NULL;
+
memset(event, 0, sizeof(struct ubus_lua_event));
event->e.cb = ubus_event_handler;
{
struct ubus_lua_connection *c = luaL_checkudata(L, 1, METANAME);
+ blob_buf_free(&c->buf);
if (c->ctx != NULL)
{
ubus_free(c->ctx);