summaryrefslogtreecommitdiff
path: root/channels/sip
diff options
context:
space:
mode:
authorCorey Farrell <git@cfware.com>2015-11-02 21:24:58 -0500
committerCorey Farrell <git@cfware.com>2015-11-03 08:53:00 -0500
commit40574a2ea31f03d5a4d3914f1e20895a9b49d7f0 (patch)
tree65d286436b6cedb1a0ab91b30b7ac18867c51d38 /channels/sip
parentf80a0ae49be93c654a1da156d4e1a9858cb3223a (diff)
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
Diffstat (limited to 'channels/sip')
-rw-r--r--channels/sip/include/sip.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h
index 771ed22b4..87b59f661 100644
--- a/channels/sip/include/sip.h
+++ b/channels/sip/include/sip.h
@@ -774,6 +774,7 @@ struct sip_settings {
int tcp_enabled;
int default_max_forwards; /*!< Default max forwards (SIP Anti-loop) */
int websocket_write_timeout; /*!< Socket write timeout for websocket transports, in ms */
+ int websocket_enabled; /*!< Are websockets enabled? */
};
struct ast_websocket;