include "logger.h" and errno.h from asterisk.h - usage shows that they
[asterisk/asterisk.git] / apps / app_dial.c
index d9b068d..dfaa682 100644 (file)
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
-#include <stdlib.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <sys/stat.h>
@@ -42,7 +36,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/lock.h"
 #include "asterisk/file.h"
-#include "asterisk/logger.h"
 #include "asterisk/channel.h"
 #include "asterisk/pbx.h"
 #include "asterisk/options.h"
@@ -66,7 +59,7 @@ static char *app = "Dial";
 static char *synopsis = "Place a call and connect to the current channel";
 
 static char *descrip =
-"  Dial(Technology/resource[&Tech2/resource2...][|timeout][|options][|URL]):\n"
+"  Dial(Technology/resource[&Tech2/resource2...][,timeout][,options][,URL]):\n"
 "This application will place calls to one or more specified channels. As soon\n"
 "as one of the requested channels answers, the originating channel will be\n"
 "answered, if it has not already been answered. These two channels will then\n"
@@ -109,7 +102,8 @@ static char *descrip =
 "           party has answered, but before the call gets bridged. The 'called'\n"
 "           DTMF string is sent to the called party, and the 'calling' DTMF\n"
 "           string is sent to the calling party. Both parameters can be used\n"
-"           alone.\n"          
+"           alone.\n"
+"    e    - execute the 'h' extension for peer after the call ends\n"
 "    f    - Force the callerid of the *calling* channel to be set as the\n"
 "           extension associated with the channel using a dialplan 'hint'.\n"
 "           For example, some PSTNs do not allow CallerID to be set to anything\n"
@@ -214,7 +208,7 @@ static char *descrip =
 static char *rapp = "RetryDial";
 static char *rsynopsis = "Place a call, retrying on failure allowing optional exit extension.";
 static char *rdescrip =
-"  RetryDial(announce|sleep|retries|dialargs): This application will attempt to\n"
+"  RetryDial(announce,sleep,retries,dialargs): This application will attempt to\n"
 "place a call using the normal Dial application. If no channel can be reached,\n"
 "the 'announce' file will be played. Then, it will wait 'sleep' number of\n"
 "seconds before retying the call. After 'retires' number of attempts, the\n"
@@ -256,10 +250,11 @@ enum {
        OPT_IGNORE_FORWARDING = (1 << 27),
        OPT_CALLEE_GOSUB =      (1 << 28),
        OPT_CANCEL_ELSEWHERE =  (1 << 29),
+       OPT_PEER_H =            (1 << 30),
 };
 
-#define DIAL_STILLGOING                        (1 << 30)
-#define DIAL_NOFORWARDHTML             (1 << 31)
+#define DIAL_STILLGOING                        (1 << 31)
+#define DIAL_NOFORWARDHTML             ((uint64_t)1 << 32) /* flags are now 64 bits, so keep it up! */
 
 enum {
        OPT_ARG_ANNOUNCE = 0,
@@ -276,12 +271,13 @@ enum {
        OPT_ARG_ARRAY_SIZE,
 };
 
-AST_APP_OPTIONS(dial_exec_options, {
+AST_APP_OPTIONS(dial_exec_options, BEGIN_OPTIONS
        AST_APP_OPTION_ARG('A', OPT_ANNOUNCE, OPT_ARG_ANNOUNCE),
        AST_APP_OPTION('C', OPT_RESETCDR),
        AST_APP_OPTION('c', OPT_CANCEL_ELSEWHERE),
        AST_APP_OPTION('d', OPT_DTMF_EXIT),
        AST_APP_OPTION_ARG('D', OPT_SENDDTMF, OPT_ARG_SENDDTMF),
+       AST_APP_OPTION('e', OPT_PEER_H),
        AST_APP_OPTION('f', OPT_FORCECLID),
        AST_APP_OPTION('g', OPT_GO_ON),
        AST_APP_OPTION_ARG('G', OPT_GOTO, OPT_ARG_GOTO),
@@ -290,13 +286,15 @@ AST_APP_OPTIONS(dial_exec_options, {
        AST_APP_OPTION('i', OPT_IGNORE_FORWARDING),
        AST_APP_OPTION('k', OPT_CALLEE_PARK),
        AST_APP_OPTION('K', OPT_CALLER_PARK),
+       AST_APP_OPTION('k', OPT_CALLEE_PARK),
+       AST_APP_OPTION('K', OPT_CALLER_PARK),
        AST_APP_OPTION_ARG('L', OPT_DURATION_LIMIT, OPT_ARG_DURATION_LIMIT),
        AST_APP_OPTION_ARG('m', OPT_MUSICBACK, OPT_ARG_MUSICBACK),
        AST_APP_OPTION_ARG('M', OPT_CALLEE_MACRO, OPT_ARG_CALLEE_MACRO),
        AST_APP_OPTION('n', OPT_SCREEN_NOINTRO),
        AST_APP_OPTION('N', OPT_SCREEN_NOCLID),
-       AST_APP_OPTION_ARG('O', OPT_OPERMODE,OPT_ARG_OPERMODE),
        AST_APP_OPTION('o', OPT_ORIGINAL_CLID),
+       AST_APP_OPTION_ARG('O', OPT_OPERMODE,OPT_ARG_OPERMODE),
        AST_APP_OPTION('p', OPT_SCREENING),
        AST_APP_OPTION_ARG('P', OPT_PRIVACY, OPT_ARG_PRIVACY),
        AST_APP_OPTION('r', OPT_RINGBACK),
@@ -306,7 +304,11 @@ AST_APP_OPTIONS(dial_exec_options, {
        AST_APP_OPTION_ARG('U', OPT_CALLEE_GOSUB, OPT_ARG_CALLEE_GOSUB),
        AST_APP_OPTION('w', OPT_CALLEE_MONITOR),
        AST_APP_OPTION('W', OPT_CALLER_MONITOR),
-});
+END_OPTIONS );
+
+#define CAN_EARLY_BRIDGE(flags) (!ast_test_flag64(flags, OPT_CALLEE_HANGUP | \
+       OPT_CALLER_HANGUP | OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER | \
+       OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR | OPT_CALLEE_PARK | OPT_CALLER_PARK))
 
 /*
  * The list of active channels
@@ -314,7 +316,7 @@ AST_APP_OPTIONS(dial_exec_options, {
 struct chanlist {
        struct chanlist *next;
        struct ast_channel *chan;
-       unsigned int flags;
+       uint64_t flags;
        int forwards;
 };
 
@@ -448,7 +450,7 @@ static void senddialendevent(const struct ast_channel *src, const char *dialstat
  * the outgoing channel without properly deleting it.
  */
 static void do_forward(struct chanlist *o,
-       struct cause_args *num, struct ast_flags *peerflags, int single)
+       struct cause_args *num, struct ast_flags64 *peerflags, int single)
 {
        char tmpchan[256];
        struct ast_channel *original = o->chan;
@@ -471,12 +473,10 @@ static void do_forward(struct chanlist *o,
        /* Before processing channel, go ahead and check for forwarding */
        o->forwards++;
        if (o->forwards < AST_MAX_FORWARDS) {
-               if (option_verbose > 2)
-                       ast_verbose(VERBOSE_PREFIX_3 "Now forwarding %s to '%s/%s' (thanks to %s)\n", in->name, tech, stuff, c->name);
+               ast_verb(3, "Now forwarding %s to '%s/%s' (thanks to %s)\n", in->name, tech, stuff, c->name);
                /* If we have been told to ignore forwards, just set this channel to null and continue processing extensions normally */
-               if (ast_test_flag(peerflags, OPT_IGNORE_FORWARDING)) {
-                       if (option_verbose > 2)
-                               ast_verbose(VERBOSE_PREFIX_3 "Forwarding %s to '%s/%s' prevented.\n", in->name, tech, stuff);
+               if (ast_test_flag64(peerflags, OPT_IGNORE_FORWARDING)) {
+                       ast_verb(3, "Forwarding %s to '%s/%s' prevented.\n", in->name, tech, stuff);
                        c = o->chan = NULL;
                        cause = AST_CAUSE_BUSY;
                } else {
@@ -490,20 +490,19 @@ static void do_forward(struct chanlist *o,
                                ast_log(LOG_NOTICE, "Unable to create local channel for call forward to '%s/%s' (cause = %d)\n", tech, stuff, cause);
                }
        } else {
-               if (option_verbose > 2)
-                       ast_verbose(VERBOSE_PREFIX_3 "Too many forwards from %s\n", c->name);
+               ast_verb(3, "Too many forwards from %s\n", c->name);
                cause = AST_CAUSE_CONGESTION;
                c = o->chan = NULL;
        }
        if (!c) {
-               ast_clear_flag(o, DIAL_STILLGOING);     
+               ast_clear_flag64(o, DIAL_STILLGOING);   
                handle_cause(cause, num);
        } else {
                char *new_cid_num, *new_cid_name;
                struct ast_channel *src;
 
                ast_rtp_make_compatible(c, in, single);
-               if (ast_test_flag(o, OPT_FORCECLID)) {
+               if (ast_test_flag64(o, OPT_FORCECLID)) {
                        new_cid_num = ast_strdup(S_OR(in->macroexten, in->exten));
                        new_cid_name = NULL; /* XXX no name ? */
                        src = c;        /* XXX possible bug in previous code, which used 'winner' ? it may have changed */
@@ -523,14 +522,14 @@ static void do_forward(struct chanlist *o,
                S_REPLACE(c->cid.cid_rdnis, ast_strdup(S_OR(in->macroexten, in->exten)));
                if (ast_call(c, tmpchan, 0)) {
                        ast_log(LOG_NOTICE, "Failed to dial on local channel for call forward to '%s'\n", tmpchan);
-                       ast_clear_flag(o, DIAL_STILLGOING);     
+                       ast_clear_flag64(o, DIAL_STILLGOING);   
                        ast_hangup(original);
                        c = o->chan = NULL;
                        num->nochan++;
                } else {
                        senddialevent(in, c);
                        /* After calling, set callerid to extension */
-                       if (!ast_test_flag(peerflags, OPT_ORIGINAL_CLID)) {
+                       if (!ast_test_flag64(peerflags, OPT_ORIGINAL_CLID)) {
                                char cidname[AST_MAX_EXTENSION] = "";
                                ast_set_callerid(c, S_OR(in->macroexten, in->exten), get_cid_name(cidname, sizeof(cidname), in), NULL);
                        }
@@ -550,7 +549,7 @@ struct privacy_args {
 };
 
 static struct ast_channel *wait_for_answer(struct ast_channel *in,
-       struct chanlist *outgoing, int *to, struct ast_flags *peerflags,
+       struct chanlist *outgoing, int *to, struct ast_flags64 *peerflags,
        struct privacy_args *pa,
        const struct cause_args *num_in, int *result)
 {
@@ -559,7 +558,10 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
        int orig = *to;
        struct ast_channel *peer = NULL;
        /* single is set if only one destination is enabled */
-       int single = outgoing && !outgoing->next && !ast_test_flag(outgoing, OPT_MUSICBACK | OPT_RINGBACK);
+       int single = outgoing && !outgoing->next && !ast_test_flag64(outgoing, OPT_MUSICBACK | OPT_RINGBACK);
+#ifdef HAVE_EPOLL
+       struct chanlist *epollo;
+#endif
        
        if (single) {
                /* Turn off hold music, etc */
@@ -567,7 +569,11 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                /* If we are calling a single channel, make them compatible for in-band tone purpose */
                ast_channel_make_compatible(outgoing->chan, in);
        }
-       
+
+#ifdef HAVE_EPOLL
+       for (epollo = outgoing; epollo; epollo = epollo->next)
+               ast_poll_channel_add(in, epollo->chan);
+#endif 
        
        while (*to && !peer) {
                struct chanlist *o;
@@ -579,14 +585,13 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                watchers[pos++] = in;
                for (o = outgoing; o; o = o->next) {
                        /* Keep track of important channels */
-                       if (ast_test_flag(o, DIAL_STILLGOING) && o->chan)
+                       if (ast_test_flag64(o, DIAL_STILLGOING) && o->chan)
                                watchers[pos++] = o->chan;
                        numlines++;
                }
                if (pos == 1) { /* only the input channel is available */
                        if (numlines == (num.busy + num.congestion + num.nochan)) {
-                               if (option_verbose > 2)
-                                       ast_verbose( VERBOSE_PREFIX_2 "Everyone is busy/congested at this time (%d:%d/%d/%d)\n", numlines, num.busy, num.congestion, num.nochan);
+                               ast_verb(2, "Everyone is busy/congested at this time (%d:%d/%d/%d)\n", numlines, num.busy, num.congestion, num.nochan);
                                if (num.busy)
                                        strcpy(pa->status, "BUSY");     
                                else if (num.congestion)
@@ -594,8 +599,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                                else if (num.nochan)
                                        strcpy(pa->status, "CHANUNAVAIL");
                        } else {
-                               if (option_verbose > 2)
-                                       ast_verbose(VERBOSE_PREFIX_3 "No one is available to answer at this time (%d:%d/%d/%d)\n", numlines, num.busy, num.congestion, num.nochan);
+                               ast_verb(3, "No one is available to answer at this time (%d:%d/%d/%d)\n", numlines, num.busy, num.congestion, num.nochan);
                        }
                        *to = 0;
                        return NULL;
@@ -607,12 +611,11 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
 
                        if (c == NULL)
                                continue;
-                       if (ast_test_flag(o, DIAL_STILLGOING) && c->_state == AST_STATE_UP) {
+                       if (ast_test_flag64(o, DIAL_STILLGOING) && c->_state == AST_STATE_UP) {
                                if (!peer) {
-                                       if (option_verbose > 2)
-                                               ast_verbose(VERBOSE_PREFIX_3 "%s answered %s\n", c->name, in->name);
+                                       ast_verb(3, "%s answered %s\n", c->name, in->name);
                                        peer = c;
-                                       ast_copy_flags(peerflags, o,
+                                       ast_copy_flags64(peerflags, o,
                                                       OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER |
                                                       OPT_CALLEE_HANGUP | OPT_CALLER_HANGUP |
                                                       OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR |
@@ -635,7 +638,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                                in->hangupcause = c->hangupcause;
                                ast_hangup(c);
                                c = o->chan = NULL;
-                               ast_clear_flag(o, DIAL_STILLGOING);
+                               ast_clear_flag64(o, DIAL_STILLGOING);
                                handle_cause(in->hangupcause, &num);
                                continue;
                        }
@@ -644,10 +647,9 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                                case AST_CONTROL_ANSWER:
                                        /* This is our guy if someone answered. */
                                        if (!peer) {
-                                               if (option_verbose > 2)
-                                                       ast_verbose( VERBOSE_PREFIX_3 "%s answered %s\n", c->name, in->name);
+                                               ast_verb(3, "%s answered %s\n", c->name, in->name);
                                                peer = c;
-                                               ast_copy_flags(peerflags, o,
+                                               ast_copy_flags64(peerflags, o,
                                                               OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER |
                                                               OPT_CALLEE_HANGUP | OPT_CALLER_HANGUP |
                                                               OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR |
@@ -655,72 +657,65 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                                                               DIAL_NOFORWARDHTML);
                                                ast_copy_string(c->dialcontext, "", sizeof(c->dialcontext));
                                                ast_copy_string(c->exten, "", sizeof(c->exten));
-                                               /* Setup early bridge if appropriate */
-                                               ast_channel_early_bridge(in, peer);
+                                               if (CAN_EARLY_BRIDGE(peerflags))
+                                                       /* Setup early bridge if appropriate */
+                                                       ast_channel_early_bridge(in, peer);
                                        }
                                        /* If call has been answered, then the eventual hangup is likely to be normal hangup */
                                        in->hangupcause = AST_CAUSE_NORMAL_CLEARING;
                                        c->hangupcause = AST_CAUSE_NORMAL_CLEARING;
                                        break;
                                case AST_CONTROL_BUSY:
-                                       if (option_verbose > 2)
-                                               ast_verbose(VERBOSE_PREFIX_3 "%s is busy\n", c->name);
+                                       ast_verb(3, "%s is busy\n", c->name);
                                        in->hangupcause = c->hangupcause;
                                        ast_hangup(c);
                                        c = o->chan = NULL;
-                                       ast_clear_flag(o, DIAL_STILLGOING);     
+                                       ast_clear_flag64(o, DIAL_STILLGOING);   
                                        handle_cause(AST_CAUSE_BUSY, &num);
                                        break;
                                case AST_CONTROL_CONGESTION:
-                                       if (option_verbose > 2)
-                                               ast_verbose(VERBOSE_PREFIX_3 "%s is circuit-busy\n", c->name);
+                                       ast_verb(3, "%s is circuit-busy\n", c->name);
                                        in->hangupcause = c->hangupcause;
                                        ast_hangup(c);
                                        c = o->chan = NULL;
-                                       ast_clear_flag(o, DIAL_STILLGOING);
+                                       ast_clear_flag64(o, DIAL_STILLGOING);
                                        handle_cause(AST_CAUSE_CONGESTION, &num);
                                        break;
                                case AST_CONTROL_RINGING:
-                                       if (option_verbose > 2)
-                                               ast_verbose(VERBOSE_PREFIX_3 "%s is ringing\n", c->name);
+                                       ast_verb(3, "%s is ringing\n", c->name);
                                        /* Setup early media if appropriate */
-                                       if (single)
+                                       if (single && CAN_EARLY_BRIDGE(peerflags))
                                                ast_channel_early_bridge(in, c);
-                                       if (!(pa->sentringing) && !ast_test_flag(outgoing, OPT_MUSICBACK)) {
+                                       if (!(pa->sentringing) && !ast_test_flag64(outgoing, OPT_MUSICBACK)) {
                                                ast_indicate(in, AST_CONTROL_RINGING);
                                                pa->sentringing++;
                                        }
                                        break;
                                case AST_CONTROL_PROGRESS:
-                                       if (option_verbose > 2)
-                                               ast_verbose (VERBOSE_PREFIX_3 "%s is making progress passing it to %s\n", c->name, in->name);
+                                       ast_verb(3, "%s is making progress passing it to %s\n", c->name, in->name);
                                        /* Setup early media if appropriate */
-                                       if (single)
+                                       if (single && CAN_EARLY_BRIDGE(peerflags))
                                                ast_channel_early_bridge(in, c);
-                                       if (!ast_test_flag(outgoing, OPT_RINGBACK))
+                                       if (!ast_test_flag64(outgoing, OPT_RINGBACK))
                                                ast_indicate(in, AST_CONTROL_PROGRESS);
                                        break;
                                case AST_CONTROL_VIDUPDATE:
-                                       if (option_verbose > 2)
-                                               ast_verbose (VERBOSE_PREFIX_3 "%s requested a video update, passing it to %s\n", c->name, in->name);
+                                       ast_verb(3, "%s requested a video update, passing it to %s\n", c->name, in->name);
                                        ast_indicate(in, AST_CONTROL_VIDUPDATE);
                                        break;
                                case AST_CONTROL_PROCEEDING:
-                                       if (option_verbose > 2)
-                                               ast_verbose (VERBOSE_PREFIX_3 "%s is proceeding passing it to %s\n", c->name, in->name);
-                                       if (single)
+                                       ast_verb(3, "%s is proceeding passing it to %s\n", c->name, in->name);
+                                       if (single && CAN_EARLY_BRIDGE(peerflags))
                                                ast_channel_early_bridge(in, c);
-                                       if (!ast_test_flag(outgoing, OPT_RINGBACK))
+                                       if (!ast_test_flag64(outgoing, OPT_RINGBACK))
                                                ast_indicate(in, AST_CONTROL_PROCEEDING);
                                        break;
                                case AST_CONTROL_HOLD:
-                                       if (option_verbose > 2)
-                                               ast_verbose(VERBOSE_PREFIX_3 "Call on %s placed on hold\n", c->name);
+                                       ast_verb(3, "Call on %s placed on hold\n", c->name);
                                        ast_indicate(in, AST_CONTROL_HOLD);
                                        break;
                                case AST_CONTROL_UNHOLD:
-                                       if (option_verbose > 2)
-                                               ast_verbose(VERBOSE_PREFIX_3 "Call on %s left from hold\n", c->name);
+                                       ast_verb(3, "Call on %s left from hold\n", c->name);
                                        ast_indicate(in, AST_CONTROL_UNHOLD);
                                        break;
                                case AST_CONTROL_OFFHOOK:
@@ -728,9 +723,8 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                                        /* Ignore going off hook and flash */
                                        break;
                                case -1:
-                                       if (!ast_test_flag(outgoing, OPT_RINGBACK | OPT_MUSICBACK)) {
-                                               if (option_verbose > 2)
-                                                       ast_verbose(VERBOSE_PREFIX_3 "%s stopped sounds\n", c->name);
+                                       if (!ast_test_flag64(outgoing, OPT_RINGBACK | OPT_MUSICBACK)) {
+                                               ast_verb(3, "%s stopped sounds\n", c->name);
                                                ast_indicate(in, -1);
                                                pa->sentringing = 0;
                                        }
@@ -740,16 +734,16 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                                }
                        } else if (single) {
                                /* XXX are we sure the logic is correct ? or we should just switch on f->frametype ? */
-                               if (f->frametype == AST_FRAME_VOICE && !ast_test_flag(outgoing, OPT_RINGBACK|OPT_MUSICBACK)) {
+                               if (f->frametype == AST_FRAME_VOICE && !ast_test_flag64(outgoing, OPT_RINGBACK|OPT_MUSICBACK)) {
                                        if (ast_write(in, f)) 
                                                ast_log(LOG_WARNING, "Unable to forward voice frame\n");
-                               } else if (f->frametype == AST_FRAME_IMAGE && !ast_test_flag(outgoing, OPT_RINGBACK|OPT_MUSICBACK)) {
+                               } else if (f->frametype == AST_FRAME_IMAGE && !ast_test_flag64(outgoing, OPT_RINGBACK|OPT_MUSICBACK)) {
                                        if (ast_write(in, f))
                                                ast_log(LOG_WARNING, "Unable to forward image\n");
-                               } else if (f->frametype == AST_FRAME_TEXT && !ast_test_flag(outgoing, OPT_RINGBACK|OPT_MUSICBACK)) {
+                               } else if (f->frametype == AST_FRAME_TEXT && !ast_test_flag64(outgoing, OPT_RINGBACK|OPT_MUSICBACK)) {
                                        if (ast_write(in, f))
                                                ast_log(LOG_WARNING, "Unable to send text\n");
-                               } else if (f->frametype == AST_FRAME_HTML && !ast_test_flag(outgoing, DIAL_NOFORWARDHTML)) {
+                               } else if (f->frametype == AST_FRAME_HTML && !ast_test_flag64(outgoing, DIAL_NOFORWARDHTML)) {
                                        if (ast_channel_sendhtml(in, f->subclass, f->data, f->datalen) == -1)
                                                ast_log(LOG_WARNING, "Unable to send URL\n");
                                }
@@ -776,11 +770,10 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
 
                        /* now f is guaranteed non-NULL */
                        if (f->frametype == AST_FRAME_DTMF) {
-                               if (ast_test_flag(peerflags, OPT_DTMF_EXIT)) {
+                               if (ast_test_flag64(peerflags, OPT_DTMF_EXIT)) {
                                        const char *context = pbx_builtin_getvar_helper(in, "EXITCONTEXT");
                                        if (onedigit_goto(in, context, (char) f->subclass, 1)) {
-                                               if (option_verbose > 2)
-                                                       ast_verbose(VERBOSE_PREFIX_3 "User hit %c to disconnect call.\n", f->subclass);
+                                               ast_verb(3, "User hit %c to disconnect call.\n", f->subclass);
                                                *to=0;
                                                ast_cdr_noanswer(in->cdr);
                                                *result = f->subclass;
@@ -790,10 +783,9 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                                        }
                                }
 
-                               if (ast_test_flag(peerflags, OPT_CALLER_HANGUP) && 
+                               if (ast_test_flag64(peerflags, OPT_CALLER_HANGUP) && 
                                                  (f->subclass == '*')) { /* hmm it it not guaranteed to be '*' anymore. */
-                                       if (option_verbose > 2)
-                                               ast_verbose(VERBOSE_PREFIX_3 "User hit %c to disconnect call.\n", f->subclass);
+                                       ast_verb(3, "User hit %c to disconnect call.\n", f->subclass);
                                        *to=0;
                                        strcpy(pa->status, "CANCEL");
                                        ast_cdr_noanswer(in->cdr);
@@ -803,7 +795,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                        }
 
                        /* Forward HTML stuff */
-                       if (single && (f->frametype == AST_FRAME_HTML) && !ast_test_flag(outgoing, DIAL_NOFORWARDHTML)) 
+                       if (single && (f->frametype == AST_FRAME_HTML) && !ast_test_flag64(outgoing, DIAL_NOFORWARDHTML)) 
                                if(ast_channel_sendhtml(outgoing->chan, f->subclass, f->data, f->datalen) == -1)
                                        ast_log(LOG_WARNING, "Unable to send URL\n");
                        
@@ -816,20 +808,24 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                                ((f->subclass == AST_CONTROL_HOLD) || 
                                 (f->subclass == AST_CONTROL_UNHOLD) || 
                                 (f->subclass == AST_CONTROL_VIDUPDATE))) {
-                               if (option_verbose > 2)
-                                       ast_verbose(VERBOSE_PREFIX_3 "%s requested special control %d, passing it to %s\n", in->name, f->subclass, outgoing->chan->name);
+                               ast_verb(3, "%s requested special control %d, passing it to %s\n", in->name, f->subclass, outgoing->chan->name);
                                ast_indicate_data(outgoing->chan, f->subclass, f->data, f->datalen);
                        }
                        ast_frfree(f);
                }
-               if (!*to && (option_verbose > 2))
-                       ast_verbose(VERBOSE_PREFIX_3 "Nobody picked up in %d ms\n", orig);
+               if (!*to)
+                       ast_verb(3, "Nobody picked up in %d ms\n", orig);
                if (!*to || ast_check_hangup(in)) {
                        ast_cdr_noanswer(in->cdr);
                }
                
        }
 
+#ifdef HAVE_EPOLL
+       for (epollo = outgoing; epollo; epollo = epollo->next)
+               ast_poll_channel_del(in, epollo->chan);
+#endif
+
        return peer;
 }
 
@@ -837,18 +833,18 @@ static void replace_macro_delimiter(char *s)
 {
        for (; *s; s++)
                if (*s == '^')
-                       *s = '|';
+                       *s = ',';
 }
 
 
 /* returns true if there is a valid privacy reply */
-static int valid_priv_reply(struct ast_flags *opts, int res)
+static int valid_priv_reply(struct ast_flags64 *opts, int res)
 {
        if (res < '1')
                return 0;
-       if (ast_test_flag(opts, OPT_PRIVACY) && res <= '5')
+       if (ast_test_flag64(opts, OPT_PRIVACY) && res <= '5')
                return 1;
-       if (ast_test_flag(opts, OPT_SCREENING) && res <= '4')
+       if (ast_test_flag64(opts, OPT_SCREENING) && res <= '4')
                return 1;
        return 0;
 }
@@ -928,21 +924,20 @@ static int do_timelimit(struct ast_channel *chan, struct ast_bridge_config *conf
        /* more efficient to do it like S(x) does since no advanced opts */
        if (!config->play_warning && !config->start_sound && !config->end_sound && config->timelimit) {
                *calldurationlimit = config->timelimit / 1000;
-               if (option_verbose > 2)
-                       ast_verbose(VERBOSE_PREFIX_3 "Setting call duration limit to %d seconds.\n",
+               ast_verb(3, "Setting call duration limit to %d seconds.\n",
                                *calldurationlimit);
                config->timelimit = play_to_caller = play_to_callee =
                config->play_warning = config->warning_freq = 0;
-       } else if (option_verbose > 2) {
-               ast_verbose(VERBOSE_PREFIX_3 "Limit Data for this call:\n");
-               ast_verbose(VERBOSE_PREFIX_4 "timelimit      = %ld\n", config->timelimit);
-               ast_verbose(VERBOSE_PREFIX_4 "play_warning   = %ld\n", config->play_warning);
-               ast_verbose(VERBOSE_PREFIX_4 "play_to_caller = %s\n", play_to_caller ? "yes" : "no");
-               ast_verbose(VERBOSE_PREFIX_4 "play_to_callee = %s\n", play_to_callee ? "yes" : "no");
-               ast_verbose(VERBOSE_PREFIX_4 "warning_freq   = %ld\n", config->warning_freq);
-               ast_verbose(VERBOSE_PREFIX_4 "start_sound    = %s\n", S_OR(config->start_sound, ""));
-               ast_verbose(VERBOSE_PREFIX_4 "warning_sound  = %s\n", config->warning_sound);
-               ast_verbose(VERBOSE_PREFIX_4 "end_sound      = %s\n", S_OR(config->end_sound, ""));
+       } else {
+               ast_verb(3, "Limit Data for this call:\n");
+               ast_verb(4, "timelimit      = %ld\n", config->timelimit);
+               ast_verb(4, "play_warning   = %ld\n", config->play_warning);
+               ast_verb(4, "play_to_caller = %s\n", play_to_caller ? "yes" : "no");
+               ast_verb(4, "play_to_callee = %s\n", play_to_callee ? "yes" : "no");
+               ast_verb(4, "warning_freq   = %ld\n", config->warning_freq);
+               ast_verb(4, "start_sound    = %s\n", S_OR(config->start_sound, ""));
+               ast_verb(4, "warning_sound  = %s\n", config->warning_sound);
+               ast_verb(4, "end_sound      = %s\n", S_OR(config->end_sound, ""));
        }
         if (play_to_caller)
                 ast_set_flag(&(config->features_caller), AST_FEATURE_PLAY_WARNING);
@@ -952,7 +947,7 @@ static int do_timelimit(struct ast_channel *chan, struct ast_bridge_config *conf
 }
 
 static int do_privacy(struct ast_channel *chan, struct ast_channel *peer,
-    struct ast_flags *opts, char **opt_args, struct privacy_args *pa)
+    struct ast_flags64 *opts, char **opt_args, struct privacy_args *pa)
 {
 
        int res2;
@@ -966,13 +961,13 @@ static int do_privacy(struct ast_channel *chan, struct ast_channel *peer,
           target extension was picked up. We are going to have to kill some
           time and make the caller believe the peer hasn't picked up yet */
 
-       if (ast_test_flag(opts, OPT_MUSICBACK) && !ast_strlen_zero(opt_args[OPT_ARG_MUSICBACK])) {
+       if (ast_test_flag64(opts, OPT_MUSICBACK) && !ast_strlen_zero(opt_args[OPT_ARG_MUSICBACK])) {
                char *original_moh = ast_strdupa(chan->musicclass);
                ast_indicate(chan, -1);
                ast_string_field_set(chan, musicclass, opt_args[OPT_ARG_MUSICBACK]);
                ast_moh_start(chan, opt_args[OPT_ARG_MUSICBACK], NULL);
                ast_string_field_set(chan, musicclass, original_moh);
-       } else if (ast_test_flag(opts, OPT_RINGBACK)) {
+       } else if (ast_test_flag64(opts, OPT_RINGBACK)) {
                ast_indicate(chan, AST_CONTROL_RINGING);
                pa->sentringing++;
        }
@@ -997,9 +992,9 @@ static int do_privacy(struct ast_channel *chan, struct ast_channel *peer,
                /* now get input from the called party, as to their choice */
                if( !res2 ) {
                        /* XXX can we have both, or they are mutually exclusive ? */
-                       if( ast_test_flag(opts, OPT_PRIVACY) )
+                       if( ast_test_flag64(opts, OPT_PRIVACY) )
                                res2 = ast_play_and_wait(peer,"priv-callee-options");
-                       if( ast_test_flag(opts, OPT_SCREENING) )
+                       if( ast_test_flag64(opts, OPT_SCREENING) )
                                res2 = ast_play_and_wait(peer,"screen-callee-options");
                }
                /*! \page DialPrivacy Dial Privacy scripts
@@ -1024,20 +1019,19 @@ static int do_privacy(struct ast_channel *chan, struct ast_channel *peer,
                res2 = ast_play_and_wait(peer, "vm-sorry");
        }
 
-       if (ast_test_flag(opts, OPT_MUSICBACK)) {
+       if (ast_test_flag64(opts, OPT_MUSICBACK)) {
                ast_moh_stop(chan);
-       } else if (ast_test_flag(opts, OPT_RINGBACK)) {
+       } else if (ast_test_flag64(opts, OPT_RINGBACK)) {
                ast_indicate(chan, -1);
                pa->sentringing=0;
        }
        ast_autoservice_stop(chan);
-       if(ast_test_flag(opts, OPT_PRIVACY) && (res2 >= '1' && res2 <= '5')) {
+       if(ast_test_flag64(opts, OPT_PRIVACY) && (res2 >= '1' && res2 <= '5')) {
                /* map keypresses to various things, the index is res2 - '1' */
                static const char *_val[] = { "ALLOW", "DENY", "TORTURE", "KILL", "ALLOW" };
                static const int _flag[] = { AST_PRIVACY_ALLOW, AST_PRIVACY_DENY, AST_PRIVACY_TORTURE, AST_PRIVACY_KILL, AST_PRIVACY_ALLOW};
                int i = res2 - '1';
-               if (option_verbose > 2)
-                       ast_verbose(VERBOSE_PREFIX_3 "--Set privacy database entry %s/%s to %s\n",
+               ast_verb(3, "--Set privacy database entry %s/%s to %s\n",
                                             opt_args[OPT_ARG_PRIVACY], pa->privcid, _val[i]);
                ast_privacy_set(opt_args[OPT_ARG_PRIVACY], pa->privcid, _flag[i]);
        }
@@ -1055,7 +1049,7 @@ static int do_privacy(struct ast_channel *chan, struct ast_channel *peer,
                break;
        case '5':
                /* XXX should we set status to DENY ? */
-               if( ast_test_flag(opts, OPT_PRIVACY) )
+               if( ast_test_flag64(opts, OPT_PRIVACY) )
                        break;
                /* if not privacy, then 5 is the same as "default" case */
        default:        /* bad input or -1 if failure to start autoservice */
@@ -1072,12 +1066,12 @@ static int do_privacy(struct ast_channel *chan, struct ast_channel *peer,
        if (res2 == '1') {      /* the only case where we actually connect */
                /* if the intro is NOCALLERID, then there's no reason to leave it on disk, it'll 
                   just clog things up, and it's not useful information, not being tied to a CID */
-               if( strncmp(pa->privcid,"NOCALLERID",10) == 0 || ast_test_flag(opts, OPT_SCREEN_NOINTRO) ) {
+               if( strncmp(pa->privcid,"NOCALLERID",10) == 0 || ast_test_flag64(opts, OPT_SCREEN_NOINTRO) ) {
                        ast_filedelete(pa->privintro, NULL);
                        if( ast_fileexists(pa->privintro, NULL, NULL ) > 0 )
                                ast_log(LOG_NOTICE, "privacy: ast_filedelete didn't do its job on %s\n", pa->privintro);
-                       else if (option_verbose > 2)
-                               ast_verbose(VERBOSE_PREFIX_3 "Successfully deleted %s intro file\n", pa->privintro);
+                       else
+                               ast_verb(3, "Successfully deleted %s intro file\n", pa->privintro);
                }
                return 0;       /* the good exit path */
        } else {
@@ -1088,7 +1082,7 @@ static int do_privacy(struct ast_channel *chan, struct ast_channel *peer,
 
 /*! \brief returns 1 if successful, 0 or <0 if the caller should 'goto out' */
 static int setup_privacy_args(struct privacy_args *pa,
-       struct ast_flags *opts, char *opt_args[], struct ast_channel *chan)
+       struct ast_flags64 *opts, char *opt_args[], struct ast_channel *chan)
 {
        char callerid[60];
        int res;
@@ -1097,14 +1091,12 @@ static int setup_privacy_args(struct privacy_args *pa,
        if (!ast_strlen_zero(chan->cid.cid_num)) {
                l = ast_strdupa(chan->cid.cid_num);
                ast_shrink_phone_number(l);
-               if (ast_test_flag(opts, OPT_PRIVACY) ) {
-                       if (option_verbose > 2)
-                               ast_verbose(VERBOSE_PREFIX_3  "Privacy DB is '%s', clid is '%s'\n",
+               if (ast_test_flag64(opts, OPT_PRIVACY) ) {
+                       ast_verb(3, "Privacy DB is '%s', clid is '%s'\n",
                                             opt_args[OPT_ARG_PRIVACY], l);
                        pa->privdb_val = ast_privacy_check(opt_args[OPT_ARG_PRIVACY], l);
                } else {
-                       if (option_verbose > 2)
-                               ast_verbose(VERBOSE_PREFIX_3  "Privacy Screening, clid is '%s'\n", l);
+                       ast_verb(3,  "Privacy Screening, clid is '%s'\n", l);
                        pa->privdb_val = AST_PRIVACY_UNKNOWN;
                }
        } else {
@@ -1116,8 +1108,7 @@ static int setup_privacy_args(struct privacy_args *pa,
                        if (*tn2=='/')  /* any other chars to be afraid of? */
                                *tn2 = '=';
                }
-               if (option_verbose > 2)
-                       ast_verbose(VERBOSE_PREFIX_3  "Privacy-- callerid is empty\n");
+               ast_verb(3, "Privacy-- callerid is empty\n");
 
                snprintf(callerid, sizeof(callerid), "NOCALLERID_%s%s", chan->exten, tnam);
                l = callerid;
@@ -1126,11 +1117,11 @@ static int setup_privacy_args(struct privacy_args *pa,
        
        ast_copy_string(pa->privcid,l,sizeof(pa->privcid));
 
-       if( strncmp(pa->privcid,"NOCALLERID",10) != 0 && ast_test_flag(opts, OPT_SCREEN_NOCLID) ) { /* if callerid is set, and ast_test_flag(&opts, OPT_SCREEN_NOCLID) is set also */  
+       if( strncmp(pa->privcid,"NOCALLERID",10) != 0 && ast_test_flag64(opts, OPT_SCREEN_NOCLID) ) { /* if callerid is set, and ast_test_flag64(&opts, OPT_SCREEN_NOCLID) is set also */  
                if (option_verbose > 2)
                        ast_verbose( VERBOSE_PREFIX_3  "CallerID set (%s); N option set; Screening should be off\n", pa->privcid);
                pa->privdb_val = AST_PRIVACY_ALLOW;
-       } else if (ast_test_flag(opts, OPT_SCREEN_NOCLID) && strncmp(pa->privcid,"NOCALLERID",10) == 0 ) {
+       } else if (ast_test_flag64(opts, OPT_SCREEN_NOCLID) && strncmp(pa->privcid,"NOCALLERID",10) == 0 ) {
                if (option_verbose > 2)
                        ast_verbose( VERBOSE_PREFIX_3  "CallerID blank; N option set; Screening should happen; dbval is %d\n", pa->privdb_val);
        }
@@ -1181,8 +1172,8 @@ static int setup_privacy_args(struct privacy_args *pa,
                                ast_filedelete(pa->privintro, NULL);
                                if (ast_fileexists(pa->privintro,NULL,NULL ) > 0 )
                                        ast_log(LOG_NOTICE,"privacy: ast_filedelete didn't do its job on %s\n", pa->privintro);
-                               else if (option_verbose > 2)
-                                       ast_verbose( VERBOSE_PREFIX_3 "Successfully deleted %s intro file\n", pa->privintro);
+                               else
+                                       ast_verb(3, "Successfully deleted %s intro file\n", pa->privintro);
                                return -1;
                        }
                        if (!ast_streamfile(chan, "vm-dialout", chan->language) )
@@ -1192,7 +1183,7 @@ static int setup_privacy_args(struct privacy_args *pa,
        return 1;       /* success */
 }
 
-static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags *peerflags, int *continue_exec)
+static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags64 *peerflags, int *continue_exec)
 {
        int res = -1;   /* default: error */
        char *rest, *cur;       /* scan the list of destinations */
@@ -1224,7 +1215,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                             AST_APP_ARG(options);
                             AST_APP_ARG(url);
        );
-       struct ast_flags opts = { 0, };
+       struct ast_flags64 opts = { 0, };
        char *opt_args[OPT_ARG_ARRAY_SIZE];
 
        if (ast_strlen_zero(data)) {
@@ -1240,7 +1231,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
        memset(&config,0,sizeof(struct ast_bridge_config));
 
        if (!ast_strlen_zero(args.options) &&
-                       ast_app_parse_options(dial_exec_options, &opts, opt_args, args.options)) {
+                       ast_app_parse_options64(dial_exec_options, &opts, opt_args, args.options)) {
                pbx_builtin_setvar_helper(chan, "DIALSTATUS", pa.status);
                goto done;
        }
@@ -1251,39 +1242,37 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                goto done;
        }
 
-       if (ast_test_flag(&opts, OPT_OPERMODE)) {
+       if (ast_test_flag64(&opts, OPT_OPERMODE)) {
                opermode = ast_strlen_zero(opt_args[OPT_ARG_OPERMODE]) ? 1 : atoi(opt_args[OPT_ARG_OPERMODE]);
-               if (option_verbose > 2)
-                       ast_verbose(VERBOSE_PREFIX_3 "Setting operator services mode to %d.\n", opermode);
+               ast_verb(3, "Setting operator services mode to %d.\n", opermode);
        }
        
-       if (ast_test_flag(&opts, OPT_DURATION_STOP) && !ast_strlen_zero(opt_args[OPT_ARG_DURATION_STOP])) {
+       if (ast_test_flag64(&opts, OPT_DURATION_STOP) && !ast_strlen_zero(opt_args[OPT_ARG_DURATION_STOP])) {
                calldurationlimit = atoi(opt_args[OPT_ARG_DURATION_STOP]);
                if (!calldurationlimit) {
                        ast_log(LOG_WARNING, "Dial does not accept S(%s), hanging up.\n", opt_args[OPT_ARG_DURATION_STOP]);
                        pbx_builtin_setvar_helper(chan, "DIALSTATUS", pa.status);
                        goto done;
                }
-               if (option_verbose > 2)
-                       ast_verbose(VERBOSE_PREFIX_3 "Setting call duration limit to %d seconds.\n", calldurationlimit);
+               ast_verb(3, "Setting call duration limit to %d seconds.\n", calldurationlimit);
        }
 
-       if (ast_test_flag(&opts, OPT_SENDDTMF) && !ast_strlen_zero(opt_args[OPT_ARG_SENDDTMF])) {
+       if (ast_test_flag64(&opts, OPT_SENDDTMF) && !ast_strlen_zero(opt_args[OPT_ARG_SENDDTMF])) {
                dtmfcalling = opt_args[OPT_ARG_SENDDTMF];
                dtmfcalled = strsep(&dtmfcalling, ":");
        }
 
-       if (ast_test_flag(&opts, OPT_DURATION_LIMIT) && !ast_strlen_zero(opt_args[OPT_ARG_DURATION_LIMIT])) {
+       if (ast_test_flag64(&opts, OPT_DURATION_LIMIT) && !ast_strlen_zero(opt_args[OPT_ARG_DURATION_LIMIT])) {
                if (do_timelimit(chan, &config, opt_args[OPT_ARG_DURATION_LIMIT], &calldurationlimit))
                        goto done;
        }
 
-       if (ast_test_flag(&opts, OPT_RESETCDR) && chan->cdr)
+       if (ast_test_flag64(&opts, OPT_RESETCDR) && chan->cdr)
                ast_cdr_reset(chan->cdr, NULL);
-       if (ast_test_flag(&opts, OPT_PRIVACY) && ast_strlen_zero(opt_args[OPT_ARG_PRIVACY]))
+       if (ast_test_flag64(&opts, OPT_PRIVACY) && ast_strlen_zero(opt_args[OPT_ARG_PRIVACY]))
                opt_args[OPT_ARG_PRIVACY] = ast_strdupa(chan->exten);
 
-       if (ast_test_flag(&opts, OPT_PRIVACY) || ast_test_flag(&opts, OPT_SCREENING)) {
+       if (ast_test_flag64(&opts, OPT_PRIVACY) || ast_test_flag64(&opts, OPT_SCREENING)) {
                res = setup_privacy_args(&pa, &opts, opt_args, chan);
                if (res <= 0)
                        goto out;
@@ -1301,7 +1290,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                outbound_group = pbx_builtin_getvar_helper(chan, "OUTBOUND_GROUP");
        }
            
-       ast_copy_flags(peerflags, &opts, OPT_DTMF_EXIT | OPT_GO_ON | OPT_ORIGINAL_CLID | OPT_CALLER_HANGUP | OPT_IGNORE_FORWARDING);
+       ast_copy_flags64(peerflags, &opts, OPT_DTMF_EXIT | OPT_GO_ON | OPT_ORIGINAL_CLID | OPT_CALLER_HANGUP | OPT_IGNORE_FORWARDING);
        /* loop through the list of dial destinations */
        rest = args.peers;
        while ((cur = strsep(&rest, "&")) ) {
@@ -1317,14 +1306,14 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                if (!(tmp = ast_calloc(1, sizeof(*tmp))))
                        goto out;
                if (opts.flags) {
-                       ast_copy_flags(tmp, &opts,
+                       ast_copy_flags64(tmp, &opts,
                                       OPT_CANCEL_ELSEWHERE |
                                       OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER |
                                       OPT_CALLEE_HANGUP | OPT_CALLER_HANGUP |
                                       OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR |
                                       OPT_CALLEE_PARK | OPT_CALLER_PARK |
                                       OPT_RINGBACK | OPT_MUSICBACK | OPT_FORCECLID);
-                       ast_set2_flag(tmp, args.url, DIAL_NOFORWARDHTML);       
+                       ast_set2_flag64(tmp, args.url, DIAL_NOFORWARDHTML);     
                }
                ast_copy_string(numsubst, number, sizeof(numsubst));
                /* Request the peer */
@@ -1355,17 +1344,15 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                        }
                        tmp->forwards++;
                        if (tmp->forwards < AST_MAX_FORWARDS) {
-                               if (option_verbose > 2)
-                                       ast_verbose(VERBOSE_PREFIX_3 "Now forwarding %s to '%s/%s' (thanks to %s)\n",
+                               ast_verb(3, "Now forwarding %s to '%s/%s' (thanks to %s)\n",
                                        chan->name, tech, stuff, tc->name);
                                ast_hangup(tc);
                                /* If we have been told to ignore forwards, just set this channel to null
                                 * and continue processing extensions normally */
-                               if (ast_test_flag(&opts, OPT_IGNORE_FORWARDING)) {
+                               if (ast_test_flag64(&opts, OPT_IGNORE_FORWARDING)) {
                                        tc = NULL;
                                        cause = AST_CAUSE_BUSY;
-                                       if (option_verbose > 2)
-                                               ast_verbose(VERBOSE_PREFIX_3 "Forwarding %s to '%s/%s' prevented.\n",
+                                       ast_verb(3, "Forwarding %s to '%s/%s' prevented.\n",
                                                        chan->name, tech, stuff);
                                } else {
                                        tc = ast_request(tech, chan->nativeformats, stuff, &cause);
@@ -1375,8 +1362,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                                else
                                        ast_channel_inherit_variables(chan, tc);
                        } else {
-                               if (option_verbose > 2)
-                                       ast_verbose(VERBOSE_PREFIX_3 "Too many forwards from %s\n", tc->name);
+                               ast_verb(3, "Too many forwards from %s\n", tc->name);
                                ast_hangup(tc);
                                tc = NULL;
                                cause = AST_CAUSE_CONGESTION;
@@ -1413,6 +1399,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                tc->cid.cid_pres = chan->cid.cid_pres;
                tc->cid.cid_ton = chan->cid.cid_ton;
                tc->cid.cid_tns = chan->cid.cid_tns;
+               tc->cid.cid_ani2 = chan->cid.cid_ani2;
                tc->adsicpe = chan->adsicpe;
                tc->transfercapability = chan->transfercapability;
 
@@ -1440,23 +1427,21 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                if (res) {
                        /* Again, keep going even if there's an error */
                        ast_debug(1, "ast call on peer returned %d\n", res);
-                       if (option_verbose > 2)
-                               ast_verbose(VERBOSE_PREFIX_3 "Couldn't call %s\n", numsubst);
+                       ast_verb(3, "Couldn't call %s\n", numsubst);
                        ast_hangup(tc);
                        tc = NULL;
                        ast_free(tmp);
                        continue;
                } else {
                        senddialevent(chan, tc);
-                       if (option_verbose > 2)
-                               ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", numsubst);
-                       if (!ast_test_flag(peerflags, OPT_ORIGINAL_CLID))
+                       ast_verb(3, "Called %s\n", numsubst);
+                       if (!ast_test_flag64(peerflags, OPT_ORIGINAL_CLID))
                                ast_set_callerid(tc, S_OR(chan->macroexten, chan->exten), get_cid_name(cidname, sizeof(cidname), chan), NULL);
                }
                /* Put them in the list of outgoing thingies...  We're ready now. 
                   XXX If we're forcibly removed, these outgoing calls won't get
                   hung up XXX */
-               ast_set_flag(tmp, DIAL_STILLGOING);     
+               ast_set_flag64(tmp, DIAL_STILLGOING);   
                tmp->chan = tc;
                tmp->next = outgoing;
                outgoing = tmp;
@@ -1480,7 +1465,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
        } else {
                /* Our status will at least be NOANSWER */
                strcpy(pa.status, "NOANSWER");
-               if (ast_test_flag(outgoing, OPT_MUSICBACK)) {
+               if (ast_test_flag64(outgoing, OPT_MUSICBACK)) {
                        moh = 1;
                        if (!ast_strlen_zero(opt_args[OPT_ARG_MUSICBACK])) {
                                char *original_moh = ast_strdupa(chan->musicclass);
@@ -1491,7 +1476,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                                ast_moh_start(chan, NULL, NULL);
                        }
                        ast_indicate(chan, AST_CONTROL_PROGRESS);
-               } else if (ast_test_flag(outgoing, OPT_RINGBACK)) {
+               } else if (ast_test_flag64(outgoing, OPT_RINGBACK)) {
                        ast_indicate(chan, AST_CONTROL_RINGING);
                        sentringing++;
                }
@@ -1534,13 +1519,13 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                        ast_debug(1, "app_dial: sendurl=%s.\n", args.url);
                        ast_channel_sendurl( peer, args.url );
                }
-               if ( (ast_test_flag(&opts, OPT_PRIVACY) || ast_test_flag(&opts, OPT_SCREENING)) && pa.privdb_val == AST_PRIVACY_UNKNOWN) {
+               if ( (ast_test_flag64(&opts, OPT_PRIVACY) || ast_test_flag64(&opts, OPT_SCREENING)) && pa.privdb_val == AST_PRIVACY_UNKNOWN) {
                        if (do_privacy(chan, peer, &opts, opt_args, &pa)) {
                                res = 0;
                                goto out;
                        }
                }
-               if (!ast_test_flag(&opts, OPT_ANNOUNCE) || ast_strlen_zero(opt_args[OPT_ARG_ANNOUNCE])) {
+               if (!ast_test_flag64(&opts, OPT_ANNOUNCE) || ast_strlen_zero(opt_args[OPT_ARG_ANNOUNCE])) {
                        res = 0;
                } else {
                        int digit = 0;
@@ -1555,26 +1540,26 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                        /* Ok, done. stop autoservice */
                        res = ast_autoservice_stop(chan);
                        if (digit > 0 && !res)
-                               res = ast_senddigit(chan, digit); 
+                               res = ast_senddigit(chan, digit, 0); 
                        else
                                res = digit;
 
                }
 
-               if (chan && peer && ast_test_flag(&opts, OPT_GOTO) && !ast_strlen_zero(opt_args[OPT_ARG_GOTO])) {
+               if (chan && peer && ast_test_flag64(&opts, OPT_GOTO) && !ast_strlen_zero(opt_args[OPT_ARG_GOTO])) {
                        replace_macro_delimiter(opt_args[OPT_ARG_GOTO]);
                        ast_parseable_goto(chan, opt_args[OPT_ARG_GOTO]);
                        ast_parseable_goto(peer, opt_args[OPT_ARG_GOTO]);
                        peer->priority++;
                        ast_pbx_start(peer);
-                       hanguptree(outgoing, NULL, ast_test_flag(&opts, OPT_CANCEL_ELSEWHERE) ? 1 : 0);
+                       hanguptree(outgoing, NULL, ast_test_flag64(&opts, OPT_CANCEL_ELSEWHERE) ? 1 : 0);
                        if (continue_exec)
                                *continue_exec = 1;
                        res = 0;
                        goto done;
                }
 
-               if (ast_test_flag(&opts, OPT_CALLEE_MACRO) && !ast_strlen_zero(opt_args[OPT_ARG_CALLEE_MACRO])) {
+               if (ast_test_flag64(&opts, OPT_CALLEE_MACRO) && !ast_strlen_zero(opt_args[OPT_ARG_CALLEE_MACRO])) {
                        struct ast_app *theapp;
                        const char *macro_result;
 
@@ -1606,18 +1591,18 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
 
                                if (!strcasecmp(macro_result, "BUSY")) {
                                        ast_copy_string(pa.status, macro_result, sizeof(pa.status));
-                                       ast_set_flag(peerflags, OPT_GO_ON);
+                                       ast_set_flag64(peerflags, OPT_GO_ON);
                                        res = -1;
                                } else if (!strcasecmp(macro_result, "CONGESTION") || !strcasecmp(macro_result, "CHANUNAVAIL")) {
                                        ast_copy_string(pa.status, macro_result, sizeof(pa.status));
-                                       ast_set_flag(peerflags, OPT_GO_ON);     
+                                       ast_set_flag64(peerflags, OPT_GO_ON);   
                                        res = -1;
                                } else if (!strcasecmp(macro_result, "CONTINUE")) {
                                        /* hangup peer and keep chan alive assuming the macro has changed 
                                           the context / exten / priority or perhaps 
                                           the next priority in the current exten is desired.
                                        */
-                                       ast_set_flag(peerflags, OPT_GO_ON);     
+                                       ast_set_flag64(peerflags, OPT_GO_ON);   
                                        res = -1;
                                } else if (!strcasecmp(macro_result, "ABORT")) {
                                        /* Hangup both ends unless the caller has the g flag */
@@ -1628,13 +1613,13 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                                        if (strchr(macro_transfer_dest, '^')) { /* context^exten^priority*/
                                                replace_macro_delimiter(macro_transfer_dest);
                                                if (!ast_parseable_goto(chan, macro_transfer_dest))
-                                                       ast_set_flag(peerflags, OPT_GO_ON);
+                                                       ast_set_flag64(peerflags, OPT_GO_ON);
                                        }
                                }
                        }
                }
 
-               if (ast_test_flag(&opts, OPT_CALLEE_GOSUB) && !ast_strlen_zero(opt_args[OPT_ARG_CALLEE_GOSUB])) {
+               if (ast_test_flag64(&opts, OPT_CALLEE_GOSUB) && !ast_strlen_zero(opt_args[OPT_ARG_CALLEE_GOSUB])) {
                        struct ast_app *theapp;
                        const char *gosub_result;
                        char *gosub_args, *gosub_argstart;
@@ -1689,18 +1674,18 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
 
                                if (!strcasecmp(gosub_result, "BUSY")) {
                                        ast_copy_string(pa.status, gosub_result, sizeof(pa.status));
-                                       ast_set_flag(peerflags, OPT_GO_ON);
+                                       ast_set_flag64(peerflags, OPT_GO_ON);
                                        res = -1;
                                } else if (!strcasecmp(gosub_result, "CONGESTION") || !strcasecmp(gosub_result, "CHANUNAVAIL")) {
                                        ast_copy_string(pa.status, gosub_result, sizeof(pa.status));
-                                       ast_set_flag(peerflags, OPT_GO_ON);     
+                                       ast_set_flag64(peerflags, OPT_GO_ON);   
                                        res = -1;
                                } else if (!strcasecmp(gosub_result, "CONTINUE")) {
                                        /* hangup peer and keep chan alive assuming the macro has changed 
                                           the context / exten / priority or perhaps 
                                           the next priority in the current exten is desired.
                                        */
-                                       ast_set_flag(peerflags, OPT_GO_ON);     
+                                       ast_set_flag64(peerflags, OPT_GO_ON);   
                                        res = -1;
                                } else if (!strcasecmp(gosub_result, "ABORT")) {
                                        /* Hangup both ends unless the caller has the g flag */
@@ -1711,7 +1696,7 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                                        if (strchr(gosub_transfer_dest, '^')) { /* context^exten^priority*/
                                                replace_macro_delimiter(gosub_transfer_dest);
                                                if (!ast_parseable_goto(chan, gosub_transfer_dest))
-                                                       ast_set_flag(peerflags, OPT_GO_ON);
+                                                       ast_set_flag64(peerflags, OPT_GO_ON);
                                        }
                                }
                        }
@@ -1724,12 +1709,12 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                        if (!ast_strlen_zero(dtmfcalled)) { 
                                if (option_verbose > 2)
                                        ast_verbose(VERBOSE_PREFIX_3 "Sending DTMF '%s' to the called party.\n", dtmfcalled);
-                               res = ast_dtmf_stream(peer,chan,dtmfcalled,250);
+                               res = ast_dtmf_stream(peer,chan,dtmfcalled,250,0);
                        }
                        if (!ast_strlen_zero(dtmfcalling)) {
                                if (option_verbose > 2)
                                        ast_verbose(VERBOSE_PREFIX_3 "Sending DTMF '%s' to the calling party.\n", dtmfcalling);
-                               res = ast_dtmf_stream(chan,peer,dtmfcalling,250);
+                               res = ast_dtmf_stream(chan,peer,dtmfcalling,250,0);
                        }
                }
                
@@ -1737,21 +1722,21 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                        res = -1;
                        end_time = time(NULL);
                } else {
-                       if (ast_test_flag(peerflags, OPT_CALLEE_TRANSFER))
+                       if (ast_test_flag64(peerflags, OPT_CALLEE_TRANSFER))
                                ast_set_flag(&(config.features_callee), AST_FEATURE_REDIRECT);
-                       if (ast_test_flag(peerflags, OPT_CALLER_TRANSFER))
+                       if (ast_test_flag64(peerflags, OPT_CALLER_TRANSFER))
                                ast_set_flag(&(config.features_caller), AST_FEATURE_REDIRECT);
-                       if (ast_test_flag(peerflags, OPT_CALLEE_HANGUP))
+                       if (ast_test_flag64(peerflags, OPT_CALLEE_HANGUP))
                                ast_set_flag(&(config.features_callee), AST_FEATURE_DISCONNECT);
-                       if (ast_test_flag(peerflags, OPT_CALLER_HANGUP))
+                       if (ast_test_flag64(peerflags, OPT_CALLER_HANGUP))
                                ast_set_flag(&(config.features_caller), AST_FEATURE_DISCONNECT);
-                       if (ast_test_flag(peerflags, OPT_CALLEE_MONITOR))
+                       if (ast_test_flag64(peerflags, OPT_CALLEE_MONITOR))
                                ast_set_flag(&(config.features_callee), AST_FEATURE_AUTOMON);
-                       if (ast_test_flag(peerflags, OPT_CALLER_MONITOR)) 
+                       if (ast_test_flag64(peerflags, OPT_CALLER_MONITOR)) 
                                ast_set_flag(&(config.features_caller), AST_FEATURE_AUTOMON);
-                       if (ast_test_flag(peerflags, OPT_CALLEE_PARK))
+                       if (ast_test_flag64(peerflags, OPT_CALLEE_PARK))
                                ast_set_flag(&(config.features_callee), AST_FEATURE_PARKCALL);
-                       if (ast_test_flag(peerflags, OPT_CALLER_PARK))
+                       if (ast_test_flag64(peerflags, OPT_CALLER_PARK))
                                ast_set_flag(&(config.features_caller), AST_FEATURE_PARKCALL);
 
                        if (moh) {
@@ -1789,9 +1774,35 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
 
                snprintf(toast, sizeof(toast), "%ld", (long)(end_time - start_time));
                pbx_builtin_setvar_helper(chan, "DIALEDTIME", toast);
-
+               
+               
+               if (ast_test_flag64(&opts, OPT_PEER_H)) {
+                       ast_log(LOG_NOTICE,"PEER context: %s; PEER exten: %s;  PEER priority: %d\n", 
+                                       peer->context, peer->exten, peer->priority);
+               }
+               
+               strcpy(peer->context, chan->context);
+
+               if (ast_test_flag64(&opts, OPT_PEER_H) && ast_exists_extension(peer, peer->context, "h", 1, peer->cid.cid_num)) {
+                       int autoloopflag;
+                       int found;
+                       strcpy(peer->exten, "h");
+                       peer->priority = 1;
+                       autoloopflag = ast_test_flag(peer, AST_FLAG_IN_AUTOLOOP);       /* save value to restore at the end */
+                       ast_set_flag(peer, AST_FLAG_IN_AUTOLOOP);
+                       
+                       while ((res = ast_spawn_extension(peer, peer->context, peer->exten, peer->priority, peer->cid.cid_num, &found,1))) {
+                               peer->priority++;
+                       }
+                       if (found && res) {
+                               /* Something bad happened, or a hangup has been requested. */
+                               ast_debug(1, "Spawn extension (%s,%s,%d) exited non-zero on '%s'\n", peer->context, peer->exten, peer->priority, peer->name);
+                               ast_verb(2, "Spawn extension (%s, %s, %d) exited non-zero on '%s'\n", peer->context, peer->exten, peer->priority, peer->name);
+                       }
+                       ast_set2_flag(peer, autoloopflag, AST_FLAG_IN_AUTOLOOP);  /* set it back the way it was */
+               }
                if (res != AST_PBX_NO_HANGUP_PEER) {
-                       if (!chan->_softhangup)
+                       if (!ast_check_hangup(chan))
                                chan->hangupcause = peer->hangupcause;
                        ast_hangup(peer);
                }
@@ -1810,7 +1821,7 @@ out:
        senddialendevent(chan, pa.status);
        ast_debug(1, "Exiting with DIALSTATUS=%s.\n", pa.status);
        
-       if ((ast_test_flag(peerflags, OPT_GO_ON)) && (!chan->_softhangup) && (res != AST_PBX_KEEPALIVE)) {
+       if ((ast_test_flag64(peerflags, OPT_GO_ON)) && !ast_check_hangup(chan) && (res != AST_PBX_KEEPALIVE)) {
                if (calldurationlimit)
                        chan->whentohangup = 0;
                res = 0;
@@ -1822,7 +1833,7 @@ done:
 
 static int dial_exec(struct ast_channel *chan, void *data)
 {
-       struct ast_flags peerflags;
+       struct ast_flags64 peerflags;
 
        memset(&peerflags, 0, sizeof(peerflags));
 
@@ -1831,41 +1842,33 @@ static int dial_exec(struct ast_channel *chan, void *data)
 
 static int retrydial_exec(struct ast_channel *chan, void *data)
 {
-       char *announce = NULL, *dialdata = NULL;
+       char *parse;
        const char *context = NULL;
        int sleep = 0, loops = 0, res = -1;
-       struct ast_flags peerflags;
-       
+       struct ast_flags64 peerflags = { 0, };
+       AST_DECLARE_APP_ARGS(args,
+               AST_APP_ARG(announce);
+               AST_APP_ARG(sleep);
+               AST_APP_ARG(retries);
+               AST_APP_ARG(dialdata);
+       );
+
        if (ast_strlen_zero(data)) {
                ast_log(LOG_WARNING, "RetryDial requires an argument!\n");
                return -1;
        }       
 
-       announce = ast_strdupa(data);
-
-       memset(&peerflags, 0, sizeof(peerflags));
+       parse = ast_strdupa(data);
+       AST_STANDARD_APP_ARGS(args, parse);
 
-       if ((dialdata = strchr(announce, '|'))) {
-               *dialdata++ = '\0';
-               if (sscanf(dialdata, "%d", &sleep) == 1) {
-                       sleep *= 1000;
-               } else {
-                       ast_log(LOG_ERROR, "%s requires the numerical argument <sleep>\n",rapp);
-                       goto done;
-               }
-               if ((dialdata = strchr(dialdata, '|'))) {
-                       *dialdata++ = '\0';
-                       if (sscanf(dialdata, "%d", &loops) != 1) {
-                               ast_log(LOG_ERROR, "%s requires the numerical argument <loops>\n",rapp);
-                               goto done;
-                       }
-               }
+       if ((sleep = atoi(args.sleep))) {
+               sleep *= 1000;
        }
-       
-       if ((dialdata = strchr(dialdata, '|'))) {
-               *dialdata++ = '\0';
-       } else {
-               ast_log(LOG_ERROR, "%s requires more arguments\n",rapp);
+
+       loops = atoi(args.retries);
+
+       if (!args.dialdata) {
+               ast_log(LOG_ERROR, "%s requires a 4th argument (dialdata)\n", rapp);
                goto done;
        }
                
@@ -1885,18 +1888,18 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
                if (ast_test_flag(chan, AST_FLAG_MOH))
                        ast_moh_stop(chan);
 
-               res = dial_exec_full(chan, dialdata, &peerflags, &continue_exec);
+               res = dial_exec_full(chan, args.dialdata, &peerflags, &continue_exec);
                if (continue_exec)
                        break;
 
                if (res == 0) {
-                       if (ast_test_flag(&peerflags, OPT_DTMF_EXIT)) {
-                               if (!ast_strlen_zero(announce)) {
-                                       if (ast_fileexists(announce, NULL, chan->language)) {
-                                               if(!(res = ast_streamfile(chan, announce, chan->language)))                                                             
+                       if (ast_test_flag64(&peerflags, OPT_DTMF_EXIT)) {
+                               if (!ast_strlen_zero(args.announce)) {
+                                       if (ast_fileexists(args.announce, NULL, chan->language) > 0) {
+                                               if(!(res = ast_streamfile(chan, args.announce, chan->language)))                                                                
                                                        ast_waitstream(chan, AST_DIGIT_ANY);
                                        } else
-                                               ast_log(LOG_WARNING, "Announce file \"%s\" specified in Retrydial does not exist\n", announce);
+                                               ast_log(LOG_WARNING, "Announce file \"%s\" specified in Retrydial does not exist\n", args.announce);
                                }
                                if (!res && sleep) {
                                        if (!ast_test_flag(chan, AST_FLAG_MOH))
@@ -1904,12 +1907,12 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
                                        res = ast_waitfordigit(chan, sleep);
                                }
                        } else {
-                               if (!ast_strlen_zero(announce)) {
-                                       if (ast_fileexists(announce, NULL, chan->language)) {
-                                               if (!(res = ast_streamfile(chan, announce, chan->language)))
+                               if (!ast_strlen_zero(args.announce)) {
+                                       if (ast_fileexists(args.announce, NULL, chan->language) > 0) {
+                                               if (!(res = ast_streamfile(chan, args.announce, chan->language)))
                                                        res = ast_waitstream(chan, "");
                                        } else
-                                               ast_log(LOG_WARNING, "Announce file \"%s\" specified in Retrydial does not exist\n", announce);
+                                               ast_log(LOG_WARNING, "Announce file \"%s\" specified in Retrydial does not exist\n", args.announce);
                                }
                                if (sleep) {
                                        if (!ast_test_flag(chan, AST_FLAG_MOH))
@@ -1966,7 +1969,7 @@ static int load_module(void)
        if (!con)
                ast_log(LOG_ERROR, "Dial virtual context 'app_dial_gosub_virtual_context' does not exist and unable to create\n");
        else
-               ast_add_extension2(con, 1, "s", 1, NULL, NULL, "KeepAlive", ast_strdup(""), ast_free, "app_dial");
+               ast_add_extension2(con, 1, "s", 1, NULL, NULL, "KeepAlive", ast_strdup(""), ast_free_ptr, "app_dial");
 
        res = ast_register_application(app, dial_exec, synopsis, descrip);
        res |= ast_register_application(rapp, retrydial_exec, rsynopsis, rdescrip);