diff options
| author | DukePyrolator <DukePyrolator@anope.org> | 2012-10-24 05:12:47 +0200 |
|---|---|---|
| committer | DukePyrolator <DukePyrolator@anope.org> | 2012-10-24 05:12:47 +0200 |
| commit | ef5c6684c71fda6837f4d217d4f61bb418523047 (patch) | |
| tree | 599dffcd828fc4a4213a7a2d2b17a449ed3c6e77 /include | |
| parent | e0438e3a7ee3b7737f5138e7f43157b07479c824 (diff) | |
| parent | 04632bd381796dd90742bbc6ccd38905d4de25be (diff) | |
Merge branch '1.9' of ssh://anope.git.sourceforge.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'include')
| -rw-r--r-- | include/config.h | 3 | ||||
| -rw-r--r-- | include/dns.h | 2 | ||||
| -rw-r--r-- | include/modules.h | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/include/config.h b/include/config.h index 947daa3e5..5851247e8 100644 --- a/include/config.h +++ b/include/config.h @@ -500,7 +500,8 @@ class CoreExport ServerConfig Anope::string NameServer; /* Time before a DNS query is considered dead */ time_t DNSTimeout; - /* The port DNS queries come in on */ + /* The IP/port DNS queries come in on */ + Anope::string DNSIP; int DNSPort; /* Prefix of guest nicks when a user gets forced off of a nick */ diff --git a/include/dns.h b/include/dns.h index 062fed26f..bb57945f3 100644 --- a/include/dns.h +++ b/include/dns.h @@ -162,7 +162,7 @@ class CoreExport DNSManager : public Timer, public Socket sockaddrs addrs; std::map<unsigned short, DNSRequest *> requests; - DNSManager(const Anope::string &nameserver, int port); + DNSManager(const Anope::string &nameserver, const Anope::string &ip, int port); ~DNSManager(); diff --git a/include/modules.h b/include/modules.h index 3827e9234..cdaf53fc0 100644 --- a/include/modules.h +++ b/include/modules.h @@ -919,8 +919,9 @@ class CoreExport Module : public Extensible /** Called when a DNS request (question) is recieved. * @param req The dns request + * @param reply The reply that will be sent */ - virtual void OnDnsRequest(DNSPacket &req) { } + virtual void OnDnsRequest(DNSPacket &req, DNSPacket *reply) { } /** Called when a channels modes are being checked to see if they are allowed, * mostly to ensure mlock/+r are set. |