diff options
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_sip.c | 10 | ||||
-rw-r--r-- | channels/sip/include/sip.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 5e829357f..14b460c14 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -2665,6 +2665,10 @@ static void sip_websocket_callback(struct ast_websocket *session, struct ast_var goto end; } + if (ast_websocket_set_timeout(session, sip_cfg.websocket_write_timeout)) { + goto end; + } + while ((res = ast_wait_for_input(ast_websocket_fd(session), -1)) > 0) { char *payload; uint64_t payload_len; @@ -32009,6 +32013,12 @@ static int reload_config(enum channelreloadreason reason) ast_copy_string(default_parkinglot, v->value, sizeof(default_parkinglot)); } else if (!strcasecmp(v->name, "refer_addheaders")) { global_refer_addheaders = ast_true(v->value); + } else if (!strcasecmp(v->name, "websocket_write_timeout")) { + if (sscanf(v->value, "%30d", &sip_cfg.websocket_write_timeout) != 1 + || sip_cfg.websocket_write_timeout < 0) { + ast_log(LOG_WARNING, "'%s' is not a valid websocket_write_timeout value at line %d. Using default '%d'.\n", v->value, v->lineno, AST_DEFAULT_WEBSOCKET_WRITE_TIMEOUT); + sip_cfg.websocket_write_timeout = AST_DEFAULT_WEBSOCKET_WRITE_TIMEOUT; + } } } diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h index e2ab6e19a..ab151de10 100644 --- a/channels/sip/include/sip.h +++ b/channels/sip/include/sip.h @@ -773,6 +773,7 @@ struct sip_settings { struct ast_format_cap *caps; /*!< Supported codecs */ 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 */ }; struct ast_websocket; |