sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed crash when incoming SIP transport is immediately closed (#3527)

This commit is contained in:
sauwming 2023-05-01 09:03:14 +08:00 committed by GitHub
parent 3fa60838cc
commit dc4778ed8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
pjsip/src/pjsip/sip_transport_tcp.c
View File

@ -1181,32 +1181,34 @@ static pj_bool_t on_accept_complete(pj_activesock_t *asock,
status = tcp_create( listener, NULL, sock, PJ_TRUE,
&tmp_dst_addr, &tmp_src_addr, &tcp);
if (status == PJ_SUCCESS) {
/* Notify application of transport state accepted */
state_cb = pjsip_tpmgr_get_state_cb(tcp->base.tpmgr);
if (state_cb) {
pjsip_transport_state_info state_info;
pj_bzero(&state_info, sizeof(state_info));
(*state_cb)(&tcp->base, PJSIP_TP_STATE_CONNECTED, &state_info);
}
if (tcp->base.is_shutdown || tcp->base.is_destroying) {
return PJ_TRUE;
}
/* Start keep-alive timer */
if (pjsip_cfg()->tcp.keep_alive_interval) {
pj_time_val delay = { 0 };
delay.sec = pjsip_cfg()->tcp.keep_alive_interval;
pjsip_endpt_schedule_timer(listener->endpt,
&tcp->ka_timer,
&delay);
tcp->ka_timer.id = PJ_TRUE;
pj_gettimeofday(&tcp->last_activity);
}
status = tcp_start_read(tcp);
if (status != PJ_SUCCESS) {
PJ_LOG(3,(tcp->base.obj_name, "New transport cancelled"));
tcp_destroy(&tcp->base, status);
} else {
if (tcp->base.is_shutdown || tcp->base.is_destroying) {
return PJ_TRUE;
}
/* Start keep-alive timer */
if (pjsip_cfg()->tcp.keep_alive_interval) {
pj_time_val delay = { 0 };
delay.sec = pjsip_cfg()->tcp.keep_alive_interval;
pjsip_endpt_schedule_timer(listener->endpt,
&tcp->ka_timer,
&delay);
tcp->ka_timer.id = PJ_TRUE;
pj_gettimeofday(&tcp->last_activity);
}
/* Notify application of transport state accepted */
state_cb = pjsip_tpmgr_get_state_cb(tcp->base.tpmgr);
if (state_cb) {
pjsip_transport_state_info state_info;
pj_bzero(&state_info, sizeof(state_info));
(*state_cb)(&tcp->base, PJSIP_TP_STATE_CONNECTED, &state_info);
}
}
}

21
pjsip/src/pjsip/sip_transport_tls.c
View File

@ -1503,23 +1503,22 @@ static pj_bool_t on_accept_complete2(pj_ssl_sock_t *ssock,
if (is_shutdown)
return PJ_TRUE;
/* Start keep-alive timer */
if (pjsip_cfg()->tls.keep_alive_interval) {
pj_time_val delay = {0};
delay.sec = pjsip_cfg()->tls.keep_alive_interval;
pjsip_endpt_schedule_timer(listener->endpt,
&tls->ka_timer,
&delay);
tls->ka_timer.id = PJ_TRUE;
pj_gettimeofday(&tls->last_activity);
}
status = tls_start_read(tls);
if (status != PJ_SUCCESS) {
PJ_LOG(3,(tls->base.obj_name, "New transport cancelled"));
tls_init_shutdown(tls, status);
tls_destroy(&tls->base, status);
} else {
/* Start keep-alive timer */
if (pjsip_cfg()->tls.keep_alive_interval) {
pj_time_val delay = {0};
delay.sec = pjsip_cfg()->tls.keep_alive_interval;
pjsip_endpt_schedule_timer(listener->endpt,
&tls->ka_timer,
&delay);
tls->ka_timer.id = PJ_TRUE;
pj_gettimeofday(&tls->last_activity);
}
}
return PJ_TRUE;