Changeset 1733

Timestamp:

11/14/10 16:37:20 (3 years ago)

Author:

ahu

Message:

implement CNAME handling for NAT64 & full dns record passthrough to Lua for phun and profit

Location:

branches/pdns-nat64/pdns

Files:

• lua-pdns-recursor.cc (modified) (5 diffs)
• powerdns-example-script.lua (modified) (1 diff)

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

@@ -1 +1 @@
 #include "lua-pdns-recursor.hh"
 #include "syncres.hh"
+#include <boost/foreach.hpp>
 
 #if !defined(PDNS_ENABLE_LUA) && !defined(LIBDIR)
@@ -89 +90 @@
   
   ComboAddress prefixAddress(prefix);
-  ComboAddress ipv4(ret.rbegin()->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);
-  cerr<<"Going to return: "<<prefixAddress.toString()<<endl;
-  lua_pushstring(lua, prefixAddress.toString().c_str());
+
+  lua_newtable(lua);
+  int pos=1;
+  
+  BOOST_FOREACH(DNSResourceRecord& rr, ret)
+  {
+    // row number
+    lua_pushnumber(lua, pos++);
+    // "row" table
+    lua_newtable(lua);
+    
+    lua_pushstring(lua, rr.qname.c_str());
+    lua_setfield(lua, -2, "qname");  // pushes value at the top of the stack to the table immediately below that (-1 = top, -2 is below)
+    
+    lua_pushnumber(lua, rr.ttl);
+    lua_setfield(lua, -2, "ttl");
+    
+    if(rr.qtype.getCode() == QType::A && rr.d_place==DNSResourceRecord::ANSWER) {
+      lua_pushnumber(lua, QType::AAAA);
+      lua_setfield(lua, -2, "qtype");
+    
+      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);
+  
+    
+      lua_pushstring(lua, prefixAddress.toString().c_str());
+      lua_setfield(lua, -2, "content");
+    }
+    else {
+      lua_pushnumber(lua, rr.qtype.getCode());
+      lua_setfield(lua, -2, "qtype");
+    
+    
+      lua_pushstring(lua, rr.content.c_str());
+      lua_setfield(lua, -2, "content");
+    }
+    
+    
+    lua_settable(lua, -3);
+    cerr<<"pushed row at right number"<<pos-1<<endl;
+  }
+  
   return 1;
 }
+
+int resolveRecords(lua_State *lua)
+{
+  string qname = lua_tostring(lua, 1);
+  uint16_t qtype = lua_tonumber(lua, 2);
+  cerr<<"Request from Lua to resolveRecords  '"<<qname<<"', "<<qtype<<"\n";
+  vector<DNSResourceRecord> ret;
+  directResolve(qname, QType(qtype), 1, ret);
+  cerr<<"Have "<<ret.size()<<" answers for Lua"<<endl;
+  
+  // make a table of tables
+  lua_newtable(lua);
+  
+  
+  int pos=0;
+  BOOST_FOREACH(const DNSResourceRecord& rr, ret)
+  {
+    // row number
+    lua_pushnumber(lua, ++pos);
+    // "row" table
+    lua_newtable(lua);
+    
+    lua_pushstring(lua, rr.qname.c_str());
+    lua_setfield(lua, -2, "qname");  // pushes value at the top of the stack to the table immediately below that (-1 = top, -2 is below)
+    
+    lua_pushstring(lua, rr.content.c_str());
+    lua_setfield(lua, -2, "content");
+    
+    lua_pushnumber(lua, rr.qtype.getCode());
+    lua_setfield(lua, -2, "qtype");
+    
+    lua_pushnumber(lua, rr.ttl);
+    lua_setfield(lua, -2, "ttl");
+    
+    lua_settable(lua, -3);
+    cerr<<"pushed row at right number"<<pos<<endl;
+  }
+  
+  
+  return 1;
+}
+
 
 int netmaskMatchLua(lua_State *lua)
@@ -175 +256 @@
   lua_setglobal(d_lua, "getFakeAAAARecords");
 
+  lua_pushcfunction(d_lua, resolveRecords);
+  lua_setglobal(d_lua, "resolveRecords");
+
+
   lua_pushcfunction(d_lua, logLua);
   lua_setglobal(d_lua, "pdnslog");
@@ -213 +298 @@
 bool PowerDNSLua::nodata(const ComboAddress& remote, const ComboAddress& local,const string& query, const QType& qtype, vector<DNSResourceRecord>& ret, int& res, bool* variable)
 {
-  vector<DNSResourceRecord> better;
-  directResolve(query, QType(QType::A), 1, better);
-  cerr<<"Had "<<better.size()<<" hits"<<endl;
-  
   return passthrough("nodata", remote, local, query, qtype, ret, res, variable);
 }
@@ -302 +383 @@
   int tableLen = lua_objlen(d_lua, 2);
 #endif
+  cerr<<"Got back "<<tableLen<< " answers from Lua"<<endl;
 
   for(int n=1; n < tableLen + 1; ++n) {

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

@@ -62 +62 @@
         print ("nodata called for: ", remoteip, getlocaladdress(), domain, qtype, pdns.AAAA)
         if qtype ~= pdns.AAAA then return -1, {} end  --  only AAAA records
-        
-        ipv6=getFakeAAAARecords(domain, "fe80::21b:77ff:0:0")
-        ret={}
-        ret[1]={qtype=pdns.AAAA, content=ipv6, ttl=3602}
+
+        ret=getFakeAAAARecords(domain, "fe80::21b:77ff:0:0")
+        print("ret[1]: ",ret[1])
         return 0, ret
 end