From 9e7a99378ad488a3d57c66fb71b9bdfad573f736 Mon Sep 17 00:00:00 2001 From: sxyoxygen <42184617+sxyoxygen@users.noreply.github.com> Date: Wed, 8 Aug 2018 01:45:59 +0800 Subject: [PATCH 1/5] Update utils.h --- src/utils.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/utils.h b/src/utils.h index 589eb800..3a68f5ab 100644 --- a/src/utils.h +++ b/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); +bool ss_is_ipv6addr(const char *addr); + #define ss_free(ptr) \ do { \ free(ptr); \ From 95c1dba176ff1cdf034f2735580bf3ea830940a7 Mon Sep 17 00:00:00 2001 From: sxyoxygen <42184617+sxyoxygen@users.noreply.github.com> Date: Wed, 8 Aug 2018 01:47:19 +0800 Subject: [PATCH 2/5] Update utils.c --- src/utils.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/utils.c b/src/utils.c index ee01e0fd..8fe9b84e 100644 --- a/src/utils.c +++ b/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() { From 8356d8ae74148dda31e67224e159081e91e7fb4b Mon Sep 17 00:00:00 2001 From: sxyoxygen <42184617+sxyoxygen@users.noreply.github.com> Date: Wed, 8 Aug 2018 01:56:12 +0800 Subject: [PATCH 3/5] Update server.c --- src/server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server.c b/src/server.c index 30c03a41..7c8543d2 100644 --- a/src/server.c +++ b/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); From 059780ff9bee752140ead535526c4343fc0e8064 Mon Sep 17 00:00:00 2001 From: sxyoxygen <42184617+sxyoxygen@users.noreply.github.com> Date: Wed, 8 Aug 2018 01:56:37 +0800 Subject: [PATCH 4/5] Update local.c --- src/local.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/local.c b/src/local.c index 11091d59..6a8474e5 100644 --- a/src/local.c +++ b/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); From 46e2b28d396f28786621df694c427e753a5924be Mon Sep 17 00:00:00 2001 From: sxyoxygen <42184617+sxyoxygen@users.noreply.github.com> Date: Wed, 8 Aug 2018 12:03:56 +0800 Subject: [PATCH 5/5] Update utils.h --- src/utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils.h b/src/utils.h index 3a68f5ab..3be10c69 100644 --- a/src/utils.h +++ b/src/utils.h @@ -231,7 +231,7 @@ void *ss_malloc(size_t size); void *ss_align(size_t size); void *ss_realloc(void *ptr, size_t new_size); -bool ss_is_ipv6addr(const char *addr); +int ss_is_ipv6addr(const char *addr); #define ss_free(ptr) \ do { \