[Asterisk-cvs] asterisk/channels Makefile,1.57,1.58 chan_zap.c,1.315,1.316

[malcolmd at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory localhost.localdomain:/tmp/cvs-serv1067/channels

Modified Files:
	Makefile chan_zap.c 
Log Message:
chan_h323 Makefile change for Bug #2064.  Also back out changes for Bug #2115..next time read carefully. :)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/Makefile,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- Makefile	7 Jul 2004 09:34:01 -0000	1.57
+++ Makefile	30 Jul 2004 18:57:37 -0000	1.58
@@ -39,7 +39,8 @@
 PTLIB=-lpt_OpenBSD_x86_r
 H323LIB=-lh323_OpenBSD_x86_r
 CHANH323LIB=-L/usr/local/lib
-else
+endif
+ifeq (${OSARCH},Linux)
 MYSQLLIB=-L/usr/lib/mysql -lmysqlclient
 PTLIB=-lpt_linux_x86_r
 H323LIB=-lh323_linux_x86_r
@@ -50,6 +51,9 @@
 CHANNEL_LIBS+=chan_oss.so
 endif
 ifeq (${OSARCH},FreeBSD)
+PTLIB=-lpt_FreeBSD_x86_r
+H323LIB=-lh323_FreeBSD_x86_r
+CHANH323LIB=-pthread
 SOLINK+=-L/usr/local/lib
 CHANNEL_LIBS+=chan_oss.so
 endif
@@ -179,7 +183,7 @@
 	 $(CXX) $(SOLINK) -o $@ $< -lvpb -lpthread -lm -ldl
 
 chan_h323.so: chan_h323.o h323/libchanh323.a
-	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lpthread -lcrypto -lssl -lexpat
+	$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
 
 
 #chan_modem.so : chan_modem.o

Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -d -r1.315 -r1.316
--- chan_zap.c	30 Jul 2004 18:42:46 -0000	1.315
+++ chan_zap.c	30 Jul 2004 18:57:37 -0000	1.316
@@ -443,7 +443,6 @@
 	char language[MAX_LANGUAGE];
 	char musicclass[MAX_LANGUAGE];
 	char callerid[AST_MAX_EXTENSION];
-	int callerton;
 	char lastcallerid[AST_MAX_EXTENSION];
 	char *origcallerid;			/* malloced original callerid */
 	char callwaitcid[AST_MAX_EXTENSION];
@@ -4410,7 +4409,6 @@
 			tmp->callerid = strdup(i->callerid);
 			tmp->ani = strdup(i->callerid);
 		}
-		tmp->callerton = i->callerton;
 		tmp->restrictcid = i->restrictcid;
 		tmp->callingpres = i->callingpres;
 #ifdef ZAPATA_PRI
@@ -7238,8 +7236,6 @@
 							strncpy(pri->pvts[chanpos]->callerid, e->ring.callingnum, sizeof(pri->pvts[chanpos]->callerid)-1);
 					} else
 						pri->pvts[chanpos]->callerid[0] = '\0';
-					/* Caller Type Of Number - used to distinguise NANPA from International */
-					pri->pvts[chanpos]->callerton = ((e->ring.callingplan) >> 4) & 0x7;
 					strncpy(pri->pvts[chanpos]->rdnis, e->ring.redirectingnum, sizeof(pri->pvts[chanpos]->rdnis) - 1);
 					/* If immediate=yes go to s|1 */
 					if (pri->pvts[chanpos]->immediate) {