[PATCH gwproxy v3 2/6] dnslookup: Add a new parameter default_port

[Ahmad Gani <reyuki@gnuweeb.org>]

default_port as parameter in convert_str_to_ssaddr function is needed
when separator ':' does not exists in the provided address string.

Signed-off-by: Ahmad Gani <reyuki@gnuweeb.org>
---
 src/gwproxy/gwproxy.c |  4 ++--
 src/gwproxy/net.c     | 24 +++++++++++++++---------
 src/gwproxy/net.h     |  4 +++-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/gwproxy/gwproxy.c b/src/gwproxy/gwproxy.c
index 40fb5ece21cc..9de460c53751 100644
--- a/src/gwproxy/gwproxy.c
+++ b/src/gwproxy/gwproxy.c
@@ -540,7 +540,7 @@ static int gwp_ctx_init_threads(struct gwp_ctx *ctx)
 		return -EINVAL;
 	}
 
-	r = convert_str_to_ssaddr(cfg->bind, &bind_addr);
+	r = convert_str_to_ssaddr(cfg->bind, &bind_addr, 0);
 	if (r) {
 		pr_err(&ctx->lh, "Invalid bind address '%s'\n", cfg->bind);
 		return r;
@@ -759,7 +759,7 @@ static int gwp_ctx_init(struct gwp_ctx *ctx)
 
 	if (!ctx->cfg.as_socks5) {
 		const char *t = ctx->cfg.target;
-		r = convert_str_to_ssaddr(t, &ctx->target_addr);
+		r = convert_str_to_ssaddr(t, &ctx->target_addr, 0);
 		if (r) {
 			pr_err(&ctx->lh, "Invalid target address '%s'", t);
 			goto out_free_log;
diff --git a/src/gwproxy/net.c b/src/gwproxy/net.c
index 12c6c0b1275d..366fdff5a64d 100644
--- a/src/gwproxy/net.c
+++ b/src/gwproxy/net.c
@@ -10,7 +10,8 @@
 #include <gwproxy/common.h>
 
 __cold
-int convert_str_to_ssaddr(const char *str, struct gwp_sockaddr *gs)
+int convert_str_to_ssaddr(const char *str,
+				struct gwp_sockaddr *gs, uint16_t default_port)
 {
 	static const struct addrinfo hints = {
 		.ai_family = AF_UNSPEC,
@@ -22,29 +23,34 @@ int convert_str_to_ssaddr(const char *str, struct gwp_sockaddr *gs)
 	size_t l;
 	int r;
 
+	l = strlen(str);
+	p = NULL;
 	if (*str == '[') {
 		p = strchr(++str, ']');
 		if (!p)
 			return -EINVAL;
 		l = p - str;
-		if (l >= sizeof(host))
-			return -EINVAL;
 		p++;
-		if (*p != ':')
+		if (*p != ':' && !default_port)
 			return -EINVAL;
-	} else {
+	} else if (!default_port) {
 		p = strchr(str, ':');
 		if (!p)
 			return -EINVAL;
 		l = p - str;
-		if (l >= sizeof(host))
-			return -EINVAL;
 	}
 
+	if (l >= sizeof(host))
+		return -EINVAL;
+
 	strncpy(host, str, l);
 	host[l] = '\0';
-	strncpy(port, p + 1, sizeof(port) - 1);
-	port[sizeof(port) - 1] = '\0';
+	if (default_port) {
+		snprintf(port, 6, "%u", default_port);
+	} else {
+		strncpy(port, p + 1, sizeof(port) - 1);
+		port[sizeof(port) - 1] = '\0';
+	}
 
 	r = getaddrinfo(host, port, &hints, &res);
 	if (r)
diff --git a/src/gwproxy/net.h b/src/gwproxy/net.h
index 627a70f926f9..ff4ca1fc1965 100644
--- a/src/gwproxy/net.h
+++ b/src/gwproxy/net.h
@@ -19,9 +19,11 @@ struct gwp_sockaddr {
  *
  * @param str source
  * @param gs destination
+ * @param default_port fill it with zero if unspecified
  * @return zero on success and a negative integer on failure.
  */
-int convert_str_to_ssaddr(const char *str, struct gwp_sockaddr *gs);
+int convert_str_to_ssaddr(const char *str,
+				struct gwp_sockaddr *gs, uint16_t default_port);
 
 /*
  * Convert network address to string format
-- 
Ahmad Gani