lib: update script encoder signatures

Update the two test functions that encode a prefix and an interface to
match the encoder_func signature expected by the scripting infra.

Signed-off-by: Quentin Young <qlyoung@nvidia.com>
This commit is contained in:
Quentin Young 2020-11-29 01:50:03 -05:00
parent 9f79b3758d
commit a3ce06c40b
2 changed files with 9 additions and 6 deletions

View File

@ -70,7 +70,7 @@ int frrlua_table_get_integer(lua_State *L, const char *key)
* datatypes. * datatypes.
*/ */
void frrlua_newtable_prefix(lua_State *L, const struct prefix *prefix) int frrlua_newtable_prefix(lua_State *L, const struct prefix *prefix)
{ {
char buffer[100]; char buffer[100];
@ -81,10 +81,11 @@ void frrlua_newtable_prefix(lua_State *L, const struct prefix *prefix)
lua_setfield(L, -2, "route"); lua_setfield(L, -2, "route");
lua_pushinteger(L, prefix->family); lua_pushinteger(L, prefix->family);
lua_setfield(L, -2, "family"); lua_setfield(L, -2, "family");
lua_setglobal(L, "prefix");
return 0;
} }
void frrlua_newtable_interface(lua_State *L, const struct interface *ifp) int frrlua_newtable_interface(lua_State *L, const struct interface *ifp)
{ {
zlog_debug("frrlua: pushing interface table"); zlog_debug("frrlua: pushing interface table");
@ -111,6 +112,8 @@ void frrlua_newtable_interface(lua_State *L, const struct interface *ifp)
lua_setfield(L, -2, "link_ifindex"); lua_setfield(L, -2, "link_ifindex");
lua_pushinteger(L, ifp->ll_type); lua_pushinteger(L, ifp->ll_type);
lua_setfield(L, -2, "linklayer_type"); lua_setfield(L, -2, "linklayer_type");
return 0;
} }
/* /*
@ -171,7 +174,7 @@ void frrlua_export_logging(lua_State *L)
{ {
lua_newtable(L); lua_newtable(L);
luaL_setfuncs(L, log_funcs, 0); luaL_setfuncs(L, log_funcs, 0);
lua_setfield(L, -2, "log"); lua_setglobal(L, "log");
} }
/* /*

View File

@ -37,12 +37,12 @@ extern "C" {
* *
* Additionally sets the global variable "prefix" to point at this table. * Additionally sets the global variable "prefix" to point at this table.
*/ */
void frrlua_newtable_prefix(lua_State *L, const struct prefix *prefix); int frrlua_newtable_prefix(lua_State *L, const struct prefix *prefix);
/* /*
* Pushes a new table containing relevant fields from an interface structure. * Pushes a new table containing relevant fields from an interface structure.
*/ */
void frrlua_newtable_interface(lua_State *L, const struct interface *ifp); int frrlua_newtable_interface(lua_State *L, const struct interface *ifp);
/* /*
* Retrieve a string from table on the top of the stack. * Retrieve a string from table on the top of the stack.