Add obsolete ssl[._]port preferences.

gcd95e197ca renamed a bunch of "<proto>.ssl.port" preferences to
"<proto>.tls.port" but neglected to add obsolete entries for the old
preferences. Do so here.

Rename couchbase.tls_port to couchbase.tls.port to be in line with the
other TLS port preferences.

Change-Id: Ie23d6be0a5cb3616f37e41dbfbf13ad1b7206473
Reviewed-on: https://code.wireshark.org/review/29829
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>

diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c
index 8700d826810783d07b3f6bc39b91c512d19b3f2e..7bdcb2bd9626e60169318f62f197c0dd7716f749 100644 (file)
--- a/epan/dissectors/asn1/ldap/packet-ldap-template.c
+++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c
@@ -2208,6 +2208,7 @@ void proto_register_ldap(void) {
   prefs_register_uint_preference(ldap_module, "tls.port", "LDAPS TCP Port",
                                  "Set the port for LDAP operations over TLS",
                                  10, &global_ldaps_tcp_port);
+  prefs_register_obsolete_preference(ldap_module, "ssl.port");
   /* UAT */
   attributes_uat = uat_new("Custom LDAP AttributeValue types",
                            sizeof(attribute_type_t),

diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c
index 23376f7f527f39011ca68d690abc04b0a43dc1fc..bad4d954724b27befea8a60215ec06aec806a63b 100644 (file)
--- a/epan/dissectors/packet-amqp.c
+++ b/epan/dissectors/packet-amqp.c
@@ -13409,6 +13409,7 @@ proto_register_amqp(void)
                                    "Set the TCP port for AMQP over SSL/TLS"
                                    "(if other than the default of 5671)",
                                    10, &amqps_port);
+    prefs_register_obsolete_preference(amqp_module, "ssl.port");
 
     register_decode_as(&amqp_da);
 }

diff --git a/epan/dissectors/packet-couchbase.c b/epan/dissectors/packet-couchbase.c
index f33ff8eb1e7bce225755578492bc585df97e5b29..fdbf7b44820eb25cf4e1f919cb127d6125099e5b 100644 (file)
--- a/epan/dissectors/packet-couchbase.c
+++ b/epan/dissectors/packet-couchbase.c
@@ -2582,9 +2582,10 @@ proto_register_couchbase(void)
                                  " to reassemble TCP streams\" in the TCP protocol settings.",
                                  &couchbase_desegment_body);
 
-  prefs_register_uint_preference(couchbase_module, "tls_port", "SSL/TLS Data Port",
+  prefs_register_uint_preference(couchbase_module, "tls.port", "SSL/TLS Data Port",
                                  "The port used for communicating with the data service via SSL/TLS",
                                  10, &couchbase_ssl_port_pref);
+  prefs_register_obsolete_preference(couchbase_module, "ssl_port");
 
 
 }

diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index 83b88a85bce951c73240edd2f39af352a818e51f..c4e70d614f3de0f102201feb78a0d711a7331820 100644 (file)
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -4017,6 +4017,7 @@ proto_register_http(void)
        prefs_register_range_preference(http_module, "tls.port", "SSL/TLS Ports",
                                        "SSL/TLS Ports range",
                                        &global_http_ssl_range, 65535);
+       prefs_register_obsolete_preference(http_module, "ssl.port");
        /* UAT */
        headers_uat = uat_new("Custom HTTP Header Fields",
                              sizeof(header_field_t),

diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 8d6ac0d5bce77976617b3a2895d8c3a67d96c5b2..67f121f40fa7844d2290be4f4e58738205221875 100644 (file)
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -5755,6 +5755,7 @@ void proto_register_ldap(void) {
   prefs_register_uint_preference(ldap_module, "tls.port", "LDAPS TCP Port",
                                  "Set the port for LDAP operations over TLS",
                                  10, &global_ldaps_tcp_port);
+  prefs_register_obsolete_preference(ldap_module, "ssl.port");
   /* UAT */
   attributes_uat = uat_new("Custom LDAP AttributeValue types",
                            sizeof(attribute_type_t),
@@ -5905,7 +5906,7 @@ proto_reg_handoff_ldap(void)
 
 
 /*--- End of included file: packet-ldap-dis-tab.c ---*/
-#line 2345 "./asn1/ldap/packet-ldap-template.c"
+#line 2346 "./asn1/ldap/packet-ldap-template.c"
 
  dissector_add_uint_range_with_preference("tcp.port", TCP_PORT_RANGE_LDAP, ldap_handle);
 }

diff --git a/epan/dissectors/packet-opa-fe.c b/epan/dissectors/packet-opa-fe.c
index 2266167e54ad984392c721f8ba5d01f6e07131bc..02d52e68850deeb0d0924df24d50d44e0d08886d 100644 (file)
--- a/epan/dissectors/packet-opa-fe.c
+++ b/epan/dissectors/packet-opa-fe.c
@@ -142,6 +142,7 @@ void proto_register_opa_fe(void)
     prefs_register_range_preference(opa_fe_module, "tls.port", "SSL/TLS Ports",
         "SSL/TLS Ports range",
         &global_fe_ssl_range, 65535);
+    prefs_register_obsolete_preference(opa_fe_module, "ssl.port");
 }
 
 void proto_reg_handoff_opa_fe(void)