Regenerated files for asn1 templates committed in SVN #26750

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26751 f5534014-38df-0310-8fa8-9805f1628bb7

6 files changed, 87 insertions, 91 deletions

diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c
index b3773b8366..d37e78d2b5 100644
--- a/epan/dissectors/packet-dap.c
+++ b/epan/dissectors/packet-dap.c
@@ -66,9 +66,8 @@
 #define PFNAME "dap"
 
 static guint global_dap_tcp_port = 102;
-static guint tcp_port = 0;
-static dissector_handle_t tpkt_handle = NULL;
-void prefs_register_dap(void); /* forwad declaration for use in preferences registration */
+static dissector_handle_t tpkt_handle;
+void prefs_register_dap(void); /* forward declaration for use in preferences registration */
 
 
 /* Initialize the protocol and registered fields */
@@ -476,7 +475,7 @@ static int hf_dap_SearchControlOptions_separateFamilyMembers = -1;
 static int hf_dap_SearchControlOptions_searchFamily = -1;
 
 /*--- End of included file: packet-dap-hf.c ---*/
-#line 71 "packet-dap-template.c"
+#line 70 "packet-dap-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_dap = -1;
@@ -654,7 +653,7 @@ static gint ett_dap_UpdateError = -1;
 static gint ett_dap_T_signedUpdateError = -1;
 
 /*--- End of included file: packet-dap-ett.c ---*/
-#line 75 "packet-dap-template.c"
+#line 74 "packet-dap-template.c"
 
 
 /*--- Included file: packet-dap-val.h ---*/
@@ -679,7 +678,7 @@ static gint ett_dap_T_signedUpdateError = -1;
 #define id_errcode_dsaReferral         9
 
 /*--- End of included file: packet-dap-val.h ---*/
-#line 77 "packet-dap-template.c"
+#line 76 "packet-dap-template.c"
 
 
 /*--- Included file: packet-dap-table.c ---*/
@@ -717,7 +716,7 @@ static const value_string dap_err_code_string_vals[] = {
 
 
 /*--- End of included file: packet-dap-table.c ---*/
-#line 79 "packet-dap-template.c"
+#line 78 "packet-dap-template.c"
 
 
 /*--- Included file: packet-dap-fn.c ---*/
@@ -4753,7 +4752,7 @@ static int dissect_UpdateError_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr
 
 
 /*--- End of included file: packet-dap-fn.c ---*/
-#line 81 "packet-dap-template.c"
+#line 80 "packet-dap-template.c"
 
 
 /*--- Included file: packet-dap-table11.c ---*/
@@ -4785,7 +4784,7 @@ static const ros_opr_t dap_opr_tab[] = {
 
 
 /*--- End of included file: packet-dap-table11.c ---*/
-#line 83 "packet-dap-template.c"
+#line 82 "packet-dap-template.c"
 
 /*--- Included file: packet-dap-table21.c ---*/
 #line 1 "packet-dap-table21.c"
@@ -4814,7 +4813,7 @@ static const ros_err_t dap_err_tab[] = {
 
 
 /*--- End of included file: packet-dap-table21.c ---*/
-#line 84 "packet-dap-template.c"
+#line 83 "packet-dap-template.c"
 
 static const ros_info_t dap_ros_info = {
   "DAP",
@@ -6418,7 +6417,7 @@ void proto_register_dap(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-dap-hfarr.c ---*/
-#line 103 "packet-dap-template.c"
+#line 102 "packet-dap-template.c"
   };
 
   /* List of subtrees */
@@ -6598,7 +6597,7 @@ void proto_register_dap(void) {
     &ett_dap_T_signedUpdateError,
 
 /*--- End of included file: packet-dap-ettarr.c ---*/
-#line 109 "packet-dap-template.c"
+#line 108 "packet-dap-template.c"
   };
   module_t *dap_module;
 
@@ -6646,15 +6645,15 @@ void proto_reg_handoff_dap(void) {
   /* AttributeTypes */
   x509if_register_fmt(hf_dap_present, "= *");
 
-
 }
 
 
 void prefs_register_dap(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 */
diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c
index a6b7e0373d..133a9a150a 100644
--- a/epan/dissectors/packet-disp.c
+++ b/epan/dissectors/packet-disp.c
@@ -68,9 +68,8 @@
 #define PFNAME "disp"
 
 static guint global_disp_tcp_port = 102;
-static guint tcp_port = 0;
-static dissector_handle_t tpkt_handle = NULL;
-void prefs_register_disp(void); /* forwad declaration for use in preferences registration */
+static dissector_handle_t tpkt_handle;
+void prefs_register_disp(void); /* forward declaration for use in preferences registration */
 
 
 /* Initialize the protocol and registered fields */
@@ -190,7 +189,7 @@ static int hf_disp_signedShadowError = -1;        /* T_signedShadowError */
 static int hf_disp_shadowError = -1;              /* ShadowErrorData */
 
 /*--- End of included file: packet-disp-hf.c ---*/
-#line 74 "packet-disp-template.c"
+#line 73 "packet-disp-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_disp = -1;
@@ -253,7 +252,7 @@ static gint ett_disp_ShadowError = -1;
 static gint ett_disp_T_signedShadowError = -1;
 
 /*--- End of included file: packet-disp-ett.c ---*/
-#line 78 "packet-disp-template.c"
+#line 77 "packet-disp-template.c"
 
 
 /*--- Included file: packet-disp-fn.c ---*/
@@ -1517,7 +1516,7 @@ static void dissect_ShadowingAgreementInfo_PDU(tvbuff_t *tvb _U_, packet_info *p
 
 
 /*--- End of included file: packet-disp-fn.c ---*/
-#line 80 "packet-disp-template.c"
+#line 79 "packet-disp-template.c"
 
 /*
 * Dissect DISP PDUs inside a ROS PDUs
@@ -2081,7 +2080,7 @@ void proto_register_disp(void) {
         "disp.ShadowErrorData", HFILL }},
 
 /*--- End of included file: packet-disp-hfarr.c ---*/
-#line 211 "packet-disp-template.c"
+#line 210 "packet-disp-template.c"
   };
 
   /* List of subtrees */
@@ -2146,7 +2145,7 @@ void proto_register_disp(void) {
     &ett_disp_T_signedShadowError,
 
 /*--- End of included file: packet-disp-ettarr.c ---*/
-#line 217 "packet-disp-template.c"
+#line 216 "packet-disp-template.c"
   };
   module_t *disp_module;
 
@@ -2172,7 +2171,7 @@ void proto_register_disp(void) {
 
 /*--- proto_reg_handoff_disp --- */
 void proto_reg_handoff_disp(void) {
-  dissector_handle_t handle = NULL;
+  dissector_handle_t disp_handle;
 
 
 /*--- Included file: packet-disp-dis-tab.c ---*/
@@ -2185,7 +2184,7 @@ void proto_reg_handoff_disp(void) {
 
 
 /*--- End of included file: packet-disp-dis-tab.c ---*/
-#line 245 "packet-disp-template.c"
+#line 244 "packet-disp-template.c"
 
   /* APPLICATION CONTEXT */
 
@@ -2196,13 +2195,11 @@ void proto_reg_handoff_disp(void) {
 
   /* ABSTRACT SYNTAXES */
 
-  if((handle = find_dissector("disp"))) {
+  disp_handle = find_dissector("disp");
 
-    register_ros_oid_dissector_handle("2.5.9.3", handle, 0, "id-as-directory-shadow", FALSE); 
-
-    register_rtse_oid_dissector_handle("2.5.9.5", handle, 0, "id-as-directory-reliable-shadow", FALSE); 
-    register_rtse_oid_dissector_handle("2.5.9.6", handle, 0, "id-as-directory-reliable-binding", FALSE); 
-  } 
+  register_ros_oid_dissector_handle("2.5.9.3", disp_handle, 0, "id-as-directory-shadow", FALSE); 
+  register_rtse_oid_dissector_handle("2.5.9.5", disp_handle, 0, "id-as-directory-reliable-shadow", FALSE); 
+  register_rtse_oid_dissector_handle("2.5.9.6", disp_handle, 0, "id-as-directory-reliable-binding", FALSE); 
 
   /* OPERATIONAL BINDING */
   oid_add_from_string("id-op-binding-shadow","2.5.1.0.5.1");
@@ -2216,10 +2213,11 @@ void proto_reg_handoff_disp(void) {
 
 
 void prefs_register_disp(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 */
diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c
index d988d429a6..395833fe13 100644
--- a/epan/dissectors/packet-dop.c
+++ b/epan/dissectors/packet-dop.c
@@ -65,9 +65,8 @@
 #define PFNAME "dop"
 
 static guint global_dop_tcp_port = 102;
-static guint tcp_port = 0;
-static dissector_handle_t tpkt_handle = NULL;
-void prefs_register_dop(void); /* forwad declaration for use in preferences registration */
+static dissector_handle_t tpkt_handle;
+void prefs_register_dop(void); /* forward declaration for use in preferences registration */
 
 /* Initialize the protocol and registered fields */
 int proto_dop = -1;
@@ -271,7 +270,7 @@ static int hf_dop_GrantsAndDenials_grantInvoke = -1;
 static int hf_dop_GrantsAndDenials_denyInvoke = -1;
 
 /*--- End of included file: packet-dop-hf.c ---*/
-#line 73 "packet-dop-template.c"
+#line 72 "packet-dop-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_dop = -1;
@@ -348,7 +347,7 @@ static gint ett_dop_T_basicLevels = -1;
 static gint ett_dop_GrantsAndDenials = -1;
 
 /*--- End of included file: packet-dop-ett.c ---*/
-#line 78 "packet-dop-template.c"
+#line 77 "packet-dop-template.c"
 
 /* Dissector table */
 static dissector_table_t dop_dissector_table;
@@ -2051,7 +2050,7 @@ static void dissect_ACIItem_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 
 /*--- End of included file: packet-dop-fn.c ---*/
-#line 93 "packet-dop-template.c"
+#line 92 "packet-dop-template.c"
 
 static int
 call_dop_oid_callback(char *base_string, tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, char *col_info)
@@ -2968,7 +2967,7 @@ void proto_register_dop(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-dop-hfarr.c ---*/
-#line 253 "packet-dop-template.c"
+#line 252 "packet-dop-template.c"
   };
 
   /* List of subtrees */
@@ -3047,7 +3046,7 @@ void proto_register_dop(void) {
     &ett_dop_GrantsAndDenials,
 
 /*--- End of included file: packet-dop-ettarr.c ---*/
-#line 260 "packet-dop-template.c"
+#line 259 "packet-dop-template.c"
   };
 
   module_t *dop_module;
@@ -3078,7 +3077,7 @@ void proto_register_dop(void) {
 
 /*--- proto_reg_handoff_dop --- */
 void proto_reg_handoff_dop(void) {
-  dissector_handle_t handle = NULL;
+  dissector_handle_t dop_handle;
 
 
 /*--- Included file: packet-dop-dis-tab.c ---*/
@@ -3103,7 +3102,7 @@ void proto_reg_handoff_dop(void) {
 
 
 /*--- End of included file: packet-dop-dis-tab.c ---*/
-#line 293 "packet-dop-template.c"
+#line 292 "packet-dop-template.c"
   /* APPLICATION CONTEXT */
 
   oid_add_from_string("id-ac-directory-operational-binding-management","2.5.3.3");
@@ -3111,9 +3110,8 @@ void proto_reg_handoff_dop(void) {
   /* ABSTRACT SYNTAXES */
     
   /* Register DOP with ROS (with no use of RTSE) */
-  if((handle = find_dissector("dop"))) {
-    register_ros_oid_dissector_handle("2.5.9.4", handle, 0, "id-as-directory-operational-binding-management", FALSE); 
-  }
+  dop_handle = find_dissector("dop");
+  register_ros_oid_dissector_handle("2.5.9.4", dop_handle, 0, "id-as-directory-operational-binding-management", FALSE); 
 
   /* BINDING TYPES */
 
@@ -3144,10 +3142,11 @@ void proto_reg_handoff_dop(void) {
 }
 
 void prefs_register_dop(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 */
diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c
index ad74afd11e..eb3e199d8e 100644
--- a/epan/dissectors/packet-dsp.c
+++ b/epan/dissectors/packet-dsp.c
@@ -62,9 +62,8 @@
 #define PFNAME "dsp"
 
 static guint global_dsp_tcp_port = 102;
-static guint tcp_port = 0;
-static dissector_handle_t tpkt_handle = NULL;
-void prefs_register_dsp(void); /* forwad declaration for use in preferences registration */
+static dissector_handle_t tpkt_handle;
+void prefs_register_dsp(void); /* forward declaration for use in preferences registration */
 
 
 /* Initialize the protocol and registered fields */
@@ -206,7 +205,7 @@ static int hf_dsp_signed = -1;                    /* BOOLEAN */
 static int hf_dsp_other = -1;                     /* EXTERNAL */
 
 /*--- End of included file: packet-dsp-hf.c ---*/
-#line 68 "packet-dsp-template.c"
+#line 67 "packet-dsp-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_dsp = -1;
@@ -285,7 +284,7 @@ static gint ett_dsp_AuthenticationLevel = -1;
 static gint ett_dsp_T_basicLevels = -1;
 
 /*--- End of included file: packet-dsp-ett.c ---*/
-#line 72 "packet-dsp-template.c"
+#line 71 "packet-dsp-template.c"
 
 
 /*--- Included file: packet-dsp-fn.c ---*/
@@ -1733,7 +1732,7 @@ static void dissect_MasterAndShadowAccessPoints_PDU(tvbuff_t *tvb _U_, packet_in
 
 
 /*--- End of included file: packet-dsp-fn.c ---*/
-#line 74 "packet-dsp-template.c"
+#line 73 "packet-dsp-template.c"
 
 /*
 * Dissect X518 PDUs inside a ROS PDUs
@@ -2463,7 +2462,7 @@ void proto_register_dsp(void) {
         "dsp.EXTERNAL", HFILL }},
 
 /*--- End of included file: packet-dsp-hfarr.c ---*/
-#line 283 "packet-dsp-template.c"
+#line 282 "packet-dsp-template.c"
   };
 
   /* List of subtrees */
@@ -2544,7 +2543,7 @@ void proto_register_dsp(void) {
     &ett_dsp_T_basicLevels,
 
 /*--- End of included file: packet-dsp-ettarr.c ---*/
-#line 289 "packet-dsp-template.c"
+#line 288 "packet-dsp-template.c"
   };
   module_t *dsp_module;
 
@@ -2575,7 +2574,7 @@ void proto_register_dsp(void) {
 
 /*--- proto_reg_handoff_dsp --- */
 void proto_reg_handoff_dsp(void) {
-  dissector_handle_t handle = NULL;
+  dissector_handle_t dsp_handle;
 
 
 /*--- Included file: packet-dsp-dis-tab.c ---*/
@@ -2587,7 +2586,7 @@ void proto_reg_handoff_dsp(void) {
 
 
 /*--- End of included file: packet-dsp-dis-tab.c ---*/
-#line 322 "packet-dsp-template.c"
+#line 321 "packet-dsp-template.c"
 
   /* APPLICATION CONTEXT */
 
@@ -2595,19 +2594,21 @@ void proto_reg_handoff_dsp(void) {
 
   /* ABSTRACT SYNTAXES */
     
-  /* Register DSP with ROS (with no use of RTSE) */
-  if((handle = find_dissector("dsp"))) {
-    register_ros_oid_dissector_handle("2.5.9.2", handle, 0, "id-as-directory-system", FALSE); 
-  }
+  /* remember the tpkt handler for change in preferences */
+  tpkt_handle = find_dissector("tpkt");
 
+  /* Register DSP with ROS (with no use of RTSE) */
+  dsp_handle = find_dissector("dsp");
+  register_ros_oid_dissector_handle("2.5.9.2", dsp_handle, 0, "id-as-directory-system", FALSE); 
 
 }
 
 void prefs_register_dsp(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 */
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 */
diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c
index 31290dbc4e..ad9c0cdfc7 100644
--- a/epan/dissectors/packet-x411.c
+++ b/epan/dissectors/packet-x411.c
@@ -65,9 +65,8 @@
 #define PFNAME "x411"
 
 static guint global_x411_tcp_port = 102;
-static guint tcp_port = 0;
-static dissector_handle_t tpkt_handle = NULL;
-void prefs_register_x411(void); /* forwad declaration for use in preferences registration */
+static dissector_handle_t tpkt_handle;
+void prefs_register_x411(void); /* forward declaration for use in preferences registration */
 
 /* Initialize the protocol and registered fields */
 int proto_x411 = -1;
@@ -609,7 +608,7 @@ static int hf_x411_G3FacsimileNonBasicParameters_jpeg = -1;
 static int hf_x411_G3FacsimileNonBasicParameters_processable_mode_26 = -1;
 
 /*--- End of included file: packet-x411-hf.c ---*/
-#line 87 "packet-x411-template.c"
+#line 86 "packet-x411-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_x411 = -1;
@@ -787,7 +786,7 @@ static gint ett_x411_SecurityCategories = -1;
 static gint ett_x411_SecurityCategory = -1;
 
 /*--- End of included file: packet-x411-ett.c ---*/
-#line 97 "packet-x411-template.c"
+#line 96 "packet-x411-template.c"
 
 /* Dissector tables */
 static dissector_table_t x411_extension_dissector_table;
@@ -6976,7 +6975,7 @@ static void dissect_SecurityClassification_PDU(tvbuff_t *tvb _U_, packet_info *p
 
 
 /*--- End of included file: packet-x411-fn.c ---*/
-#line 105 "packet-x411-template.c"
+#line 104 "packet-x411-template.c"
 
 char* x411_get_last_oraddress() { return oraddress; }
 
@@ -9164,7 +9163,7 @@ void proto_register_x411(void) {
         "", HFILL }},
 
 /*--- End of included file: packet-x411-hfarr.c ---*/
-#line 240 "packet-x411-template.c"
+#line 239 "packet-x411-template.c"
   };
 
   /* List of subtrees */
@@ -9344,7 +9343,7 @@ void proto_register_x411(void) {
     &ett_x411_SecurityCategory,
 
 /*--- End of included file: packet-x411-ettarr.c ---*/
-#line 252 "packet-x411-template.c"
+#line 251 "packet-x411-template.c"
   };
 
   module_t *x411_module;
@@ -9374,7 +9373,7 @@ void proto_register_x411(void) {
 
 /*--- proto_reg_handoff_x411 --- */
 void proto_reg_handoff_x411(void) {
-  dissector_handle_t handle = NULL;
+  dissector_handle_t x411_handle;
 
 
 /*--- Included file: packet-x411-dis-tab.c ---*/
@@ -9534,7 +9533,7 @@ void proto_reg_handoff_x411(void) {
 
 
 /*--- End of included file: packet-x411-dis-tab.c ---*/
-#line 284 "packet-x411-template.c"
+#line 283 "packet-x411-template.c"
 
   /* APPLICATION CONTEXT */
 
@@ -9542,14 +9541,13 @@ void proto_reg_handoff_x411(void) {
 
   /* ABSTRACT SYNTAXES */
 
-  if((handle = find_dissector("x411")) != NULL) {
-    register_rtse_oid_dissector_handle("2.6.0.2.12", handle, 0, "id-as-mta-rtse", TRUE); 
-    register_rtse_oid_dissector_handle("2.6.0.2.7", handle, 0, "id-as-mtse", FALSE);
+  x411_handle = find_dissector("x411");
+  register_rtse_oid_dissector_handle("2.6.0.2.12", x411_handle, 0, "id-as-mta-rtse", TRUE); 
+  register_rtse_oid_dissector_handle("2.6.0.2.7", x411_handle, 0, "id-as-mtse", FALSE);
 
-    register_ber_syntax_dissector("X.411 Message", proto_x411, dissect_x411_mts_apdu);
-    register_rtse_oid_dissector_handle("applicationProtocol.1", handle, 0, "mts-transfer-protocol-1984", FALSE);
-    register_rtse_oid_dissector_handle("applicationProtocol.12", handle, 0, "mta-transfer-protocol", FALSE);
-  }
+  register_ber_syntax_dissector("X.411 Message", proto_x411, dissect_x411_mts_apdu);
+  register_rtse_oid_dissector_handle("applicationProtocol.1", x411_handle, 0, "mts-transfer-protocol-1984", FALSE);
+  register_rtse_oid_dissector_handle("applicationProtocol.12", x411_handle, 0, "mta-transfer-protocol", FALSE);
 
   /* remember the tpkt handler for change in preferences */
   tpkt_handle = find_dissector("tpkt");
@@ -9557,10 +9555,11 @@ void proto_reg_handoff_x411(void) {
 }
 
 void prefs_register_x411(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 */