From 7c637b35038e4cc7d2f16e07f413cfa2b0f1f97a Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Sun, 8 Oct 2023 12:34:15 +0200 Subject: [PATCH] Remove last uses of inet_ntoa inet_ntoa is officially deprecated and in some places its use already causes warnings (e.g. Fedora submissions). Since we mostly use inet_ntop already, just convert the remaining usages to that. Change-Id: I052bebe720ddf26340827f25b94705945e470bfa Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe Message-Id: <20231008103415.19625-1-frank@lichtenheld.com> URL: https://www.mail-archive.com/search?l=mid&q=20231008103415.19625-1-frank@lichtenheld.com Signed-off-by: Gert Doering --- src/openvpn/manage.c | 4 +++- src/openvpn/route.c | 4 +++- src/openvpn/socket.c | 24 +++++++++++------------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c index 739ed40f72e..feb62b2374b 100644 --- a/src/openvpn/manage.c +++ b/src/openvpn/manage.c @@ -3058,9 +3058,11 @@ management_post_tunnel_open(struct management *man, const in_addr_t tun_local_ip /* listen on our local TUN/TAP IP address */ struct in_addr ia; int ret; + char buf[INET_ADDRSTRLEN]; ia.s_addr = htonl(tun_local_ip); - ret = openvpn_getaddrinfo(GETADDR_PASSIVE, inet_ntoa(ia), NULL, 0, NULL, + inet_ntop(AF_INET, &ia, buf, sizeof(buf)); + ret = openvpn_getaddrinfo(GETADDR_PASSIVE, buf, NULL, 0, NULL, AF_INET, &man->settings.local); ASSERT(ret==0); man_connection_init(man); diff --git a/src/openvpn/route.c b/src/openvpn/route.c index 9212186f447..ff64938a0eb 100644 --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -342,7 +342,9 @@ init_route(struct route_ipv4 *r, goto fail; } special.s_addr = htonl(special.s_addr); - ret = openvpn_getaddrinfo(0, inet_ntoa(special), NULL, 0, NULL, + char buf[INET_ADDRSTRLEN]; + inet_ntop(AF_INET, &special, buf, sizeof(buf)); + ret = openvpn_getaddrinfo(0, buf, NULL, 0, NULL, AF_INET, network_list); } else diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index 501e023ea36..903f98b05d1 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -2901,16 +2901,16 @@ const char * print_in_addr_t(in_addr_t addr, unsigned int flags, struct gc_arena *gc) { struct in_addr ia; - struct buffer out = alloc_buf_gc(64, gc); + char *out = gc_malloc(INET_ADDRSTRLEN, true, gc); if (addr || !(flags & IA_EMPTY_IF_UNDEF)) { CLEAR(ia); ia.s_addr = (flags & IA_NET_ORDER) ? addr : htonl(addr); - buf_printf(&out, "%s", inet_ntoa(ia)); + inet_ntop(AF_INET, &ia, out, INET_ADDRSTRLEN); } - return BSTR(&out); + return out; } /* @@ -2920,16 +2920,14 @@ print_in_addr_t(in_addr_t addr, unsigned int flags, struct gc_arena *gc) const char * print_in6_addr(struct in6_addr a6, unsigned int flags, struct gc_arena *gc) { - struct buffer out = alloc_buf_gc(64, gc); - char tmp_out_buf[64]; /* inet_ntop wants pointer to buffer */ + char *out = gc_malloc(INET6_ADDRSTRLEN, true, gc); if (memcmp(&a6, &in6addr_any, sizeof(a6)) != 0 || !(flags & IA_EMPTY_IF_UNDEF)) { - inet_ntop(AF_INET6, &a6, tmp_out_buf, sizeof(tmp_out_buf)-1); - buf_printf(&out, "%s", tmp_out_buf ); + inet_ntop(AF_INET6, &a6, out, INET6_ADDRSTRLEN); } - return BSTR(&out); + return out; } /* @@ -2978,7 +2976,7 @@ setenv_sockaddr(struct env_set *es, const char *name_prefix, const struct openvp { char name_buf[256]; - char buf[128]; + char buf[INET6_ADDRSTRLEN]; switch (addr->addr.sa.sa_family) { case AF_INET: @@ -2991,7 +2989,8 @@ setenv_sockaddr(struct env_set *es, const char *name_prefix, const struct openvp openvpn_snprintf(name_buf, sizeof(name_buf), "%s", name_prefix); } - setenv_str(es, name_buf, inet_ntoa(addr->addr.in4.sin_addr)); + inet_ntop(AF_INET, &addr->addr.in4.sin_addr, buf, sizeof(buf)); + setenv_str(es, name_buf, buf); if ((flags & SA_IP_PORT) && addr->addr.in4.sin_port) { @@ -3007,13 +3006,12 @@ setenv_sockaddr(struct env_set *es, const char *name_prefix, const struct openvp memcpy(&ia.s_addr, &addr->addr.in6.sin6_addr.s6_addr[12], sizeof(ia.s_addr)); openvpn_snprintf(name_buf, sizeof(name_buf), "%s_ip", name_prefix); - openvpn_snprintf(buf, sizeof(buf), "%s", inet_ntoa(ia) ); + inet_ntop(AF_INET, &ia, buf, sizeof(buf)); } else { openvpn_snprintf(name_buf, sizeof(name_buf), "%s_ip6", name_prefix); - getnameinfo(&addr->addr.sa, sizeof(struct sockaddr_in6), - buf, sizeof(buf), NULL, 0, NI_NUMERICHOST); + inet_ntop(AF_INET6, &addr->addr.in6.sin6_addr, buf, sizeof(buf)); } setenv_str(es, name_buf, buf);