diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2014-06-23 18:44:14 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2014-06-23 16:48:26 +0000 |
| commit | 54cc0d86da4dcc4ae88dc767dba91dd79a545b7e (patch) | |
| tree | 1161b8b5fc9f471f43646a46004d565c218c8b2b | |
| parent | cb04fd57e97c01291614585cf100a63999209a10 (diff) | |
| download | wireshark-54cc0d86da4dcc4ae88dc767dba91dd79a545b7e.tar.gz | |
Replace AF_ values by COMMON_AF_ values.
Remove no longer needed system includes
Change-Id: Id9ffffaa7da5185041db63fa7611d348a1cc4b68
Reviewed-on: https://code.wireshark.org/review/2577
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
| -rw-r--r-- | epan/dissectors/packet-rpcap.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c index 7cfbbf3e70..b2f9ad0bc1 100644 --- a/epan/dissectors/packet-rpcap.c +++ b/epan/dissectors/packet-rpcap.c @@ -25,18 +25,7 @@ #include "config.h" -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif - -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -#endif - -#ifdef HAVE_WINSOCK2_H -#include <winsock2.h> -#endif - +#include <epan/aftypes.h> #include <epan/packet.h> #include <epan/prefs.h> #include <epan/to_str.h> @@ -298,8 +287,8 @@ static const value_string auth_type[] = { }; static const value_string address_family[] = { - { AF_UNSPEC, "AF_UNSPEC" }, - { AF_INET, "AF_INET" }, + { COMMON_AF_UNSPEC, "AF_UNSPEC" }, + { COMMON_AF_INET, "AF_INET" }, { 0, NULL } }; @@ -418,7 +407,7 @@ dissect_rpcap_ifaddr (tvbuff_t *tvb, packet_info *pinfo, proto_tree_add_item (tree, hf_if_af, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; - if (af == AF_INET) { + if (af == COMMON_AF_INET) { proto_tree_add_item (tree, hf_if_port, tvb, offset, 2, ENC_BIG_ENDIAN); offset += 2; @@ -435,7 +424,7 @@ dissect_rpcap_ifaddr (tvbuff_t *tvb, packet_info *pinfo, offset += 120; } else { ti = proto_tree_add_item (tree, hf_if_unknown, tvb, offset, 126, ENC_NA); - if (af != AF_UNSPEC) { + if (af != COMMON_AF_UNSPEC) { expert_add_info_format(pinfo, ti, &ei_if_unknown, "Unknown address family: %d", af); } |