its doing something

diff --git a/tests/lua-rns.c b/tests/lua-rns.c
index 628f8238085e3d8bca9e47c38107bb1462e100cf..baecbdd8bebdfd03143dad5e2a4a978cf5b814be 100644 (file)
--- a/tests/lua-rns.c
+++ b/tests/lua-rns.c
@@ -19,6 +19,7 @@
 /* lua includes */
 #include "lua50/lua.h"
 #include "lua50/lualib.h"
+#include "lua50/lauxlib.h"
 
 /* ldns include */
 #include <ldns/dns.h>
@@ -47,29 +48,30 @@ version(FILE *f, char *progname)
 =====================================================
  Lua bindings for ldns
 =====================================================
-*/
 
-/*
- * http://lua-users.org/wiki/UserDataWithPointerExample
- * is the way to go here, as we do our own mem management
- * in ldns
- * Seems pretty straitforward
- */
+the l_ prefix stands for lua_ldns_, but that was way
+to long to type and the lua_ prefix is already claimed
+by lua.
+
+*/
 
-/* Add the central RR type (ldns_rr*) to Lua */
-static ldns_rr* 
-push_ldns_rr(lua_State *L)
+static int
+l_rr_new_frm_str(lua_State *L)
 {
-       ldns_rr *new_rr = (ldns_rr*)lua_newuserdata(L, sizeof(ldns_rr));
-       luaL_getmetatable(L, FOO);
-       lua_setmetatable(L, -1);
-       return new_rr;
+       /* pop string from stack, make new rr, push rr to
+        * stack and return 1 - to signal the new pointer
+        */
+       char *str = (char*)luaL_checkstring(L, 1);
+       ldns_rr *new_rr = ldns_rr_new_frm_str(str);
+
+       lua_pushlightuserdata(L, new_rr);
+       return 1;
 }
 
 
 /* Test function which doesn't call ldns stuff yet */
 static int 
-ldns_average(lua_State *L)
+l_average(lua_State *L)
 {
        int n = lua_gettop(L);
        double sum = 0;
@@ -106,7 +108,9 @@ register_ldns_functions(void)
        /* need to encap. all used functions in a
         * still lua can understand
         */
-        lua_register(L, "ldns_average", ldns_average);
+        lua_register(L, "l_average", l_average);
+
+       lua_register(L, "l_rr_new_frm_str", l_rr_new_frm_str);
 }
 
 int

diff --git a/tests/rns.lua b/tests/rns.lua
index 3e789919834eae9eb618f195a2166530bf894faa..1f9276e8271ed989b1ff37e85e39622415c4ee05 100644 (file)
--- a/tests/rns.lua
+++ b/tests/rns.lua
@@ -1,6 +1,10 @@
 -- call a C function
 
-avg, sum = ldns_average(10, 20, 30, 40, 50)
+avg, sum = l_average(10, 20, 30, 40, 50)
 
 print("The average is ", avg)
 print("The sum is ", sum)
+
+-- Now the scary ldns_* stuff
+
+my_rr = l_rr_new_frm_str("miek.nl")