Tweaks to backwards memcpy's that dont actually do anything, causing ipv6 address...

[user/henk/code/inspircd.git] / src / socket.cpp

diff --git a/src/socket.cpp b/src/socket.cpp
index 472d58c2e91cd731a6114b2dc7e9e6a5673aac12..861cd9b12260645fb81826d45bd63285016cfdbc 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -294,7 +294,7 @@ bool InspIRCd::BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server
                *addr = 0;
 
        if ((*addr) && (insp_aton(addr,&addy) < 1))
-               return false;;
+               return false;
 
 #ifdef IPV6
        server.sin6_family = AF_FAMILY;
@@ -304,7 +304,7 @@ bool InspIRCd::BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server
        if (!*addr)
        {
 #ifdef IPV6
-               memcpy(&addy, &server.sin6_addr, sizeof(in6_addr));
+               memcpy(&server.sin6_addr, INADDR6_ANY, sizeof(INADDR6_ANY));
 #else
                server.sin_addr.s_addr = htonl(INADDR_ANY);
 #endif
@@ -312,7 +312,7 @@ bool InspIRCd::BindSocket(int sockfd, insp_sockaddr client, insp_sockaddr server
        else
        {
 #ifdef IPV6
-               memcpy(&addy, &server.sin6_addr, sizeof(in6_addr));
+               memcpy(&server.sin6_addr, &addy, sizeof(in6_addr));
 #else
                server.sin_addr = addy;
 #endif