Skip to content

Commit

Permalink
app_lua: updated old lua api with the changes to registrar module
Browse files Browse the repository at this point in the history
  • Loading branch information
@miconda
miconda committed Apr 24, 2016
1 parent c652cc7 commit c348d28
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions modules/app_lua/app_lua_exp.c
View file
Expand Up @@ -1375,8 +1375,8 @@ static int lua_sr_registrar_save(lua_State *L)
{
int ret;
int flags;
char *table;
str uri ={NULL, 0};
str table = STR_NULL;
str uri = STR_NULL;
sr_lua_env_t *env_L;

flags = 0;
Expand All @@ -1394,28 +1394,28 @@ static int lua_sr_registrar_save(lua_State *L)
}
if(lua_gettop(L)==1)
{
table = (char*)lua_tostring(L, -1);
table.s = (char*)lua_tostring(L, -1);
} else if(lua_gettop(L)==2) {
table = (char*)lua_tostring(L, -2);
table.s = (char*)lua_tostring(L, -2);
flags = lua_tointeger(L, -1);
} else if(lua_gettop(L)==3) {
table = (char*)lua_tostring(L, -3);
table.s = (char*)lua_tostring(L, -3);
flags = lua_tointeger(L, -2);
uri.s = (char*)lua_tostring(L, -1);
uri.len = strlen(uri.s);
} else {
LM_WARN("invalid number of parameters from Lua\n");
return app_lua_return_error(L);
}
if(table==NULL || strlen(table)==0)
if(table.s==NULL || (table.len=strlen(table.s))==0)
{
LM_WARN("invalid parameters from Lua\n");
return app_lua_return_error(L);
}
if (lua_gettop(L)==3) {
ret = _lua_registrarb.save_uri(env_L->msg, table, flags, &uri);
ret = _lua_registrarb.save_uri(env_L->msg, &table, flags, &uri);
} else {
ret = _lua_registrarb.save(env_L->msg, table, flags);
ret = _lua_registrarb.save(env_L->msg, &table, flags);
}

return app_lua_return_int(L, ret);
Expand All @@ -1427,8 +1427,8 @@ static int lua_sr_registrar_save(lua_State *L)
static int lua_sr_registrar_lookup(lua_State *L)
{
int ret;
char *table = NULL;
str uri = {NULL, 0};
str table = STR_NULL;
str uri = STR_NULL;
sr_lua_env_t *env_L;

env_L = sr_lua_env_get();
Expand All @@ -1445,28 +1445,28 @@ static int lua_sr_registrar_lookup(lua_State *L)
}
if(lua_gettop(L)==1)
{
table = (char*)lua_tostring(L, -1);
table.s = (char*)lua_tostring(L, -1);
}
else if (lua_gettop(L)==2)
{
table = (char*)lua_tostring(L, -2);
table.s = (char*)lua_tostring(L, -2);
uri.s = (char*)lua_tostring(L, -1);
uri.len = strlen(uri.s);
} else
{
LM_WARN("invalid number of parameters from Lua\n");
return app_lua_return_error(L);
}
if(table==NULL || strlen(table)==0)
if(table.s==NULL || (table.len=strlen(table.s))==0)
{
LM_WARN("invalid parameters from Lua\n");
return app_lua_return_error(L);
}
if(lua_gettop(L)==2)
{
ret = _lua_registrarb.lookup_uri(env_L->msg, table, &uri);
ret = _lua_registrarb.lookup_uri(env_L->msg, &table, &uri);
} else {
ret = _lua_registrarb.lookup(env_L->msg, table);
ret = _lua_registrarb.lookup(env_L->msg, &table);
}

return app_lua_return_int(L, ret);
Expand All @@ -1478,8 +1478,8 @@ static int lua_sr_registrar_lookup(lua_State *L)
static int lua_sr_registrar_lookup_to_dset(lua_State *L)
{
int ret;
char *table = NULL;
str uri = {NULL, 0};
str table = STR_NULL;
str uri = STR_NULL;
sr_lua_env_t *env_L;

env_L = sr_lua_env_get();
Expand All @@ -1496,28 +1496,28 @@ static int lua_sr_registrar_lookup_to_dset(lua_State *L)
}
if(lua_gettop(L)==1)
{
table = (char*)lua_tostring(L, -1);
table.s = (char*)lua_tostring(L, -1);
}
else if (lua_gettop(L)==2)
{
table = (char*)lua_tostring(L, -2);
table.s = (char*)lua_tostring(L, -2);
uri.s = (char*)lua_tostring(L, -1);
uri.len = strlen(uri.s);
} else
{
LM_WARN("invalid number of parameters from Lua\n");
return app_lua_return_error(L);
}
if(table==NULL || strlen(table)==0)
if(table.s==NULL || (table.len=strlen(table.s))==0)
{
LM_WARN("invalid parameters from Lua\n");
return app_lua_return_error(L);
}
if(lua_gettop(L)==2)
{
ret = _lua_registrarb.lookup_to_dset(env_L->msg, table, &uri);
ret = _lua_registrarb.lookup_to_dset(env_L->msg, &table, &uri);
} else {
ret = _lua_registrarb.lookup_to_dset(env_L->msg, table, NULL);
ret = _lua_registrarb.lookup_to_dset(env_L->msg, &table, NULL);
}

return app_lua_return_int(L, ret);
Expand All @@ -1529,7 +1529,7 @@ static int lua_sr_registrar_lookup_to_dset(lua_State *L)
static int lua_sr_registrar_registered(lua_State *L)
{
int ret;
char *table;
str table;
sr_lua_env_t *env_L;

env_L = sr_lua_env_get();
Expand All @@ -1549,13 +1549,13 @@ static int lua_sr_registrar_registered(lua_State *L)
LM_WARN("invalid number of parameters from Lua\n");
return app_lua_return_error(L);
}
table = (char*)lua_tostring(L, -1);
if(table==NULL || strlen(table)==0)
table.s = (char*)lua_tostring(L, -1);
if(table.s==NULL || (table.len=strlen(table.s))==0)
{
LM_WARN("invalid parameters from Lua\n");
return app_lua_return_error(L);
}
ret = _lua_registrarb.registered(env_L->msg, table);
ret = _lua_registrarb.registered(env_L->msg, &table);

return app_lua_return_int(L, ret);
}
Expand Down

0 comments on commit c348d28

Please sign in to comment.