[asterisk-commits] branch oej/videosupport r9291 - in
/team/oej/videosupport: ./ agi/ apps/ cdr/...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Feb 9 08:07:14 MST 2006
Author: oej
Date: Thu Feb 9 09:05:25 2006
New Revision: 9291
URL: http://svn.digium.com/view/asterisk?rev=9291&view=rev
Log:
Updates to trunk, automerging on
Added:
team/oej/videosupport/configs/muted.conf.sample
- copied unchanged from r9263, trunk/configs/muted.conf.sample
team/oej/videosupport/doc/00README.1st
- copied unchanged from r9263, trunk/doc/00README.1st
team/oej/videosupport/doc/ael.txt
- copied unchanged from r9263, trunk/doc/ael.txt
team/oej/videosupport/doc/app-sms.txt
- copied unchanged from r9263, trunk/doc/app-sms.txt
team/oej/videosupport/doc/asterisk-conf.txt
- copied unchanged from r9263, trunk/doc/asterisk-conf.txt
team/oej/videosupport/doc/backtrace.txt
- copied unchanged from r9263, trunk/doc/backtrace.txt
team/oej/videosupport/doc/billing.txt
- copied unchanged from r9263, trunk/doc/billing.txt
team/oej/videosupport/doc/callingpres.txt
- copied unchanged from r9263, trunk/doc/callingpres.txt
team/oej/videosupport/doc/cdrdriver.txt
- copied unchanged from r9263, trunk/doc/cdrdriver.txt
team/oej/videosupport/doc/chaniax.txt
- copied unchanged from r9263, trunk/doc/chaniax.txt
team/oej/videosupport/doc/channels.txt
- copied unchanged from r9263, trunk/doc/channels.txt
team/oej/videosupport/doc/channelvariables.txt
- copied unchanged from r9263, trunk/doc/channelvariables.txt
team/oej/videosupport/doc/cliprompt.txt
- copied unchanged from r9263, trunk/doc/cliprompt.txt
team/oej/videosupport/doc/configuration.txt
- copied unchanged from r9263, trunk/doc/configuration.txt
team/oej/videosupport/doc/cygwin.txt
- copied unchanged from r9263, trunk/doc/cygwin.txt
team/oej/videosupport/doc/dundi.txt
- copied unchanged from r9263, trunk/doc/dundi.txt
team/oej/videosupport/doc/enum.txt
- copied unchanged from r9263, trunk/doc/enum.txt
team/oej/videosupport/doc/extconfig.txt
- copied unchanged from r9263, trunk/doc/extconfig.txt
team/oej/videosupport/doc/externalivr.txt
- copied unchanged from r9263, trunk/doc/externalivr.txt
team/oej/videosupport/doc/freetds.txt
- copied unchanged from r9263, trunk/doc/freetds.txt
team/oej/videosupport/doc/h323.txt
- copied unchanged from r9263, trunk/doc/h323.txt
team/oej/videosupport/doc/hardware.txt
- copied unchanged from r9263, trunk/doc/hardware.txt
team/oej/videosupport/doc/ices.txt
- copied unchanged from r9263, trunk/doc/ices.txt
team/oej/videosupport/doc/jitterbuffer.txt
- copied unchanged from r9263, trunk/doc/jitterbuffer.txt
team/oej/videosupport/doc/linkedlists.txt
- copied unchanged from r9263, trunk/doc/linkedlists.txt
team/oej/videosupport/doc/math.txt
- copied unchanged from r9263, trunk/doc/math.txt
team/oej/videosupport/doc/misdn.txt
- copied unchanged from r9263, trunk/doc/misdn.txt
team/oej/videosupport/doc/mp3.txt
- copied unchanged from r9263, trunk/doc/mp3.txt
team/oej/videosupport/doc/musiconhold-fpm.txt
- copied unchanged from r9263, trunk/doc/musiconhold-fpm.txt
team/oej/videosupport/doc/mysql.txt
- copied unchanged from r9263, trunk/doc/mysql.txt
team/oej/videosupport/doc/odbcstorage.txt
- copied unchanged from r9263, trunk/doc/odbcstorage.txt
team/oej/videosupport/doc/privacy.txt
- copied unchanged from r9263, trunk/doc/privacy.txt
team/oej/videosupport/doc/realtime.txt
- copied unchanged from r9263, trunk/doc/realtime.txt
team/oej/videosupport/doc/security.txt
- copied unchanged from r9263, trunk/doc/security.txt
team/oej/videosupport/doc/sms.txt
- copied unchanged from r9263, trunk/doc/sms.txt
team/oej/videosupport/funcs/func_sha1.c
- copied unchanged from r9263, trunk/funcs/func_sha1.c
team/oej/videosupport/include/asterisk/sha1.h
- copied unchanged from r9263, trunk/include/asterisk/sha1.h
team/oej/videosupport/sha1.c
- copied unchanged from r9263, trunk/sha1.c
Removed:
team/oej/videosupport/HARDWARE
team/oej/videosupport/README.fpm
team/oej/videosupport/SECURITY
team/oej/videosupport/apps/app_intercom.c
team/oej/videosupport/apps/app_sql_postgres.c
team/oej/videosupport/doc/README.ael
team/oej/videosupport/doc/README.app_sms
team/oej/videosupport/doc/README.asterisk.conf
team/oej/videosupport/doc/README.backtrace
team/oej/videosupport/doc/README.callingpres
team/oej/videosupport/doc/README.cdr
team/oej/videosupport/doc/README.channels
team/oej/videosupport/doc/README.cliprompt
team/oej/videosupport/doc/README.configuration
team/oej/videosupport/doc/README.cygwin
team/oej/videosupport/doc/README.dundi
team/oej/videosupport/doc/README.enum
team/oej/videosupport/doc/README.extconfig
team/oej/videosupport/doc/README.externalivr
team/oej/videosupport/doc/README.h323
team/oej/videosupport/doc/README.iax
team/oej/videosupport/doc/README.ices
team/oej/videosupport/doc/README.jitterbuffer
team/oej/videosupport/doc/README.linkedlists
team/oej/videosupport/doc/README.math
team/oej/videosupport/doc/README.misdn
team/oej/videosupport/doc/README.mp3
team/oej/videosupport/doc/README.mysql
team/oej/videosupport/doc/README.odbcstorage
team/oej/videosupport/doc/README.privacy
team/oej/videosupport/doc/README.realtime
team/oej/videosupport/doc/README.sms
team/oej/videosupport/doc/README.tds
team/oej/videosupport/doc/README.variables
team/oej/videosupport/doc/cdr.txt
team/oej/videosupport/muted.conf.sample
Modified:
team/oej/videosupport/ (props changed)
team/oej/videosupport/.cleancount
team/oej/videosupport/Makefile
team/oej/videosupport/agi/Makefile
team/oej/videosupport/apps/Makefile
team/oej/videosupport/apps/app_dial.c
team/oej/videosupport/apps/app_disa.c
team/oej/videosupport/apps/app_dumpchan.c
team/oej/videosupport/apps/app_flash.c
team/oej/videosupport/apps/app_macro.c
team/oej/videosupport/apps/app_meetme.c
team/oej/videosupport/apps/app_queue.c
team/oej/videosupport/apps/app_softhangup.c
team/oej/videosupport/apps/app_transfer.c
team/oej/videosupport/apps/app_voicemail.c
team/oej/videosupport/apps/app_zapbarge.c
team/oej/videosupport/apps/app_zapras.c
team/oej/videosupport/apps/app_zapscan.c
team/oej/videosupport/cdr.c
team/oej/videosupport/cdr/Makefile
team/oej/videosupport/channel.c
team/oej/videosupport/channels/Makefile
team/oej/videosupport/channels/chan_agent.c
team/oej/videosupport/channels/chan_alsa.c
team/oej/videosupport/channels/chan_features.c
team/oej/videosupport/channels/chan_iax2.c
team/oej/videosupport/channels/chan_local.c
team/oej/videosupport/channels/chan_mgcp.c
team/oej/videosupport/channels/chan_misdn.c
team/oej/videosupport/channels/chan_misdn_config.c
team/oej/videosupport/channels/chan_nbs.c
team/oej/videosupport/channels/chan_oss.c
team/oej/videosupport/channels/chan_phone.c
team/oej/videosupport/channels/chan_sip.c
team/oej/videosupport/channels/chan_skinny.c
team/oej/videosupport/channels/chan_vpb.c
team/oej/videosupport/channels/chan_zap.c
team/oej/videosupport/channels/iax2-parser.c
team/oej/videosupport/channels/iax2-parser.h
team/oej/videosupport/channels/misdn/Makefile
team/oej/videosupport/channels/misdn/chan_misdn_config.h
team/oej/videosupport/channels/misdn/isdn_lib.c
team/oej/videosupport/channels/misdn/isdn_lib.h
team/oej/videosupport/channels/misdn/isdn_lib_intern.h
team/oej/videosupport/channels/misdn/isdn_msg_parser.c
team/oej/videosupport/cli.c
team/oej/videosupport/codecs/Makefile
team/oej/videosupport/configs/misdn.conf.sample
team/oej/videosupport/configs/sip.conf.sample
team/oej/videosupport/dsp.c
team/oej/videosupport/enum.c
team/oej/videosupport/file.c
team/oej/videosupport/formats/Makefile
team/oej/videosupport/frame.c
team/oej/videosupport/funcs/Makefile
team/oej/videosupport/funcs/func_language.c
team/oej/videosupport/funcs/func_moh.c
team/oej/videosupport/image.c
team/oej/videosupport/include/asterisk/cdr.h
team/oej/videosupport/include/asterisk/channel.h
team/oej/videosupport/include/asterisk/frame.h
team/oej/videosupport/include/asterisk/image.h
team/oej/videosupport/include/asterisk/musiconhold.h
team/oej/videosupport/include/asterisk/stringfields.h
team/oej/videosupport/include/asterisk/utils.h
team/oej/videosupport/logger.c
team/oej/videosupport/pbx.c
team/oej/videosupport/pbx/Makefile
team/oej/videosupport/res/Makefile
team/oej/videosupport/res/res_agi.c
team/oej/videosupport/res/res_clioriginate.c
team/oej/videosupport/res/res_features.c
team/oej/videosupport/res/res_musiconhold.c
team/oej/videosupport/res/res_odbc.c
team/oej/videosupport/rtp.c
team/oej/videosupport/stdtime/Makefile
team/oej/videosupport/udptl.c
team/oej/videosupport/utils.c
team/oej/videosupport/utils/Makefile
Propchange: team/oej/videosupport/
------------------------------------------------------------------------------
automerge = rally
Propchange: team/oej/videosupport/
------------------------------------------------------------------------------
automerge-email = oej at edvina.net
Propchange: team/oej/videosupport/
------------------------------------------------------------------------------
--- branch-1.2-blocked (added)
+++ branch-1.2-blocked Thu Feb 9 09:05:25 2006
@@ -1,0 +1,1 @@
+/branches/1.2:7490,7497,7517,7529,7546,7550,7552,7557,7580,7586,7595,7605,7641,7663,7706,7738,7771,7792,7812,7870-7871,7898-7900,7915,7960,7965,7970,7976,8047,8112,8124,8134,8394,8412,8414,8418,8429,8433,8445,8562,8573,8600,8619,8666,8808,9073,9262
Propchange: team/oej/videosupport/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/videosupport/
('svnmerge-blocked' removed)
Propchange: team/oej/videosupport/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Feb 9 09:05:25 2006
@@ -1,1 +1,1 @@
-/trunk:1-9012
+/trunk:1-9288
Modified: team/oej/videosupport/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/.cleancount?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/.cleancount (original)
+++ team/oej/videosupport/.cleancount Thu Feb 9 09:05:25 2006
@@ -1,1 +1,1 @@
-9
+10
Modified: team/oej/videosupport/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/Makefile?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/Makefile (original)
+++ team/oej/videosupport/Makefile Thu Feb 9 09:05:25 2006
@@ -3,7 +3,7 @@
#
# Top level Makefile
#
-# Copyright (C) 1999-2005, Mark Spencer
+# Copyright (C) 1999-2006, Digium, Inc.
#
# Mark Spencer <markster at digium.com>
#
@@ -327,8 +327,6 @@
ifneq ($(wildcard .svn),)
ASTERISKVERSIONNUM=999999
ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name)
- else
- ASTERISKVERSIONNUM=000000
endif
endif
@@ -351,7 +349,7 @@
astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
netsock.o slinfactory.o ast_expr2.o ast_expr2f.o \
- cryptostub.o
+ cryptostub.o sha1.o
ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
OBJS+= poll.o
@@ -912,3 +910,37 @@
if cmp -s .cleancount .lastclean ; then echo ; else \
$(MAKE) clean; cp -f .cleancount .lastclean;\
fi
+
+_uninstall:
+ rm -f $(DESTDIR)$(MODULES_DIR)/*
+ rm -f $(DESTDIR)$(ASTSBINDIR)/*asterisk*
+ rm -f $(DESTDIR)$(ASTSBINDIR)/astgenkey
+ rm -f $(DESTDIR)$(ASTSBINDIR)/autosupport
+ rm -rf $(DESTDIR)$(ASTHEADERDIR)
+ rm -rf $(DESTDIR)$(ASTVARLIBDIR)/sounds
+ rm -rf $(DESTDIR)$(ASTVARLIBDIR)/firmware
+ rm -rf $(DESTDIR)$(ASTMANDIR)/man8
+ for x in $(SUBDIRS); do $(MAKE) -C $$x uninstall || exit 1 ; done
+
+uninstall: _uninstall
+ @echo " +--------- Asterisk Uninstall Complete -----+"
+ @echo " + Asterisk binaries, sounds, man pages, +"
+ @echo " + headers, modules, and firmware builds, +"
+ @echo " + have all been uninstalled. +"
+ @echo " + +"
+ @echo " + To remove ALL traces of Asterisk, +"
+ @echo " + including configuration, spool +"
+ @echo " + directories, and logs, run the following +"
+ @echo " + command: +"
+ @echo " + +"
+ @echo " + $(MAKE) uninstall-all +"
+ @echo " +-------------------------------------------+"
+
+
+uninstall-all: _uninstall
+ rm -rf $(DESTDIR)$(ASTLIBDIR)
+ rm -rf $(DESTDIR)$(ASTVARLIBDIR)
+ rm -rf $(DESTDIR)$(ASTSPOOLDIR)
+ rm -rf $(DESTDIR)$(ASTETCDIR)
+ rm -rf $(DESTDIR)$(ASTLOGDIR)
+
Modified: team/oej/videosupport/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/agi/Makefile?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/agi/Makefile (original)
+++ team/oej/videosupport/agi/Makefile Thu Feb 9 09:05:25 2006
@@ -30,6 +30,9 @@
mkdir -p $(DESTDIR)$(AGI_DIR)
for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
+uninstall:
+ for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done
+
eagi-test: eagi-test.o
$(CC) $(CFLAGS) -o eagi-test eagi-test.o $(LIBS)
Modified: team/oej/videosupport/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/apps/Makefile?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/apps/Makefile (original)
+++ team/oej/videosupport/apps/Makefile Thu Feb 9 09:05:25 2006
@@ -26,12 +26,6 @@
app_userevent.so app_url.so app_verbose.so app_voicemail.so \
app_waitforring.so app_waitforsilence.so app_while.so app_zapateller.so \
app_morsecode.so
-
-#
-# Obsolete things...
-#
-#APPS+=app_sql_postgres.so
-#APPS+=app_sql_odbc.so
#
# Experimental things
@@ -92,17 +86,10 @@
rm -f $(DESTDIR)$(MODULES_DIR)/app_datetime.so
rm -f $(DESTDIR)$(MODULES_DIR)/app_qcall.so
+uninstall:
+
app_curl.so: app_curl.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS)
-
-app_sql_postgres.o: app_sql_postgres.c
- $(CC) -pipe -I$(CROSS_COMPILE_TARGET)/usr/local/pgsql/include -I$(CROSS_COMPILE_TARGET)/usr/include/postgresql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
-
-app_sql_postgres.so: app_sql_postgres.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L/usr/local/pgsql/lib -lpq
-
-app_sql_odbc.so: app_sql_odbc.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc
look: look.c
$(CC) -pipe -O6 -g look.c -o look -lncurses
Modified: team/oej/videosupport/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/apps/app_dial.c?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/apps/app_dial.c (original)
+++ team/oej/videosupport/apps/app_dial.c Thu Feb 9 09:05:25 2006
@@ -58,6 +58,7 @@
#include "asterisk/rtp.h"
#include "asterisk/manager.h"
#include "asterisk/privacy.h"
+#include "asterisk/stringfields.h"
static char *tdesc = "Dialing Application";
@@ -498,7 +499,7 @@
else
newcid = in->exten;
o->chan->cid.cid_num = strdup(newcid);
- ast_copy_string(o->chan->accountcode, winner->accountcode, sizeof(o->chan->accountcode));
+ ast_string_field_set(o->chan, accountcode, winner->accountcode);
o->chan->cdrflags = winner->cdrflags;
if (!o->chan->cid.cid_num)
ast_log(LOG_WARNING, "Out of memory\n");
@@ -513,7 +514,7 @@
if (!o->chan->cid.cid_name)
ast_log(LOG_WARNING, "Out of memory\n");
}
- ast_copy_string(o->chan->accountcode, in->accountcode, sizeof(o->chan->accountcode));
+ ast_string_field_set(o->chan, accountcode, in->accountcode);
o->chan->cdrflags = in->cdrflags;
}
@@ -1089,11 +1090,11 @@
tmp->chan->cid.cid_ani = strdup(chan->cid.cid_ani);
/* Copy language from incoming to outgoing */
- ast_copy_string(tmp->chan->language, chan->language, sizeof(tmp->chan->language));
- ast_copy_string(tmp->chan->accountcode, chan->accountcode, sizeof(tmp->chan->accountcode));
+ ast_string_field_set(tmp->chan, language, chan->language);
+ ast_string_field_set(tmp->chan, accountcode, chan->accountcode);
tmp->chan->cdrflags = chan->cdrflags;
if (ast_strlen_zero(tmp->chan->musicclass))
- ast_copy_string(tmp->chan->musicclass, chan->musicclass, sizeof(tmp->chan->musicclass));
+ ast_string_field_set(tmp->chan, musicclass, chan->musicclass);
if (chan->cid.cid_rdnis)
tmp->chan->cid.cid_rdnis = strdup(chan->cid.cid_rdnis);
/* Pass callingpres setting */
Modified: team/oej/videosupport/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/apps/app_disa.c?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/apps/app_disa.c (original)
+++ team/oej/videosupport/apps/app_disa.c Thu Feb 9 09:05:25 2006
@@ -47,6 +47,7 @@
#include "asterisk/translate.h"
#include "asterisk/ulaw.h"
#include "asterisk/callerid.h"
+#include "asterisk/stringfields.h"
static char *tdesc = "DISA (Direct Inward System Access) Application";
@@ -347,7 +348,7 @@
}
if (!ast_strlen_zero(acctcode))
- ast_copy_string(chan->accountcode, acctcode, sizeof(chan->accountcode));
+ ast_string_field_set(chan, accountcode, acctcode);
if (special_noanswer) flags.flags = 0;
ast_cdr_reset(chan->cdr, &flags);
Modified: team/oej/videosupport/apps/app_dumpchan.c
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/apps/app_dumpchan.c?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/apps/app_dumpchan.c (original)
+++ team/oej/videosupport/apps/app_dumpchan.c Thu Feb 9 09:05:25 2006
@@ -106,7 +106,7 @@
"Data= %s\n"
"Blocking_in= %s\n",
c->name,
- c->type,
+ c->tech->type,
c->uniqueid,
(c->cid.cid_num ? c->cid.cid_num : "(N/A)"),
(c->cid.cid_name ? c->cid.cid_name : "(N/A)"),
Modified: team/oej/videosupport/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/apps/app_flash.c?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/apps/app_flash.c (original)
+++ team/oej/videosupport/apps/app_flash.c Thu Feb 9 09:05:25 2006
@@ -82,7 +82,7 @@
struct localuser *u;
struct zt_params ztp;
LOCAL_USER_ADD(u);
- if (!strcasecmp(chan->type, "Zap")) {
+ if (!strcasecmp(chan->tech->type, "Zap")) {
memset(&ztp, 0, sizeof(ztp));
res = ioctl(chan->fds[0], ZT_GET_PARAMS, &ztp);
if (!res) {
Modified: team/oej/videosupport/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/apps/app_macro.c?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/apps/app_macro.c (original)
+++ team/oej/videosupport/apps/app_macro.c Thu Feb 9 09:05:25 2006
@@ -107,7 +107,7 @@
char oldcontext[AST_MAX_CONTEXT] = "";
int offset, depth = 0;
int setmacrocontext=0;
- int autoloopflag;
+ int autoloopflag, dead = 0;
char *save_macro_exten;
char *save_macro_context;
@@ -208,8 +208,8 @@
break;
}
switch(res) {
- case MACRO_EXIT_RESULT:
- res = 0;
+ case MACRO_EXIT_RESULT:
+ res = 0;
goto out;
case AST_PBX_KEEPALIVE:
if (option_debug)
@@ -223,6 +223,7 @@
ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro);
else if (option_verbose > 1)
ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro);
+ dead = 1;
goto out;
}
}
@@ -242,37 +243,44 @@
out:
/* Reset the depth back to what it was when the routine was entered (like if we called Macro recursively) */
snprintf(depthc, sizeof(depthc), "%d", depth);
- pbx_builtin_setvar_helper(chan, "MACRO_DEPTH", depthc);
-
- ast_set2_flag(chan, autoloopflag, AST_FLAG_IN_AUTOLOOP);
- for (x=1; x<argc; x++) {
+ if (!dead) {
+ pbx_builtin_setvar_helper(chan, "MACRO_DEPTH", depthc);
+
+ ast_set2_flag(chan, autoloopflag, AST_FLAG_IN_AUTOLOOP);
+ }
+
+ for (x = 1; x < argc; x++) {
/* Restore old arguments and delete ours */
snprintf(varname, sizeof(varname), "ARG%d", x);
if (oldargs[x]) {
- pbx_builtin_setvar_helper(chan, varname, oldargs[x]);
+ if (!dead)
+ pbx_builtin_setvar_helper(chan, varname, oldargs[x]);
free(oldargs[x]);
- } else {
+ } else if (!dead) {
pbx_builtin_setvar_helper(chan, varname, NULL);
}
}
/* Restore macro variables */
- pbx_builtin_setvar_helper(chan, "MACRO_EXTEN", save_macro_exten);
+ if (!dead) {
+ pbx_builtin_setvar_helper(chan, "MACRO_EXTEN", save_macro_exten);
+ pbx_builtin_setvar_helper(chan, "MACRO_CONTEXT", save_macro_context);
+ pbx_builtin_setvar_helper(chan, "MACRO_PRIORITY", save_macro_priority);
+ }
if (save_macro_exten)
free(save_macro_exten);
- pbx_builtin_setvar_helper(chan, "MACRO_CONTEXT", save_macro_context);
if (save_macro_context)
free(save_macro_context);
- pbx_builtin_setvar_helper(chan, "MACRO_PRIORITY", save_macro_priority);
if (save_macro_priority)
free(save_macro_priority);
- if (setmacrocontext) {
+
+ if (!dead && setmacrocontext) {
chan->macrocontext[0] = '\0';
chan->macroexten[0] = '\0';
chan->macropriority = 0;
}
- if (!strcasecmp(chan->context, fullmacro)) {
+ if (!dead && !strcasecmp(chan->context, fullmacro)) {
/* If we're leaving the macro normally, restore original information */
chan->priority = oldpriority;
ast_copy_string(chan->context, oldcontext, sizeof(chan->context));
@@ -292,7 +300,8 @@
}
}
- pbx_builtin_setvar_helper(chan, "MACRO_OFFSET", save_macro_offset);
+ if (!dead)
+ pbx_builtin_setvar_helper(chan, "MACRO_OFFSET", save_macro_offset);
if (save_macro_offset)
free(save_macro_offset);
LOCAL_USER_REMOVE(u);
Modified: team/oej/videosupport/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/apps/app_meetme.c?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/apps/app_meetme.c (original)
+++ team/oej/videosupport/apps/app_meetme.c Thu Feb 9 09:05:25 2006
@@ -996,7 +996,7 @@
}
ast_indicate(chan, -1);
- retryzap = strcasecmp(chan->type, "Zap");
+ retryzap = strcasecmp(chan->tech->type, "Zap");
user->zapchannel = !retryzap;
zapretry:
@@ -1302,7 +1302,7 @@
using_pseudo = 0;
}
ast_log(LOG_DEBUG, "Ooh, something swapped out under us, starting over\n");
- retryzap = strcasecmp(c->type, "Zap");
+ retryzap = strcasecmp(c->tech->type, "Zap");
user->zapchannel = !retryzap;
goto zapretry;
}
Modified: team/oej/videosupport/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/apps/app_queue.c?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/apps/app_queue.c (original)
+++ team/oej/videosupport/apps/app_queue.c Thu Feb 9 09:05:25 2006
@@ -91,6 +91,7 @@
#include "asterisk/causes.h"
#include "asterisk/astdb.h"
#include "asterisk/devicestate.h"
+#include "asterisk/stringfields.h"
#define QUEUE_STRATEGY_RINGALL 0
#define QUEUE_STRATEGY_ROUNDROBIN 1
@@ -1735,7 +1736,7 @@
if (!o->chan->cid.cid_name)
ast_log(LOG_WARNING, "Out of memory\n");
}
- ast_copy_string(o->chan->accountcode, in->accountcode, sizeof(o->chan->accountcode));
+ ast_string_field_set(o->chan, accountcode, in->accountcode);
o->chan->cdrflags = in->cdrflags;
if (in->cid.cid_ani) {
@@ -2182,9 +2183,9 @@
we will always return with -1 so that it is hung up properly after the
conversation. */
qe->handled++;
- if (!strcmp(qe->chan->type,"Zap"))
+ if (!strcmp(qe->chan->tech->type, "Zap"))
ast_channel_setoption(qe->chan, AST_OPTION_TONE_VERIFY, &nondataquality, sizeof(nondataquality), 0);
- if (!strcmp(peer->type,"Zap"))
+ if (!strcmp(peer->tech->type, "Zap"))
ast_channel_setoption(peer, AST_OPTION_TONE_VERIFY, &nondataquality, sizeof(nondataquality), 0);
/* Update parameters for the queue */
recalc_holdtime(qe);
Modified: team/oej/videosupport/apps/app_softhangup.c
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/apps/app_softhangup.c?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/apps/app_softhangup.c (original)
+++ team/oej/videosupport/apps/app_softhangup.c Thu Feb 9 09:05:25 2006
@@ -84,7 +84,7 @@
/* XXX watch out, i think it is wrong to access c-> after unlocking! */
if (all) {
/* CAPI is set up like CAPI[foo/bar]/clcnt */
- if (!strcmp(c->type,"CAPI"))
+ if (!strcmp(c->tech->type, "CAPI"))
cut = strrchr(name,'/');
/* Basically everything else is Foo/Bar-Z */
else
Modified: team/oej/videosupport/apps/app_transfer.c
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/apps/app_transfer.c?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/apps/app_transfer.c (original)
+++ team/oej/videosupport/apps/app_transfer.c Thu Feb 9 09:05:25 2006
@@ -113,7 +113,7 @@
tech = dest;
dest = slash + 1;
/* Allow execution only if the Tech/destination agrees with the type of the channel */
- if (strncasecmp(chan->type, tech, len)) {
+ if (strncasecmp(chan->tech->type, tech, len)) {
pbx_builtin_setvar_helper(chan, "TRANSFERSTATUS", "FAILURE");
LOCAL_USER_REMOVE(u);
return 0;
Modified: team/oej/videosupport/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/apps/app_voicemail.c?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/apps/app_voicemail.c (original)
+++ team/oej/videosupport/apps/app_voicemail.c Thu Feb 9 09:05:25 2006
@@ -72,6 +72,7 @@
#include "asterisk/localtime.h"
#include "asterisk/cli.h"
#include "asterisk/utils.h"
+#include "asterisk/stringfields.h"
#ifdef USE_ODBC_STORAGE
#include "asterisk/res_odbc.h"
#endif
@@ -2655,7 +2656,7 @@
}
-static int say_and_wait(struct ast_channel *chan, int num, char *language)
+static int say_and_wait(struct ast_channel *chan, int num, const char *language)
{
int d;
d = ast_say_number(chan, num, AST_DIGIT_ANY, language, (char *) NULL);
@@ -5150,7 +5151,7 @@
/* Set language from config to override channel language */
if (!ast_strlen_zero(vmu->language))
- ast_copy_string(chan->language, vmu->language, sizeof(chan->language));
+ ast_string_field_set(chan, language, vmu->language);
create_dirpath(vms.curdir, sizeof(vms.curdir), vmu->context, vms.username, "");
/* Retrieve old and new message counts */
res = open_mailbox(&vms, vmu, 1);
Modified: team/oej/videosupport/apps/app_zapbarge.c
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/apps/app_zapbarge.c?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/apps/app_zapbarge.c (original)
+++ team/oej/videosupport/apps/app_zapbarge.c Thu Feb 9 09:05:25 2006
@@ -131,7 +131,7 @@
goto outrun;
}
ast_indicate(chan, -1);
- retryzap = strcasecmp(chan->type, "Zap");
+ retryzap = strcasecmp(chan->tech->type, "Zap");
zapretry:
origfd = chan->fds[0];
if (retryzap) {
Modified: team/oej/videosupport/apps/app_zapras.c
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/apps/app_zapras.c?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/apps/app_zapras.c (original)
+++ team/oej/videosupport/apps/app_zapras.c Thu Feb 9 09:05:25 2006
@@ -217,7 +217,7 @@
/* Answer the channel if it's not up */
if (chan->_state != AST_STATE_UP)
ast_answer(chan);
- if (strcasecmp(chan->type, "Zap")) {
+ if (strcasecmp(chan->tech->type, "Zap")) {
/* If it's not a zap channel, we're done. Wait a couple of
seconds and then hangup... */
if (option_verbose > 1)
Modified: team/oej/videosupport/apps/app_zapscan.c
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/apps/app_zapscan.c?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/apps/app_zapscan.c (original)
+++ team/oej/videosupport/apps/app_zapscan.c Thu Feb 9 09:05:25 2006
@@ -137,7 +137,7 @@
goto outrun;
}
ast_indicate(chan, -1);
- retryzap = strcasecmp(chan->type, "Zap");
+ retryzap = strcasecmp(chan->tech->type, "Zap");
zapretry:
origfd = chan->fds[0];
if (retryzap) {
@@ -345,7 +345,7 @@
continue;
}
}
- if ( tempchan && tempchan->type && (!strcmp(tempchan->type, "Zap")) && (tempchan != chan) ) {
+ if (tempchan && (!strcmp(tempchan->tech->type, "Zap")) && (tempchan != chan) ) {
ast_verbose(VERBOSE_PREFIX_3 "Zap channel %s is in-use, monitoring...\n", tempchan->name);
ast_copy_string(confstr, tempchan->name, sizeof(confstr));
ast_mutex_unlock(&tempchan->lock);
Modified: team/oej/videosupport/cdr.c
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/cdr.c?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/cdr.c (original)
+++ team/oej/videosupport/cdr.c Thu Feb 9 09:05:25 2006
@@ -54,6 +54,7 @@
#include "asterisk/config.h"
#include "asterisk/cli.h"
#include "asterisk/module.h"
+#include "asterisk/stringfields.h"
/*! Default AMA flag for billing records (CDR's) */
int ast_default_amaflags = AST_CDR_DOCUMENTATION;
@@ -535,7 +536,7 @@
return res;
}
-void ast_cdr_setdestchan(struct ast_cdr *cdr, char *chann)
+void ast_cdr_setdestchan(struct ast_cdr *cdr, const char *chann)
{
char *chan;
@@ -682,7 +683,7 @@
{
struct ast_cdr *cdr = chan->cdr;
- ast_copy_string(chan->accountcode, account, sizeof(chan->accountcode));
+ ast_string_field_set(chan, accountcode, account);
while (cdr) {
if (!ast_test_flag(cdr, AST_CDR_FLAG_LOCKED))
ast_copy_string(cdr->accountcode, chan->accountcode, sizeof(cdr->accountcode));
Modified: team/oej/videosupport/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/cdr/Makefile?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/cdr/Makefile (original)
+++ team/oej/videosupport/cdr/Makefile Thu Feb 9 09:05:25 2006
@@ -45,11 +45,11 @@
#
# FreeTDS stuff...
#
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h),)
- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.63),1)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),)
+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1)
CFLAGS += -DFREETDS_0_63
else
- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.62),1)
+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1)
CFLAGS += -DFREETDS_0_62
else
CFLAGS += -DFREETDS_PRE_0_62
@@ -112,6 +112,8 @@
install: all
for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
+uninstall:
+
clean:
rm -f *.so *.o .depend
Modified: team/oej/videosupport/channel.c
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/channel.c?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/channel.c (original)
+++ team/oej/videosupport/channel.c Thu Feb 9 09:05:25 2006
@@ -72,6 +72,7 @@
#include "asterisk/app.h"
#include "asterisk/transcap.h"
#include "asterisk/devicestate.h"
+#include "asterisk/sha1.h"
struct channel_spy_trans {
int last_format;
@@ -604,6 +605,8 @@
return NULL;
}
+ ast_string_field_init(tmp, 128);
+
/* Don't bother initializing the last two FD here, because they
will *always* be set just a few lines down (AST_TIMING_FD,
AST_ALERT_FD). */
@@ -642,7 +645,7 @@
tmp->fds[AST_ALERT_FD] = tmp->alertpipe[0];
/* And timing pipe */
tmp->fds[AST_TIMING_FD] = tmp->timingfd;
- strcpy(tmp->name, "**Unknown**");
+ ast_string_field_set(tmp, name, "**Unknown**");
/* Initial state */
tmp->_state = AST_STATE_DOWN;
tmp->streamid = -1;
@@ -657,11 +660,11 @@
ast_mutex_init(&tmp->lock);
AST_LIST_HEAD_INIT_NOLOCK(headp);
strcpy(tmp->context, "default");
- ast_copy_string(tmp->language, defaultlanguage, sizeof(tmp->language));
+ ast_string_field_set(tmp, language, defaultlanguage);
strcpy(tmp->exten, "s");
tmp->priority = 1;
tmp->amaflags = ast_default_amaflags;
- ast_copy_string(tmp->accountcode, ast_default_accountcode, sizeof(tmp->accountcode));
+ ast_string_field_set(tmp, accountcode, ast_default_accountcode);
tmp->tech = &null_tech;
@@ -2805,10 +2808,8 @@
void ast_change_name(struct ast_channel *chan, char *newname)
{
- char tmp[256];
- ast_copy_string(tmp, chan->name, sizeof(tmp));
- ast_copy_string(chan->name, newname, sizeof(chan->name));
- manager_event(EVENT_FLAG_CALL, "Rename", "Oldname: %s\r\nNewname: %s\r\nUniqueid: %s\r\n", tmp, chan->name, chan->uniqueid);
+ manager_event(EVENT_FLAG_CALL, "Rename", "Oldname: %s\r\nNewname: %s\r\nUniqueid: %s\r\n", chan->name, newname, chan->uniqueid);
+ ast_string_field_set(chan, name, newname);
}
void ast_channel_inherit_variables(const struct ast_channel *parent, struct ast_channel *child)
@@ -2941,10 +2942,10 @@
snprintf(masqn, sizeof(masqn), "%s<MASQ>", newn);
/* Copy the name from the clone channel */
- ast_copy_string(original->name, newn, sizeof(original->name));
+ ast_string_field_set(original, name, newn);
/* Mangle the name of the clone channel */
- ast_copy_string(clone->name, masqn, sizeof(clone->name));
+ ast_string_field_set(clone, name, masqn);
/* Notify any managers of the change, first the masq then the other */
manager_event(EVENT_FLAG_CALL, "Rename", "Oldname: %s\r\nNewname: %s\r\nUniqueid: %s\r\n", newn, masqn, clone->uniqueid);
@@ -3026,17 +3027,16 @@
snprintf(zombn, sizeof(zombn), "%s<ZOMBIE>", orig);
/* Mangle the name of the clone channel */
- ast_copy_string(clone->name, zombn, sizeof(clone->name));
+ ast_string_field_set(clone, name, zombn);
manager_event(EVENT_FLAG_CALL, "Rename", "Oldname: %s\r\nNewname: %s\r\nUniqueid: %s\r\n", masqn, zombn, clone->uniqueid);
/* Update the type. */
- original->type = clone->type;
t_pvt = original->monitor;
original->monitor = clone->monitor;
clone->monitor = t_pvt;
/* Keep the same language. */
- ast_copy_string(original->language, clone->language, sizeof(original->language));
+ ast_string_field_set(original, language, clone->language);
/* Copy the FD's other than the generator fd */
for (x = 0; x < AST_MAX_FDS; x++) {
if (x != AST_GENERATOR_FD)
@@ -3079,7 +3079,7 @@
ast_set_read_format(original, rformat);
/* Copy the music class */
- ast_copy_string(original->musicclass, clone->musicclass, sizeof(original->musicclass));
+ ast_string_field_set(original, musicclass, clone->musicclass);
ast_log(LOG_DEBUG, "Putting channel %s in %d/%d formats\n", original->name, wformat, rformat);
@@ -3089,13 +3089,13 @@
res = original->tech->fixup(clone, original);
if (res) {
ast_log(LOG_WARNING, "Channel for type '%s' could not fixup channel %s\n",
- original->type, original->name);
+ original->tech->type, original->name);
ast_mutex_unlock(&clone->lock);
return -1;
}
} else
ast_log(LOG_WARNING, "Channel type '%s' does not have a fixup routine (for %s)! Bad things may happen.\n",
- original->type, original->name);
+ original->tech->type, original->name);
/* Now, at this point, the "clone" channel is totally F'd up. We mark it as
a zombie so nothing tries to touch it. If it's already been marked as a
@@ -3775,15 +3775,13 @@
return group;
}
-static int (*ast_moh_start_ptr)(struct ast_channel *, char *) = NULL;
+static int (*ast_moh_start_ptr)(struct ast_channel *, const char *) = NULL;
static void (*ast_moh_stop_ptr)(struct ast_channel *) = NULL;
static void (*ast_moh_cleanup_ptr)(struct ast_channel *) = NULL;
-
-void ast_install_music_functions(int (*start_ptr)(struct ast_channel *, char *),
- void (*stop_ptr)(struct ast_channel *),
- void (*cleanup_ptr)(struct ast_channel *)
- )
+void ast_install_music_functions(int (*start_ptr)(struct ast_channel *, const char *),
+ void (*stop_ptr)(struct ast_channel *),
+ void (*cleanup_ptr)(struct ast_channel *))
{
ast_moh_start_ptr = start_ptr;
ast_moh_stop_ptr = stop_ptr;
@@ -3798,7 +3796,7 @@
}
/*! \brief Turn on music on hold on a given channel */
-int ast_moh_start(struct ast_channel *chan, char *mclass)
+int ast_moh_start(struct ast_channel *chan, const char *mclass)
{
if (ast_moh_start_ptr)
return ast_moh_start_ptr(chan, mclass);
Modified: team/oej/videosupport/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/videosupport/channels/Makefile?rev=9291&r1=9290&r2=9291&view=diff
==============================================================================
--- team/oej/videosupport/channels/Makefile (original)
+++ team/oej/videosupport/channels/Makefile Thu Feb 9 09:05:25 2006
@@ -69,7 +69,7 @@
CHANNEL_LIBS+=chan_h323.so
endif
-ifneq ($(wildcard misdn/chan_misdn_lib.a),)
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),)
CHANNEL_LIBS+=chan_misdn.so
CFLAGS+=-Imisdn
endif
@@ -224,16 +224,25 @@
$(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
endif
+misdn/chan_misdn_lib.a:
+ make -C misdn
+
chan_misdn.so: chan_misdn.o chan_misdn_config.o misdn/chan_misdn_lib.a
$(CC) -shared -Xlinker -x -L/usr/lib -o $@ $^ -lisdnnet -lmISDN
chan_misdn.o: chan_misdn.c
- $(CC) $(CFLAGS) -DCHAN_MISDN_VERSION=\"0.2.1\" -c $< -o $@
[... 8146 lines stripped ...]
More information about the asterisk-commits
mailing list