[Asterisk-cvs] asterisk/channels chan_zap.c,1.250,1.251

[markster at lists.digium.com]

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

Modified Files:
	chan_zap.c 
Log Message:
Must call spanstat before checking number of channels (bug #1796)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -d -r1.250 -r1.251
--- chan_zap.c	6 Jun 2004 20:47:51 -0000	1.250
+++ chan_zap.c	6 Jun 2004 22:22:48 -0000	1.251
@@ -5687,12 +5687,6 @@
 			int offset;
 			int myswitchtype;
 			offset = 0;
-			pri_resolve_span(&span, channel, (channel - p.chanpos), &si);
-			if (span < 0) {
-				ast_log(LOG_WARNING, "Channel %d: Unable to find locate channel/trunk group!\n", channel);
-				free(tmp);
-				return NULL;
-			}
 			if ((signalling == SIG_PRI) && ioctl(tmp->subs[SUB_REAL].zfd, ZT_AUDIOMODE, &offset)) {
 				ast_log(LOG_ERROR, "Unable to set clear mode on clear channel %d of span %d: %s\n", channel, p.spanno, strerror(errno));
 				free(tmp);
@@ -5709,6 +5703,12 @@
 					free(tmp);
 					return NULL;
 				} 
+				pri_resolve_span(&span, channel, (channel - p.chanpos), &si);
+				if (span < 0) {
+					ast_log(LOG_WARNING, "Channel %d: Unable to find locate channel/trunk group!\n", channel);
+					free(tmp);
+					return NULL;
+				}
 				if (signalling == SIG_PRI)
 					myswitchtype = switchtype;
 				else