Remember: C++ only works if you type the right method names and not ones that dont...

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

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 2a399df037f266643a056960e49c33ac14233428..5ce3775af4d23e14c60b00afd02bcbbfe50f320a 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -236,7 +236,7 @@ public:
        
                        bool valid = false;
 #ifdef IPV6
-                       if (user->GetAddressFamily() == AF_INET6)
+                       if (user->GetProtocolFamily() == AF_INET6)
                                valid = (inet_pton(AF_INET6, user->password, &((sockaddr_in6*)&user->ip)->sin6_addr) > 0);
                        else
                                valid = (inet_aton(user->password, &((sockaddr_in*)&user->ip)->sin_addr));
@@ -300,7 +300,7 @@ public:
                user->Extend("cgiirc_realhost", new std::string(user->host));
                user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
 #ifdef IPV6
-               if (user->GetAddressFamily() == AF_INET6)
+               if (user->GetProtocolFamily() == AF_INET6)
                        inet_pton(AF_INET6, newip, &((sockaddr_in6*)&user->ip)->sin6_addr);
                else
                        inet_aton(newip, &((sockaddr_in*)&user->ip)->sin_addr);

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 6c7d36974d4a726138527ee6c2b21b98d791fec4..338535ad8b048f37fd0514ebdd3b3c4504214bc6 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -143,7 +143,7 @@ class RFC1413 : public InspSocket
                        uslen = sizeof(sockaddr_in);
                        themlen = sizeof(sockaddr_in);
 #ifdef IPV6
-                       if (this->u->GetAddressFamily() == AF_INET6)
+                       if (this->u->GetProtocolFamily() == AF_INET6)
                        {
                                themlen = sizeof(sockaddr_in6);
                                uslen = sizeof(sockaddr_in6);
@@ -163,7 +163,7 @@ class RFC1413 : public InspSocket
                        {
                                // send the request in the following format: theirsocket,oursocket
 #ifdef IPV6
-                               if (this->u->GetAddressFamily() == AF_INET6)
+                               if (this->u->GetProtocolFamily() == AF_INET6)
                                        snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in6*)sock_them)->sin6_port),ntohs(((sockaddr_in6*)sock_us)->sin6_port));
                                else
                                        snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port));