osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

wsutil: Rewrite ip6_to_str_buf()

This commit is contained in:
João Valverde 2021-09-16 19:32:19 +01:00
parent d4c7978f68
commit 364df939ea
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/address_types.c
View File

@ -235,7 +235,8 @@ static int ipv4_name_res_len(void)
******************************************************************************/
static int ipv6_to_str(const address* addr, gchar *buf, int buf_len)
{
return ip6_to_str_buf((const ws_in6_addr *)addr->data, buf, buf_len) + 1;
ip6_to_str_buf((const ws_in6_addr *)addr->data, buf, buf_len);
return (int)(strlen(buf) + 1);
}
static int ipv6_str_len(const address* addr _U_)

21
wsutil/to_str.c
View File

@ -587,26 +587,21 @@ char *ip_to_str(wmem_allocator_t *scope, const guint8 *ad)
return buf;
}
int
ip6_to_str_buf(const ws_in6_addr *addr, gchar *buf, int buf_size)
void
ip6_to_str_buf(const ws_in6_addr *addr, gchar *buf, size_t buf_size)
{
gchar addr_buf[WS_INET6_ADDRSTRLEN];
int len;
/* slightly more efficient than ip6_to_str_buf_with_pfx(addr, buf, buf_size, NULL) */
len = (int)g_strlcpy(buf, ws_inet_ntop6(addr, addr_buf, sizeof(addr_buf)), buf_size); /* this returns len = strlen(addr_buf) */
if (len > buf_size - 1) { /* size minus nul terminator */
len = (int)g_strlcpy(buf, BUF_TOO_SMALL_ERR, buf_size); /* Let the unexpected value alert user */
}
return len;
/*
* If there is not enough space then ws_inet_ntop6() will leave
* an error message in the buffer, we don't need to use BUF_TOO_SMALL_ERR.
*/
ws_inet_ntop6(addr, buf, (guint)buf_size);
}
char *ip6_to_str(wmem_allocator_t *scope, const ws_in6_addr *ad)
{
char *buf = wmem_alloc(scope, WS_INET6_ADDRSTRLEN * sizeof(char));
ip6_to_str_buf(ad, buf, WS_INET6_ADDRSTRLEN);
ws_inet_ntop6(ad, buf, WS_INET6_ADDRSTRLEN);
return buf;
}

2
wsutil/to_str.h
View File

@ -289,7 +289,7 @@ WS_DLL_PUBLIC void ip_to_str_buf(const guint8 *ad, gchar *buf, const int buf_len
WS_DLL_PUBLIC char *ip_to_str(wmem_allocator_t *scope, const guint8 *ad);
/* Returns length of the result. */
WS_DLL_PUBLIC int ip6_to_str_buf(const ws_in6_addr *ad, gchar *buf, int buf_size);
WS_DLL_PUBLIC void ip6_to_str_buf(const ws_in6_addr *ad, gchar *buf, size_t buf_size);
WS_DLL_PUBLIC char *ip6_to_str(wmem_allocator_t *scope, const ws_in6_addr *ad);