summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@nvidia.com>2020-11-29 01:50:03 -0500
committerQuentin Young <qlyoung@nvidia.com>2020-12-01 18:37:14 -0500
commita3ce06c40b0fc8f7ec695393d099f2ed35a5c8fd (patch)
treefd34965819a00bd7026b2d41997c7f020e5455d2
parent9f79b3758dc305264623c779a677415572bc4d68 (diff)
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>
-rw-r--r--lib/frrlua.c11
-rw-r--r--lib/frrlua.h4
2 files changed, 9 insertions, 6 deletions
diff --git a/lib/frrlua.c b/lib/frrlua.c
index 57288e6676..4d576829c5 100644
--- a/lib/frrlua.c
+++ b/lib/frrlua.c
@@ -70,7 +70,7 @@ int frrlua_table_get_integer(lua_State *L, const char *key)
* 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];
@@ -81,10 +81,11 @@ void frrlua_newtable_prefix(lua_State *L, const struct prefix *prefix)
lua_setfield(L, -2, "route");
lua_pushinteger(L, prefix->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");
@@ -111,6 +112,8 @@ void frrlua_newtable_interface(lua_State *L, const struct interface *ifp)
lua_setfield(L, -2, "link_ifindex");
lua_pushinteger(L, ifp->ll_type);
lua_setfield(L, -2, "linklayer_type");
+
+ return 0;
}
/*
@@ -171,7 +174,7 @@ void frrlua_export_logging(lua_State *L)
{
lua_newtable(L);
luaL_setfuncs(L, log_funcs, 0);
- lua_setfield(L, -2, "log");
+ lua_setglobal(L, "log");
}
/*
diff --git a/lib/frrlua.h b/lib/frrlua.h
index 37e8e8635b..029e6ecee8 100644
--- a/lib/frrlua.h
+++ b/lib/frrlua.h
@@ -37,12 +37,12 @@ extern "C" {
*
* 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.
*/
-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.