From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server-vie001.gnuweeb.org X-Spam-Level: X-Spam-Status: No, score=-1.2 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_ZEN_BLOCKED_OPENDNS autolearn=ham autolearn_force=no version=3.4.6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=new2025; t=1754376634; bh=FvvfEdQuYFX9DQRu5RrWmA8tU4qGQ2Cm6xy1aLfNMrk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding:Message-ID:Date:From: Reply-To:Subject:To:Cc:In-Reply-To:References:Resent-Date: Resent-From:Resent-To:Resent-Cc:User-Agent:Content-Type: Content-Transfer-Encoding; b=tV5cwc/BlsP0BmZRAzrimymJSos+iR/MMfoe1KyMe/NJqWYF821jayIoVivdMf4zc THm+2M7n8lsHhkCUnTzH9g6gxELnkboC7yodj5dtsiXWrSTw+trBCNubnyanH/ohh0 C9kcBdBF9y9uaKeiyiW3VeeYhuwQntjBe+6WL0Yxw+1j2eLBDEZhGl6g1Npbc5xmSu bCqTfnO/mnieAIZR4Q7naFuOYupdgkiIV803k4POgdv+VeU4ty5zOHRa7cWJTrHUQq ZDRNOZc9SWscu1uCs3o46UyN22srHNZslVaIgmXPJdmi9jkNA/mZDhenbHs8QvMS5u KwqwmQurS0CxQ== Received: from zero (unknown [182.253.151.158]) by server-vie001.gnuweeb.org (Postfix) with ESMTPSA id E5ADF3128020; Tue, 5 Aug 2025 06:50:32 +0000 (UTC) From: Ahmad Gani To: Ammar Faizi Cc: Ahmad Gani , Alviro Iskandar Setiawan , GNU/Weeb Mailing List Subject: [PATCH gwproxy v3 2/9] dnslookup: Add a new parameter, default_port. Date: Tue, 5 Aug 2025 13:49:22 +0700 Message-ID: <20250805064933.109080-3-reyuki@gnuweeb.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250805064933.109080-1-reyuki@gnuweeb.org> References: <20250805064933.109080-1-reyuki@gnuweeb.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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 --- src/gwproxy/net.c | 10 +++++----- src/gwproxy/net.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gwproxy/net.c b/src/gwproxy/net.c index c65f124a30af..2397f7e3f55d 100644 --- a/src/gwproxy/net.c +++ b/src/gwproxy/net.c @@ -10,7 +10,7 @@ #include __cold -int convert_str_to_ssaddr(const char *str, struct gwp_sockaddr *gs, uint16_t prt) +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, @@ -29,9 +29,9 @@ int convert_str_to_ssaddr(const char *str, struct gwp_sockaddr *gs, uint16_t prt return -EINVAL; l = p - str; p++; - if (*p != ':' && !prt) + if (*p != ':' && !default_port) return -EINVAL; - } else if (!prt) { + } else if (!default_port) { p = strchr(str, ':'); if (!p) return -EINVAL; @@ -43,8 +43,8 @@ int convert_str_to_ssaddr(const char *str, struct gwp_sockaddr *gs, uint16_t prt strncpy(host, str, l); host[l] = '\0'; - if (prt) { - snprintf(port, 6, "%u", prt); + if (default_port) { + snprintf(port, 6, "%u", default_port); } else { strncpy(port, p + 1, sizeof(port) - 1); port[sizeof(port) - 1] = '\0'; diff --git a/src/gwproxy/net.h b/src/gwproxy/net.h index 113b176def74..3ef40d5ecfb3 100644 --- a/src/gwproxy/net.h +++ b/src/gwproxy/net.h @@ -19,10 +19,10 @@ struct gwp_sockaddr { * * @param str source * @param gs destination - * @param prt default port, fill it with zero if unspecified + * @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, uint16_t prt); +int convert_str_to_ssaddr(const char *str, struct gwp_sockaddr *gs, uint16_t default_port); /* * Convert network address to string format -- Ahmad Gani