Revert "fixup: VoLTE support for outgoing and incoming calls"
This reverts commit df9f6c6e32
.
[May 16 15:20:45] TRACE[56]: pjproject: <?>: sip_util.c Request msg INVITE/cseq=11852 (tdta0x70735c0866d8) created.
Thread 31 "asterisk" received signal SIGSEGV, Segmentation fault.
[Switching to Thread 0x7074086fd6c0 (LWP 56)]
ast_sip_session_create_invite (session=session@entry=0x70735c04f250,
tdata=tdata@entry=0x7074086fcb08) at res_pjsip_session.c:2950
2950 if (transport_state->volte.p_access_network_info[0] &&
#0 ast_sip_session_create_invite (session=session@entry=0x70735c04f250,
tdata=tdata@entry=0x7074086fcb08) at res_pjsip_session.c:2950
#1 0x00007074091ee0e6 in call (data=0x7072e40079f0) at chan_pjsip.c:2403
#2 0x00005a7294347789 in ast_taskprocessor_execute (
tps=tps@entry=0x70735c050d20) at taskprocessor.c:1302
#3 0x00005a729434dc28 in execute_tasks (data=0x70735c050d20)
at threadpool.c:1350
#4 0x00005a7294347789 in ast_taskprocessor_execute (tps=0x5a729644a9d0)
at taskprocessor.c:1302
#5 0x00005a729434e68f in threadpool_execute (pool=0x5a729644ef70)
at threadpool.c:367
#6 worker_active (worker=0x707368001170) at threadpool.c:1137
#7 worker_start (arg=arg@entry=0x707368001170) at threadpool.c:1056
#8 0x00005a72943562bc in dummy_start (data=<optimized out>) at utils.c:1607
#9 0x000070740def9134 in ?? () from /lib/x86_64-linux-gnu/libc.so.6
#10 0x000070740df78a40 in clone ()
This commit is contained in:
parent
df9f6c6e32
commit
705ea61774
|
@ -2947,11 +2947,6 @@ int ast_sip_session_create_invite(struct ast_sip_session *session, pjsip_tx_data
|
|||
SCOPE_EXIT_RTN_VALUE(-1, "pjsip_inv_invite failed\n");
|
||||
}
|
||||
|
||||
if (transport_state->volte.p_access_network_info[0] &&
|
||||
volte_add_p_access_network_info(*tdata, transport_state->volte.p_access_network_info)) {
|
||||
ast_log(LOG_ERROR, "Failed to add sec agree header.\n");
|
||||
}
|
||||
|
||||
if (volte_add_sec_agree(*tdata)) {
|
||||
ast_log(LOG_ERROR, "Failed to add sec-agree.\n");
|
||||
}
|
||||
|
|
|
@ -27,7 +27,6 @@ const pj_str_t STR_SECURITY_VERIFY = { "Security-Verify", 15 };
|
|||
const pj_str_t STR_REQUIRE = { "Require", 7 };
|
||||
const pj_str_t STR_PROXY_REQUIRE = { "Proxy-Require", 13 };
|
||||
const pj_str_t STR_SEC_AGREE = { "sec-agree", 9 };
|
||||
const pj_str_t STR_P_ACCESS_NETWORK_INFO = { "P-Access-Network-Info", 21 };
|
||||
|
||||
/* Create string header and add given value. */
|
||||
static pj_status_t add_value_string_hdr(pjsip_tx_data *tdata, const pj_str_t *name, const pj_str_t *value)
|
||||
|
@ -106,17 +105,3 @@ pj_status_t volte_add_sec_agree(pjsip_tx_data *tdata)
|
|||
return PJ_SUCCESS;
|
||||
}
|
||||
|
||||
/* Add P-Access-Network-Info to header. */
|
||||
pj_status_t volte_add_p_access_network_info(pjsip_tx_data *tdata, char *info)
|
||||
{
|
||||
pj_status_t status;
|
||||
|
||||
const pj_str_t info_str = { info, strlen(info) };
|
||||
|
||||
/* "P-Access-Network-Info" */
|
||||
status = add_value_string_hdr(tdata, &STR_P_ACCESS_NETWORK_INFO, &info_str);
|
||||
if (status)
|
||||
return status;
|
||||
|
||||
return PJ_SUCCESS;
|
||||
}
|
||||
|
|
|
@ -2,4 +2,3 @@
|
|||
|
||||
pj_status_t volte_add_sec_agree(pjsip_tx_data *tdata);
|
||||
pj_status_t volte_add_security_verify(struct ast_sip_transport_state *transport_state, pjsip_tx_data *tdata);
|
||||
pj_status_t volte_add_p_access_network_info(pjsip_tx_data *tdata, char *info);
|
||||
|
|
Loading…
Reference in New Issue