From 54ba76e3bc99f30afecb2af1899fda6c59e3355c Mon Sep 17 00:00:00 2001
From: Logan oos Even <46396513+Logan007@users.noreply.github.com>
Date: Mon, 8 Feb 2021 17:24:03 +0545
Subject: [PATCH] clarified error message (#634)

---
 src/edge.c       | 8 ++++----
 src/edge_utils.c | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/edge.c b/src/edge.c
index f52c5d3..5be7cc0 100644
--- a/src/edge.c
+++ b/src/edge.c
@@ -497,14 +497,14 @@ static int setOption (int optkey, char *optargument, n2n_tuntap_priv_config_t *e
             break;
         }
 
-        case 'l': /* supernode-list */
+        case 'l': /* supernode-list */ {
             if(optargument) {
                 if(edge_conf_add_supernode(conf, optargument) != 0) {
-                    traceEvent(TRACE_WARNING, "Too many supernodes!");
-                    exit(1);
+                    traceEvent(TRACE_WARNING, "Failed to add supernode '%s'", optargument);
                 }
-                break;
             }
+            break;
+        }
 
         case 'i': /* supernode registration interval */
             conf->register_interval = atoi(optargument);
diff --git a/src/edge_utils.c b/src/edge_utils.c
index 55e3a72..b26fd7b 100644
--- a/src/edge_utils.c
+++ b/src/edge_utils.c
@@ -55,9 +55,13 @@ int edge_verify_conf (const n2n_edge_conf_t *conf) {
     if(conf->community_name[0] == 0)
         return(-1);
 
+    // REVISIT: are the following two conditions equal? if so, remove one. but note that sn_num is used elsewhere
     if(conf->sn_num == 0)
         return(-2);
 
+    if(HASH_COUNT(conf->supernodes) == 0)
+        return(-5);
+
     if(conf->register_interval < 1)
         return(-3);
 
@@ -65,9 +69,6 @@ int edge_verify_conf (const n2n_edge_conf_t *conf) {
        ((conf->encrypt_key != NULL) && (conf->transop_id == N2N_TRANSFORM_ID_NULL)))
         return(-4);
 
-    if(HASH_COUNT(conf->supernodes) == 0)
-        return(-5);
-
     return(0);
 }
 
@@ -3064,7 +3065,7 @@ int edge_conf_add_supernode (n2n_edge_conf_t *conf, const char *ip_and_port) {
     rv = supernode2sock(sock, ip_and_port);
 
     if(rv != 0) {
-        traceEvent(TRACE_WARNING, "Invalid socket");
+        traceEvent(TRACE_WARNING, "Invalid supernode address");
         free(sock);
         return(1);
     }