Merge pull request #594 from tsubery/master

Fix hello-timeout argument configuration and ipv6 formatter
robertdavidgraham · Jul 7, 2021 · 1310495 · 1310495
2 parents 34a9d69 + a6b8bed
commit 1310495
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main.c b/src/main.c
@@ -691,7 +691,7 @@ receive_thread(void *v)
         }
         if (masscan->tcp_hello_timeout) {
             char foo[64];
-            sprintf_s(foo, sizeof(foo), "%u", masscan->tcp_connection_timeout);
+            sprintf_s(foo, sizeof(foo), "%u", masscan->tcp_hello_timeout);
             tcpcon_set_parameter(   tcpcon,
                                  "hello-timeout",
                                  strlen(foo),

diff --git a/src/massip-addr.c b/src/massip-addr.c
@@ -45,14 +45,16 @@ _append_ipv6(stream_t *out, const unsigned char *ipv6)
          * of 0 can be removed completely, replaced by an extra colon */
         if (n == 0 && !is_ellision) {
             is_ellision = 1;
-            while (i < 16 && ipv6[i + 2] == 0 && ipv6[i + 3] == 0)
+            while (i < 13 && ipv6[i + 2] == 0 && ipv6[i + 3] == 0)
                 i += 2;
             _append_char(out, ':');
 
             /* test for all-zero address, in which case the output
              * will be "::". */
-            if (i == 14)
+            while (i == 14 && ipv6[i] == 0 && ipv6[i + 1] == 0){
+                i=16;
                 _append_char(out, ':');
+            }
             continue;
         }