From d2bcb8597e88fccd496b6b0e358347f4bf6a15da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20D=C3=B6rre?= Date: Thu, 22 Feb 2024 01:09:05 +0000 Subject: [PATCH] extmod/modlwip: Add back support for empty IP addresses. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Prior to commit 628abf8f25a7705a2810fffe2ca6ae652c532896 which added IPv6 support, binding a socket with s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.bind(("", PORT)) was possible. But, the empty string is not regarded as a valid IP address by lwip. This commit adds a special case for the empty IP string, restoring the previous CPython-compatible behaviour. Signed-off-by: Felix Dörre --- extmod/modlwip.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/extmod/modlwip.c b/extmod/modlwip.c index a6630c693c..f1242b0461 100644 --- a/extmod/modlwip.c +++ b/extmod/modlwip.c @@ -367,8 +367,16 @@ mp_uint_t lwip_parse_inet_addr(mp_obj_t addr_in, ip_addr_t *out_ip) { mp_obj_get_array_fixed_n(addr_in, 2, &addr_items); size_t addr_len; const char *addr_str = mp_obj_str_get_data(addr_items[0], &addr_len); - if (!ipaddr_aton(addr_str, out_ip)) { - mp_raise_ValueError(MP_ERROR_TEXT("invalid arguments")); + if (*addr_str == 0) { + #if LWIP_IPV6 + *out_ip = *IP6_ADDR_ANY; + #else + *out_ip = *IP_ADDR_ANY; + #endif + } else { + if (!ipaddr_aton(addr_str, out_ip)) { + mp_raise_ValueError(MP_ERROR_TEXT("invalid arguments")); + } } return mp_obj_get_int(addr_items[1]); }