Silence some GCC warnings.

[user/henk/code/inspircd.git] / src / modules / m_haproxy.cpp

diff --git a/src/modules/m_haproxy.cpp b/src/modules/m_haproxy.cpp
index e92c45686fb006612ac6e4a2ff0e3c4584824559..4d0e52514522064ddf1b6a73e21a15a2ddbfe164 100644 (file)
--- a/src/modules/m_haproxy.cpp
+++ b/src/modules/m_haproxy.cpp
@@ -240,7 +240,7 @@ class HAProxyHook : public IOHookMiddle
                                {
                                        case AF_INET:
                                                memcpy(&client.in4.sin_addr.s_addr, &recvq[0], 4);
-                                               memcpy(&server.in4.sin_addr.s_addr, &recvq[4], 8);
+                                               memcpy(&server.in4.sin_addr.s_addr, &recvq[4], 4);
                                                memcpy(&client.in4.sin_port, &recvq[8], 2);
                                                memcpy(&server.in4.sin_port, &recvq[10], 2);
                                                tlv_index = 12;
@@ -256,12 +256,13 @@ class HAProxyHook : public IOHookMiddle
 
                                        case AF_UNIX:
                                                memcpy(client.un.sun_path, &recvq[0], 108);
-                                               memcpy(client.un.sun_path, &recvq[108], 108);
+                                               memcpy(server.un.sun_path, &recvq[108], 108);
                                                tlv_index = 216;
                                                break;
                                }
 
-                               sock->OnSetEndPoint(server, client);
+                               if (!sock->OnSetEndPoint(server, client))
+                                       return -1;
 
                                // Parse any available TLVs.
                                while (tlv_index < address_length)
@@ -364,6 +365,7 @@ class HAProxyHook : public IOHookMiddle
  public:
        HAProxyHook(IOHookProvider* Prov, StreamSocket* sock, UserCertificateAPI& api)
                : IOHookMiddle(Prov)
+               , address_length(0)
                , sslapi(api)
                , state(HPS_WAITING_FOR_HEADER)
        {