diff options
Diffstat (limited to 'epan/dissectors/packet-p7.c')
-rw-r--r-- | epan/dissectors/packet-p7.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c index 89585dbaec..f0e9d57bea 100644 --- a/epan/dissectors/packet-p7.c +++ b/epan/dissectors/packet-p7.c @@ -58,8 +58,7 @@ #define PFNAME "p7" static guint global_p7_tcp_port = 102; -static guint tcp_port = 0; -static dissector_handle_t tpkt_handle = NULL; +static dissector_handle_t tpkt_handle; static const char *object_identifier_id = NULL; /* attribute identifier */ static int seqno = 0; @@ -439,7 +438,7 @@ static int hf_p7_T_entry_class_problem_entry_class_not_subscribed = -1; static int hf_p7_T_entry_class_problem_inappropriate_entry_class = -1; /*--- End of included file: packet-p7-hf.c ---*/ -#line 65 "packet-p7-template.c" +#line 64 "packet-p7-template.c" /* Initialize the subtree pointers */ static gint ett_p7 = -1; @@ -581,7 +580,7 @@ static gint ett_p7_RTSE_apdus = -1; static gint ett_p7_RTABapdu = -1; /*--- End of included file: packet-p7-ett.c ---*/ -#line 69 "packet-p7-template.c" +#line 68 "packet-p7-template.c" /*--- Included file: packet-p7-val.h ---*/ @@ -613,7 +612,7 @@ static gint ett_p7_RTABapdu = -1; #define err_entry_class_error 34 /*--- End of included file: packet-p7-val.h ---*/ -#line 71 "packet-p7-template.c" +#line 70 "packet-p7-template.c" /*--- Included file: packet-p7-table.c ---*/ @@ -656,7 +655,7 @@ static const value_string p7_err_code_string_vals[] = { /*--- End of included file: packet-p7-table.c ---*/ -#line 73 "packet-p7-template.c" +#line 72 "packet-p7-template.c" /*--- Included file: packet-p7-fn.c ---*/ @@ -4058,7 +4057,7 @@ static void dissect_RTSE_apdus_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr /*--- End of included file: packet-p7-fn.c ---*/ -#line 75 "packet-p7-template.c" +#line 74 "packet-p7-template.c" /*--- Included file: packet-p7-table11.c ---*/ @@ -4090,7 +4089,7 @@ static const ros_opr_t p7_opr_tab[] = { /*--- End of included file: packet-p7-table11.c ---*/ -#line 77 "packet-p7-template.c" +#line 76 "packet-p7-template.c" /*--- Included file: packet-p7-table21.c ---*/ #line 1 "packet-p7-table21.c" @@ -4129,7 +4128,7 @@ static const ros_err_t p7_err_tab[] = { /*--- End of included file: packet-p7-table21.c ---*/ -#line 78 "packet-p7-template.c" +#line 77 "packet-p7-template.c" static const ros_info_t p7_ros_info = { "P7", @@ -5609,7 +5608,7 @@ void proto_register_p7(void) { "", HFILL }}, /*--- End of included file: packet-p7-hfarr.c ---*/ -#line 97 "packet-p7-template.c" +#line 96 "packet-p7-template.c" }; /* List of subtrees */ @@ -5753,7 +5752,7 @@ void proto_register_p7(void) { &ett_p7_RTABapdu, /*--- End of included file: packet-p7-ettarr.c ---*/ -#line 103 "packet-p7-template.c" +#line 102 "packet-p7-template.c" }; module_t *p7_module; @@ -5812,7 +5811,7 @@ void proto_reg_handoff_p7(void) { /*--- End of included file: packet-p7-dis-tab.c ---*/ -#line 129 "packet-p7-template.c" +#line 128 "packet-p7-template.c" /* APPLICATION CONTEXT */ @@ -5832,10 +5831,11 @@ void proto_reg_handoff_p7(void) { void prefs_register_p7(void) { + static guint tcp_port = 0; /* de-register the old port */ /* port 102 is registered by TPKT - don't undo this! */ - if((tcp_port != 102) && tpkt_handle) + if((tcp_port > 0) && (tcp_port != 102) && tpkt_handle) dissector_delete("tcp.port", tcp_port, tpkt_handle); /* Set our port number for future use */ |