Changeset 1309

Timestamp:

11/27/08 16:47:02 (4 years ago)

Author:

ahu

Message:

send Lua the 'local' address too

Location:

trunk/pdns/pdns

Files:

• docs/pdns.sgml (modified) (1 diff)
• lua-pdns-recursor.cc (modified) (4 diffs)
• lua-pdns-recursor.hh (modified) (1 diff)
• pdns_recursor.cc (modified) (3 diffs)

trunk/pdns/pdns/docs/pdns.sgml

@@ -8844 +8844 @@
         <para>
           Both functions are passed the IP address of the requestor, plus the name and type being requested. In return, these functions indicate if they
-          have taken over the request, or want to let normal proceedings take their course.
+          have taken over the request, or want to let normal proceedings take their course. Beyond version 3.1.7, the IP address on which the question was received
+          is inserted immediately after the IP address of the requestor - so in that case there are 4 parameters.
         </para>
         <para>

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

@@ -10 +10 @@
 }
 
-bool PowerDNSLua::nxdomain(const ComboAddress& remote, const string& query, const QType& qtype, vector<DNSResourceRecord>& ret, int& res)
+bool PowerDNSLua::nxdomain(const ComboAddress& remote,const ComboAddress& local, const string& query, const QType& qtype, vector<DNSResourceRecord>& ret, int& res)
 {
   return false;
 }
 
-bool PowerDNSLua::preresolve(const ComboAddress& remote, const string& query, const QType& qtype, vector<DNSResourceRecord>& ret, int& res)
+bool PowerDNSLua::preresolve(const ComboAddress& remote, const ComboAddress& local, const string& query, const QType& qtype, vector<DNSResourceRecord>& ret, int& res)
 {
   return false;
@@ -114 +114 @@
 }
 
-bool PowerDNSLua::nxdomain(const ComboAddress& remote, const string& query, const QType& qtype, vector<DNSResourceRecord>& ret, int& res)
-{
-  return passthrough("nxdomain", remote, query, qtype, ret, res);
-}
-
-bool PowerDNSLua::preresolve(const ComboAddress& remote, const string& query, const QType& qtype, vector<DNSResourceRecord>& ret, int& res)
-{
-  return passthrough("preresolve", remote, query, qtype, ret, res);
+bool PowerDNSLua::nxdomain(const ComboAddress& remote, const ComboAddress& local,const string& query, const QType& qtype, vector<DNSResourceRecord>& ret, int& res)
+{
+  return passthrough("nxdomain", remote, local, query, qtype, ret, res);
+}
+
+bool PowerDNSLua::preresolve(const ComboAddress& remote, const ComboAddress& local,const string& query, const QType& qtype, vector<DNSResourceRecord>& ret, int& res)
+{
+  return passthrough("preresolve", remote, local, query, qtype, ret, res);
 }
 
@@ -154 +154 @@
 
 
-bool PowerDNSLua::passthrough(const string& func, const ComboAddress& remote, const string& query, const QType& qtype, vector<DNSResourceRecord>& ret, int& res)
+bool PowerDNSLua::passthrough(const string& func, const ComboAddress& remote, const ComboAddress& local, const string& query, const QType& qtype, vector<DNSResourceRecord>& ret, int& res)
 {
   lua_getglobal(d_lua,  func.c_str());
@@ -164 +164 @@
   /* 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,  3, 2, 0)) { // error 
-    string error=string("lua error: ")+lua_tostring(d_lua, -1);
+  if(lua_pcall(d_lua,  4, 2, 0)) { // error 
+    string error=string("lua error in '"+func+"': ")+lua_tostring(d_lua, -1);
     lua_pop(d_lua, 1);
     throw runtime_error(error);

trunk/pdns/pdns/lua-pdns-recursor.hh

@@ -12 +12 @@
   ~PowerDNSLua();
   void reload();
-  bool preresolve(const ComboAddress& remote, const string& query, const QType& qtype, vector<DNSResourceRecord>& res, int& ret);
-  bool nxdomain(const ComboAddress& remote, const string& query, const QType& qtype, vector<DNSResourceRecord>& res, int& ret);
+  bool preresolve(const ComboAddress& remote,const ComboAddress& local, const string& query, const QType& qtype, vector<DNSResourceRecord>& res, int& ret);
+  bool nxdomain(const ComboAddress& remote, const ComboAddress& local, const string& query, const QType& qtype, vector<DNSResourceRecord>& res, int& ret);
 private:
   lua_State* d_lua;
-  bool passthrough(const string& func, const ComboAddress& remote, const string& query, const QType& qtype, vector<DNSResourceRecord>& ret, int& res);
+  bool passthrough(const string& func, const ComboAddress& remote,const ComboAddress& local, const string& query, const QType& qtype, vector<DNSResourceRecord>& ret, int& res);
   bool getFromTable(const std::string& key, std::string& value);
   bool getFromTable(const std::string& key, uint32_t& value);

trunk/pdns/pdns/pdns_recursor.cc

@@ -85 +85 @@
 g_tcpListenSockets_t g_tcpListenSockets;
 int g_tcpTimeout;
-
+map<int, ComboAddress> g_listenSocketsAddresses;
 struct DNSComboWriter {
   DNSComboWriter(const char* data, uint16_t len, const struct timeval& now) : d_mdp(data, len), d_now(now), d_tcp(false), d_socket(-1)
@@ -540 +540 @@
     int res;
 
-    if(!g_pdl.get() || !g_pdl->preresolve(dc->d_remote, dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), ret, res)) {
+    if(!g_pdl.get() || !g_pdl->preresolve(dc->d_remote, g_listenSocketsAddresses[dc->d_socket], dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), ret, res)) {
        res = sr.beginResolve(dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), dc->d_mdp.d_qclass, ret);
 
        if(g_pdl.get()) {
          if(res == RCode::NXDomain)
-           g_pdl->nxdomain(dc->d_remote, dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), ret, res);
+           g_pdl->nxdomain(dc->d_remote, g_listenSocketsAddresses[dc->d_socket], dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), ret, res);
        }
     }
@@ -1048 +1048 @@
     
     Utility::setNonBlocking(fd);
-    //    g_fdm->addReadFD(fd, handleNewUDPQuestion);
+
     deferredAdd.push_back(make_pair(fd, handleNewUDPQuestion));
-
+    g_listenSocketsAddresses[fd]=sin;
     if(sin.sin4.sin_family == AF_INET) 
       L<<Logger::Error<<"Listening for UDP queries on "<< sin.toString() <<":"<<st.port<<endl;