From 0393bd6bed3b87b312d7fc252c4fa3782df8260a Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Mon, 2 Nov 2015 21:24:58 -0500 Subject: chan_sip: Allow websockets to be disabled. This patch adds a new setting "websockets_enabled" to sip.conf. Setting this to false allows chan_sip to be used without causing conflicts with res_pjsip_transport_websocket. ASTERISK-24106 #close Reported by: Andrew Nagy Change-Id: I04fe8c4f2d57b2d7375e0e25826c91a72e93bea7 --- configs/samples/sip.conf.sample | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'configs/samples/sip.conf.sample') diff --git a/configs/samples/sip.conf.sample b/configs/samples/sip.conf.sample index 44d2d4352..a24ab30a6 100644 --- a/configs/samples/sip.conf.sample +++ b/configs/samples/sip.conf.sample @@ -229,6 +229,10 @@ tcpbindaddr=0.0.0.0 ; IP address for TCP server to bind to (0.0.0.0 ; unauthenticated sessions that will be allowed ; to connect at any given time. (default: 100) +;websocket_enabled = true ; Set to false to prevent chan_sip from listening to websockets. This + ; is neeeded when using chan_sip and res_pjsip_transport_websockets on + ; the same system. + ;websocket_write_timeout = 100 ; Default write timeout to set on websocket transports. ; This value may need to be adjusted for connections where ; Asterisk must write a substantial amount of data and the -- cgit v1.2.3