From: Maxim Mamontov <faust.madf@gmail.com>
Date: Wed, 14 Feb 2018 10:29:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/ticket52' into stg-2.409
X-Git-Tag: 2.409~28
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/df4e8a09fef4d521167151e90080da07f166bb0b?hp=1a42b634841392c7c0516bcb76fcc33f6d700808

Merge remote-tracking branch 'origin/ticket52' into stg-2.409
---

diff --git a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp
index de30e7d2..3aec35ae 100644
--- a/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp
+++ b/projects/stargazer/plugins/authorization/inetaccess/inetaccess.cpp
@@ -1203,7 +1203,7 @@ if ((iaUser->phase.GetPhase() == 2) && (connAck->rnd == iaUser->rnd + 1))
         return -1;
         }
     }
-printfd(__FILE__, "Invalid phase or control number. Phase: %d. Control number: %d\n", iaUser->phase.GetPhase(), connAck->rnd);
+printfd(__FILE__, "Invalid phase or control number. Phase: %d. Control number: %d, expected: %d\n", iaUser->phase.GetPhase(), connAck->rnd, iaUser->rnd + 1);
 if (iaSettings.LogProtocolErrors())
     {
     if (iaUser->phase.GetPhase() != 2)
@@ -1248,7 +1248,7 @@ if ((iaUser->phase.GetPhase() == 2) && (connAck->rnd == iaUser->rnd + 1))
         return -1;
         }
     }
-printfd(__FILE__, "Invalid phase or control number. Phase: %d. Control number: %d\n", iaUser->phase.GetPhase(), connAck->rnd);
+printfd(__FILE__, "Invalid phase or control number. Phase: %d. Control number: %d, expected: %d\n", iaUser->phase.GetPhase(), connAck->rnd, iaUser->rnd + 1);
 if (iaSettings.LogProtocolErrors())
     {
     if (iaUser->phase.GetPhase() != 2)
@@ -1411,6 +1411,8 @@ for (int j = 0; j < DIR_NUM; j++)
 iaUser->rnd = static_cast<uint32_t>(random());
 connSynAck6.rnd = iaUser->rnd;
 
+printfd(__FILE__, "Sending CONN_SYN_ACK with control number %d.\n", iaUser->rnd);
+
 connSynAck6.userTimeOut = iaSettings.GetUserTimeout().GetSec();
 connSynAck6.aliveDelay = iaSettings.GetUserDelay().GetSec();
 
@@ -1453,6 +1455,8 @@ for (int j = 0; j < DIR_NUM; j++)
 iaUser->rnd = static_cast<uint32_t>(random());
 connSynAck8.rnd = iaUser->rnd;
 
+printfd(__FILE__, "Sending CONN_SYN_ACK with control number %d.\n", iaUser->rnd);
+
 connSynAck8.userTimeOut = iaSettings.GetUserTimeout().GetSec();
 connSynAck8.aliveDelay = iaSettings.GetUserDelay().GetSec();
 
diff --git a/projects/stargazer/plugins/other/rscript/send_functor.h b/projects/stargazer/plugins/other/rscript/send_functor.h
index baa4c118..dc8ad63a 100644
--- a/projects/stargazer/plugins/other/rscript/send_functor.h
+++ b/projects/stargazer/plugins/other/rscript/send_functor.h
@@ -33,6 +33,7 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <netinet/in.h>
 #include <netinet/ip.h>
 
 class PacketSender : public std::unary_function<uint32_t, ssize_t> {