diff options
author | Corey Farrell <git@cfware.com> | 2015-11-02 21:24:58 -0500 |
---|---|---|
committer | Corey Farrell <git@cfware.com> | 2015-11-03 08:52:52 -0500 |
commit | 0393bd6bed3b87b312d7fc252c4fa3782df8260a (patch) | |
tree | 80be850e2c3d775119d32f0a7825c064b2edd626 /channels/sip | |
parent | 6fbffe42e13d82eebd5545de9a74b6a36bd9a558 (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.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h index 3ed3e8a33..82f208c77 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; |