Remove ISDN hold restriction for non-bridged calls.

The check if an ISDN call is bridged before it could be placed on hold is
not necessary and is overly restrictive.  The check was originally done to
prevent problems with call transfers in case a user tried to transfer a
call connected to an application to another call connected to an
application.  The ISDN transfer code has not required this restriction for
quite some time because ECT could transfer any two active calls to each
other.

* Remove ISDN hold restriction for calls connected to applications.

* Made ast_waitfordigit_full() ignore AST_CONTROL_HOLD and
AST_CONTROL_UNHOLD instead of generating a warning message.

(closes issue ASTERISK-19388)
Reported by: Birger Harzenetter
Tested by: rmudgett

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@357894 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/sig_pri.c b/channels/sig_pri.c
index 3cbca5bc4f47a1b025f7a5e2f8b4b26853e3f921..e3080212d75abc8afc3618ade3609934e021e088 100644 (file)
--- a/channels/sig_pri.c
+++ b/channels/sig_pri.c
@@ -4435,7 +4435,6 @@ static int sig_pri_handle_hold(struct sig_pri_span *pri, pri_event *ev)
        int retval;
        int chanpos_old;
        int chanpos_new;
-       struct ast_channel *bridged;
        struct ast_channel *owner;
 
        chanpos_old = pri_find_principle_by_call(pri, ev->hold.call);
@@ -4456,9 +4455,11 @@ static int sig_pri_handle_hold(struct sig_pri_span *pri, pri_event *ev)
        if (!owner) {
                goto done_with_private;
        }
-       bridged = ast_bridged_channel(owner);
-       if (!bridged) {
-               /* Cannot hold a call that is not bridged. */
+       if (pri->pvts[chanpos_old]->call_level != SIG_PRI_CALL_LEVEL_CONNECT) {
+               /*
+                * Make things simple.  Don't allow placing a call on hold that
+                * is not connected.
+                */
                goto done_with_owner;
        }
        chanpos_new = pri_find_empty_nobch(pri);

diff --git a/main/channel.c b/main/channel.c
index 173dfc642329f65022afb7445ca7e81dc382e25f..c9d741b16d8f526833439c17f03b10feccc89178 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -3578,6 +3578,8 @@ int ast_waitfordigit_full(struct ast_channel *c, int ms, int audiofd, int cmdfd)
                                case AST_CONTROL_CONNECTED_LINE:
                                case AST_CONTROL_REDIRECTING:
                                case AST_CONTROL_UPDATE_RTP_PEER:
+                               case AST_CONTROL_HOLD:
+                               case AST_CONTROL_UNHOLD:
                                case -1:
                                        /* Unimportant */
                                        break;