diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-06-02 19:29:14 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-06-02 19:29:14 +0000 |
| commit | 32abf98aab5e2263fb4856e559e35f681cc036f9 (patch) | |
| tree | 479d138150dcfe9d44c81a1fa7cf290e010928f2 /epan/dissectors/packet-isis.c | |
| parent | 0829787c21f4f43c1734afb87d461682ef47eef0 (diff) | |
From David Bond:
Added the IEEE defined ether types for TRILL and Layer 2 ISIS. Also had ISIS
register itself with the ethertype dissector.
References:
http://www.postel.org/pipermail/rbridge/2010-May/003998.html
http://tools.ietf.org/html/draft-ietf-isis-layer2-05
http://tools.ietf.org/html/draft-ietf-trill-rbridge-protocol-16
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4825
svn path=/trunk/; revision=33059
Diffstat (limited to 'epan/dissectors/packet-isis.c')
| -rw-r--r-- | epan/dissectors/packet-isis.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c index 1b60ec854d..e2550295da 100644 --- a/epan/dissectors/packet-isis.c +++ b/epan/dissectors/packet-isis.c @@ -31,6 +31,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/nlpid.h> +#include <epan/etypes.h> #include "packet-osi.h" #include "packet-isis.h" #include "packet-isis-lsp.h" @@ -322,4 +323,5 @@ proto_reg_handoff_isis(void) isis_handle = create_dissector_handle(dissect_isis, proto_isis); dissector_add("osinl", NLPID_ISO10589_ISIS, isis_handle); + dissector_add("ethertype", ETHERTYPE_L2ISIS, isis_handle); } |