diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-04-25 19:55:12 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-04-25 19:55:12 +0000 |
| commit | d2ac624b877d3a4f9c47dfa85dba58f791582565 (patch) | |
| tree | 93936fd717c3a1941ec8487d29330670b52bf1e9 /channels/sig_pri.h | |
| parent | 04ddb5714fbddc64b8a81f3418e12ae371807527 (diff) | |
Clear ISDN channel resetting state if the peer continues to use it.
Some ISDN switches occasionally fail to send a RESTART ACKNOWLEDGE in
response to a RESTART request.
* Made the second SETUP received after sending a RESTART request clear the
channel resetting state as if the peer had sent the expected RESTART
ACKNOWLEDGE before continuing to process the SETUP. The peer may not be
sending the expected RESTART ACKNOWLEDGE.
(issue ASTERISK-19608)
(issue AST-844)
(issue AST-815)
Patches:
jira_ast_815_v1.8.patch (license #5621) patch uploaded by rmudgett (modified)
........
Merged revisions 363687 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 363688 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@363689 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sig_pri.h')
| -rw-r--r-- | channels/sig_pri.h | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/channels/sig_pri.h b/channels/sig_pri.h index 7a48d824a..6c1ca2aa3 100644 --- a/channels/sig_pri.h +++ b/channels/sig_pri.h @@ -150,6 +150,27 @@ enum sig_pri_call_level { SIG_PRI_CALL_LEVEL_CONNECT, }; +enum sig_pri_reset_state { + /*! \brief The channel is not being RESTARTed. */ + SIG_PRI_RESET_IDLE, + /*! + * \brief The channel is being RESTARTed. + * \note Waiting for a RESTART ACKNOWLEDGE from the peer. + */ + SIG_PRI_RESET_ACTIVE, + /*! + * \brief Peer may not be sending the expected RESTART ACKNOWLEDGE. + * + * \details We have already received a SETUP on this channel. + * If another SETUP comes in on this channel then the peer + * considers this channel useable. Assume that the peer is + * never going to give us a RESTART ACKNOWLEDGE and assume that + * we have received one. This is not according to Q.931, but + * some peers occasionally fail to send a RESTART ACKNOWLEDGE. + */ + SIG_PRI_RESET_NO_ACK, +}; + struct sig_pri_span; struct sig_pri_callback { @@ -299,7 +320,6 @@ struct sig_pri_chan { 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 progress:1; /*!< TRUE if the call has seen inband-information progress through the network */ - unsigned int resetting:1; /*!< TRUE if this channel is being reset/restarted */ /*! * \brief TRUE when this channel is allocated. @@ -328,6 +348,8 @@ struct sig_pri_chan { /*! Call establishment life cycle level for simple comparisons. */ enum sig_pri_call_level call_level; + /*! \brief Channel reset/restart state. */ + enum sig_pri_reset_state resetting; int prioffset; /*!< channel number in span */ int logicalspan; /*!< logical span number within trunk group */ int mastertrunkgroup; /*!< what trunk group is our master */ |