Branch Merge

[irc/rqf/shadowircd.git] / include / res.h

diff --git a/include/res.h b/include/res.h
index 8f533132b96d594e0a6e4f00db63f0460ab82d5f..1b70094d9a7218b719a13adc3916da8e29ff3449 100644 (file)
--- a/include/res.h
+++ b/include/res.h
@@ -9,10 +9,8 @@
 
 #include "ircd_defs.h"
 #include "common.h"
-#include "commio.h"
 #include "reslib.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 
 /* Maximum number of nameservers in /etc/resolv.conf we care about 
@@ -24,7 +22,7 @@
 struct DNSReply
 {
   char *h_name;
-  struct irc_sockaddr_storage addr;
+  struct rb_sockaddr_storage addr;
 };
 
 struct DNSQuery
@@ -33,14 +31,14 @@ struct DNSQuery
   void (*callback)(void* vptr, struct DNSReply *reply); /* callback to call */
 };
 
-extern struct irc_sockaddr_storage irc_nsaddr_list[];
+extern struct rb_sockaddr_storage irc_nsaddr_list[];
 extern int irc_nscount;
 
 extern void init_resolver(void);
 extern void restart_resolver(void);
 extern void delete_resolver_queries(const struct DNSQuery *);
 extern void gethost_byname_type(const char *, struct DNSQuery *, int);
-extern void gethost_byaddr(const struct irc_sockaddr_storage *, struct DNSQuery *);
+extern void gethost_byaddr(const struct rb_sockaddr_storage *, struct DNSQuery *);
 extern void add_local_domain(char *, size_t);
 extern void report_dns_servers(struct Client *);