diff options
| author | Jeff Morriss <morriss@ulticom.com> | 2014-02-28 14:47:56 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-03-01 21:16:59 +0000 |
| commit | 54cf849419a3537d065428181ea4717997fc597b (patch) | |
| tree | fc22685a048428e8b7bfcb00d91236fb937fcec1 /epan/dissectors | |
| parent | 79ef36a5f0c8b856080196b0af6d82db595c36d5 (diff) | |
Add the PPID for 3GPP Pua. Move the (unregistered) M2TP PPID into that dissector.
Also put a note in sctpppids.h saying that only IANA-registered PPIDs should go
in that file. Inspired by the rejection of
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4332
Change-Id: I763aad7d1b69e9d36c798061473438ce3cb66ca1
Reviewed-on: https://code.wireshark.org/review/434
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-m2tp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c index efed5e9b78..a8880459dc 100644 --- a/epan/dissectors/packet-m2tp.c +++ b/epan/dissectors/packet-m2tp.c @@ -5,8 +5,6 @@ * * Copyright 2001, Heinz Prantner <heinz.prantner[AT]radisys.com> * - * $Id$ - * * Wireshark - Network traffic analyzer * By Gerald Combs <gerald@wireshark.org> * Copyright 1998 Gerald Combs @@ -34,7 +32,8 @@ #include <glib.h> #include <epan/packet.h> -#include <epan/sctpppids.h> + +#define M2TP_PAYLOAD_PROTOCOL_ID 99 /* s-link, not IANA-registered */ void proto_register_m2tp(void); void proto_reg_handoff_m2tp(void); |