Changeset 1509 for trunk/pdns/pdns/lua-pdns-recursor.cc

Timestamp:

02/06/10 14:50:14 (3 years ago)

Author:

ahu

Message:

WARNING WARNING! This changes the Lua/PowerDNS interface in SVN, and restores the 3.1.7.* API!
From now, use getlocaladdress() call to get the address to which a query was sent. Implemented after advice from the ever helpful #lua!

Files:

• trunk/pdns/pdns/lua-pdns-recursor.cc (modified) (5 diffs)

trunk/pdns/pdns/lua-pdns-recursor.cc

@@ -85 +85 @@
 }
 
+int getLocalAddressLua(lua_State* lua)
+{
+  lua_getfield(lua, LUA_REGISTRYINDEX, "__PowerDNSLua"); 
+  PowerDNSLua* pl = (PowerDNSLua*)lua_touserdata(lua, -1);
+  
+  lua_pushstring(lua, pl->getLocal().toString().c_str());
+  return 1;
+}
+
 int logLua(lua_State *lua)
 {
@@ -118 +127 @@
   lua_setglobal(d_lua, "pdnslog");
 
+  lua_pushcfunction(d_lua, getLocalAddressLua);
+  lua_setglobal(d_lua, "getlocaladdress");
+
   lua_newtable(d_lua);
 
@@ -127 +139 @@
   lua_setfield(d_lua, -2, "NXDOMAIN");
   lua_setglobal(d_lua, "pdns");
+  
+  lua_pushlightuserdata(d_lua, (void*)this); 
+  lua_setfield(d_lua, LUA_REGISTRYINDEX, "__PowerDNSLua");
 }
 
@@ -177 +192 @@
     return false;
   }
+  
+  d_local = local;
   /* the first argument */
   lua_pushstring(d_lua,  remote.toString().c_str() );
-  lua_pushstring(d_lua,  local.toString().c_str() );
   lua_pushstring(d_lua,  query.c_str() );
   lua_pushnumber(d_lua,  qtype.getCode() );
 
-  if(lua_pcall(d_lua,  4, 2, 0)) { // error 
+  if(lua_pcall(d_lua,  3, 2, 0)) { // error 
     string error=string("lua error in '"+func+"': ")+lua_tostring(d_lua, -1);
     lua_pop(d_lua, 1);
@@ -218 +234 @@
     lua_gettable(d_lua, 2);
 
-    uint32_t tmpnum;
+    uint32_t tmpnum=0;
     if(!getFromTable("qtype", tmpnum)) 
       rr.qtype=QType::A;