diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2016-10-31 08:27:14 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-10-31 11:38:55 +0000 |
| commit | d7e874c5d05b353cece337c72fddafde466a321e (patch) | |
| tree | 7ad86df6acded25cb288a58fa5f9644fae567e67 /epan/dissectors/packet-ip.c | |
| parent | b61cfd7ec17f9646ceecadddbe2b79dcfb72cb96 (diff) | |
PW_ACH: Use proper symbolic names
Collect all used PW Associated Channel Types and use them in the
subdissector table registrations.
Change-Id: I5d196bceefdb4560b1f4388ff86898e316e5e2ae
Reviewed-on: https://code.wireshark.org/review/18590
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ip.c')
| -rw-r--r-- | epan/dissectors/packet-ip.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index c86fb9118a..ed04abeb11 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -57,6 +57,7 @@ #include "packet-gre.h" #include "packet-l2tp.h" #include "packet-vxlan.h" +#include "packet-mpls.h" #ifdef HAVE_GEOIP #include <GeoIP.h> @@ -3162,7 +3163,7 @@ proto_reg_handoff_ip(void) dissector_add_uint("ax25.pid", AX25_P_IP, ip_handle); dissector_add_uint("juniper.proto", JUNIPER_PROTO_IP, ip_handle); dissector_add_uint("juniper.proto", JUNIPER_PROTO_MPLS_IP, ip_handle); - dissector_add_uint("pwach.channel_type", 0x21, ip_handle); /* IPv4, RFC4385 clause 6. */ + dissector_add_uint("pwach.channel_type", PW_ACH_TYPE_IPV4, ip_handle); dissector_add_uint("sflow_245.header_protocol", SFLOW_245_HEADER_IPv4, ip_handle); dissector_add_uint("l2tp.pw_type", L2TPv3_PROTOCOL_IP, ip_handle); dissector_add_for_decode_as_with_preference("udp.port", ip_handle); |