Move to entirely using insp_sockaddr and insp_inaddr for socket stuff, first step on the road to ipv6 support

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4609 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 15 insertions, 15 deletions

diff --git a/include/dns.h b/include/dns.h
index ea02f03bb..9b477e98f 100644
--- a/include/dns.h
+++ b/include/dns.h
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 struct dns_ip4list
 {
-	in_addr ip;
+	insp_inaddr ip;
 	dns_ip4list *next;
 };
 
@@ -51,24 +51,24 @@ enum ResolverError
 class DNS : public Extensible
 {
 private:
-	in_addr *binip;
+	insp_inaddr *binip;
 	char* result;
 	char localbuf[1024];
 	int t;
 	void dns_init();
 	int myfd;
 	void dns_init_2(const char* dnsserver);
-	in_addr *dns_aton4(const char * const ipstring);
-	char *dns_ntoa4(const in_addr * const ip);
+	insp_inaddr *dns_aton4(const char * const ipstring);
+	char *dns_ntoa4(const insp_inaddr * const ip);
 	int dns_getip4(const char * const name);
 	int dns_getip4list(const char * const name);
-	int dns_getname4(const in_addr * const ip);
+	int dns_getname4(const insp_inaddr * const ip);
 	char *dns_getresult(const int fd);
-	in_addr *dns_aton4_s(const char * const ipstring, in_addr * const ip);
-	char *dns_ntoa4_s(const in_addr * const ip, char * const result);
+	insp_inaddr *dns_aton4_s(const char * const ipstring, insp_inaddr * const ip);
+	char *dns_ntoa4_s(const insp_inaddr * const ip, char * const result);
 	char *dns_getresult_s(const int fd, char * const result);
-	in_addr *dns_aton4_r(const char * const ipstring);
-	char *dns_ntoa4_r(const in_addr * const ip);
+	insp_inaddr *dns_aton4_r(const char * const ipstring);
+	char *dns_ntoa4_r(const insp_inaddr * const ip);
 	char *dns_getresult_r(const int fd);
 public:
 	/** The default constructor uses dns addresses read from /etc/resolv.conf.
diff --git a/include/hashcomp.h b/include/hashcomp.h
index 1d3a5d0b1..714d3286f 100644
--- a/include/hashcomp.h
+++ b/include/hashcomp.h
@@ -40,9 +40,9 @@ using namespace std;
 
 namespace nspace
 {
-        template<> struct hash<in_addr>
+        template<> struct hash<insp_inaddr>
         {
-                size_t operator()(const struct in_addr &a) const;
+                size_t operator()(const insp_inaddr &a) const;
         };
 
         template<> struct hash<std::string>
@@ -68,7 +68,7 @@ namespace irc
 	};
 
 
-	/** This class returns true if two in_addr structs match.
+	/** This class returns true if two insp_inaddr structs match.
 	 * Checking is done by copying both into a size_t then doing a
 	 * numeric comparison of the two.
 	 */
@@ -76,7 +76,7 @@ namespace irc
 	{
 		/** The operator () does the actual comparison in hash_map
 		 */
-	        bool operator()(const in_addr &s1, const in_addr &s2) const;
+	        bool operator()(const insp_inaddr &s1, const insp_inaddr &s2) const;
 	};
 
 	/** irc::tokenstream reads a string formatted as per RFC1459 and RFC2812.
diff --git a/include/users.h b/include/users.h
index 52068bb24..c91b2635a 100644
--- a/include/users.h
+++ b/include/users.h
@@ -246,7 +246,7 @@ class userrec : public connection
 
 	/** IPV4 ip address
 	 */
-	in_addr ip4;
+	insp_inaddr ip4;
 
 	/* Write error string
 	 */
@@ -429,7 +429,7 @@ void kill_link(userrec *user,const char* r);
 void kill_link_silent(userrec *user,const char* r);
 void AddWhoWas(userrec* u);
 void MaintainWhoWas(time_t TIME);
-void AddClient(int socket, int port, bool iscached, in_addr ip4);
+void AddClient(int socket, int port, bool iscached, insp_inaddr ip4);
 void FullConnectUser(userrec* user, CullList* Goners);
 userrec* ReHashNick(const char* Old, const char* New);
 void force_nickchange(userrec* user,const char* newnick);