chan_h323 Makefile change for Bug #2064. Also back out changes for Bug #2115..next...

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

diff --git a/channels/Makefile b/channels/Makefile
index d908a3712a5618b5b1ffe8e5cbfffff4aa9af9fd..a2d49cbb74b46a71a015b01313c90051fc32c856 100755 (executable)
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -39,7 +39,8 @@ CFLAGS+=-I/usr/local/include
 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 @@ ifneq (${OSARCH},Darwin)
 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 @@ chan_vpb.so: chan_vpb.o
         $(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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index adcf061776fbb75304fa0c74dfbb54df2f9b332f..09db2807acb5e7b575cd864c4b76f1127264bd9d 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -443,7 +443,6 @@ static struct zt_pvt {
        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 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
                        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 @@ static void *pri_dchannel(void *vpri)
                                                        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) {

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index d95aa43acb1c050ce8665f249f4e64e58607bc2d..c5268a657f4f0598bdf2fa99f360d50e66f13a05 100755 (executable)
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -149,8 +149,6 @@ struct ast_channel {
        char *dnid;                             
        /*! Malloc'd Caller ID */
        char *callerid;
-       /*! Caller Type Of Number */
-       int callerton;
        /*! Malloc'd ANI */
        char *ani;                      
        /*! Malloc'd RDNIS */

diff --git a/pbx.c b/pbx.c
index 279cafd0ecb088503899a7c5ee97499e02d24a9b..1a18208fd210802c266478125be088268d8b98e0 100755 (executable)
--- a/pbx.c
+++ b/pbx.c
@@ -896,8 +896,6 @@ static void pbx_substitute_variables_temp(struct ast_channel *c, const char *var
                        *ret = workspace;
                } else 
                        *ret = NULL;
-       } else if (c && !strcmp(var, "CALLERTON")) {
-               snprintf(workspace, workspacelen, "%d", c->callerton);
        } else if (c && !strcmp(var, "DNID")) {
                if (c->dnid) {
                        strncpy(workspace, c->dnid, workspacelen - 1);