[Asterisk-cvs] asterisk/channels chan_zap.c,1.344.2.8,1.344.2.9

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv28409/channels

Modified Files:
      Tag: v1-0
	chan_zap.c 
Log Message:
make cid rings configurable (bug #2889)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.344.2.8
retrieving revision 1.344.2.9
diff -u -d -r1.344.2.8 -r1.344.2.9
--- chan_zap.c	3 Dec 2004 00:11:21 -0000	1.344.2.8
+++ chan_zap.c	30 Dec 2004 20:36:57 -0000	1.344.2.9
@@ -264,6 +264,9 @@
 
 static int ifcount = 0;
 
+/* When to send the CallerID signals (rings) */
+static int sendcalleridafter = DEFAULT_CIDRINGS;
+
 /* Protect the monitoring thread, so only one process can kill or start it, and not
    when it's doing something critical. */
 AST_MUTEX_DEFINE_STATIC(monlock);
@@ -543,6 +546,7 @@
 	int dtmfrelax;		/* whether to run in relaxed DTMF mode */
 	int fake_event;
 	int zaptrcallerid;	/* should we use the callerid from incoming call on zap transfer or not */
+	int sendcalleridafter;
 #ifdef ZAPATA_PRI
 	struct zt_pri *pri;
 	struct zt_pvt *bearer;
@@ -1532,7 +1536,7 @@
 			} else {
 				if (ioctl(p->subs[SUB_REAL].zfd, ZT_SETCADENCE, NULL))
 					ast_log(LOG_WARNING, "Unable to reset default ring on '%s'\n", ast->name);
-				p->cidrings = DEFAULT_CIDRINGS;
+				p->cidrings = p->sendcalleridafter;
 			}
 
 
@@ -9595,6 +9599,8 @@
 			cur_rxflash = atoi(v->value);
 		} else if (!strcasecmp(v->name, "debounce")) {
 			cur_debounce = atoi(v->value);
+		} else if (!strcasecmp(v->name, "sendcalleridafter")) {
+			sendcalleridafter = atoi(v->value);
 		} else
 			ast_log(LOG_WARNING, "Ignoring %s\n", v->name);
 		v = v->next;