Index: channels/sig_pri.h =================================================================== --- channels/sig_pri.h (revision 300158) +++ channels/sig_pri.h (working copy) @@ -83,6 +83,22 @@ SIG_PRI_ALAW }; +/*! Call establishment life cycle level for simple comparisons. */ +enum sig_pri_call_level { + /*! Call does not exist. */ + SIG_PRI_CALL_LEVEL_IDLE, + /*! Call is present but has no response yet. (SETUP) */ + SIG_PRI_CALL_LEVEL_SETUP, + /*! Call is collecting digits for overlap dialing. (SETUP ACKNOWLEDGE) */ + SIG_PRI_CALL_LEVEL_OVERLAP, + /*! Call routing is happening. (PROCEEDING) */ + SIG_PRI_CALL_LEVEL_PROCEEDING, + /*! Called party is being alerted of the call. (ALERTING) */ + SIG_PRI_CALL_LEVEL_ALERTING, + /*! Call is connected/answered. (CONNECT) */ + SIG_PRI_CALL_LEVEL_CONNECT, +}; + struct sig_pri_span; struct sig_pri_callback { @@ -210,14 +226,9 @@ unsigned int holding_aoce:1; /*!< received AOC-E msg from asterisk. holding for disconnect/release */ #endif /* defined(HAVE_PRI_AOC_EVENTS) */ unsigned int inalarm:1; - unsigned int alerting:1; /*!< TRUE if channel is alerting/ringing */ unsigned int alreadyhungup:1; /*!< TRUE if the call has already gone/hungup */ unsigned int isidlecall:1; /*!< TRUE if this is an idle call */ - unsigned int proceeding:1; /*!< TRUE if call is in a proceeding state */ - unsigned int progress:1; /*!< TRUE if the call has seen progress through the network */ unsigned int resetting:1; /*!< TRUE if this channel is being reset/restarted */ - unsigned int setup_ack:1; /*!< TRUE if this channel has received a SETUP_ACKNOWLEDGE */ - unsigned int outgoing:1; unsigned int digital:1; /*! \brief TRUE if this interface has no B channel. (call hold and call waiting) */ @@ -232,6 +243,8 @@ struct sig_pri_span *pri; q931_call *call; /*!< opaque libpri call control structure */ + /*! Call establishment life cycle level for simple comparisons. */ + enum sig_pri_call_level call_level; int prioffset; /*!< channel number in span */ int logicalspan; /*!< logical span number within trunk group */ int mastertrunkgroup; /*!< what trunk group is our master */ Index: channels/chan_dahdi.c =================================================================== --- channels/chan_dahdi.c (revision 300158) +++ channels/chan_dahdi.c (working copy) @@ -7660,7 +7660,7 @@ ast_debug(1, "Detected %sdigit '%c'\n", p->pulsedial ? "pulse ": "", res & 0xff); #if defined(HAVE_PRI) if (dahdi_sig_pri_lib_handles(p->sig) - && !((struct sig_pri_chan *) p->sig_pvt)->proceeding + && ((struct sig_pri_chan *) p->sig_pvt)->call_level < SIG_PRI_CALL_LEVEL_PROCEEDING && p->pri && (p->pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING)) { /* absorb event */ @@ -7680,7 +7680,7 @@ ast_debug(1, "DTMF Down '%c'\n", res & 0xff); #if defined(HAVE_PRI) if (dahdi_sig_pri_lib_handles(p->sig) - && !((struct sig_pri_chan *) p->sig_pvt)->proceeding + && ((struct sig_pri_chan *) p->sig_pvt)->call_level < SIG_PRI_CALL_LEVEL_PROCEEDING && p->pri && (p->pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING)) { /* absorb event */ @@ -8931,7 +8931,7 @@ || f->frametype == AST_FRAME_DTMF_END) { #ifdef HAVE_PRI if (dahdi_sig_pri_lib_handles(p->sig) - && !((struct sig_pri_chan *) p->sig_pvt)->proceeding + && ((struct sig_pri_chan *) p->sig_pvt)->call_level < SIG_PRI_CALL_LEVEL_PROCEEDING && p->pri && ((!p->outgoing && (p->pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING)) || (p->outgoing && (p->pri->overlapdial & DAHDI_OVERLAPDIAL_OUTGOING)))) { Index: channels/sig_pri.c =================================================================== --- channels/sig_pri.c (revision 300158) +++ channels/sig_pri.c (working copy) @@ -1186,12 +1186,8 @@ new_chan->waiting_for_aoce = old_chan->waiting_for_aoce; new_chan->holding_aoce = old_chan->holding_aoce; #endif /* defined(HAVE_PRI_AOC_EVENTS) */ - new_chan->alerting = old_chan->alerting; new_chan->alreadyhungup = old_chan->alreadyhungup; new_chan->isidlecall = old_chan->isidlecall; - new_chan->proceeding = old_chan->proceeding; - new_chan->progress = old_chan->progress; - new_chan->setup_ack = old_chan->setup_ack; new_chan->outgoing = old_chan->outgoing; new_chan->digital = old_chan->digital; #if defined(HAVE_PRI_CALL_WAITING) @@ -1203,12 +1199,8 @@ old_chan->waiting_for_aoce = 0; old_chan->holding_aoce = 0; #endif /* defined(HAVE_PRI_AOC_EVENTS) */ - old_chan->alerting = 0; old_chan->alreadyhungup = 0; old_chan->isidlecall = 0; - old_chan->proceeding = 0; - old_chan->progress = 0; - old_chan->setup_ack = 0; old_chan->outgoing = 0; old_chan->digital = 0; #if defined(HAVE_PRI_CALL_WAITING) @@ -1216,6 +1208,8 @@ #endif /* defined(HAVE_PRI_CALL_WAITING) */ /* More stuff to transfer to the new channel. */ + new_chan->call_level = old_chan->call_level; + old_chan->call_level = SIG_PRI_CALL_LEVEL_IDLE; #if defined(HAVE_PRI_REVERSE_CHARGE) new_chan->reverse_charging_indication = old_chan->reverse_charging_indication; #endif /* defined(HAVE_PRI_REVERSE_CHARGE) */ @@ -1591,7 +1585,9 @@ if (p->pri->pri) { if (!pri_grab(p, p->pri)) { pri_proceeding(p->pri->pri, p->call, PVT_TO_CHANNEL(p), 0); - p->proceeding = 1; + if (p->call_level < SIG_PRI_CALL_LEVEL_PROCEEDING) { + p->call_level = SIG_PRI_CALL_LEVEL_PROCEEDING; + } pri_rel(p->pri); } else { ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->pri->span); @@ -4786,13 +4782,14 @@ /* Setup law */ if (e->ring.complete || !(pri->overlapdial & DAHDI_OVERLAPDIAL_INCOMING)) { /* Just announce proceeding */ - pri->pvts[chanpos]->proceeding = 1; pri_proceeding(pri->pri, e->ring.call, PVT_TO_CHANNEL(pri->pvts[chanpos]), 0); + pri->pvts[chanpos]->call_level = SIG_PRI_CALL_LEVEL_PROCEEDING; + } else if (pri->switchtype == PRI_SWITCH_GR303_TMC) { + pri_answer(pri->pri, e->ring.call, PVT_TO_CHANNEL(pri->pvts[chanpos]), 1); + pri->pvts[chanpos]->call_level = SIG_PRI_CALL_LEVEL_CONNECT; } else { - if (pri->switchtype != PRI_SWITCH_GR303_TMC) - pri_need_more_info(pri->pri, e->ring.call, PVT_TO_CHANNEL(pri->pvts[chanpos]), 1); - else - pri_answer(pri->pri, e->ring.call, PVT_TO_CHANNEL(pri->pvts[chanpos]), 1); + pri_need_more_info(pri->pri, e->ring.call, PVT_TO_CHANNEL(pri->pvts[chanpos]), 1); + pri->pvts[chanpos]->call_level = SIG_PRI_CALL_LEVEL_OVERLAP; } /* Start PBX */ @@ -5034,7 +5031,9 @@ sig_pri_cc_generic_check(pri, chanpos, AST_CC_CCNR); sig_pri_set_echocanceller(pri->pvts[chanpos], 1); pri_queue_control(pri, chanpos, AST_CONTROL_RINGING); - pri->pvts[chanpos]->alerting = 1; + if (pri->pvts[chanpos]->call_level < SIG_PRI_CALL_LEVEL_ALERTING) { + pri->pvts[chanpos]->call_level = SIG_PRI_CALL_LEVEL_ALERTING; + } if ( #ifdef PRI_PROGRESS_MASK @@ -5091,8 +5090,7 @@ } } - if (!pri->pvts[chanpos]->progress - && !pri->pvts[chanpos]->no_b_channel + if (!pri->pvts[chanpos]->no_b_channel #ifdef PRI_PROGRESS_MASK && (e->proceeding.progressmask & PRI_PROG_INBAND_AVAILABLE) #else @@ -5103,7 +5101,6 @@ ast_debug(1, "Queuing frame from PRI_EVENT_PROGRESS on channel %d/%d span %d\n", pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset,pri->span); pri_queue_control(pri, chanpos, AST_CONTROL_PROGRESS); - pri->pvts[chanpos]->progress = 1; sig_pri_set_dialing(pri->pvts[chanpos], 0); sig_pri_open_media(pri->pvts[chanpos]); } @@ -5121,14 +5118,13 @@ sig_pri_lock_private(pri->pvts[chanpos]); sig_pri_handle_subcmds(pri, chanpos, e->e, e->proceeding.channel, e->proceeding.subcmds, e->proceeding.call); - if (!pri->pvts[chanpos]->proceeding) { + if (pri->pvts[chanpos]->call_level < SIG_PRI_CALL_LEVEL_PROCEEDING) { + pri->pvts[chanpos]->call_level = SIG_PRI_CALL_LEVEL_PROCEEDING; ast_debug(1, "Queuing frame from PRI_EVENT_PROCEEDING on channel %d/%d span %d\n", pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset,pri->span); pri_queue_control(pri, chanpos, AST_CONTROL_PROCEEDING); - pri->pvts[chanpos]->proceeding = 1; } - if (!pri->pvts[chanpos]->progress - && !pri->pvts[chanpos]->no_b_channel + if (!pri->pvts[chanpos]->no_b_channel #ifdef PRI_PROGRESS_MASK && (e->proceeding.progressmask & PRI_PROG_INBAND_AVAILABLE) #else @@ -5137,7 +5133,6 @@ ) { /* Bring voice path up */ pri_queue_control(pri, chanpos, AST_CONTROL_PROGRESS); - pri->pvts[chanpos]->progress = 1; sig_pri_set_dialing(pri->pvts[chanpos], 0); sig_pri_open_media(pri->pvts[chanpos]); } @@ -5260,7 +5255,9 @@ #endif /* defined(HAVE_PRI_CALL_WAITING) */ sig_pri_handle_subcmds(pri, chanpos, e->e, e->answer.channel, e->answer.subcmds, e->answer.call); - pri->pvts[chanpos]->proceeding = 1; + if (pri->pvts[chanpos]->call_level < SIG_PRI_CALL_LEVEL_CONNECT) { + pri->pvts[chanpos]->call_level = SIG_PRI_CALL_LEVEL_CONNECT; + } sig_pri_open_media(pri->pvts[chanpos]); pri_queue_control(pri, chanpos, AST_CONTROL_ANSWER); /* Enable echo cancellation if it's not on already */ @@ -5683,16 +5680,33 @@ } else { chanpos = pri_fixup_principle(pri, chanpos, e->setup_ack.call); if (chanpos > -1) { + unsigned int len; + sig_pri_lock_private(pri->pvts[chanpos]); sig_pri_handle_subcmds(pri, chanpos, e->e, e->setup_ack.channel, e->setup_ack.subcmds, e->setup_ack.call); - pri->pvts[chanpos]->setup_ack = 1; + if (pri->pvts[chanpos]->call_level < SIG_PRI_CALL_LEVEL_OVERLAP) { + pri->pvts[chanpos]->call_level = SIG_PRI_CALL_LEVEL_OVERLAP; + } + /* Send any queued digits */ - for (x = 0;x < strlen(pri->pvts[chanpos]->dialdest); x++) { + len = strlen(pri->pvts[chanpos]->dialdest); + for (x = 0; x < len; ++x) { ast_debug(1, "Sending pending digit '%c'\n", pri->pvts[chanpos]->dialdest[x]); pri_information(pri->pri, pri->pvts[chanpos]->call, pri->pvts[chanpos]->dialdest[x]); } + + if ((pri->overlapdial & DAHDI_OVERLAPDIAL_OUTGOING) + && !pri->pvts[chanpos]->no_b_channel) { + /* + * Call has a channel. + * Indicate for overlap dialing that dialtone may be present. + */ + pri_queue_control(pri, chanpos, AST_CONTROL_PROGRESS); + sig_pri_set_dialing(pri->pvts[chanpos], 0); + sig_pri_open_media(pri->pvts[chanpos]); + } sig_pri_unlock_private(pri->pvts[chanpos]); } else ast_log(LOG_WARNING, "Unable to move channel %d!\n", e->setup_ack.channel); @@ -5823,10 +5837,7 @@ ast_atomic_fetchadd_int(&p->pri->num_call_waiting_calls, -1); } #endif /* defined(HAVE_PRI_CALL_WAITING) */ - p->proceeding = 0; - p->progress = 0; - p->alerting = 0; - p->setup_ack = 0; + p->call_level = SIG_PRI_CALL_LEVEL_IDLE; p->cid_num[0] = '\0'; p->cid_subaddr[0] = '\0'; p->cid_name[0] = '\0'; @@ -6406,6 +6417,7 @@ pri_sr_free(sr); return -1; } + p->call_level = SIG_PRI_CALL_LEVEL_SETUP; pri_sr_free(sr); ast_setstate(ast, AST_STATE_DIALING); sig_pri_set_dialing(p, 1); @@ -6423,11 +6435,15 @@ chan->hangupcause = AST_CAUSE_USER_BUSY; chan->_softhangup |= AST_SOFTHANGUP_DEV; res = 0; - } else if (!p->progress && p->pri && !p->outgoing) { - if (p->pri->pri) { + break; + } + res = sig_pri_play_tone(p, SIG_PRI_TONE_BUSY); + if (p->call_level < SIG_PRI_CALL_LEVEL_ALERTING && !p->outgoing) { + chan->hangupcause = AST_CAUSE_USER_BUSY; + if (p->pri && p->pri->pri) { if (!pri_grab(p, p->pri)) { #ifdef HAVE_PRI_PROG_W_CAUSE - pri_progress_with_cause(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1, PRI_CAUSE_USER_BUSY); /* cause = 17 */ + pri_progress_with_cause(p->pri->pri, p->call, PVT_TO_CHANNEL(p), 1, chan->hangupcause); #else pri_progress(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1); #endif @@ -6436,13 +6452,12 @@ ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->pri->span); } } - p->progress = 1; - res = sig_pri_play_tone(p, SIG_PRI_TONE_BUSY); } break; case AST_CONTROL_RINGING: - if ((!p->alerting) && p->pri && !p->outgoing && (chan->_state != AST_STATE_UP)) { - if (p->pri->pri) { + if (p->call_level < SIG_PRI_CALL_LEVEL_ALERTING && !p->outgoing) { + p->call_level = SIG_PRI_CALL_LEVEL_ALERTING; + if (p->pri && p->pri->pri) { if (!pri_grab(p, p->pri)) { pri_acknowledge(p->pri->pri,p->call, PVT_TO_CHANNEL(p), p->no_b_channel || p->digital ? 0 : 1); @@ -6451,7 +6466,6 @@ ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->pri->span); } } - p->alerting = 1; } res = sig_pri_play_tone(p, SIG_PRI_TONE_RINGTONE); if (chan->_state != AST_STATE_UP) { @@ -6461,12 +6475,12 @@ break; case AST_CONTROL_PROCEEDING: ast_debug(1,"Received AST_CONTROL_PROCEEDING on %s\n",chan->name); - if (!p->proceeding && p->pri && !p->outgoing) { - if (p->pri->pri) { + if (p->call_level < SIG_PRI_CALL_LEVEL_PROCEEDING && !p->outgoing) { + p->call_level = SIG_PRI_CALL_LEVEL_PROCEEDING; + if (p->pri && p->pri->pri) { if (!pri_grab(p, p->pri)) { pri_proceeding(p->pri->pri,p->call, PVT_TO_CHANNEL(p), p->no_b_channel || p->digital ? 0 : 1); - p->proceeding = 1; if (!p->no_b_channel && !p->digital) { sig_pri_set_dialing(p, 0); } @@ -6482,8 +6496,8 @@ case AST_CONTROL_PROGRESS: ast_debug(1,"Received AST_CONTROL_PROGRESS on %s\n",chan->name); sig_pri_set_digital(p, 0); /* Digital-only calls isn't allowing any inband progress messages */ - if (!p->progress && !p->alerting && p->pri && !p->outgoing && !p->no_b_channel) { - if (p->pri->pri) { + if (p->call_level < SIG_PRI_CALL_LEVEL_ALERTING && !p->outgoing && !p->no_b_channel) { + if (p->pri && p->pri->pri) { if (!pri_grab(p, p->pri)) { #ifdef HAVE_PRI_PROG_W_CAUSE pri_progress_with_cause(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1, -1); /* no cause at all */ @@ -6495,22 +6509,44 @@ ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->pri->span); } } - p->progress = 1; } /* don't continue in ast_indicate */ res = 0; break; case AST_CONTROL_CONGESTION: - chan->hangupcause = AST_CAUSE_CONGESTION; if (p->priindication_oob || p->no_b_channel) { - chan->hangupcause = AST_CAUSE_SWITCH_CONGESTION; + /* There are many cause codes that generate an AST_CONTROL_CONGESTION. */ + switch (chan->hangupcause) { + case AST_CAUSE_USER_BUSY: + case AST_CAUSE_NORMAL_CLEARING: + case 0:/* Cause has not been set. */ + /* Supply a more appropriate cause. */ + chan->hangupcause = AST_CAUSE_SWITCH_CONGESTION; + break; + default: + break; + } chan->_softhangup |= AST_SOFTHANGUP_DEV; res = 0; - } else if (!p->progress && p->pri && !p->outgoing) { - if (p->pri->pri) { + break; + } + res = sig_pri_play_tone(p, SIG_PRI_TONE_CONGESTION); + if (p->call_level < SIG_PRI_CALL_LEVEL_ALERTING && !p->outgoing) { + /* There are many cause codes that generate an AST_CONTROL_CONGESTION. */ + switch (chan->hangupcause) { + case AST_CAUSE_USER_BUSY: + case AST_CAUSE_NORMAL_CLEARING: + case 0:/* Cause has not been set. */ + /* Supply a more appropriate cause. */ + chan->hangupcause = AST_CAUSE_SWITCH_CONGESTION; + break; + default: + break; + } + if (p->pri && p->pri->pri) { if (!pri_grab(p, p->pri)) { #ifdef HAVE_PRI_PROG_W_CAUSE - pri_progress_with_cause(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1, PRI_CAUSE_SWITCH_CONGESTION); /* cause = 42 */ + pri_progress_with_cause(p->pri->pri, p->call, PVT_TO_CHANNEL(p), 1, chan->hangupcause); #else pri_progress(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1); #endif @@ -6519,8 +6555,6 @@ ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->pri->span); } } - p->progress = 1; - res = sig_pri_play_tone(p, SIG_PRI_TONE_CONGESTION); } break; case AST_CONTROL_HOLD: @@ -6638,7 +6672,9 @@ p->aoc_s_request_invoke_id_valid = 0; } #endif /* defined(HAVE_PRI_AOC_EVENTS) */ - p->proceeding = 1; + if (p->call_level < SIG_PRI_CALL_LEVEL_CONNECT) { + p->call_level = SIG_PRI_CALL_LEVEL_CONNECT; + } sig_pri_set_dialing(p, 0); sig_pri_open_media(p); res = pri_answer(p->pri->pri, p->call, 0, !p->digital); @@ -6767,22 +6803,37 @@ * functions should handle it normally (generate inband DTMF) */ int sig_pri_digit_begin(struct sig_pri_chan *pvt, struct ast_channel *ast, char digit) { - if ((ast->_state == AST_STATE_DIALING) && !pvt->proceeding) { - if (pvt->setup_ack) { + if (ast->_state == AST_STATE_DIALING) { + if (pvt->call_level < SIG_PRI_CALL_LEVEL_OVERLAP) { + unsigned int len; + + len = strlen(pvt->dialdest); + if (len < sizeof(pvt->dialdest) - 1) { + ast_debug(1, "Queueing digit '%c' since setup_ack not yet received\n", + digit); + pvt->dialdest[len++] = digit; + pvt->dialdest[len] = '\0'; + } else { + ast_log(LOG_ERROR, + "Span %d: Deferred digit buffer overflow for digit '%c'.\n", + pvt->pri->span, digit); + } + return 0; + } + if (pvt->call_level < SIG_PRI_CALL_LEVEL_PROCEEDING) { if (!pri_grab(pvt, pvt->pri)) { pri_information(pvt->pri->pri, pvt->call, digit); pri_rel(pvt->pri); } else { ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", pvt->pri->span); } - } else if (strlen(pvt->dialdest) < sizeof(pvt->dialdest) - 1) { - int res; - ast_debug(1, "Queueing digit '%c' since setup_ack not yet received\n", digit); - res = strlen(pvt->dialdest); - pvt->dialdest[res++] = digit; - pvt->dialdest[res] = '\0'; + return 0; } - return 0; + if (pvt->call_level < SIG_PRI_CALL_LEVEL_CONNECT) { + ast_log(LOG_WARNING, + "Span %d: Digit '%c' may be ignored by peer. (Call level:%d)\n", + pvt->pri->span, digit, pvt->call_level); + } } return 1; }