aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-osi.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-osi.c')
-rw-r--r--epan/dissectors/packet-osi.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c
index 9c00ddea41..5f829c3314 100644
--- a/epan/dissectors/packet-osi.c
+++ b/epan/dissectors/packet-osi.c
@@ -449,7 +449,7 @@ const value_string nlpid_vals[] = {
static dissector_table_t osinl_incl_subdissector_table;
static dissector_table_t osinl_excl_subdissector_table;
-static dissector_handle_t data_handle, ppp_handle;
+static dissector_handle_t ppp_handle;
/* Dissect OSI over TCP over TPKT */
static int
@@ -506,17 +506,17 @@ static int dissect_osi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
case NLPID_ISO9542X25_ESIS:
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESIS (X.25)");
- call_dissector(data_handle,tvb, pinfo, tree);
+ call_data_dissector(tvb, pinfo, tree);
break;
case NLPID_ISO10747_IDRP:
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IDRP");
- call_dissector(data_handle,tvb, pinfo, tree);
+ call_data_dissector(tvb, pinfo, tree);
break;
default:
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISO");
col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown ISO protocol (%02x)", nlpid);
- call_dissector(data_handle,tvb, pinfo, tree);
+ call_data_dissector(tvb, pinfo, tree);
break;
}
return tvb_captured_length(tvb);
@@ -547,7 +547,6 @@ proto_reg_handoff_osi(void)
dissector_add_uint("juniper.proto", JUNIPER_PROTO_CLNP, osi_juniper_handle);
dissector_add_uint("juniper.proto", JUNIPER_PROTO_MPLS_CLNP, osi_juniper_handle);
- data_handle = find_dissector("data");
ppp_handle = find_dissector("ppp");