kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-01-06 18:13:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

chan_h323 Makefile change for Bug #2064. Also back out changes for Bug #2115..next time read carefully. :)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Malcolm Davenport
2004-07-30 18:57:37 +00:00
parent 943133953e
commit a322c6f411
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/Makefile
View File

@@ -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

4
channels/chan_zap.c
View File

@@ -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) {

2
include/asterisk/channel.h
View File

@@ -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 */

2
pbx.c
View File

@@ -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);