Changeset 1744

Timestamp:

12/01/10 11:51:26 (2 years ago)

Author:

ahu

Message:

fix up reentrant use of Lua within the same Lua struct (which does not work)

Location:

branches/pdns-dns64/pdns

Files:

• lua-pdns-recursor.cc (modified) (9 diffs)
• powerdns-example-script.lua (modified) (2 diffs)

branches/pdns-dns64/pdns/lua-pdns-recursor.cc

@@ -79 +79 @@
   
   int res = sr.beginResolve(qname, QType(qtype), qclass, ret);
-  cerr<<"Result: "<<res<<endl;
+  // cerr<<"Result: "<<res<<endl;
   return res;
 }
@@ -117 +117 @@
 
 extern "C" {
-
+#if 0
 int getFakeAAAARecords(lua_State *lua)
 {
@@ -158 +158 @@
   return 2;
 }
+
+#endif
 
 int netmaskMatchLua(lua_State *lua)
@@ -212 +214 @@
 }
 
+int getFakeAAAARecords(const std::string& qname, const std::string& prefix, vector<DNSResourceRecord>& ret)
+{
+  int rcode=directResolve(qname, QType(QType::A), 1, ret);
+  
+  ComboAddress prefixAddress(prefix);
+
+  BOOST_FOREACH(DNSResourceRecord& rr, ret)
+  {    
+    if(rr.qtype.getCode() == QType::A && rr.d_place==DNSResourceRecord::ANSWER) {
+      ComboAddress ipv4(rr.content);
+      uint32_t tmp;
+      memcpy((void*)&tmp, &ipv4.sin4.sin_addr.s_addr, 4);
+      // tmp=htonl(tmp);
+      memcpy(((char*)&prefixAddress.sin6.sin6_addr.s6_addr)+12, &tmp, 4);
+      rr.content = prefixAddress.toString();
+      rr.qtype = QType(QType::AAAA);
+    }
+  }
+  return rcode;
+}
+
+
+
 PowerDNSLua::PowerDNSLua(const std::string& fname)
 {
@@ -232 +257 @@
   lua_setglobal(d_lua, "matchnetmask");
 
+/*
   lua_pushcfunction(d_lua, getFakeAAAARecords);
   lua_setglobal(d_lua, "getFakeAAAARecords");
@@ -237 +263 @@
   lua_pushcfunction(d_lua, resolveName);
   lua_setglobal(d_lua, "resolveName");
-
+*/
   lua_pushcfunction(d_lua, logLua);
   lua_setglobal(d_lua, "pdnslog");
@@ -338 +364 @@
   }
 
-  if(lua_pcall(d_lua,  3 + extraParameter, 2, 0)) { 
-    string error=string("lua error in '"+func+"': ")+lua_tostring(d_lua, -1);
+  if(lua_pcall(d_lua,  3 + extraParameter, 3, 0)) { 
+    string error=string("lua error in '"+func+"' while processing query for '"+query+"|"+qtype.getName()+": ")+lua_tostring(d_lua, -1);
     lua_pop(d_lua, 1);
     throw runtime_error(error);
@@ -347 +373 @@
   *variable |= d_variable;
   
+  
+  if(!lua_isnumber(d_lua, 1)) {
+    string tocall = lua_tostring(d_lua,1);
+    string luaqname = lua_tostring(d_lua,2);
+    string luaprefix = lua_tostring(d_lua, 3);
+    lua_pop(d_lua, 3);
+    // cerr<<"should call '"<<tocall<<"' to finish off"<<endl;
+    ret.clear();
+    res=getFakeAAAARecords(luaqname, luaprefix, ret);
+    return true;
+    // returned a followup 
+  }
+  
   int newres = (int)lua_tonumber(d_lua, 1); // new rcode
   if(newres < 0) {
     //    cerr << "handler did not handle"<<endl;
-    lua_pop(d_lua, 2);
+    lua_pop(d_lua, 3);
     return false;
   }
@@ -402 +441 @@
   }
 
-  lua_pop(d_lua, 2);
+  lua_pop(d_lua, 3);
 
   return true;

branches/pdns-dns64/pdns/powerdns-example-script.lua

@@ -57 +57 @@
         print ("nodata called for: ", remoteip, getlocaladdress(), domain, qtype)
         if qtype ~= pdns.AAAA then return -1, {} end  --  only AAAA records
-        for key,val in ipairs(records) 
-        do
-                print(val.qtype, val.ttl)
-        end
-        
-        rcode, ret=getFakeAAAARecords(domain, "fe80::21b:77ff:0:0")
+--      for key,val in ipairs(records) 
+--      do
+--              print(val.qtype, val.ttl)
+--      end
+
         setvariable()
-        return rcode, ret
+        return "getFakeAAAARecords", domain, "fe80::21b:77ff:0:0"
 end     
 
@@ -84 +83 @@
                 end
                 
-                print(val.content)
+        --      print(val.content)
         end
         return origrcode, records