From ee46e3e86b7b6272078884c23af7843d676c6dd4 Mon Sep 17 00:00:00 2001
From: switch_st <switch.st@gmail.com>
Date: Wed, 22 Jul 2020 16:40:15 +0800
Subject: [PATCH] Revert "fix supernode coredump when accessing management
 socket"

This reverts commit 66d73b0713fae1287b7e2d74b1a4bd9d4d4c50a6.
---
 include/n2n.h  |  2 --
 src/sn_utils.c | 30 +++++++++++++++---------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/include/n2n.h b/include/n2n.h
index e0066a6..e4b3b4a 100644
--- a/include/n2n.h
+++ b/include/n2n.h
@@ -99,8 +99,6 @@
 #include <immintrin.h>
 #endif
 
-#define SAFE_SNPRINTF(BUF, SIZE, FORMAT, ...) (ssize_t)(SIZE) > 0 ? snprintf(BUF, SIZE, FORMAT, ##__VA_ARGS__) : 0
-
 #define ETH_ADDR_LEN 6
 
 struct ether_hdr
diff --git a/src/sn_utils.c b/src/sn_utils.c
index c92950a..4ea34f6 100644
--- a/src/sn_utils.c
+++ b/src/sn_utils.c
@@ -302,10 +302,10 @@ static int process_mgmt(n2n_sn_t *sss,
 
     traceEvent(TRACE_DEBUG, "process_mgmt");
 
-    ressize += SAFE_SNPRINTF(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
+    ressize += snprintf(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
                         "----------------\n");
 
-    ressize += SAFE_SNPRINTF(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
+    ressize += snprintf(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
                         "uptime    %lu\n", (now - sss->start_time));
 
     HASH_ITER(hh, sss->communities, community, tmp)
@@ -313,54 +313,54 @@ static int process_mgmt(n2n_sn_t *sss,
         num_edges += HASH_COUNT(community->edges);
     }
 
-    ressize += SAFE_SNPRINTF(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
+    ressize += snprintf(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
                         "edges     %u\n",
                         num_edges);
 
-    ressize += SAFE_SNPRINTF(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
+    ressize += snprintf(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
                         "errors    %u\n",
                         (unsigned int)sss->stats.errors);
 
-    ressize += SAFE_SNPRINTF(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
+    ressize += snprintf(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
                         "reg_sup   %u\n",
                         (unsigned int)sss->stats.reg_super);
 
-    ressize += SAFE_SNPRINTF(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
+    ressize += snprintf(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
                         "reg_nak   %u\n",
                         (unsigned int)sss->stats.reg_super_nak);
 
-    ressize += SAFE_SNPRINTF(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
+    ressize += snprintf(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
                         "fwd       %u\n",
                         (unsigned int)sss->stats.fwd);
 
-    ressize += SAFE_SNPRINTF(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
+    ressize += snprintf(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
                         "broadcast %u\n",
                         (unsigned int)sss->stats.broadcast);
 
-    ressize += SAFE_SNPRINTF(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
+    ressize += snprintf(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
                         "last fwd  %lu sec ago\n",
                         (long unsigned int)(now - sss->stats.last_fwd));
 
-    ressize += SAFE_SNPRINTF(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
+    ressize += snprintf(resbuf + ressize, N2N_SN_PKTBUF_SIZE - ressize,
                         "last reg  %lu sec ago\n",
                         (long unsigned int)(now - sss->stats.last_reg_super));
 
-    ressize += SAFE_SNPRINTF(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
+    ressize += snprintf(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
                         "cur_cmnts");
     HASH_ITER(hh, sss->communities, community, tmp) {
-      ressize += SAFE_SNPRINTF(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
+      ressize += snprintf(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
                           " [%s]",
                           community->community);
       HASH_ITER(hh, community->edges, peer, tmpPeer) {
-        ressize += SAFE_SNPRINTF(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
+        ressize += snprintf(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
                             " {%s}",
                             macaddr_str(mac_buf, peer->mac_addr));
       }
     }
-    ressize += SAFE_SNPRINTF(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
+    ressize += snprintf(resbuf+ressize, N2N_SN_PKTBUF_SIZE-ressize,
                         "\n");
 
-    r = sendto(sss->mgmt_sock, resbuf, MIN(ressize, N2N_SN_PKTBUF_SIZE), 0 /*flags*/,
+    r = sendto(sss->mgmt_sock, resbuf, ressize, 0 /*flags*/,
                (struct sockaddr *)sender_sock, sizeof(struct sockaddr_in));
 
     if (r <= 0)