Don't register to SCTP port 0: use dissector_add_handle instead

svn path=/trunk/; revision=26703

3 files changed, 9 insertions, 4 deletions

diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c
index 1151c10b0f..5fad892069 100644
--- a/asn1/nbap/packet-nbap-template.c
+++ b/asn1/nbap/packet-nbap-template.c
@@ -170,7 +170,7 @@ proto_reg_handoff_nbap(void)
 
 	nbap_handle = find_dissector("nbap");
 	/*dissector_add("sctp.ppi",  Add ppid here, nbap_handle); */
-	dissector_add("sctp.port", 0, nbap_handle);
+	dissector_add_handle("sctp.port", nbap_handle);  /* for "decode-as" */
 
 #include "packet-nbap-dis-tab.c"
 }
diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c
index a9efbdb011..454a0dbbea 100644
--- a/asn1/s1ap/packet-s1ap-template.c
+++ b/asn1/s1ap/packet-s1ap-template.c
@@ -163,14 +163,19 @@ proto_reg_handoff_s1ap(void)
 
 	if (!Initialized) {
 		s1ap_handle = find_dissector("s1ap");
+		dissector_add_handle("sctp.port", s1ap_handle);   /* for "decode-as"  */
 		Initialized=TRUE;
 #include "packet-s1ap-dis-tab.c"
 	} else {
-		dissector_delete("sctp.port", SctpPort, s1ap_handle);
+		if (SctpPort != 0) {
+			dissector_delete("sctp.port", SctpPort, s1ap_handle);
+		}
 	}
 
 	SctpPort=gbl_s1apSctpPort;
-	dissector_add("sctp.port", SctpPort, s1ap_handle);
+	if (SctpPort != 0) {
+		dissector_add("sctp.port", SctpPort, s1ap_handle);
+	}
 
 }
 
diff --git a/asn1/x2ap/packet-x2ap-template.c b/asn1/x2ap/packet-x2ap-template.c
index 32e9b31c4c..bac91e9b85 100644
--- a/asn1/x2ap/packet-x2ap-template.c
+++ b/asn1/x2ap/packet-x2ap-template.c
@@ -173,7 +173,7 @@ proto_reg_handoff_x2ap(void)
 	dissector_handle_t x2ap_handle;
 
 	x2ap_handle = find_dissector("x2ap");
-	dissector_add("sctp.port", 0, x2ap_handle);
+	dissector_add_handle("sctp.port", x2ap_handle);  /* for "decode-as" */
 
 #include "packet-x2ap-dis-tab.c"
 }