diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-02-02 21:39:33 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-02-02 21:39:33 +0000 |
| commit | e150c5799200d29da2349dc442524295dfc1d901 (patch) | |
| tree | cc54c3f458a2dfda31860a327dfafdbb54d115a0 | |
| parent | eba7aaecc01a26abd912bd6e7d4f3e194d08a194 (diff) | |
From guettler:
Apply part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5622 to see OSI over IP.
svn path=/trunk/; revision=40818
| -rw-r--r-- | epan/dissectors/packet-osi.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c index 10e516dd84..a302d75038 100644 --- a/epan/dissectors/packet-osi.c +++ b/epan/dissectors/packet-osi.c @@ -38,6 +38,7 @@ #include <epan/nlpid.h> #include <epan/ppptypes.h> #include <epan/chdlctypes.h> +#include <epan/ipproto.h> #include "packet-osi.h" #include "packet-isis.h" #include "packet-esis.h" @@ -46,6 +47,7 @@ static int proto_osi = -1; static dissector_handle_t osi_handle; + /* Preferences for OSI over TPKT over TCP */ static gboolean tpkt_desegment = FALSE; static guint global_tcp_port_osi_over_tpkt = 0; @@ -297,8 +299,10 @@ proto_reg_handoff_osi(void) dissector_add_uint("chdlctype", CHDLCTYPE_OSI, osi_handle); dissector_add_uint("null.type", BSD_AF_ISO, osi_handle); dissector_add_uint("gre.proto", SAP_OSINL5, osi_handle); + dissector_add_uint("ip.proto", IP_PROTO_ISOIP, osi_handle); /* ISO-TP4 ISO Transport Protocol Class 4 [RFC905,RC77] */ data_handle = find_dissector("data"); ppp_handle = find_dissector("ppp"); + osi_tpkt_handle = create_dissector_handle(dissect_osi_tpkt, proto_osi); dissector_add_handle("tcp.port", osi_tpkt_handle); /* for 'decode-as' */ |