kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-02 10:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix closing rtp ports after call finished in chan_unistim." into 13

Browse Source
This commit is contained in:
Joshua Colp
2016-11-14 08:05:38 -06:00
committed by Gerrit Code Review
parent d5774005fe 3faca1d4ff
commit ec17e96784
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
channels/chan_unistim.c
View File

@@ -4128,7 +4128,7 @@ static void show_main_page(struct unistimsession *pte)
send_date_time2(pte); send_date_time2(pte);
send_idle_clock(pte); send_idle_clock(pte);
if (strlen(pte->device->maintext0)) { if (strlen(pte->device->maintext0)) {
send_text(TEXT_LINE0, TEXT_NORMAL, pte, pte->device->maintext0); send_text(TEXT_LINE0, TEXT_NORMAL, pte, ustmtext(pte->device->maintext0, pte));
} }
} else { } else {
if (pte->device->missed_call == 1) { if (pte->device->missed_call == 1) {
@@ -4147,11 +4147,11 @@ static void show_main_page(struct unistimsession *pte)
strcat(tmpbuf, ast_inet_ntoa(pte->sin.sin_addr)); strcat(tmpbuf, ast_inet_ntoa(pte->sin.sin_addr));
send_text(TEXT_LINE2, TEXT_NORMAL, pte, tmpbuf); send_text(TEXT_LINE2, TEXT_NORMAL, pte, tmpbuf);
} else { } else {
send_text(TEXT_LINE2, TEXT_NORMAL, pte, pte->device->maintext2); send_text(TEXT_LINE2, TEXT_NORMAL, pte, ustmtext(pte->device->maintext2, pte));
} }
} }
send_texttitle(pte, pte->device->titledefault); send_texttitle(pte, ustmtext(pte->device->titledefault, pte));
change_favorite_icon(pte, FAV_LINE_ICON); change_favorite_icon(pte, FAV_LINE_ICON);
} }
@@ -4406,7 +4406,7 @@ static void init_phone_step2(struct unistimsession *pte)
strcat(tmp, pte->macaddr); strcat(tmp, pte->macaddr);
send_text(TEXT_LINE2, TEXT_NORMAL, pte, tmp); send_text(TEXT_LINE2, TEXT_NORMAL, pte, tmp);
send_text_status(pte, ""); send_text_status(pte, "");
send_texttitle(pte, "UNISTIM for*"); send_texttitle(pte, ustmtext("UNISTIM for*", pte));
return; return;
} }
} }
@@ -4896,14 +4896,15 @@ static int unistim_hangup_clean(struct ast_channel *ast, struct unistim_subchann
ast_channel_tech_pvt_set(ast, NULL); ast_channel_tech_pvt_set(ast, NULL);
unistim_set_owner(sub, NULL); unistim_set_owner(sub, NULL);
sub->alreadygone = 0; sub->alreadygone = 0;
ast_mutex_unlock(&sub->lock);
if (sub->rtp) { if (sub->rtp) {
if (unistimdebug) { if (unistimdebug) {
ast_verb(0, "Destroying RTP session\n"); ast_verb(0, "Destroying RTP session\n");
} }
ast_rtp_instance_stop(sub->rtp);
ast_rtp_instance_destroy(sub->rtp); ast_rtp_instance_destroy(sub->rtp);
sub->rtp = NULL; sub->rtp = NULL;
} }
ast_mutex_unlock(&sub->lock);
return 0; return 0;
} }