diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-12-02 11:30:09 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-12-02 11:30:09 -0600 |
| commit | fdf0a2afb0d9f45512e1ff1e22ad24a84dd4d491 (patch) | |
| tree | 2e8dddc143446ade6910eefb8e724e87ab5e2b8c /res | |
| parent | 8d56016ae475f90b3a5745cfcaa604089e1db659 (diff) | |
| parent | 09c36a65356093e2a40cd2b23ff9f945e1028589 (diff) | |
Merge "res_pjsip/chan_sip: Advertise 'ws' in the SIP URI transport parameter" into 13
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_pjsip_transport_websocket.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/res/res_pjsip_transport_websocket.c b/res/res_pjsip_transport_websocket.c index 418182870..82ade56e0 100644 --- a/res/res_pjsip_transport_websocket.c +++ b/res/res_pjsip_transport_websocket.c @@ -378,7 +378,6 @@ static void websocket_cb(struct ast_websocket *session, struct ast_variable *par static pj_bool_t websocket_on_rx_msg(pjsip_rx_data *rdata) { static const pj_str_t STR_WS = { "ws", 2 }; - static const pj_str_t STR_WSS = { "wss", 3 }; pjsip_contact_hdr *contact; long type = rdata->tp_info.transport->key.type; @@ -395,7 +394,7 @@ static pj_bool_t websocket_on_rx_msg(pjsip_rx_data *rdata) uri->port = rdata->pkt_info.src_port; ast_debug(4, "Re-wrote Contact URI host/port to %.*s:%d\n", (int)pj_strlen(&uri->host), pj_strbuf(&uri->host), uri->port); - pj_strdup(rdata->tp_info.pool, &uri->transport_param, (type == (long)transport_type_ws) ? &STR_WS : &STR_WSS); + pj_strdup(rdata->tp_info.pool, &uri->transport_param, &STR_WS); } rdata->msg_info.via->rport_param = 0; @@ -431,7 +430,7 @@ static int load_module(void) CHECK_PJSIP_MODULE_LOADED(); pjsip_transport_register_type(PJSIP_TRANSPORT_RELIABLE, "WS", 5060, &transport_type_ws); - pjsip_transport_register_type(PJSIP_TRANSPORT_RELIABLE | PJSIP_TRANSPORT_SECURE, "WSS", 5060, &transport_type_wss); + pjsip_transport_register_type(PJSIP_TRANSPORT_RELIABLE | PJSIP_TRANSPORT_SECURE, "WS", 5060, &transport_type_wss); if (ast_sip_register_service(&websocket_module) != PJ_SUCCESS) { return AST_MODULE_LOAD_DECLINE; |