From ac3ca74bcecdd57932d8fc11360de4131f5086cf Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 19 Mar 2020 11:28:02 -0700 Subject: s_addr -> src_addr, d_addr -> dst_addr. On at least some platforms (at least some versions of the Windows SDK, and netinet/in.h on Illumos and thus possibly Solaris, and possibly others), struct in_addr's only member is a union, with some members of the union being substructures with fields corresponding to the pre-CIDR parts of an IPv4 address, with s_addr #defined to be the member of the union corresponding to the IPv4 address as a 32-bit integral value. That's presumably maintained for source compatibility with really old programs written before CIDR, on platforms where they worry about that. The *BSDs don't care, and macOS came out post-CIDR and never supportede the pre-CIDR code in the first place, so they don't do that; the same probably applies to Linux. This causes problems when s_addr is used as a variable name. In addition, inside Wireshark we tend to use "src" rather than just "s" as a prefix to refer to source addresses and ports - and "dst" or "dest" rather than just "d" as a prefix to refer to destination addresses and ports. So just go with that. Change-Id: I6010d5ea9697d2333597c06756fa393a5898364e Reviewed-on: https://code.wireshark.org/review/36504 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris --- epan/dissectors/packet-f5ethtrailer.c | 74 +++++++++++++++++------------------ 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c index 95fd956da9..5e3ff64a1e 100644 --- a/epan/dissectors/packet-f5ethtrailer.c +++ b/epan/dissectors/packet-f5ethtrailer.c @@ -479,27 +479,27 @@ static gchar * f5_ip_conv_filter(packet_info *pinfo) { gchar *buf = NULL; - gchar s_addr[WS_INET6_ADDRSTRLEN]; - gchar d_addr[WS_INET6_ADDRSTRLEN]; + gchar src_addr[WS_INET6_ADDRSTRLEN]; + gchar dst_addr[WS_INET6_ADDRSTRLEN]; - *d_addr = *s_addr = '\0'; + *dst_addr = *src_addr = '\0'; if (pinfo->net_src.type == AT_IPv4 && pinfo->net_dst.type == AT_IPv4) { - address_to_str_buf(&pinfo->src, s_addr, WS_INET6_ADDRSTRLEN); - address_to_str_buf(&pinfo->dst, d_addr, WS_INET6_ADDRSTRLEN); - if (*s_addr != '\0' && *d_addr != '\0') { + address_to_str_buf(&pinfo->src, src_addr, WS_INET6_ADDRSTRLEN); + address_to_str_buf(&pinfo->dst, dst_addr, WS_INET6_ADDRSTRLEN); + if (*src_addr != '\0' && *dst_addr != '\0') { buf = g_strdup_printf( "(ip.addr eq %s and ip.addr eq %s) or" " (f5ethtrailer.peeraddr eq %s and f5ethtrailer.peeraddr eq %s)", - s_addr, d_addr, s_addr, d_addr); + src_addr, dst_addr, src_addr, dst_addr); } } else if (pinfo->net_src.type == AT_IPv6 && pinfo->net_dst.type == AT_IPv6) { - address_to_str_buf(&pinfo->src, s_addr, WS_INET6_ADDRSTRLEN); - address_to_str_buf(&pinfo->dst, d_addr, WS_INET6_ADDRSTRLEN); - if (*s_addr != '\0' && *d_addr != '\0') { + address_to_str_buf(&pinfo->src, src_addr, WS_INET6_ADDRSTRLEN); + address_to_str_buf(&pinfo->dst, dst_addr, WS_INET6_ADDRSTRLEN); + if (*src_addr != '\0' && *dst_addr != '\0') { buf = g_strdup_printf( "(ipv6.addr eq %s and ipv6.addr eq %s) or" " (f5ethtrailer.peeraddr6 eq %s and f5ethtrailer.peeraddr6 eq %s)", - s_addr, d_addr, s_addr, d_addr); + src_addr, dst_addr, src_addr, dst_addr); } } return buf; @@ -534,33 +534,33 @@ static gchar * f5_tcp_conv_filter(packet_info *pinfo) { gchar *buf = NULL; - gchar s_addr[WS_INET6_ADDRSTRLEN]; - gchar d_addr[WS_INET6_ADDRSTRLEN]; + gchar src_addr[WS_INET6_ADDRSTRLEN]; + gchar dst_addr[WS_INET6_ADDRSTRLEN]; - *d_addr = *s_addr = '\0'; + *dst_addr = *src_addr = '\0'; if (pinfo->net_src.type == AT_IPv4 && pinfo->net_dst.type == AT_IPv4) { - address_to_str_buf(&pinfo->src, s_addr, WS_INET6_ADDRSTRLEN); - address_to_str_buf(&pinfo->dst, d_addr, WS_INET6_ADDRSTRLEN); - if (*s_addr != '\0' && *d_addr != '\0') { + address_to_str_buf(&pinfo->src, src_addr, WS_INET6_ADDRSTRLEN); + address_to_str_buf(&pinfo->dst, dst_addr, WS_INET6_ADDRSTRLEN); + if (*src_addr != '\0' && *dst_addr != '\0') { buf = g_strdup_printf( "(ip.addr eq %s and ip.addr eq %s and tcp.port eq %d and tcp.port eq %d) or" " (f5ethtrailer.peeraddr eq %s and f5ethtrailer.peeraddr eq %s and" " f5ethtrailer.peerport eq %d and f5ethtrailer.peerport eq %d and" " (f5ethtrailer.peeripproto eq 6 or (f5ethtrailer.peeripproto eq 0 and tcp)))", - s_addr, d_addr, pinfo->srcport, pinfo->destport, - s_addr, d_addr, pinfo->srcport, pinfo->destport); + src_addr, dst_addr, pinfo->srcport, pinfo->destport, + src_addr, dst_addr, pinfo->srcport, pinfo->destport); } } else if (pinfo->net_src.type == AT_IPv6 && pinfo->net_dst.type == AT_IPv6) { - address_to_str_buf(&pinfo->src, s_addr, WS_INET6_ADDRSTRLEN); - address_to_str_buf(&pinfo->dst, d_addr, WS_INET6_ADDRSTRLEN); - if (*s_addr != '\0' && *d_addr != '\0') { + address_to_str_buf(&pinfo->src, src_addr, WS_INET6_ADDRSTRLEN); + address_to_str_buf(&pinfo->dst, dst_addr, WS_INET6_ADDRSTRLEN); + if (*src_addr != '\0' && *dst_addr != '\0') { buf = g_strdup_printf( "(ipv6.addr eq %s and ipv6.addr eq %s and tcp.port eq %d and tcp.port eq %d) or" " (f5ethtrailer.peeraddr6 eq %s and f5ethtrailer.peeraddr6 eq %s and" " f5ethtrailer.peerport eq %d and f5ethtrailer.peerport eq %d and" " (f5ethtrailer.peeripproto eq 6 or (f5ethtrailer.peeripproto eq 0 and tcp)))", - s_addr, d_addr, pinfo->srcport, pinfo->destport, - s_addr, d_addr, pinfo->srcport, pinfo->destport); + src_addr, dst_addr, pinfo->srcport, pinfo->destport, + src_addr, dst_addr, pinfo->srcport, pinfo->destport); } } return buf; @@ -594,33 +594,33 @@ static gchar * f5_udp_conv_filter(packet_info *pinfo) { gchar *buf = NULL; - gchar s_addr[WS_INET6_ADDRSTRLEN]; - gchar d_addr[WS_INET6_ADDRSTRLEN]; + gchar src_addr[WS_INET6_ADDRSTRLEN]; + gchar dst_addr[WS_INET6_ADDRSTRLEN]; - *d_addr = *s_addr = '\0'; + *dst_addr = *src_addr = '\0'; if (pinfo->net_src.type == AT_IPv4 && pinfo->net_dst.type == AT_IPv4) { - address_to_str_buf(&pinfo->src, s_addr, WS_INET6_ADDRSTRLEN); - address_to_str_buf(&pinfo->dst, d_addr, WS_INET6_ADDRSTRLEN); - if (*s_addr != '\0' && *d_addr != '\0') { + address_to_str_buf(&pinfo->src, src_addr, WS_INET6_ADDRSTRLEN); + address_to_str_buf(&pinfo->dst, dst_addr, WS_INET6_ADDRSTRLEN); + if (*src_addr != '\0' && *dst_addr != '\0') { buf = g_strdup_printf( "(ip.addr eq %s and ip.addr eq %s and udp.port eq %d and udp.port eq %d) or" " (f5ethtrailer.peeraddr eq %s and f5ethtrailer.peeraddr eq %s and" " f5ethtrailer.peerport eq %d and f5ethtrailer.peerport eq %d and" " (f5ethtrailer.peeripproto eq 17 or (f5ethtrailer.peeripproto eq 0 and udp)))", - s_addr, d_addr, pinfo->srcport, pinfo->destport, - s_addr, d_addr, pinfo->srcport, pinfo->destport); + src_addr, dst_addr, pinfo->srcport, pinfo->destport, + src_addr, dst_addr, pinfo->srcport, pinfo->destport); } } else if (pinfo->net_src.type == AT_IPv6 && pinfo->net_dst.type == AT_IPv6) { - address_to_str_buf(&pinfo->src, s_addr, WS_INET6_ADDRSTRLEN); - address_to_str_buf(&pinfo->dst, d_addr, WS_INET6_ADDRSTRLEN); - if (*s_addr != '\0' && *d_addr != '\0') { + address_to_str_buf(&pinfo->src, src_addr, WS_INET6_ADDRSTRLEN); + address_to_str_buf(&pinfo->dst, dst_addr, WS_INET6_ADDRSTRLEN); + if (*src_addr != '\0' && *dst_addr != '\0') { buf = g_strdup_printf( "(ipv6.addr eq %s and ipv6.addr eq %s and udp.port eq %d and udp.port eq %d) or" " (f5ethtrailer.peeraddr6 eq %s and f5ethtrailer.peeraddr6 eq %s and" " f5ethtrailer.peerport eq %d and f5ethtrailer.peerport eq %d and" " (f5ethtrailer.peeripproto eq 17 or (f5ethtrailer.peeripproto eq 0 and udp)))", - s_addr, d_addr, pinfo->srcport, pinfo->destport, - s_addr, d_addr, pinfo->srcport, pinfo->destport); + src_addr, dst_addr, pinfo->srcport, pinfo->destport, + src_addr, dst_addr, pinfo->srcport, pinfo->destport); } } return buf; -- cgit v1.2.3