[Asterisk-cvs] asterisk/channels chan_zap.c,1.325,1.326

[markster at lists.digium.com]

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

Modified Files:
	chan_zap.c 
Log Message:
Look for feature group D on all E&M Wink Lines (bug #2228)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -d -r1.325 -r1.326
--- chan_zap.c	23 Aug 2004 17:37:24 -0000	1.325
+++ chan_zap.c	30 Aug 2004 05:07:27 -0000	1.326
@@ -3,7 +3,7 @@
  *
  * Zaptel Pseudo TDM interface 
  * 
- * Copyright (C) 2003 Digium
+ * Copyright (C) 2003-2004, Digium, Inc.
  *
  * Mark Spencer <markster at digium.com>
  *
@@ -4632,7 +4632,8 @@
 		strncpy(exten, dtmfbuf, sizeof(exten)-1);
 		if (ast_strlen_zero(exten))
 			strncpy(exten, "s", sizeof(exten)-1);
-		if (p->sig == SIG_FEATD) {
+		if (p->sig == SIG_FEATD || p->sig == SIG_EMWINK) {
+			/* Look for Feature Group D on all E&M Wink and Feature Group D trunks */
 			if (exten[0] == '*') {
 				char *stringp=NULL;
 				strncpy(exten2, exten, sizeof(exten2)-1);
@@ -4650,7 +4651,7 @@
 					strncpy(exten, s2, sizeof(exten)-1);
 				} else
 					strncpy(exten, s1, sizeof(exten)-1);
-			} else
+			} else if (p->sig == SIG_FEATD)
 				ast_log(LOG_WARNING, "Got a non-Feature Group D input on channel %d.  Assuming E&M Wink instead\n", p->channel);
 		}
 		if (p->sig == SIG_FEATDMF) {