min/max fixes, tcp send log

diff --git a/base/rebase.hpp b/base/rebase.hpp
index 6a109f0d12183cbf993620dae43025e5d6f97209..a358798ddc1caaa8347566e0fa544643f0e11260 100644 (file)
--- a/base/rebase.hpp
+++ b/base/rebase.hpp
@@ -61,8 +61,6 @@ inline int getLastOSError() {
 #      include <direct.h>\r
 #      include <WinSock2.h>\r
 #      include <windows.h>\r
-#undef min\r
-#undef max\r
 #      define _memcmp(t,s,n) memcmp(t,s,n)\r
 #      define lstat stat\r
 #      define millisecSleep(msec) Sleep(msec)\r
@@ -102,6 +100,8 @@ public:
 public:\r
        virtual void process() = 0;\r
 };\r
+#undef min\r
+#undef max\r
 /** Returns the minimum of 2 values.\r
  * @param a    first value\r
  * @param b 2nd value\r

diff --git a/net/ReTCP.cpp b/net/ReTCP.cpp
index acd5871ab8bcd67f50ecd3815da81888bead8476..6374762b48fc46c215828fc0827d4d1f027a3163 100644 (file)
--- a/net/ReTCP.cpp
+++ b/net/ReTCP.cpp
@@ -317,13 +317,12 @@ void ReTCPConnection::send(const char* command, const char* data, int length) {
        ++m_noSent;\r
        m_toSend.setLength(0);\r
        int flags = 0x7b;\r
-       length += 8;\r
+       int rest = length + 8;\r
        m_toSend.appendInt(length | (flags << 24), "%08x");\r
        m_toSend.appendFix(command, -1, 8, 8, NULL);\r
        m_toSend.append(data, length);\r
-       length += 8;\r
+       rest += 8;\r
        int sent = 0;\r
-       int rest = length;\r
        const char* buf = m_toSend.str();\r
        int rounds = 0;\r
        while (rest > 0) {\r
@@ -339,8 +338,8 @@ void ReTCPConnection::send(const char* command, const char* data, int length) {
        }\r
        if (rest == 0)\r
                m_loggerOwner->logger()->sayF(LOG_DEBUG | CAT_NETWORK, LC_WRITE_2,\r
-                           i18n("sent: $1 bytes in $2 round(s): $3")).arg(length).arg(rounds)\r
-                               .arg(ReByteBuffer().appendDump(data, length, 80).str()).end();\r
+                           i18n("sent: $1 bytes in $2 round(s): $3 $4")).arg(length).arg(rounds)\r
+                               .arg(command).arg(ReByteBuffer().appendDump(data, length, 80).str()).end();\r
 }\r
 \r
 /**\r