Change to using userrec::ip as a sockaddr to store port, ip and address family, rather than userrec::ip4 and userrec::port.

This allows us to handle remote ipv6 users on an ipv4 server, and vice versa.


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

1 files changed, 17 insertions, 1 deletions

diff --git a/include/users.h b/include/users.h
index 13dc33709..19116a130 100644
--- a/include/users.h
+++ b/include/users.h
@@ -268,7 +268,23 @@ class userrec : public connection
 
 	/** IPV4 ip address
 	 */
-	insp_inaddr ip4;
+	sockaddr ip;
+
+	/** Initialize the clients sockaddr
+	 */
+	void SetSockAddr(int protocol_family, const char* ip, int port);
+
+	/** Get port number from sockaddr
+	 */
+	int GetPort();
+
+	/** Get protocol family from sockaddr
+	 */
+	int GetProtocolFamily();
+
+	/** Get IP string from sockaddr
+	 */
+	const char* GetIPString();
 
 	/* Write error string
 	 */