[asterisk-commits] branch mogorman/asterisk-xmpp r17446 - in
/team/mogorman/asterisk-xmpp: ./ ag...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue Apr 4 15:23:35 MST 2006
Author: mogorman
Date: Tue Apr 4 17:23:20 2006
New Revision: 17446
URL: http://svn.digium.com/view/asterisk?rev=17446&view=rev
Log:
fixed merge conflict, brought back to trunk.
Added:
team/mogorman/asterisk-xmpp/agi/jukebox.agi
- copied unchanged from r17415, trunk/agi/jukebox.agi
team/mogorman/asterisk-xmpp/apps/app_channelredirect.c
- copied unchanged from r17415, trunk/apps/app_channelredirect.c
team/mogorman/asterisk-xmpp/configs/http.conf.sample
- copied unchanged from r17415, trunk/configs/http.conf.sample
team/mogorman/asterisk-xmpp/configs/res_snmp.conf.sample
- copied unchanged from r17415, trunk/configs/res_snmp.conf.sample
team/mogorman/asterisk-xmpp/contrib/scripts/meetme.sql
- copied unchanged from r17415, trunk/contrib/scripts/meetme.sql
team/mogorman/asterisk-xmpp/doc/ajam.txt
- copied unchanged from r17415, trunk/doc/ajam.txt
team/mogorman/asterisk-xmpp/doc/asterisk-mib.txt
- copied unchanged from r17415, trunk/doc/asterisk-mib.txt
team/mogorman/asterisk-xmpp/doc/digium-mib.txt
- copied unchanged from r17415, trunk/doc/digium-mib.txt
team/mogorman/asterisk-xmpp/doc/ip-tos.txt
- copied unchanged from r17415, trunk/doc/ip-tos.txt
team/mogorman/asterisk-xmpp/doc/snmp.txt
- copied unchanged from r17415, trunk/doc/snmp.txt
team/mogorman/asterisk-xmpp/http.c
- copied unchanged from r17415, trunk/http.c
team/mogorman/asterisk-xmpp/include/asterisk/http.h
- copied unchanged from r17415, trunk/include/asterisk/http.h
team/mogorman/asterisk-xmpp/res/res_convert.c
- copied unchanged from r17415, trunk/res/res_convert.c
team/mogorman/asterisk-xmpp/res/res_snmp.c
- copied unchanged from r17415, trunk/res/res_snmp.c
team/mogorman/asterisk-xmpp/res/snmp/
- copied from r17415, trunk/res/snmp/
team/mogorman/asterisk-xmpp/res/snmp/agent.c
- copied unchanged from r17415, trunk/res/snmp/agent.c
team/mogorman/asterisk-xmpp/res/snmp/agent.h
- copied unchanged from r17415, trunk/res/snmp/agent.h
team/mogorman/asterisk-xmpp/static-http/
- copied from r17415, trunk/static-http/
team/mogorman/asterisk-xmpp/static-http/ajamdemo.html
- copied unchanged from r17415, trunk/static-http/ajamdemo.html
team/mogorman/asterisk-xmpp/static-http/astman.css
- copied unchanged from r17415, trunk/static-http/astman.css
team/mogorman/asterisk-xmpp/static-http/astman.js
- copied unchanged from r17415, trunk/static-http/astman.js
team/mogorman/asterisk-xmpp/static-http/prototype.js
- copied unchanged from r17415, trunk/static-http/prototype.js
Removed:
team/mogorman/asterisk-xmpp/formats/format_au.c
team/mogorman/asterisk-xmpp/formats/format_pcm_alaw.c
Modified:
team/mogorman/asterisk-xmpp/ (props changed)
team/mogorman/asterisk-xmpp/.cleancount
team/mogorman/asterisk-xmpp/CREDITS
team/mogorman/asterisk-xmpp/Makefile
team/mogorman/asterisk-xmpp/README
team/mogorman/asterisk-xmpp/UPGRADE.txt
team/mogorman/asterisk-xmpp/acl.c
team/mogorman/asterisk-xmpp/agi/Makefile
team/mogorman/asterisk-xmpp/app.c
team/mogorman/asterisk-xmpp/apps/app_alarmreceiver.c
team/mogorman/asterisk-xmpp/apps/app_amd.c
team/mogorman/asterisk-xmpp/apps/app_dial.c
team/mogorman/asterisk-xmpp/apps/app_directory.c
team/mogorman/asterisk-xmpp/apps/app_dumpchan.c
team/mogorman/asterisk-xmpp/apps/app_echo.c
team/mogorman/asterisk-xmpp/apps/app_exec.c
team/mogorman/asterisk-xmpp/apps/app_externalivr.c
team/mogorman/asterisk-xmpp/apps/app_macro.c
team/mogorman/asterisk-xmpp/apps/app_meetme.c
team/mogorman/asterisk-xmpp/apps/app_milliwatt.c
team/mogorman/asterisk-xmpp/apps/app_mixmonitor.c
team/mogorman/asterisk-xmpp/apps/app_page.c
team/mogorman/asterisk-xmpp/apps/app_queue.c
team/mogorman/asterisk-xmpp/apps/app_readfile.c
team/mogorman/asterisk-xmpp/apps/app_rpt.c
team/mogorman/asterisk-xmpp/apps/app_senddtmf.c
team/mogorman/asterisk-xmpp/apps/app_sms.c
team/mogorman/asterisk-xmpp/apps/app_stack.c
team/mogorman/asterisk-xmpp/apps/app_voicemail.c
team/mogorman/asterisk-xmpp/apps/app_while.c
team/mogorman/asterisk-xmpp/ast_expr2.c
team/mogorman/asterisk-xmpp/ast_expr2.fl
team/mogorman/asterisk-xmpp/ast_expr2.h
team/mogorman/asterisk-xmpp/ast_expr2.y
team/mogorman/asterisk-xmpp/ast_expr2f.c
team/mogorman/asterisk-xmpp/asterisk.8
team/mogorman/asterisk-xmpp/asterisk.c
team/mogorman/asterisk-xmpp/asterisk.sgml
team/mogorman/asterisk-xmpp/astmm.c
team/mogorman/asterisk-xmpp/build_tools/make_build_h
team/mogorman/asterisk-xmpp/build_tools/make_svn_branch_name
team/mogorman/asterisk-xmpp/callerid.c
team/mogorman/asterisk-xmpp/cdr.c
team/mogorman/asterisk-xmpp/cdr/Makefile
team/mogorman/asterisk-xmpp/cdr/cdr_csv.c
team/mogorman/asterisk-xmpp/cdr/cdr_manager.c
team/mogorman/asterisk-xmpp/cdr/cdr_odbc.c
team/mogorman/asterisk-xmpp/cdr/cdr_pgsql.c
team/mogorman/asterisk-xmpp/cdr/cdr_sqlite.c
team/mogorman/asterisk-xmpp/cdr/cdr_tds.c
team/mogorman/asterisk-xmpp/channel.c
team/mogorman/asterisk-xmpp/channels/chan_agent.c
team/mogorman/asterisk-xmpp/channels/chan_h323.c
team/mogorman/asterisk-xmpp/channels/chan_iax2.c
team/mogorman/asterisk-xmpp/channels/chan_local.c
team/mogorman/asterisk-xmpp/channels/chan_misdn.c
team/mogorman/asterisk-xmpp/channels/chan_oss.c
team/mogorman/asterisk-xmpp/channels/chan_phone.c
team/mogorman/asterisk-xmpp/channels/chan_sip.c
team/mogorman/asterisk-xmpp/channels/chan_skinny.c
team/mogorman/asterisk-xmpp/channels/chan_vpb.c
team/mogorman/asterisk-xmpp/channels/chan_zap.c
team/mogorman/asterisk-xmpp/channels/h323/ast_h323.cpp
team/mogorman/asterisk-xmpp/channels/iax2-provision.c
team/mogorman/asterisk-xmpp/channels/iax2-provision.h
team/mogorman/asterisk-xmpp/channels/misdn/Makefile
team/mogorman/asterisk-xmpp/channels/misdn/chan_misdn_config.h
team/mogorman/asterisk-xmpp/channels/misdn/isdn_lib.c
team/mogorman/asterisk-xmpp/channels/misdn/isdn_lib.h
team/mogorman/asterisk-xmpp/channels/misdn/isdn_msg_parser.c
team/mogorman/asterisk-xmpp/channels/misdn_config.c
team/mogorman/asterisk-xmpp/cli.c
team/mogorman/asterisk-xmpp/codecs/Makefile
team/mogorman/asterisk-xmpp/codecs/codec_a_mu.c
team/mogorman/asterisk-xmpp/codecs/codec_adpcm.c
team/mogorman/asterisk-xmpp/codecs/codec_alaw.c
team/mogorman/asterisk-xmpp/codecs/codec_g723_1.c
team/mogorman/asterisk-xmpp/codecs/codec_g726.c
team/mogorman/asterisk-xmpp/codecs/codec_gsm.c
team/mogorman/asterisk-xmpp/codecs/codec_ilbc.c
team/mogorman/asterisk-xmpp/codecs/codec_lpc10.c
team/mogorman/asterisk-xmpp/codecs/codec_speex.c
team/mogorman/asterisk-xmpp/codecs/codec_ulaw.c
team/mogorman/asterisk-xmpp/codecs/gsm/Makefile
team/mogorman/asterisk-xmpp/config.c
team/mogorman/asterisk-xmpp/configs/cdr.conf.sample
team/mogorman/asterisk-xmpp/configs/cdr_tds.conf.sample
team/mogorman/asterisk-xmpp/configs/extensions.conf.sample
team/mogorman/asterisk-xmpp/configs/features.conf.sample
team/mogorman/asterisk-xmpp/configs/iax.conf.sample
team/mogorman/asterisk-xmpp/configs/iaxprov.conf.sample
team/mogorman/asterisk-xmpp/configs/indications.conf.sample
team/mogorman/asterisk-xmpp/configs/manager.conf.sample
team/mogorman/asterisk-xmpp/configs/misdn.conf.sample
team/mogorman/asterisk-xmpp/configs/musiconhold.conf.sample
team/mogorman/asterisk-xmpp/configs/oss.conf.sample
team/mogorman/asterisk-xmpp/configs/queues.conf.sample
team/mogorman/asterisk-xmpp/configs/sip.conf.sample
team/mogorman/asterisk-xmpp/configs/skinny.conf.sample
team/mogorman/asterisk-xmpp/configs/zapata.conf.sample
team/mogorman/asterisk-xmpp/contrib/init.d/rc.redhat.asterisk
team/mogorman/asterisk-xmpp/contrib/utils/rawplayer.c
team/mogorman/asterisk-xmpp/db.c
team/mogorman/asterisk-xmpp/devicestate.c
team/mogorman/asterisk-xmpp/doc/00README.1st
team/mogorman/asterisk-xmpp/doc/CODING-GUIDELINES
team/mogorman/asterisk-xmpp/doc/asterisk-conf.txt
team/mogorman/asterisk-xmpp/doc/billing.txt
team/mogorman/asterisk-xmpp/doc/enum.txt
team/mogorman/asterisk-xmpp/doc/extconfig.txt
team/mogorman/asterisk-xmpp/doc/manager.txt
team/mogorman/asterisk-xmpp/doc/misdn.txt
team/mogorman/asterisk-xmpp/doc/realtime.txt
team/mogorman/asterisk-xmpp/editline/np/vis.c
team/mogorman/asterisk-xmpp/editline/readline.c
team/mogorman/asterisk-xmpp/editline/term.c
team/mogorman/asterisk-xmpp/enum.c
team/mogorman/asterisk-xmpp/file.c
team/mogorman/asterisk-xmpp/formats/Makefile
team/mogorman/asterisk-xmpp/formats/format_g723.c
team/mogorman/asterisk-xmpp/formats/format_g726.c
team/mogorman/asterisk-xmpp/formats/format_g729.c
team/mogorman/asterisk-xmpp/formats/format_gsm.c
team/mogorman/asterisk-xmpp/formats/format_h263.c
team/mogorman/asterisk-xmpp/formats/format_h264.c
team/mogorman/asterisk-xmpp/formats/format_ilbc.c
team/mogorman/asterisk-xmpp/formats/format_ogg_vorbis.c
team/mogorman/asterisk-xmpp/formats/format_pcm.c
team/mogorman/asterisk-xmpp/formats/format_sln.c
team/mogorman/asterisk-xmpp/formats/format_vox.c
team/mogorman/asterisk-xmpp/formats/format_wav.c
team/mogorman/asterisk-xmpp/formats/format_wav_gsm.c
team/mogorman/asterisk-xmpp/funcs/Makefile
team/mogorman/asterisk-xmpp/funcs/func_channel.c
team/mogorman/asterisk-xmpp/funcs/func_enum.c
team/mogorman/asterisk-xmpp/image.c
team/mogorman/asterisk-xmpp/include/asterisk.h
team/mogorman/asterisk-xmpp/include/asterisk/acl.h
team/mogorman/asterisk-xmpp/include/asterisk/adsi.h
team/mogorman/asterisk-xmpp/include/asterisk/app.h
team/mogorman/asterisk-xmpp/include/asterisk/callerid.h
team/mogorman/asterisk-xmpp/include/asterisk/cdr.h
team/mogorman/asterisk-xmpp/include/asterisk/channel.h
team/mogorman/asterisk-xmpp/include/asterisk/cli.h
team/mogorman/asterisk-xmpp/include/asterisk/compat.h
team/mogorman/asterisk-xmpp/include/asterisk/config.h
team/mogorman/asterisk-xmpp/include/asterisk/crypto.h
team/mogorman/asterisk-xmpp/include/asterisk/dns.h
team/mogorman/asterisk-xmpp/include/asterisk/doxyref.h
team/mogorman/asterisk-xmpp/include/asterisk/enum.h
team/mogorman/asterisk-xmpp/include/asterisk/features.h
team/mogorman/asterisk-xmpp/include/asterisk/file.h
team/mogorman/asterisk-xmpp/include/asterisk/frame.h
team/mogorman/asterisk-xmpp/include/asterisk/fskmodem.h
team/mogorman/asterisk-xmpp/include/asterisk/image.h
team/mogorman/asterisk-xmpp/include/asterisk/indications.h
team/mogorman/asterisk-xmpp/include/asterisk/io.h
team/mogorman/asterisk-xmpp/include/asterisk/linkedlists.h
team/mogorman/asterisk-xmpp/include/asterisk/localtime.h
team/mogorman/asterisk-xmpp/include/asterisk/lock.h
team/mogorman/asterisk-xmpp/include/asterisk/logger.h
team/mogorman/asterisk-xmpp/include/asterisk/manager.h
team/mogorman/asterisk-xmpp/include/asterisk/module.h
team/mogorman/asterisk-xmpp/include/asterisk/musiconhold.h
team/mogorman/asterisk-xmpp/include/asterisk/options.h
team/mogorman/asterisk-xmpp/include/asterisk/pbx.h
team/mogorman/asterisk-xmpp/include/asterisk/plc.h
team/mogorman/asterisk-xmpp/include/asterisk/rtp.h
team/mogorman/asterisk-xmpp/include/asterisk/say.h
team/mogorman/asterisk-xmpp/include/asterisk/sched.h
team/mogorman/asterisk-xmpp/include/asterisk/strings.h
team/mogorman/asterisk-xmpp/include/asterisk/tdd.h
team/mogorman/asterisk-xmpp/include/asterisk/term.h
team/mogorman/asterisk-xmpp/include/asterisk/utils.h
team/mogorman/asterisk-xmpp/indications.c
team/mogorman/asterisk-xmpp/io.c
team/mogorman/asterisk-xmpp/jitterbuf.c
team/mogorman/asterisk-xmpp/jitterbuf.h
team/mogorman/asterisk-xmpp/loader.c
team/mogorman/asterisk-xmpp/logger.c
team/mogorman/asterisk-xmpp/manager.c
team/mogorman/asterisk-xmpp/pbx.c
team/mogorman/asterisk-xmpp/pbx/pbx_ael.c
team/mogorman/asterisk-xmpp/pbx/pbx_config.c
team/mogorman/asterisk-xmpp/pbx/pbx_dundi.c
team/mogorman/asterisk-xmpp/pbx/pbx_loopback.c
team/mogorman/asterisk-xmpp/pbx/pbx_realtime.c
team/mogorman/asterisk-xmpp/plc.c
team/mogorman/asterisk-xmpp/res/Makefile
team/mogorman/asterisk-xmpp/res/res_agi.c
team/mogorman/asterisk-xmpp/res/res_clioriginate.c
team/mogorman/asterisk-xmpp/res/res_config_odbc.c
team/mogorman/asterisk-xmpp/res/res_features.c
team/mogorman/asterisk-xmpp/res/res_indications.c
team/mogorman/asterisk-xmpp/res/res_monitor.c
team/mogorman/asterisk-xmpp/res/res_musiconhold.c
team/mogorman/asterisk-xmpp/res/res_smdi.c
team/mogorman/asterisk-xmpp/rtp.c
team/mogorman/asterisk-xmpp/sample.call
team/mogorman/asterisk-xmpp/say.c
team/mogorman/asterisk-xmpp/sched.c
team/mogorman/asterisk-xmpp/slinfactory.c
team/mogorman/asterisk-xmpp/sounds.txt
team/mogorman/asterisk-xmpp/stdtime/localtime.c
team/mogorman/asterisk-xmpp/strcompat.c
team/mogorman/asterisk-xmpp/translate.c
team/mogorman/asterisk-xmpp/utils.c
team/mogorman/asterisk-xmpp/utils/astman.c
Propchange: team/mogorman/asterisk-xmpp/
------------------------------------------------------------------------------
automerge = back on
Propchange: team/mogorman/asterisk-xmpp/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/mogorman/asterisk-xmpp/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/mogorman/asterisk-xmpp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr 4 17:23:20 2006
@@ -1,1 +1,1 @@
-/trunk:1-11170
+/trunk:1-17445
Modified: team/mogorman/asterisk-xmpp/.cleancount
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/.cleancount?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/.cleancount (original)
+++ team/mogorman/asterisk-xmpp/.cleancount Tue Apr 4 17:23:20 2006
@@ -1,1 +1,1 @@
-11
+13
Modified: team/mogorman/asterisk-xmpp/CREDITS
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/CREDITS?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/CREDITS (original)
+++ team/mogorman/asterisk-xmpp/CREDITS Tue Apr 4 17:23:20 2006
@@ -59,8 +59,8 @@
Jayson Vantuyl - Manager protocol changes, various other bugs.
jvantuyl at computingedge.net
Thorsten Lockert - OpenBSD, FreeBSD ports, making MacOS X port run on 10.3,
- dialplan include verification, route lookup on OpenBSD, various other
- bugs. tholo at sigmasoft.com
+ dialplan include verification, route lookup on OpenBSD, SNMP agent
+ support (res_snmp), various other bugs. tholo at sigmasoft.com
Brian West - ODBC support and Bug Marshaling
Josh Roberson - chan_zap reload support, Advanced Voicemail Features, other misc. patches,
and Bug Marshalling. - josh at asteriasgi.com, http://www.asteriasgi.com
@@ -83,11 +83,18 @@
Michael Jerris - bug marshaling
Leif Madsen, Jared Smith and Jim van Meggelen - the Asterisk book
available under a Creative Commons License at http://www.asteriskdocs.org
+Brian M. Clapper - poll.c emulation
+ This product includes software developed by Brian M. Clapper <bmc at clapper.org>
=== HOLD MUSIC ===
Music provided by www.freeplaymusic.com
=== OTHER SOURCE CODE IN ASTERISK ===
+Asterisk uses libedit, the lightweight readline replacement from
+NetBSD. It is BSD-licensed and requires the following statement:
+
+ This product includes software developed by the NetBSD
+ Foundation, Inc. and its contributors.
Digium did not implement the codecs in Asterisk. Here is the copyright on the
GSM source:
Modified: team/mogorman/asterisk-xmpp/Makefile
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/Makefile?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/Makefile (original)
+++ team/mogorman/asterisk-xmpp/Makefile Tue Apr 4 17:23:20 2006
@@ -225,10 +225,12 @@
endif
GREP=grep
+ID=id
ifeq ($(OSARCH),SunOS)
GREP=/usr/xpg4/bin/grep
M4=/usr/local/bin/m4
+ ID=/usr/xpg4/bin/id
endif
INCLUDE+=-Iinclude -I../include
@@ -355,14 +357,23 @@
SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
- translate.o file.o say.o pbx.o cli.o md5.o term.o \
+ translate.o file.o pbx.o cli.o md5.o term.o \
ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
cdr.o tdd.o acl.o rtp.o udptl.o manager.o asterisk.o \
dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
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 sha1.o
+ cryptostub.o sha1.o http.o
+
+# we need to link in the objects statically, not as a library, because
+# otherwise modules will not have them available if none of the static
+# objects use it.
+OBJS+= stdtime/localtime.o
+
+# At the moment say.o is an optional component which can be overridden
+# by a module.
+OBJS+= say.o
ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
OBJS+= poll.o
@@ -554,7 +565,14 @@
$(MAKE) -C stdtime clean
datafiles: all
- if [ x`whoami` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ # Should static HTTP be installed during make samples or even with its own target ala
+ # webvoicemail? There are portions here that *could* be customized but might also be
+ # improved a lot. I'll put it here for now.
+ mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/static-http
+ for x in static-http/*; do \
+ install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/static-http ; \
+ done
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
for x in sounds/digits/*.gsm; do \
@@ -777,6 +795,8 @@
echo ";astctlowner = root" ; \
echo ";astctlgroup = apache" ; \
echo ";astctl = asterisk.ctl" ; \
+ echo ";[options]" ; \
+ echo ";internal_timing = yes" ; \
) > $(DESTDIR)$(ASTCONFPATH) ; \
else \
echo "Skipping asterisk.conf creation"; \
Modified: team/mogorman/asterisk-xmpp/README
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/README?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/README (original)
+++ team/mogorman/asterisk-xmpp/README Tue Apr 4 17:23:20 2006
@@ -2,14 +2,14 @@
by Mark Spencer <markster at digium.com>
and the Asterisk.org developer community
-Copyright (C) 2001-2005 Digium, Inc.
+Copyright (C) 2001-2006 Digium, Inc.
and other copyright holders.
================================================================
* SECURITY
It is imperative that you read and fully understand the contents of
-the SECURITY file before you attempt to configure and run an Asterisk
-server.
+the security information file (doc/security.txt) before you attempt
+to configure and run an Asterisk server.
* WHAT IS ASTERISK ?
Asterisk is an Open Source PBX and telephony toolkit. It is, in a
@@ -51,13 +51,15 @@
* All Wildcard (tm) products from Digium (www.digium.com)
* QuickNet Internet PhoneJack and LineJack (http://www.quicknet.net)
* any full duplex sound card supported by ALSA or OSS
+ * any ISDN card supported by mISDN on Linux (BRI)
+ * The Xorcom AstriBank channel bank
* VoiceTronix OpenLine products
The are several drivers for ISDN BRI cards available from third party sources.
-Check the voip-info.org wiki for more information on chan_capi, chan_misdn and
+Check the voip-info.org wiki for more information on chan_capi and
zaphfc.
-* UPGRADING FROM VERSION 1.0
+* UPGRADING FROM AN EARLIER VERSION
If you are updating from a previous version of Asterisk, make sure you
read the UPGRADE.txt file in the source directory. There are some files
@@ -67,7 +69,7 @@
In order to discover new features to use, please check the configuration
examples in the /configs directory of the source code distribution.
To discover the major new features of Asterisk 1.2, please visit
-http://www.astricon.net/asterisk1-2/
+http://edvina.net/asterisk1-2/
* NEW INSTALLATIONS
@@ -82,11 +84,18 @@
So let's proceed:
-1) Run "make"
+1) Read the README files.
+ There are more README files than this one in the doc/ directory.
+ Start with doc/00README.1st
+ You may also want to check the configuration files that contain
+ examples and reference guides. They are all in the configs/
+ directory.
+
+2) Run "make"
Assuming the build completes successfully:
-2) Run "make install"
+3) Run "make install"
Each time you update or checkout from the repository, you are strongly
encouraged to ensure all previous object files are removed to avoid internal
@@ -97,7 +106,7 @@
If this is your first time working with Asterisk, you may wish to install
the sample PBX, with demonstration extensions, etc. If so, run:
-3) "make samples"
+4) "make samples"
Doing so will overwrite any existing config files you have.
Modified: team/mogorman/asterisk-xmpp/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/UPGRADE.txt?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/UPGRADE.txt (original)
+++ team/mogorman/asterisk-xmpp/UPGRADE.txt Tue Apr 4 17:23:20 2006
@@ -37,6 +37,9 @@
functions. You are encouraged to move towards the associated dialplan
function, as these variables will be removed in a future release.
+* The CDR-CSV variables uniqueid, userfield, and basing time on GMT are now
+ adjustable from cdr.conf, instead of recompiling.
+
Functions:
* The function ${CHECK_MD5()} has been deprecated in favor of using an
@@ -50,16 +53,33 @@
* The ENUMLOOKUP() function with the 'c' option (for counting the number of records),
but the lookup fails to match any records, the returned value will now be "0" instead of blank.
+The IAX2 channel:
+
+* The "mailboxdetail" option has been deprecated. Previously, if this option
+ was not enabled, the 2 byte MSGCOUNT information element would be set to all
+ 1's to indicate there there is some number of messages waiting. With this
+ option enabled, the number of new messages were placed in one byte and the
+ number of old messages are placed in the other. This is now the default
+ (and the only) behavior.
+
The SIP channel:
* The "incominglimit" setting is replaced by the "call-limit" setting in sip.conf.
Installation:
-* On BSD systems, the installation directories have changed to more "FreeBSDish" directories. On startup, Asterisk will look for the main configuration in /usr7local/etc/asterisk/asterisk.conf
+* On BSD systems, the installation directories have changed to more "FreeBSDish" directories. On startup, Asterisk will look for the main configuration in /usr/local/etc/asterisk/asterisk.conf
If you have an old installation, you might want to remove the binaries and move the configuration files to the new locations. The following directories are now default:
ASTLIBDIR /usr/local/lib/asterisk
ASTVARLIBDIR /usr/local/share/asterisk
ASTETCDIR /usr/local/etc/asterisk
ASTBINDIR /usr/local/bin/asterisk
ASTSBINDIR /usr/local/sbin/asterisk
+
+Sounds:
+
+* The phonetic sounds directory has been removed from the asterisk-sounds package
+ because they are now included directly in Asterisk. However, it is important to
+ note that the phonetic sounds that existed in asterisk-sounds used a different
+ naming convention than the sounds in Asterisk. For example, instead of alpha.gsm
+ and bravo.gsm, Asterisk has a_p.gsm and b_p.gsm.
Modified: team/mogorman/asterisk-xmpp/acl.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/acl.c?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/acl.c (original)
+++ team/mogorman/asterisk-xmpp/acl.c Tue Apr 4 17:23:20 2006
@@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2006, Digium, Inc.
*
* Mark Spencer <markster at digium.com>
*
@@ -20,7 +20,7 @@
*
* \brief Various sorts of access control
*
- * \author Mark Spencer <markster at digium.com>
+ * \author Mark Spencer <markster at digium.com>
*/
#include <stdio.h>
@@ -136,7 +136,7 @@
if (prev)
prev->next = link; /* Link previous to this object */
- if (!ret)
+ if (!ret)
ret = link; /* Save starting point */
start = start->next; /* Go to next object */
@@ -153,7 +153,7 @@
struct ast_ha *prev = NULL;
struct ast_ha *ret;
int x, z;
- unsigned int y;
+ unsigned int y;
ret = path;
while (path) {
@@ -252,12 +252,55 @@
return 0;
}
-int ast_str2tos(const char *value, int *tos)
+struct dscp_codepoint {
+ char *name;
+ unsigned int space;
+};
+
+/* IANA registered DSCP codepoints */
+
+static const struct dscp_codepoint dscp_pool1[] = {
+ { "CS0", 0x00 },
+ { "CS1", 0x08 },
+ { "CS2", 0x10 },
+ { "CS3", 0x18 },
+ { "CS4", 0x20 },
+ { "CS5", 0x28 },
+ { "CS6", 0x30 },
+ { "CS7", 0x38 },
+ { "AF11", 0x0A },
+ { "AF12", 0x0C },
+ { "AF13", 0x0E },
+ { "AF21", 0x12 },
+ { "AF22", 0x14 },
+ { "AF23", 0x16 },
+ { "AF31", 0x1A },
+ { "AF32", 0x1C },
+ { "AF33", 0x1E },
+ { "AF41", 0x22 },
+ { "AF42", 0x24 },
+ { "AF43", 0x26 },
+ { "EF", 0x2E },
+};
+
+int ast_str2tos(const char *value, unsigned int *tos)
{
int fval;
- if (sscanf(value, "%i", &fval) == 1)
- *tos = fval & 0xff;
- else if (!strcasecmp(value, "lowdelay"))
+ unsigned int x;
+
+ if (sscanf(value, "%i", &fval) == 1) {
+ *tos = fval & 0xFF;
+ return 0;
+ }
+
+ for (x = 0; x < sizeof(dscp_pool1) / sizeof(dscp_pool1[0]); x++) {
+ if (!strcasecmp(value, dscp_pool1[x].name)) {
+ *tos = dscp_pool1[x].space << 2;
+ return 0;
+ }
+ }
+
+ if (!strcasecmp(value, "lowdelay"))
*tos = IPTOS_LOWDELAY;
else if (!strcasecmp(value, "throughput"))
*tos = IPTOS_THROUGHPUT;
@@ -269,16 +312,44 @@
*tos = 0;
else
return -1;
+
+ ast_log(LOG_WARNING, "TOS value %s is deprecated. Please see doc/ip-tos.txt for more information.\n", value);
+
return 0;
}
+const char *ast_tos2str(unsigned int tos)
+{
+ unsigned int x;
+
+ switch (tos) {
+ case 0:
+ return "none";
+ case IPTOS_LOWDELAY:
+ return "lowdelay";
+ case IPTOS_THROUGHPUT:
+ return "throughput";
+ case IPTOS_RELIABILITY:
+ return "reliability";
+ case IPTOS_MINCOST:
+ return "mincost";
+ default:
+ for (x = 0; x < sizeof(dscp_pool1) / sizeof(dscp_pool1[0]); x++) {
+ if (dscp_pool1[x].space == (tos >> 2))
+ return dscp_pool1[x].name;
+ }
+ }
+
+ return "unknown";
+}
+
int ast_get_ip(struct sockaddr_in *sin, const char *value)
{
return ast_get_ip_or_srv(sin, value, NULL);
}
/* iface is the interface (e.g. eth0); address is the return value */
-int ast_lookup_iface(char *iface, struct in_addr *address)
+int ast_lookup_iface(char *iface, struct in_addr *address)
{
int mysock, res = 0;
struct my_ifreq ifreq;
@@ -357,4 +428,3 @@
return 0;
return -1;
}
-
Modified: team/mogorman/asterisk-xmpp/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/agi/Makefile?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/agi/Makefile (original)
+++ team/mogorman/asterisk-xmpp/agi/Makefile Tue Apr 4 17:23:20 2006
@@ -11,17 +11,13 @@
# the GNU General Public License
#
-AGIS=agi-test.agi eagi-test eagi-sphinx-test
+AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
-CFLAGS+=
+CFLAGS+=-DNO_AST_MM
LIBS=
ifeq ($(OSARCH),SunOS)
LIBS=-lsocket -lnsl ../strcompat.o
-endif
-
-ifeq ($(findstring BSD,${OSARCH}),BSD)
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
endif
all: depend $(AGIS)
Modified: team/mogorman/asterisk-xmpp/app.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/app.c?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/app.c (original)
+++ team/mogorman/asterisk-xmpp/app.c Tue Apr 4 17:23:20 2006
@@ -80,7 +80,7 @@
else
ast_log(LOG_NOTICE,"Huh....? no dial for indications?\n");
- for (x = strlen(collect); strlen(collect) < maxlen; ) {
+ for (x = strlen(collect); x < maxlen; ) {
res = ast_waitfordigit(chan, timeout);
if (!ast_ignore_pattern(context, collect))
ast_playtones_stop(chan);
@@ -95,12 +95,8 @@
break;
}
}
- if (res >= 0) {
- if (ast_exists_extension(chan, context, collect, 1, chan->cid.cid_num))
- res = 1;
- else
- res = 0;
- }
+ if (res >= 0)
+ res = ast_exists_extension(chan, context, collect, 1, chan->cid.cid_num) ? 1 : 0;
return res;
}
@@ -1116,7 +1112,7 @@
if (ast_strlen_zero(group))
return 0;
- s = (!ast_strlen_zero(category)) ? category : GROUP_CATEGORY_PREFIX;
+ s = S_OR(category, GROUP_CATEGORY_PREFIX);
ast_copy_string(cat, s, sizeof(cat));
chan = NULL;
@@ -1146,7 +1142,7 @@
if (regcomp(®exbuf, groupmatch, REG_EXTENDED | REG_NOSUB))
return 0;
- s = (!ast_strlen_zero(category)) ? category : GROUP_CATEGORY_PREFIX;
+ s = S_OR(category, GROUP_CATEGORY_PREFIX);
ast_copy_string(cat, s, sizeof(cat));
chan = NULL;
@@ -1210,9 +1206,10 @@
char *fs;
int res;
int fd;
+ int lp = strlen(path);
time_t start;
- if (!(s = alloca(strlen(path) + 10)) || !(fs = alloca(strlen(path) + 20))) {
+ if (!(s = alloca(lp + 10)) || !(fs = alloca(lp + 20))) {
ast_log(LOG_WARNING, "Out of memory!\n");
return AST_LOCK_FAILURE;
}
@@ -1567,7 +1564,7 @@
if (fd < 0) {
ast_log(LOG_WARNING, "Cannot open file '%s' for reading: %s\n", filename, strerror(errno));
return NULL;
- }
+ }
if ((output = ast_malloc(count))) {
res = read(fd, output, count - 1);
if (res == count - 1) {
@@ -1597,14 +1594,13 @@
s = optstr;
while (*s) {
- curarg = *s++ & 0x7f;
+ curarg = *s++ & 0x7f; /* the array (in app.h) has 128 entries */
ast_set_flag(flags, options[curarg].flag);
argloc = options[curarg].arg_index;
if (*s == '(') {
/* Has argument */
arg = ++s;
- while (*s && (*s != ')'))
- s++;
+ s = strchr(s, ')');
if (*s) {
if (argloc)
args[argloc - 1] = arg;
Modified: team/mogorman/asterisk-xmpp/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/apps/app_alarmreceiver.c?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/apps/app_alarmreceiver.c (original)
+++ team/mogorman/asterisk-xmpp/apps/app_alarmreceiver.c Tue Apr 4 17:23:20 2006
@@ -551,13 +551,12 @@
checksum = checksum % 15;
- if(checksum){
+ if (checksum) {
database_increment("checksum-errors");
- if(option_verbose >= 2){
+ if (option_verbose >= 2)
ast_verbose(VERBOSE_PREFIX_2 "AlarmReceiver: Nonzero checksum\n");
ast_log(LOG_DEBUG, "AlarmReceiver: Nonzero checksum\n");
continue;
- }
}
/* Check the message type for correctness */
Modified: team/mogorman/asterisk-xmpp/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/apps/app_amd.c?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/apps/app_amd.c (original)
+++ team/mogorman/asterisk-xmpp/apps/app_amd.c Tue Apr 4 17:23:20 2006
@@ -20,6 +20,10 @@
#include <stdio.h>
#include <stdlib.h>
+
+#include "asterisk.h"
+
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/module.h"
#include "asterisk/lock.h"
Modified: team/mogorman/asterisk-xmpp/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/apps/app_dial.c?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/apps/app_dial.c (original)
+++ team/mogorman/asterisk-xmpp/apps/app_dial.c Tue Apr 4 17:23:20 2006
@@ -112,9 +112,10 @@
" other than the number assigned to the caller.\n"
" g - Proceed with dialplan execution at the current extension if the\n"
" destination channel hangs up.\n"
-" G(context^exten^pri) - If the call is answered, transfer both parties to\n"
-" the specified priority. Optionally, an extension, or extension and\n"
-" context may be specified. Otherwise, the current extension is used.\n"
+" G(context^exten^pri) - If the call is answered, transfer the calling party to\n"
+" the specified priority and the called party to the specified priority+1.\n"
+" Optionally, an extension, or extension and context may be specified. \n"
+" Otherwise, the current extension is used.\n"
" h - Allow the called party to hang up by sending the '*' DTMF digit.\n"
" H - Allow the calling party to hang up by hitting the '*' DTMF digit.\n"
" j - Jump to priority n+101 if all of the requested channels were busy.\n"
@@ -540,7 +541,7 @@
senddialevent(in, o->chan);
/* After calling, set callerid to extension */
if (!ast_test_flag(peerflags, OPT_ORIGINAL_CLID))
- ast_set_callerid(o->chan, ast_strlen_zero(in->macroexten) ? in->exten : in->macroexten, get_cid_name(cidname, sizeof(cidname), in), NULL);
+ ast_set_callerid(o->chan, S_OR(in->macroexten, in->exten), get_cid_name(cidname, sizeof(cidname), in), NULL);
}
}
/* Hangup the original channel now, in case we needed it */
@@ -1134,7 +1135,7 @@
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", numsubst);
if (!ast_test_flag(peerflags, OPT_ORIGINAL_CLID))
- ast_set_callerid(tmp->chan, ast_strlen_zero(chan->macroexten) ? chan->exten : chan->macroexten, get_cid_name(cidname, sizeof(cidname), chan), NULL);
+ ast_set_callerid(tmp->chan, S_OR(chan->macroexten, chan->exten), get_cid_name(cidname, sizeof(cidname), chan), NULL);
}
/* Put them in the list of outgoing thingies... We're ready now.
XXX If we're forcibly removed, these outgoing calls won't get
@@ -1448,7 +1449,7 @@
if (*ch == '^')
*ch = '|';
}
- res = pbx_exec(peer, app, opt_args[OPT_ARG_CALLEE_MACRO], 1);
+ res = pbx_exec(peer, app, opt_args[OPT_ARG_CALLEE_MACRO]);
ast_log(LOG_DEBUG, "Macro exited with status %d\n", res);
res = 0;
} else {
Modified: team/mogorman/asterisk-xmpp/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/apps/app_directory.c?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/apps/app_directory.c (original)
+++ team/mogorman/asterisk-xmpp/apps/app_directory.c Tue Apr 4 17:23:20 2006
@@ -179,7 +179,7 @@
}
ast_stopstream(chan);
} else {
- res = ast_say_character_str(chan, !ast_strlen_zero(name) ? name : ext,
+ res = ast_say_character_str(chan, S_OR(name, ext),
AST_DIGIT_ANY, chan->language);
}
Modified: team/mogorman/asterisk-xmpp/apps/app_dumpchan.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/apps/app_dumpchan.c?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/apps/app_dumpchan.c (original)
+++ team/mogorman/asterisk-xmpp/apps/app_dumpchan.c Tue Apr 4 17:23:20 2006
@@ -126,7 +126,7 @@
ast_print_group(cgrp, sizeof(cgrp), c->callgroup),
ast_print_group(pgrp, sizeof(pgrp), c->pickupgroup),
( c->appl ? c->appl : "(N/A)" ),
- ( c-> data ? (!ast_strlen_zero(c->data) ? c->data : "(Empty)") : "(None)"),
+ ( c-> data ? S_OR(c->data, "(Empty)") : "(None)"),
(ast_test_flag(c, AST_FLAG_BLOCKING) ? c->blockproc : "(Not Blocking)"));
return 0;
Modified: team/mogorman/asterisk-xmpp/apps/app_echo.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/apps/app_echo.c?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/apps/app_echo.c (original)
+++ team/mogorman/asterisk-xmpp/apps/app_echo.c Tue Apr 4 17:23:20 2006
@@ -59,7 +59,6 @@
int res = -1;
int format;
struct localuser *u;
- struct ast_frame *f;
LOCAL_USER_ADD(u);
@@ -68,7 +67,7 @@
ast_set_read_format(chan, format);
while (ast_waitfor(chan, -1) > -1) {
- f = ast_read(chan);
+ struct ast_frame *f = ast_read(chan);
if (!f)
break;
f->delivery.tv_sec = 0;
Modified: team/mogorman/asterisk-xmpp/apps/app_exec.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/apps/app_exec.c?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/apps/app_exec.c (original)
+++ team/mogorman/asterisk-xmpp/apps/app_exec.c Tue Apr 4 17:23:20 2006
@@ -82,7 +82,7 @@
if (appname) {
app = pbx_findapp(appname);
if (app) {
- res = pbx_exec(chan, app, args, 1);
+ res = pbx_exec(chan, app, args);
} else {
ast_log(LOG_WARNING, "Could not find application (%s)\n", appname);
res = -1;
Modified: team/mogorman/asterisk-xmpp/apps/app_externalivr.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/apps/app_externalivr.c?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/apps/app_externalivr.c (original)
+++ team/mogorman/asterisk-xmpp/apps/app_externalivr.c Tue Apr 4 17:23:20 2006
@@ -65,7 +65,7 @@
"will receive all DTMF events received on the channel, and notification\n"
"if the channel is hung up. The application will not be forcibly terminated\n"
"when the channel is hung up.\n"
-"See doc/README.externalivr for a protocol specification.\n";
+"See doc/externalivr.txt for a protocol specification.\n";
/* XXX the parser in gcc 2.95 gets confused if you don't put a space between 'name' and the comma */
#define ast_chan_log(level, channel, format, ...) ast_log(level, "%s: " format, channel->name , ## __VA_ARGS__)
Modified: team/mogorman/asterisk-xmpp/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/mogorman/asterisk-xmpp/apps/app_macro.c?rev=17446&r1=17445&r2=17446&view=diff
==============================================================================
--- team/mogorman/asterisk-xmpp/apps/app_macro.c (original)
+++ team/mogorman/asterisk-xmpp/apps/app_macro.c Tue Apr 4 17:23:20 2006
@@ -188,7 +188,7 @@
snprintf(varname, sizeof(varname), "ARG%d", argc);
s = pbx_builtin_getvar_helper(chan, varname);
if (s)
- oldargs[argc] = strdup(s);
[... 36628 lines stripped ...]
More information about the asterisk-commits
mailing list