Fix STATUSMSG tag messages not including the status in the target.

[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..5eaffb47b4927076017c035b0063536cfd12b081 100644 (file)
--- a/src/modules/m_haproxy.cpp
+++ b/src/modules/m_haproxy.cpp
@@ -1,7 +1,9 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2018 Peter Powell <petpow@saberuk.com>
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2018-2019 Sadie Powell <sadie@witchery.services>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -219,7 +221,16 @@ class HAProxyHook : public IOHookMiddle
                return true;
        }
 
-       int ReadProxyAddress(StreamSocket* sock)
+       int ReadData(std::string& destrecvq)
+       {
+               // Once connected we handle no special data.
+               std::string& recvq = GetRecvQ();
+               destrecvq.append(recvq);
+               recvq.clear();
+               return 1;
+       }
+
+       int ReadProxyAddress(StreamSocket* sock, std::string& destrecvq)
        {
                // Block until we have the entire address.
                std::string& recvq = GetRecvQ();
@@ -240,7 +251,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 +267,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)
@@ -275,14 +287,15 @@ class HAProxyHook : public IOHookMiddle
 
                                // Erase the processed proxy information from the receive queue.
                                recvq.erase(0, address_length);
+                               break;
                }
 
                // We're done!
                state = HPS_CONNECTED;
-               return 1;
+               return ReadData(destrecvq);
        }
 
-       int ReadProxyHeader(StreamSocket* sock)
+       int ReadProxyHeader(StreamSocket* sock, std::string& destrecvq)
        {
                // Block until we have a header.
                std::string& recvq = GetRecvQ();
@@ -358,12 +371,13 @@ class HAProxyHook : public IOHookMiddle
                }
 
                state = HPS_WAITING_FOR_ADDRESS;
-               return ReadProxyAddress(sock);
+               return ReadProxyAddress(sock, destrecvq);
        }
 
  public:
        HAProxyHook(IOHookProvider* Prov, StreamSocket* sock, UserCertificateAPI& api)
                : IOHookMiddle(Prov)
+               , address_length(0)
                , sslapi(api)
                , state(HPS_WAITING_FOR_HEADER)
        {
@@ -382,16 +396,13 @@ class HAProxyHook : public IOHookMiddle
                switch (state)
                {
                        case HPS_WAITING_FOR_HEADER:
-                               return ReadProxyHeader(sock);
+                               return ReadProxyHeader(sock, destrecvq);
 
                        case HPS_WAITING_FOR_ADDRESS:
-                               return ReadProxyAddress(sock);
+                               return ReadProxyAddress(sock, destrecvq);
 
                        case HPS_CONNECTED:
-                               std::string& recvq = GetRecvQ();
-                               destrecvq.append(recvq);
-                               recvq.clear();
-                               return 1;
+                               return ReadData(destrecvq);
                }
 
                // We should never reach this point.