1 files changed, 76 insertions, 24 deletions

diff --git a/lib/frrlua.c b/lib/frrlua.c
index d8aaa3aa3c..e97e48121c 100644
--- a/lib/frrlua.c
+++ b/lib/frrlua.c
@@ -52,10 +52,9 @@ int frrlua_table_get_integer(lua_State *L, const char *key)
 }
 
 /*
- * Encoders.
- *
  * This section has functions that convert internal FRR datatypes into Lua
- * datatypes.
+ * datatypes: one encoder function and two decoder functions for each type.
+ *
  */
 
 void lua_pushprefix(lua_State *L, const struct prefix *prefix)
@@ -71,14 +70,19 @@ void lua_pushprefix(lua_State *L, const struct prefix *prefix)
 	lua_setfield(L, -2, "family");
 }
 
-void *lua_toprefix(lua_State *L, int idx)
+void lua_decode_prefix(lua_State *L, int idx, struct prefix *prefix)
 {
-	struct prefix *p = XCALLOC(MTYPE_TMP, sizeof(struct prefix));
-
 	lua_getfield(L, idx, "network");
-	(void)str2prefix(lua_tostring(L, -1), p);
+	(void)str2prefix(lua_tostring(L, -1), prefix);
 	lua_pop(L, 1);
+	/* pop the table */
+	lua_pop(L, 1);
+}
 
+void *lua_toprefix(lua_State *L, int idx)
+{
+	struct prefix *p = XCALLOC(MTYPE_TMP, sizeof(struct prefix));
+	lua_decode_prefix(L, idx, p);
 	return p;
 }
 
@@ -109,10 +113,8 @@ void lua_pushinterface(lua_State *L, const struct interface *ifp)
 	lua_setfield(L, -2, "linklayer_type");
 }
 
-void *lua_tointerface(lua_State *L, int idx)
+void lua_decode_interface(lua_State *L, int idx, struct interface *ifp)
 {
-	struct interface *ifp = XCALLOC(MTYPE_TMP, sizeof(struct interface));
-
 	lua_getfield(L, idx, "name");
 	strlcpy(ifp->name, lua_tostring(L, -1), sizeof(ifp->name));
 	lua_pop(L, 1);
@@ -146,13 +148,21 @@ void *lua_tointerface(lua_State *L, int idx)
 	lua_getfield(L, idx, "linklayer_type");
 	ifp->ll_type = lua_tointeger(L, -1);
 	lua_pop(L, 1);
+	/* pop the table */
+	lua_pop(L, 1);
+}
+void *lua_tointerface(lua_State *L, int idx)
+{
+	struct interface *ifp = XCALLOC(MTYPE_TMP, sizeof(struct interface));
 
+	lua_decode_interface(L, idx, ifp);
 	return ifp;
 }
 
 void lua_pushinaddr(lua_State *L, const struct in_addr *addr)
 {
 	char buf[INET_ADDRSTRLEN];
+
 	inet_ntop(AF_INET, addr, buf, sizeof(buf));
 
 	lua_newtable(L);
@@ -162,14 +172,19 @@ void lua_pushinaddr(lua_State *L, const struct in_addr *addr)
 	lua_setfield(L, -2, "string");
 }
 
-void *lua_toinaddr(lua_State *L, int idx)
+void lua_decode_inaddr(lua_State *L, int idx, struct in_addr *inaddr)
 {
-	struct in_addr *inaddr = XCALLOC(MTYPE_TMP, sizeof(struct in_addr));
-
 	lua_getfield(L, idx, "value");
 	inaddr->s_addr = lua_tointeger(L, -1);
 	lua_pop(L, 1);
+	/* pop the table */
+	lua_pop(L, 1);
+}
 
+void *lua_toinaddr(lua_State *L, int idx)
+{
+	struct in_addr *inaddr = XCALLOC(MTYPE_TMP, sizeof(struct in_addr));
+	lua_decode_inaddr(L, idx, inaddr);
 	return inaddr;
 }
 
@@ -177,6 +192,7 @@ void *lua_toinaddr(lua_State *L, int idx)
 void lua_pushin6addr(lua_State *L, const struct in6_addr *addr)
 {
 	char buf[INET6_ADDRSTRLEN];
+
 	inet_ntop(AF_INET6, addr, buf, sizeof(buf));
 
 	lua_newtable(L);
@@ -186,20 +202,26 @@ void lua_pushin6addr(lua_State *L, const struct in6_addr *addr)
 	lua_setfield(L, -2, "string");
 }
 
-void *lua_toin6addr(lua_State *L, int idx)
+void lua_decode_in6addr(lua_State *L, int idx, struct in6_addr *in6addr)
 {
-	struct in6_addr *in6addr = XCALLOC(MTYPE_TMP, sizeof(struct in6_addr));
-
 	lua_getfield(L, idx, "string");
 	inet_pton(AF_INET6, lua_tostring(L, -1), in6addr);
 	lua_pop(L, 1);
+	/* pop the table */
+	lua_pop(L, 1);
+}
 
+void *lua_toin6addr(lua_State *L, int idx)
+{
+	struct in6_addr *in6addr = XCALLOC(MTYPE_TMP, sizeof(struct in6_addr));
+	lua_decode_in6addr(L, idx, in6addr);
 	return in6addr;
 }
 
 void lua_pushsockunion(lua_State *L, const union sockunion *su)
 {
 	char buf[SU_ADDRSTRLEN];
+
 	sockunion2str(su, buf, sizeof(buf));
 
 	lua_newtable(L);
@@ -210,13 +232,20 @@ void lua_pushsockunion(lua_State *L, const union sockunion *su)
 	lua_setfield(L, -2, "string");
 }
 
-void *lua_tosockunion(lua_State *L, int idx)
+void lua_decode_sockunion(lua_State *L, int idx, union sockunion *su)
 {
-	union sockunion *su = XCALLOC(MTYPE_TMP, sizeof(union sockunion));
-
 	lua_getfield(L, idx, "string");
 	str2sockunion(lua_tostring(L, -1), su);
+	lua_pop(L, 1);
+	/* pop the table */
+	lua_pop(L, 1);
+}
+
+void *lua_tosockunion(lua_State *L, int idx)
+{
+	union sockunion *su = XCALLOC(MTYPE_TMP, sizeof(union sockunion));
 
+	lua_decode_sockunion(L, idx, su);
 	return su;
 }
 
@@ -225,12 +254,17 @@ void lua_pushtimet(lua_State *L, const time_t *time)
 	lua_pushinteger(L, *time);
 }
 
+void lua_decode_timet(lua_State *L, int idx, time_t *t)
+{
+	*t = lua_tointeger(L, idx);
+	lua_pop(L, 1);
+}
+
 void *lua_totimet(lua_State *L, int idx)
 {
 	time_t *t = XCALLOC(MTYPE_TMP, sizeof(time_t));
 
-	*t = lua_tointeger(L, idx);
-
+	lua_decode_timet(L, idx, t);
 	return t;
 }
 
@@ -239,17 +273,28 @@ void lua_pushintegerp(lua_State *L, const long long *num)
 	lua_pushinteger(L, *num);
 }
 
-void *lua_tointegerp(lua_State *L, int idx)
+void lua_decode_integerp(lua_State *L, int idx, long long *num)
 {
 	int isnum;
-	long long *num = XCALLOC(MTYPE_TMP, sizeof(long long));
-
 	*num = lua_tonumberx(L, idx, &isnum);
+	lua_pop(L, 1);
 	assert(isnum);
+}
+
+void *lua_tointegerp(lua_State *L, int idx)
+{
+	long long *num = XCALLOC(MTYPE_TMP, sizeof(long long));
 
+	lua_decode_integerp(L, idx, num);
 	return num;
 }
 
+void lua_decode_stringp(lua_State *L, int idx, char *str)
+{
+	strlcpy(str, lua_tostring(L, idx), strlen(str) + 1);
+	lua_pop(L, 1);
+}
+
 void *lua_tostringp(lua_State *L, int idx)
 {
 	char *string = XSTRDUP(MTYPE_TMP, lua_tostring(L, idx));
@@ -258,6 +303,13 @@ void *lua_tostringp(lua_State *L, int idx)
 }
 
 /*
+ * Decoder for const values, since we cannot modify them.
+ */
+void lua_decode_noop(lua_State *L, int idx, const void *ptr)
+{
+}
+
+/*
  * Logging.
  *
  * Lua-compatible wrappers for FRR logging functions.