diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-09-01 00:07:49 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-09-01 03:37:40 +0000 |
| commit | 6821e0ea6f2e069ef75be58dc8f7bff50c961a7a (patch) | |
| tree | a3ba7c92fce4fb5254307df2069ce5e0816a7dff /epan | |
| parent | f16f6a3ef28754408548ff4ae1669856aec172b4 (diff) | |
Remove IP "dummy" protocol number
Change-Id: I3e6a1ec6b98028ff0a5d0bd0f7c8784651ed31da
Reviewed-on: https://code.wireshark.org/review/23341
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-dtpt.c | 10 | ||||
| -rw-r--r-- | epan/ipproto.h | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c index e0ab8eb40b..a2a93783b1 100644 --- a/epan/dissectors/packet-dtpt.c +++ b/epan/dissectors/packet-dtpt.c @@ -190,10 +190,14 @@ static const value_string names_socket_type[] = { { 0, NULL } }; +#define DTPT_PROTO_IP 0 +#define DTPT_PROTO_TCP IP_PROTO_TCP +#define DTPT_PROTO_UDP IP_PROTO_UDP + static const value_string names_protocol[] = { - { IP_PROTO_IP, "IPPROTO_IP" }, - { IP_PROTO_TCP, "IPPROTO_TCP" }, - { IP_PROTO_UDP, "IPPROTP_UDP" }, + { DTPT_PROTO_IP, "IPPROTO_IP" }, + { DTPT_PROTO_TCP, "IPPROTO_TCP" }, + { DTPT_PROTO_UDP, "IPPROTP_UDP" }, { 0, NULL } }; diff --git a/epan/ipproto.h b/epan/ipproto.h index 90b8c9efdb..042da306e2 100644 --- a/epan/ipproto.h +++ b/epan/ipproto.h @@ -30,7 +30,6 @@ * IP protocol numbers. * http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml */ -#define IP_PROTO_IP 0 /* dummy for IP */ #define IP_PROTO_HOPOPTS 0 /* IP6 hop-by-hop options - RFC1883 */ #define IP_PROTO_ICMP 1 /* control message protocol - RFC792 */ #define IP_PROTO_IGMP 2 /* group mgmt protocol - RFC1112 */ |