[Core] Disable msrp by default, only enable when listen-port or listen-ssl-port…

[Core] Disable msrp by default, only enable when listen-port or listen-ssl-port config params configured in msrp.conf

conf/vanilla/autoload_configs/msrp.conf.xml

 <configuration name="msrp.conf" description="MSRP">
   <settings>
     <param name="listen-ip" value="$${local_ip_v4}"/>
-    <param name="listen-port" value="2855"/>
-    <param name="listen-ssl-port" value="2856"/>
+    <!-- <param name="listen-port" value="2855"/> -->
+    <!-- <param name="listen-ssl-port" value="2856"/> -->
     <!-- <param name="message-buffer-size" value="50"/> -->
     <!-- <param name="debug" value="true"/> -->
     <!-- <param name="secure-cert" value="$${certs_dir}/wss.pem"/> -->

src/include/switch_msrp.h

@@ -34,9 +34,6 @@
 
 #include <switch.h>
 
-#define MSRP_LISTEN_PORT 2855
-#define MSRP_SSL_LISTEN_PORT 2856
-
 enum {
 	MSRP_ST_WAIT_HEADER,
 	MSRP_ST_PARSE_HEADER,

src/switch_msrp.c

@@ -36,8 +36,6 @@
 
 #define MSRP_BUFF_SIZE (SWITCH_RTP_MAX_BUF_LEN - 32)
 #define DEBUG_MSRP 0
-#define MSRP_LISTEN_PORT 2855
-#define MSRP_SSL_LISTEN_PORT 2856
 
 struct msrp_socket_s {
 	switch_port_t port;
@@ -297,14 +295,15 @@ SWITCH_DECLARE(switch_status_t) switch_msrp_init()
 	memset(&globals, 0, sizeof(globals));
 	set_global_ip("0.0.0.0");
 	globals.pool = pool;
-	globals.msock.port = (switch_port_t)MSRP_LISTEN_PORT;
-	globals.msock_ssl.port = (switch_port_t)MSRP_SSL_LISTEN_PORT;
+	globals.msock.port = (switch_port_t)0;
+	globals.msock_ssl.port = (switch_port_t)0;
 	globals.msock_ssl.secure = 1;
 	globals.message_buffer_size = 50;
 	globals.debug = DEBUG_MSRP;
 
 	load_config();
 
+	if (globals.msock.port) {
 		globals.running = 1;
 
 		status = msock_init(globals.ip, globals.msock.port, &globals.msock.sock, pool);
@@ -316,6 +315,10 @@ SWITCH_DECLARE(switch_status_t) switch_msrp_init()
 			switch_thread_create(&thread, thd_attr, msrp_listener, &globals.msock, pool);
 			globals.msock.thread = thread;
 		}
+	}
+
+	if (globals.msock_ssl.port) {
+		globals.running = 1;
 
 		msrp_init_ssl();
 		status = msock_init(globals.ip, globals.msock_ssl.port, &globals.msock_ssl.sock, pool);
@@ -327,6 +330,7 @@ SWITCH_DECLARE(switch_status_t) switch_msrp_init()
 			switch_thread_create(&thread, thd_attr, msrp_listener, &globals.msock_ssl, pool);
 			globals.msock_ssl.thread = thread;
 		}
+	}
 
 	return SWITCH_STATUS_SUCCESS;
 }