Version 0.1.11 from FTP

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

diff --git a/apps/app_qcall.c b/apps/app_qcall.c
index 87672e5..5e153e1 100755 (executable)
--- a/apps/app_qcall.c
+++ b/apps/app_qcall.c
@@ -217,10 +217,10 @@ time_t    t;
                ast_set_read_format(channel,AST_FORMAT_SLINEAR);
                ast_set_write_format(channel,AST_FORMAT_SLINEAR);
                channel->callerid = NULL;
-               channel->hidden_callerid = NULL;
+               channel->ani = NULL;
 #ifdef OURCLID
                channel->callerid = strdup(OURCLID);
-               channel->hidden_callerid = strdup(OURCLID);
+               channel->ani = strdup(OURCLID);
 #endif         
                channel->whentohangup = 0;
                channel->appl = "AppQcall";
@@ -237,8 +237,8 @@ time_t      t;
           }
        if (channel->callerid) free(channel->callerid);
        channel->callerid = NULL;
-       if (channel->hidden_callerid) free(channel->hidden_callerid);
-       channel->hidden_callerid = NULL;
+       if (channel->ani) free(channel->ani);
+       channel->ani = NULL;
        if (channel->state == AST_STATE_UP)
        if (debug) printf("@@@@ Autodial:Line is Up\n");
        if (option_verbose > 2)
@@ -305,7 +305,7 @@ time_t      t;
                                                ast_stopstream(channel);
                                           }
                                        channel->callerid = strdup(clid);
-                                       channel->hidden_callerid = strdup(clid);
+                                       channel->ani = strdup(clid);
                                        channel->language[0] = 0;
                                        channel->dnid = strdup(extstr);
 #ifdef AMAFLAGS

diff --git a/cdr.c b/cdr.c
index 3a0d279..91b76f0 100755 (executable)
--- a/cdr.c
+++ b/cdr.c
@@ -198,9 +198,9 @@ int ast_cdr_init(struct ast_cdr *cdr, struct ast_channel *c)
                if (strlen(cdr->channel)) 
                        ast_log(LOG_WARNING, "CDR already initialized on '%s'\n", chan); 
                strncpy(cdr->channel, c->name, sizeof(cdr->channel) - 1);
-               /* Grab source from hidden or normal Caller*ID */
-               if (c->hidden_callerid)
-                       strncpy(tmp, c->hidden_callerid, sizeof(tmp) - 1);
+               /* Grab source from ANI or normal Caller*ID */
+               if (c->ani)
+                       strncpy(tmp, c->ani, sizeof(tmp) - 1);
                else if (c->callerid)
                        strncpy(tmp, c->callerid, sizeof(tmp) - 1);
                if (c->callerid)

diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index 2c47428..9d9d9e8 100755 (executable)
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -139,6 +139,7 @@ type=peer
 username=asterisk
 secret=supersecret
 host=216.207.245.57
+;sendani=no
 ;host=asterisk.linux-support.net
 ;port=5036
 ;mask=255.255.255.255