kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "chan_unistim: Fix hold function ability to lock/crash asterisk" into 13

Browse Source
This commit is contained in:
Jenkins2
2018-01-22 16:16:46 -06:00
committed by Gerrit Code Review
parent 31b501c1a7 1488efb3a8
commit 5d74e07793
1 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
channels/chan_unistim.c
View File

@@ -116,7 +116,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#define SUB_REAL 0
#define SUB_RING 1
#define SUB_THREEWAY 2
#define SUB_ONHOLD 3
struct ast_format_cap *global_cap;
@@ -353,13 +352,14 @@ struct wsabuf {
struct unistim_subchannel {
ast_mutex_t lock;
unsigned int subtype; /*! SUB_REAL, SUB_RING, SUB_THREEWAY or SUB_ONHOLD */
unsigned int subtype; /*! SUB_REAL, SUB_RING or SUB_THREEWAY */
struct ast_channel *owner; /*! Asterisk channel used by the subchannel */
struct unistim_line *parent; /*! Unistim line */
struct ast_rtp_instance *rtp; /*! RTP handle */
int softkey; /*! Softkey assigned */
pthread_t ss_thread; /*! unistim_ss thread handle */
int alreadygone;
int holding; /*! this subchannel holds someone */
signed char ringvolume;
signed char ringstyle;
int moh; /*!< Music on hold in progress */
@@ -2017,8 +2017,6 @@ static const char *subtype_tostr(const int type)
switch (type) {
case SUB_REAL:
return "REAL";
case SUB_ONHOLD:
return "ONHOLD";
case SUB_RING:
return "RINGING";
case SUB_THREEWAY:
@@ -2498,6 +2496,24 @@ static struct unistim_subchannel* get_sub(struct unistim_device *device, int typ
return sub;
}
static struct unistim_subchannel* get_sub_holding(struct unistim_device *device, int type, int holding)
{
struct unistim_subchannel *sub = NULL;
AST_LIST_LOCK(&device->subs);
AST_LIST_TRAVERSE(&device->subs, sub, list) {
if (!sub) {
continue;
}
if (sub->subtype == type && sub->holding == holding) {
break;
}
}
AST_LIST_UNLOCK(&device->subs);
return sub;
}
static void sub_start_silence(struct unistimsession *pte, struct unistim_subchannel *sub)
{
/* Silence our channel */
@@ -2535,13 +2551,12 @@ static void sub_hold(struct unistimsession *pte, struct unistim_subchannel *sub)
return;
}
sub->moh = 1;
sub->subtype = SUB_ONHOLD;
sub->holding = 1;
send_favorite_short(sub->softkey, FAV_ICON_ONHOLD_BLACK + FAV_BLINK_SLOW, pte);
send_select_output(pte, pte->device->output, pte->device->volume, MUTE_ON);
send_stop_timer(pte);
if (sub->owner) {
ast_queue_hold(sub->owner, NULL);
send_end_call(pte);
}
return;
}
@@ -2556,7 +2571,7 @@ static void sub_unhold(struct unistimsession *pte, struct unistim_subchannel *su
}
sub->moh = 0;
sub->subtype = SUB_REAL;
sub->holding = 0;
send_favorite_short(sub->softkey, FAV_ICON_OFFHOOK_BLACK, pte);
send_select_output(pte, pte->device->output, pte->device->volume, MUTE_OFF);
send_start_timer(pte);
@@ -3356,12 +3371,12 @@ static int unistim_do_senddigit(struct unistimsession *pte, char digit)
static void handle_key_fav(struct unistimsession *pte, char keycode)
{
int keynum = keycode - KEY_FAV0;
struct unistim_subchannel *sub;
sub = get_sub(pte->device, SUB_REAL);
struct unistim_subchannel *sub, *sub_key = NULL;
sub = get_sub_holding(pte->device, SUB_REAL, 0);
/* Make an action on selected favorite key */
if (!pte->device->ssub[keynum]) { /* Key have no assigned call */
sub = get_sub_holding(pte->device, SUB_REAL, 0);
send_favorite_selected(FAV_LINE_ICON, pte);
if (is_key_line(pte->device, keynum)) {
if (unistimdebug) {
@@ -3386,21 +3401,24 @@ static void handle_key_fav(struct unistimsession *pte, char keycode)
key_favorite(pte, keycode);
}
} else {
sub = pte->device->ssub[keynum];
sub_key = pte->device->ssub[keynum];
/* Favicon have assigned sub, activate it and put current on hold */
if (sub->subtype == SUB_REAL) {
sub_hold(pte, sub);
if (sub_key->subtype == SUB_REAL && !sub_key->holding) {
sub_hold(pte, sub_key);
show_main_page(pte);
} else if (sub->subtype == SUB_RING) {
sub->softkey = keynum;
handle_call_incoming(pte);
} else if (sub->subtype == SUB_ONHOLD) {
} else if (sub_key->subtype == SUB_REAL && sub_key->holding) {
/* We are going to unhold line (we should put active line on hold, of any) */
if (pte->state == STATE_DIALPAGE){
send_tone(pte, 0, 0);
}
send_callerid_screen(pte, sub);
sub_unhold(pte, sub);
sub_hold(pte, sub);
send_callerid_screen(pte, sub_key);
sub_unhold(pte, sub_key);
pte->state = STATE_CALL;
} else if (sub_key->subtype == SUB_RING) {
sub_hold(pte, sub);
sub_key->softkey = keynum;
handle_call_incoming(pte);
}
}
}
@@ -3470,8 +3488,13 @@ static void key_call(struct unistimsession *pte, char keycode)
case KEY_ONHOLD:
if (!sub) {
if(pte->device->ssub[pte->device->selected]) {
sub_hold(pte, pte->device->ssub[pte->device->selected]);
sub = pte->device->ssub[pte->device->selected];
} else {
break;
}
}
if (sub->holding) {
sub_unhold(pte, sub);
} else {
sub_hold(pte, sub);
}
@@ -5429,7 +5452,8 @@ static struct unistim_subchannel *find_subchannel_by_name(const char *dest)
}
if (sub->owner) {
/* Allocate additional channel if asterisk channel already here */
sub = unistim_alloc_sub(d, SUB_ONHOLD);
sub = unistim_alloc_sub(d, SUB_REAL);
sub->holding = 1;
}
sub->ringvolume = -1;
sub->ringstyle = -1;