Adds immediate yes/no option to iax.conf

This is very similar to the DAHDI immediate=yes option.  When the phone is picked up, instead of giving a dialtone it connects directly to the "s" extension.  Changes where implemented in chan_iax2.c to directly connect to the "s" extension in the appropriate context when this option is enabled.  Examples explaining its use are added to iax2.conf.sample.  CHANGES has been updated as well.

(closes issue #14266)
Reported by: jcovert
Patches:
      chan_iax2.c.patch-trunk uploaded by jcovert (license 551)
      iax.conf.sample.patch uploaded by jcovert (license 551)
Tested by: jcovert, dvossel
Review: http://reviewboard.digium.com/r/143/

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

diff --git a/CHANGES b/CHANGES
index cb8b7e5..79934f8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -545,6 +545,7 @@ IAX2 changes
   * Added the srvlookup option to iax.conf
   * Added support for OSP.  The token is set and retrieved through the CHANNEL()
      dialplan function.
+  * Added immediate option to iax.conf
 
 XMPP Google Talk/Jingle changes
 -------------------------------

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index f263dcc..3e28f86 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -369,13 +369,14 @@ enum iax2_flags {
        IAX_FORCEJITTERBUF =    (1 << 20),      /*!< Force jitterbuffer, even when bridged to a channel that can take jitter */ 
        IAX_RTIGNOREREGEXPIRE = (1 << 21),      /*!< When using realtime, ignore registration expiration */
        IAX_TRUNKTIMESTAMPS =   (1 << 22),      /*!< Send trunk timestamps */
-       IAX_TRANSFERMEDIA =     (1 << 23),      /*!< When doing IAX2 transfers, transfer media only */
+       IAX_TRANSFERMEDIA =     (1 << 23),      /*!< When doing IAX2 transfers, transfer media only */
        IAX_MAXAUTHREQ =        (1 << 24),      /*!< Maximum outstanding AUTHREQ restriction is in place */
        IAX_DELAYPBXSTART =     (1 << 25),      /*!< Don't start a PBX on the channel until the peer sends us a
                                                     response, so that we've achieved a three-way handshake with
                                                     them before sending voice or anything else*/
-       IAX_ALLOWFWDOWNLOAD = (1 << 26),        /*!< Allow the FWDOWNL command? */
-       IAX_NOKEYROTATE = (1 << 27), /*!< Disable key rotation with encryption */
+       IAX_ALLOWFWDOWNLOAD =   (1 << 26),      /*!< Allow the FWDOWNL command? */
+       IAX_NOKEYROTATE =       (1 << 27),      /*!< Disable key rotation with encryption */
+       IAX_IMMEDIATE =         (1 << 28),      /*!< Allow immediate off-hook to extension s */
 };
 
 static int global_rtautoclear = 120;
@@ -6221,6 +6222,7 @@ static int check_access(int callno, struct sockaddr_in *sin, struct iax_ies *ies
                        ast_set_flag(iaxs[callno], IAX_MAXAUTHREQ);
                iaxs[callno]->prefs = user->prefs;
                ast_copy_flags(iaxs[callno], user, IAX_CODEC_USER_FIRST);
+               ast_copy_flags(iaxs[callno], user, IAX_IMMEDIATE);
                ast_copy_flags(iaxs[callno], user, IAX_CODEC_NOPREFS);
                ast_copy_flags(iaxs[callno], user, IAX_CODEC_NOCAP);
                ast_copy_flags(iaxs[callno], user, IAX_NOKEYROTATE);
@@ -9465,11 +9467,15 @@ retryowner2:
                                                        ast_set_flag(&iaxs[fr->callno]->state, IAX_STATE_TBD);
                                                        /* If this is a TBD call, we're ready but now what...  */
                                                        ast_verb(3, "Accepted AUTHENTICATED TBD call from %s\n", ast_inet_ntoa(sin.sin_addr));
+                                                       if (ast_test_flag(iaxs[fr->callno], IAX_IMMEDIATE)) {
+                                                               goto immediatedial;
+                                                       }
                                                }
                                        }
                                }
                                break;
                        case IAX_COMMAND_DIAL:
+immediatedial:
                                if (ast_test_flag(&iaxs[fr->callno]->state, IAX_STATE_TBD)) {
                                        ast_clear_flag(&iaxs[fr->callno]->state, IAX_STATE_TBD);
                                        ast_string_field_set(iaxs[fr->callno], exten, ies.called_number ? ies.called_number : "s");
@@ -10984,6 +10990,8 @@ static struct iax2_user *build_user(const char *name, struct ast_variable *v, st
                                        ast_set_flag(user, IAX_CODEC_NOCAP);
                                        ast_set_flag(user, IAX_CODEC_NOPREFS);
                                }
+                       } else if (!strcasecmp(v->name, "immediate")) {
+                               ast_set2_flag(user, ast_true(v->value), IAX_IMMEDIATE);
                        } else if (!strcasecmp(v->name, "jitterbuffer")) {
                                ast_set2_flag(user, ast_true(v->value), IAX_USEJITTERBUF);
                        } else if (!strcasecmp(v->name, "forcejitterbuffer")) {

diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index 4bfabe3..17f333f 100644 (file)
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -469,3 +469,15 @@ host=216.207.245.47
 ;context=default
 ;permit=0.0.0.0/0.0.0.0
 
+;
+; With immediate=yes, an IAX phone or a phone on an IAXy acts as a hot-line
+; which goes immediately to the s extension when picked up.  Useful for
+; elevator phones, manual service, or other similar applications.
+;
+;[manual]
+;type=friend
+;host=dynamic
+;immediate=yes  ; go immediately to s extension when picked up
+;secret=moofoo ; when immediate=yes is specified, secret is required
+;context=number-please ; we start at the s extension in this context
+;