Changeset 1309 for trunk/pdns/pdns/pdns_recursor.cc
- Timestamp:
- 11/27/08 16:47:02 (4 years ago)
- Files:
-
- 1 modified
-
trunk/pdns/pdns/pdns_recursor.cc (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/pdns/pdns/pdns_recursor.cc
r1286 r1309 85 85 g_tcpListenSockets_t g_tcpListenSockets; 86 86 int g_tcpTimeout; 87 87 map<int, ComboAddress> g_listenSocketsAddresses; 88 88 struct DNSComboWriter { 89 89 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; 541 541 542 if(!g_pdl.get() || !g_pdl->preresolve(dc->d_remote, dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), ret, res)) {542 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)) { 543 543 res = sr.beginResolve(dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), dc->d_mdp.d_qclass, ret); 544 544 545 545 if(g_pdl.get()) { 546 546 if(res == RCode::NXDomain) 547 g_pdl->nxdomain(dc->d_remote, dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), ret, res);547 g_pdl->nxdomain(dc->d_remote, g_listenSocketsAddresses[dc->d_socket], dc->d_mdp.d_qname, QType(dc->d_mdp.d_qtype), ret, res); 548 548 } 549 549 } … … 1048 1048 1049 1049 Utility::setNonBlocking(fd); 1050 // g_fdm->addReadFD(fd, handleNewUDPQuestion); 1050 1051 1051 deferredAdd.push_back(make_pair(fd, handleNewUDPQuestion)); 1052 1052 g_listenSocketsAddresses[fd]=sin; 1053 1053 if(sin.sin4.sin_family == AF_INET) 1054 1054 L<<Logger::Error<<"Listening for UDP queries on "<< sin.toString() <<":"<<st.port<<endl;