Merge pull request #2140 from sxyoxygen/patch-1

Use ss_is_ipv6addr()

src/local.c

@@ -1863,7 +1863,7 @@ main(int argc, char **argv)
     ev_signal_start(EV_DEFAULT, &sigchld_watcher);
 #endif
 
-    if (strcmp(local_addr, ":") > 0)
+    if (ss_is_ipv6addr(local_addr))
         LOGI("listening at [%s]:%s", local_addr, local_port);
     else
         LOGI("listening at %s:%s", local_addr, local_port);
@@ -2045,7 +2045,7 @@ _start_ss_local_server(profile_t profile, ss_local_callback callback, void *udat
     listen_ctx.iface          = NULL;
     listen_ctx.mptcp          = mptcp;
 
-    if (strcmp(local_addr, ":") > 0)
+    if (ss_is_ipv6addr(local_addr))
         LOGI("listening at [%s]:%s", local_addr, local_port_str);
     else
         LOGI("listening at %s:%s", local_addr, local_port_str);

src/server.c

@@ -2015,7 +2015,7 @@ main(int argc, char **argv)
                 host = "127.0.0.1";
             }
 
-            if (host && strcmp(host, ":") > 0)
+            if (host && ss_is_ipv6addr(host))
                 LOGI("tcp server listening at [%s]:%s", host, server_port);
             else
                 LOGI("tcp server listening at %s:%s", host ? host : "0.0.0.0", server_port);
@@ -2054,7 +2054,7 @@ main(int argc, char **argv)
             if (plugin != NULL) {
                 port = plugin_port;
             }
-            if (host && strcmp(host, ":") > 0)
+            if (host && ss_is_ipv6addr(host))
                 LOGI("udp server listening at [%s]:%s", host, port);
             else
                 LOGI("udp server listening at %s:%s", host ? host : "0.0.0.0", port);

src/utils.c

@@ -268,6 +268,13 @@ ss_realloc(void *ptr, size_t new_size)
     return new;
 }
 
+int
+ss_is_ipv6addr(const char *addr)
+{
+    return strcmp(addr, ":") > 0;
+}
+
+
 void
 usage()
 {

src/utils.h

@@ -231,6 +231,8 @@ void *ss_malloc(size_t size);
 void *ss_align(size_t size);
 void *ss_realloc(void *ptr, size_t new_size);
 
+int ss_is_ipv6addr(const char *addr);
+
 #define ss_free(ptr)     \
     do {                 \
         free(ptr);       \