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

[Ammar Faizi <ammarfaizi2@gnuweeb.org>]

On Tue, Aug 05, 2025 at 08:04:44PM +0700, Ahmad Gani wrote:
>  __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;

I think this strlen() work can be placed in an else statement because
if you end up entering the 'if' or 'else-if' statements, the `l` var
will be overwritten anyway.

>  	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;
>  	}

        ^^^ Here.

>  
> +	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);

Use %hu for u16.

-- 
Ammar Faizi