[asterisk-commits] branch rizzo/base r9134 - in /team/rizzo/base:
./ agi/ apps/ cdr/ channels/ c...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Feb 3 03:59:40 MST 2006
Author: rizzo
Date: Fri Feb 3 04:58:18 2006
New Revision: 9134
URL: http://svn.digium.com/view/asterisk?rev=9134&view=rev
Log:
Merged revisions 8877,8883,8896,8906,8919,8925-8926,8932,8938,8948-8949,8961,8976,8991,9001,9004,9013,9034,9046-9047,9052,9057,9059-9060,9065,9071-9072,9085,9087-9088,9104-9107,9113-9114,9116,9119,9123-9124 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r8877 | markster | 2006-01-30 04:13:33 +0100 (Mon, 30 Jan 2006) | 2 lines
Merge Rizzo's waitfor update (bug #4584)
................
r8883 | tilghman | 2006-01-30 07:07:05 +0100 (Mon, 30 Jan 2006) | 2 lines
Bug 6378 - deprecate CHECK_MD5 function
................
r8896 | oej | 2006-01-30 15:12:39 +0100 (Mon, 30 Jan 2006) | 2 lines
Document installation changes for BSD users.
................
r8906 | kpfleming | 2006-01-30 18:09:55 +0100 (Mon, 30 Jan 2006) | 10 lines
Merged revisions 8905 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r8905 | kpfleming | 2006-01-30 11:08:28 -0600 (Mon, 30 Jan 2006) | 2 lines
disable buggy PRI user-user code until it can be fixed
........
................
r8919 | oej | 2006-01-30 19:51:02 +0100 (Mon, 30 Jan 2006) | 6 lines
Issue #5793
- simplification of check_auth
- constifications
- whitespace changes
Rizzo's patch with some changes
................
r8925 | oej | 2006-01-30 20:09:08 +0100 (Mon, 30 Jan 2006) | 3 lines
Issue #6035 - Don't send 403 on bad auth (correcting one of my old mistakes...) Reported by maik.
Patch inspired by, but not the patch in the bug tracker.
................
r8926 | oej | 2006-01-30 20:50:39 +0100 (Mon, 30 Jan 2006) | 2 lines
Issue 5892: Set a minimum T1 timer for calls. Reporter: twisted
................
r8932 | oej | 2006-01-30 21:36:38 +0100 (Mon, 30 Jan 2006) | 8 lines
- Doxygen and comments updates
- Moving structure declarations to top of file with the rest
- Adding some forward declarations for RTP interface functions
(All these changes to position in file are in preparation for splitting chan_sip up
into several files at some point in the future)
................
r8938 | mogorman | 2006-01-30 22:16:43 +0100 (Mon, 30 Jan 2006) | 3 lines
reverting blocks 9 and 10 from revision 7547
fixes bug 6080
................
r8948 | kpfleming | 2006-01-31 01:17:43 +0100 (Tue, 31 Jan 2006) | 2 lines
increment for recent ast_channel change
................
r8949 | russell | 2006-01-31 01:24:34 +0100 (Tue, 31 Jan 2006) | 3 lines
add a note to hopefully decrease the chance that someone forgets to increment
.cleancount after changing the ast_channel structure
................
r8961 | kpfleming | 2006-01-31 04:45:09 +0100 (Tue, 31 Jan 2006) | 2 lines
Yes Virginia, Zaptel does support native ALAW
................
r8976 | oej | 2006-01-31 15:30:09 +0100 (Tue, 31 Jan 2006) | 3 lines
- Change "prefs" to "default_prefs" and move declaration to "default" group
- Add doxygen comments
................
r8991 | oej | 2006-01-31 17:02:35 +0100 (Tue, 31 Jan 2006) | 4 lines
- Moving two session (PVT) flags to peer PAGE2 (DYNAMIC and SELFDESTRUCT) to make room for more session-related flags
This is needed for integrating patches in the bug tracker
- Adding doxygen comments
................
r9001 | russell | 2006-01-31 18:18:58 +0100 (Tue, 31 Jan 2006) | 3 lines
define a global null_frame object so when queueing a null frame, you don't
have to allocate one on the stack
................
r9004 | russell | 2006-01-31 18:57:12 +0100 (Tue, 31 Jan 2006) | 2 lines
remove some more local declarations of null frames
................
r9013 | oej | 2006-01-31 19:40:07 +0100 (Tue, 31 Jan 2006) | 3 lines
Optimize settings of defaults for a new peer object and make sure
we set the same defaults for autocreated peers and other peers.
................
r9034 | oej | 2006-02-01 14:23:59 +0100 (Wed, 01 Feb 2006) | 3 lines
- Clarify default setting of canreinvite (thanks royk)
- Add some extra headers and reference to other doc/ files for realtime
................
r9046 | oej | 2006-02-01 18:16:08 +0100 (Wed, 01 Feb 2006) | 6 lines
- Adding a doc/00README.1st with an INDEX over README files
- Moving files from / to /doc or /configs
- Renaming some documentation files
Thank you for the initiative, manxpower!
................
r9047 | oej | 2006-02-01 18:49:02 +0100 (Wed, 01 Feb 2006) | 3 lines
- Removing the "README." from the name of the README files.
................
r9052 | mogorman | 2006-02-01 19:39:41 +0100 (Wed, 01 Feb 2006) | 3 lines
Allows for user to uninstall asterisk binaries
bug 6177
................
r9057 | oej | 2006-02-01 20:16:09 +0100 (Wed, 01 Feb 2006) | 5 lines
- Update URL to digium store
- Remove X100p and S100u
- Add mISDN
- remove ISDN4Linux
................
r9059 | mogorman | 2006-02-01 21:40:45 +0100 (Wed, 01 Feb 2006) | 3 lines
reports why an agi script errors out on opening
file
................
r9060 | kpfleming | 2006-02-02 00:05:28 +0100 (Thu, 02 Feb 2006) | 6 lines
use string fields for some stuff in ast_channel
const-ify some more APIs
remove 'type' field from ast_channel, in favor of the one in the channel's tech structure
allow string field module users to specify the 'chunk size' for pool allocations
update chan_alsa to be compatible with recent const-ification patches
................
r9065 | oej | 2006-02-02 15:04:29 +0100 (Thu, 02 Feb 2006) | 2 lines
Issue #6383 - Crash on CLI originate with missing channel argument
................
r9071 | mattf | 2006-02-02 17:09:01 +0100 (Thu, 02 Feb 2006) | 2 lines
Fix for very unlikely memory leak in res_odbc
................
r9072 | mattf | 2006-02-02 17:09:38 +0100 (Thu, 02 Feb 2006) | 2 lines
Fix so that hardhdlc works w/ chan_zap
................
r9085 | mattf | 2006-02-02 19:33:23 +0100 (Thu, 02 Feb 2006) | 2 lines
More stringfield related changes
................
r9087 | kpfleming | 2006-02-02 19:40:06 +0100 (Thu, 02 Feb 2006) | 2 lines
block patch that has already been merged
................
r9088 | kpfleming | 2006-02-02 19:40:22 +0100 (Thu, 02 Feb 2006) | 10 lines
Merged revisions 9086 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r9086 | kpfleming | 2006-02-02 12:37:04 -0600 (Thu, 02 Feb 2006) | 2 lines
don't override ASTERISKVERSIONNUM to 000000 for non-svn builds
........
................
r9104 | oej | 2006-02-02 21:18:31 +0100 (Thu, 02 Feb 2006) | 3 lines
- Make debug logging for each authentication (twice per call) optional
- Small update to doxygen comment
................
r9105 | oej | 2006-02-02 21:28:57 +0100 (Thu, 02 Feb 2006) | 3 lines
- Add doxygen docs on return values on check_user_full()
- Simplify code in handle_request_subscribe (mailbox subscription)
................
r9106 | mattf | 2006-02-02 21:50:29 +0100 (Thu, 02 Feb 2006) | 1 line
................
r9107 | oej | 2006-02-02 21:51:08 +0100 (Thu, 02 Feb 2006) | 3 lines
- Remove "frame relay" from chan_sip !
- Add some comments for the monitoring thread
................
r9113 | mattf | 2006-02-02 22:02:19 +0100 (Thu, 02 Feb 2006) | 2 lines
Fix w/ string field updates #6397
................
r9114 | crichter | 2006-02-02 22:15:34 +0100 (Thu, 02 Feb 2006) | 19 lines
* removed unnecessary struct elements and functions
* fixed "RETRIEVE does not work" bug
* fixed some NT Mode bugs
* removed some // comments
* added configureable jitterbuffer
* removed own tone-generator, and use asterisks instead, to support
asterisks indications
* added more support for hw-bridging, we bridge now every possible call
* fixed some hdlc mode issues, with a patch for chan_zap we can make
data calls between chan_zap and chan_misdn now
* completely reworked the config engine, works like a charm now
* fixed SetCallerPres - bug
* added Progress and Proceeding passing
* optimized Ringing Indication handling
* added full ast_send_text support (you can setup nice menus with the dialplan
now)
* added support to read /etc/misdn-init.conf to clarify the NT+PTP Problem
* we compile now channels/misdn if mISDNuser is installed systemwide
................
r9116 | crichter | 2006-02-02 22:25:37 +0100 (Thu, 02 Feb 2006) | 1 line
updated the misdn documentation
................
r9119 | kpfleming | 2006-02-02 22:49:36 +0100 (Thu, 02 Feb 2006) | 2 lines
updates to compile against current trunk
................
r9123 | kpfleming | 2006-02-02 23:05:47 +0100 (Thu, 02 Feb 2006) | 2 lines
make chan_misdn build on x86-64
................
r9124 | kpfleming | 2006-02-02 23:23:00 +0100 (Thu, 02 Feb 2006) | 2 lines
remove obsolete stuff
................
Added:
team/rizzo/base/configs/muted.conf.sample
- copied unchanged from r9124, trunk/configs/muted.conf.sample
team/rizzo/base/doc/00README.1st
- copied unchanged from r9124, trunk/doc/00README.1st
team/rizzo/base/doc/ael.txt
- copied unchanged from r9124, trunk/doc/ael.txt
team/rizzo/base/doc/app-sms.txt
- copied unchanged from r9124, trunk/doc/app-sms.txt
team/rizzo/base/doc/asterisk-conf.txt
- copied unchanged from r9124, trunk/doc/asterisk-conf.txt
team/rizzo/base/doc/backtrace.txt
- copied unchanged from r9124, trunk/doc/backtrace.txt
team/rizzo/base/doc/billing.txt
- copied unchanged from r9124, trunk/doc/billing.txt
team/rizzo/base/doc/callingpres.txt
- copied unchanged from r9124, trunk/doc/callingpres.txt
team/rizzo/base/doc/cdrdriver.txt
- copied unchanged from r9124, trunk/doc/cdrdriver.txt
team/rizzo/base/doc/chaniax.txt
- copied unchanged from r9124, trunk/doc/chaniax.txt
team/rizzo/base/doc/channels.txt
- copied unchanged from r9124, trunk/doc/channels.txt
team/rizzo/base/doc/channelvariables.txt
- copied unchanged from r9124, trunk/doc/channelvariables.txt
team/rizzo/base/doc/cliprompt.txt
- copied unchanged from r9124, trunk/doc/cliprompt.txt
team/rizzo/base/doc/configuration.txt
- copied unchanged from r9124, trunk/doc/configuration.txt
team/rizzo/base/doc/cygwin.txt
- copied unchanged from r9124, trunk/doc/cygwin.txt
team/rizzo/base/doc/dundi.txt
- copied unchanged from r9124, trunk/doc/dundi.txt
team/rizzo/base/doc/enum.txt
- copied unchanged from r9124, trunk/doc/enum.txt
team/rizzo/base/doc/extconfig.txt
- copied unchanged from r9124, trunk/doc/extconfig.txt
team/rizzo/base/doc/externalivr.txt
- copied unchanged from r9124, trunk/doc/externalivr.txt
team/rizzo/base/doc/freetds.txt
- copied unchanged from r9124, trunk/doc/freetds.txt
team/rizzo/base/doc/h323.txt
- copied unchanged from r9124, trunk/doc/h323.txt
team/rizzo/base/doc/hardware.txt
- copied unchanged from r9124, trunk/doc/hardware.txt
team/rizzo/base/doc/ices.txt
- copied unchanged from r9124, trunk/doc/ices.txt
team/rizzo/base/doc/jitterbuffer.txt
- copied unchanged from r9124, trunk/doc/jitterbuffer.txt
team/rizzo/base/doc/linkedlists.txt
- copied unchanged from r9124, trunk/doc/linkedlists.txt
team/rizzo/base/doc/math.txt
- copied unchanged from r9124, trunk/doc/math.txt
team/rizzo/base/doc/misdn.txt
- copied unchanged from r9124, trunk/doc/misdn.txt
team/rizzo/base/doc/mp3.txt
- copied unchanged from r9124, trunk/doc/mp3.txt
team/rizzo/base/doc/musiconhold-fpm.txt
- copied unchanged from r9124, trunk/doc/musiconhold-fpm.txt
team/rizzo/base/doc/mysql.txt
- copied unchanged from r9124, trunk/doc/mysql.txt
team/rizzo/base/doc/odbcstorage.txt
- copied unchanged from r9124, trunk/doc/odbcstorage.txt
team/rizzo/base/doc/privacy.txt
- copied unchanged from r9124, trunk/doc/privacy.txt
team/rizzo/base/doc/realtime.txt
- copied unchanged from r9124, trunk/doc/realtime.txt
team/rizzo/base/doc/security.txt
- copied unchanged from r9124, trunk/doc/security.txt
team/rizzo/base/doc/sms.txt
- copied unchanged from r9124, trunk/doc/sms.txt
Removed:
team/rizzo/base/HARDWARE
team/rizzo/base/README.fpm
team/rizzo/base/SECURITY
team/rizzo/base/apps/app_intercom.c
team/rizzo/base/apps/app_sql_postgres.c
team/rizzo/base/doc/README.ael
team/rizzo/base/doc/README.app_sms
team/rizzo/base/doc/README.asterisk.conf
team/rizzo/base/doc/README.backtrace
team/rizzo/base/doc/README.callingpres
team/rizzo/base/doc/README.cdr
team/rizzo/base/doc/README.channels
team/rizzo/base/doc/README.cliprompt
team/rizzo/base/doc/README.configuration
team/rizzo/base/doc/README.cygwin
team/rizzo/base/doc/README.dundi
team/rizzo/base/doc/README.enum
team/rizzo/base/doc/README.extconfig
team/rizzo/base/doc/README.externalivr
team/rizzo/base/doc/README.h323
team/rizzo/base/doc/README.iax
team/rizzo/base/doc/README.ices
team/rizzo/base/doc/README.jitterbuffer
team/rizzo/base/doc/README.linkedlists
team/rizzo/base/doc/README.math
team/rizzo/base/doc/README.misdn
team/rizzo/base/doc/README.mp3
team/rizzo/base/doc/README.mysql
team/rizzo/base/doc/README.odbcstorage
team/rizzo/base/doc/README.privacy
team/rizzo/base/doc/README.realtime
team/rizzo/base/doc/README.sms
team/rizzo/base/doc/README.tds
team/rizzo/base/doc/README.variables
team/rizzo/base/doc/cdr.txt
team/rizzo/base/muted.conf.sample
Modified:
team/rizzo/base/ (props changed)
team/rizzo/base/.cleancount
team/rizzo/base/Makefile
team/rizzo/base/agi/Makefile
team/rizzo/base/apps/Makefile
team/rizzo/base/apps/app_dial.c
team/rizzo/base/apps/app_dial2.c
team/rizzo/base/apps/app_disa.c
team/rizzo/base/apps/app_dumpchan.c
team/rizzo/base/apps/app_flash.c
team/rizzo/base/apps/app_meetme.c
team/rizzo/base/apps/app_queue.c
team/rizzo/base/apps/app_softhangup.c
team/rizzo/base/apps/app_transfer.c
team/rizzo/base/apps/app_voicemail.c
team/rizzo/base/apps/app_zapbarge.c
team/rizzo/base/apps/app_zapras.c
team/rizzo/base/apps/app_zapscan.c
team/rizzo/base/cdr.c
team/rizzo/base/cdr/Makefile
team/rizzo/base/channel.c
team/rizzo/base/channels/Makefile
team/rizzo/base/channels/chan_agent.c
team/rizzo/base/channels/chan_alsa.c
team/rizzo/base/channels/chan_features.c
team/rizzo/base/channels/chan_h323.c
team/rizzo/base/channels/chan_iax2.c
team/rizzo/base/channels/chan_local.c
team/rizzo/base/channels/chan_mgcp.c
team/rizzo/base/channels/chan_misdn.c
team/rizzo/base/channels/chan_misdn_config.c
team/rizzo/base/channels/chan_nbs.c
team/rizzo/base/channels/chan_oss.c
team/rizzo/base/channels/chan_phone.c
team/rizzo/base/channels/chan_sip.c
team/rizzo/base/channels/chan_skinny.c
team/rizzo/base/channels/chan_vpb.c
team/rizzo/base/channels/chan_zap.c
team/rizzo/base/channels/iax2-parser.c
team/rizzo/base/channels/iax2-parser.h
team/rizzo/base/channels/misdn/Makefile
team/rizzo/base/channels/misdn/chan_misdn_config.h
team/rizzo/base/channels/misdn/isdn_lib.c
team/rizzo/base/channels/misdn/isdn_lib.h
team/rizzo/base/channels/misdn/isdn_msg_parser.c
team/rizzo/base/cli.c
team/rizzo/base/codecs/Makefile
team/rizzo/base/configs/misdn.conf.sample
team/rizzo/base/configs/sip.conf.sample
team/rizzo/base/file.c
team/rizzo/base/formats/Makefile
team/rizzo/base/formats/format_au.c
team/rizzo/base/formats/format_g723.c
team/rizzo/base/formats/format_g726.c
team/rizzo/base/formats/format_g729.c
team/rizzo/base/formats/format_gsm.c
team/rizzo/base/formats/format_h263.c
team/rizzo/base/formats/format_h264.c
team/rizzo/base/formats/format_ilbc.c
team/rizzo/base/formats/format_ogg_vorbis.c
team/rizzo/base/formats/format_pcm.c
team/rizzo/base/formats/format_pcm_alaw.c
team/rizzo/base/formats/format_sln.c
team/rizzo/base/formats/format_vox.c
team/rizzo/base/formats/format_wav.c
team/rizzo/base/formats/format_wav_gsm.c
team/rizzo/base/frame.c
team/rizzo/base/funcs/Makefile
team/rizzo/base/funcs/func_language.c
team/rizzo/base/funcs/func_moh.c
team/rizzo/base/image.c
team/rizzo/base/include/asterisk/cdr.h
team/rizzo/base/include/asterisk/channel.h
team/rizzo/base/include/asterisk/file.h
team/rizzo/base/include/asterisk/frame.h
team/rizzo/base/include/asterisk/image.h
team/rizzo/base/include/asterisk/musiconhold.h
team/rizzo/base/include/asterisk/stringfields.h
team/rizzo/base/pbx.c
team/rizzo/base/pbx/Makefile
team/rizzo/base/res/Makefile
team/rizzo/base/res/res_agi.c
team/rizzo/base/res/res_clioriginate.c
team/rizzo/base/res/res_features.c
team/rizzo/base/res/res_musiconhold.c
team/rizzo/base/res/res_odbc.c
team/rizzo/base/rtp.c
team/rizzo/base/stdtime/Makefile
team/rizzo/base/udptl.c
team/rizzo/base/utils/Makefile
Propchange: team/rizzo/base/
------------------------------------------------------------------------------
--- svnmerge-blocked (original)
+++ svnmerge-blocked Fri Feb 3 04:58:18 2006
@@ -1,1 +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
+/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
Propchange: team/rizzo/base/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb 3 04:58:18 2006
@@ -1,1 +1,1 @@
-/trunk:1-8860
+/trunk:1-9133
Modified: team/rizzo/base/.cleancount
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/.cleancount?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/.cleancount (original)
+++ team/rizzo/base/.cleancount Fri Feb 3 04:58:18 2006
@@ -1,1 +1,1 @@
-8
+10
Modified: team/rizzo/base/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/Makefile?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/Makefile (original)
+++ team/rizzo/base/Makefile Fri Feb 3 04:58:18 2006
@@ -347,8 +347,6 @@
ifneq ($(wildcard .svn),)
ASTERISKVERSIONNUM=999999
ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name)
- else
- ASTERISKVERSIONNUM=000000
endif
endif
@@ -950,3 +948,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/rizzo/base/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/agi/Makefile?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/agi/Makefile (original)
+++ team/rizzo/base/agi/Makefile Fri Feb 3 04:58:18 2006
@@ -26,6 +26,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/rizzo/base/apps/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/Makefile?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/apps/Makefile (original)
+++ team/rizzo/base/apps/Makefile Fri Feb 3 04:58:18 2006
@@ -26,13 +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
-
-# app_say_number.so
-#
-# Obsolete things...
-#
-#APPS+=app_sql_postgres.so
-#APPS+=app_sql_odbc.so
#
# Experimental things
@@ -93,6 +86,8 @@
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)
Modified: team/rizzo/base/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/app_dial.c?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/apps/app_dial.c (original)
+++ team/rizzo/base/apps/app_dial.c Fri Feb 3 04:58:18 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/rizzo/base/apps/app_dial2.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/app_dial2.c?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/apps/app_dial2.c (original)
+++ team/rizzo/base/apps/app_dial2.c Fri Feb 3 04:58:18 2006
@@ -57,7 +57,8 @@
#include "asterisk/causes.h"
#include "asterisk/manager.h"
#include "asterisk/privacy.h"
-#include "asterisk/rtp.h"
+#include "asterisk/stringfields.h"
+#include "asterisk/rtp.h" /* XXX do we need it ? */
static char *tdesc = "Dialing Application";
@@ -446,7 +447,7 @@
S_REPLACE(c->cid.cid_name, new_cid_name);
S_REPLACE(c->cid.cid_ani, ast_strdup(in->cid.cid_ani));
S_REPLACE(c->cid.cid_rdnis, ast_strdup(S_OR(in->macroexten, in->exten)));
- ast_copy_string(c->accountcode, src->accountcode, sizeof(c->accountcode));
+ ast_string_field_set(c, accountcode, src->accountcode);
c->cdrflags = src->cdrflags;
if (ast_call(c, tmpchan, 0)) {
@@ -563,6 +564,7 @@
ast_hangup(o->chan);
o->chan = NULL;
ast_clear_flag(o, DIAL_STILLGOING);
+ /* XXX in 8609, HANDLE_CAUSE(in->hangupcause, in); */
continue;
}
if (f->frametype == AST_FRAME_CONTROL) {
@@ -1292,13 +1294,13 @@
S_REPLACE(tc->cid.cid_ani, ast_strdup(chan->cid.cid_ani));
S_REPLACE(tc->cid.cid_dnid, ast_strdup(chan->cid.cid_dnid));
S_REPLACE(tc->cid.cid_rdnis, ast_strdup(chan->cid.cid_rdnis));
- ast_copy_string(tc->accountcode, chan->accountcode, sizeof(tc->accountcode));
+ ast_string_field_set(tc, accountcode, chan->accountcode);
tc->cdrflags = chan->cdrflags;
/* Copy language from incoming to outgoing */
- ast_copy_string(tc->language, chan->language, sizeof(tc->language));
+ ast_string_field_set(tc, language, chan->language);
if (ast_strlen_zero(tc->musicclass))
- ast_copy_string(tc->musicclass, chan->musicclass, sizeof(tc->musicclass));
+ ast_string_field_set(tc, musicclass, chan->musicclass);
tc->cid.cid_pres = chan->cid.cid_pres; /* Pass callingpres setting */
tc->cid.cid_ton = chan->cid.cid_ton; /* Pass type of number */
tc->cid.cid_tns = chan->cid.cid_tns; /* Pass type of tns */
Modified: team/rizzo/base/apps/app_disa.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/app_disa.c?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/apps/app_disa.c (original)
+++ team/rizzo/base/apps/app_disa.c Fri Feb 3 04:58:18 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/rizzo/base/apps/app_dumpchan.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/app_dumpchan.c?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/apps/app_dumpchan.c (original)
+++ team/rizzo/base/apps/app_dumpchan.c Fri Feb 3 04:58:18 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/rizzo/base/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/app_flash.c?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/apps/app_flash.c (original)
+++ team/rizzo/base/apps/app_flash.c Fri Feb 3 04:58:18 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/rizzo/base/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/app_meetme.c?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/apps/app_meetme.c (original)
+++ team/rizzo/base/apps/app_meetme.c Fri Feb 3 04:58:18 2006
@@ -206,7 +206,6 @@
};
static int admin_exec(struct ast_channel *chan, void *data);
-static struct ast_frame null_frame = { AST_FRAME_NULL, };
static void *recordthread(void *args);
@@ -991,7 +990,7 @@
}
ast_indicate(chan, -1);
- retryzap = strcasecmp(chan->type, "Zap");
+ retryzap = strcasecmp(chan->tech->type, "Zap");
user->zapchannel = !retryzap;
zapretry:
@@ -1297,7 +1296,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;
}
@@ -1568,7 +1567,7 @@
if (conf->transpath[index]) {
conf->transframe[index] = ast_translate(conf->transpath[index], conf->origframe, 0);
if (!conf->transframe[index])
- conf->transframe[index] = &null_frame;
+ conf->transframe[index] = &ast_null_frame;
}
}
}
Modified: team/rizzo/base/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/app_queue.c?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/apps/app_queue.c (original)
+++ team/rizzo/base/apps/app_queue.c Fri Feb 3 04:58:18 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
@@ -1706,7 +1707,7 @@
free(o->chan->cid.cid_name);
o->chan->cid.cid_name = ast_strdup(in->cid.cid_name);
- 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) {
@@ -2134,9 +2135,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/rizzo/base/apps/app_softhangup.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/app_softhangup.c?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/apps/app_softhangup.c (original)
+++ team/rizzo/base/apps/app_softhangup.c Fri Feb 3 04:58:18 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/rizzo/base/apps/app_transfer.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/app_transfer.c?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/apps/app_transfer.c (original)
+++ team/rizzo/base/apps/app_transfer.c Fri Feb 3 04:58:18 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/rizzo/base/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/app_voicemail.c?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/apps/app_voicemail.c (original)
+++ team/rizzo/base/apps/app_voicemail.c Fri Feb 3 04:58:18 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
@@ -2652,7 +2653,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);
@@ -5143,7 +5144,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/rizzo/base/apps/app_zapbarge.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/app_zapbarge.c?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/apps/app_zapbarge.c (original)
+++ team/rizzo/base/apps/app_zapbarge.c Fri Feb 3 04:58:18 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/rizzo/base/apps/app_zapras.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/app_zapras.c?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/apps/app_zapras.c (original)
+++ team/rizzo/base/apps/app_zapras.c Fri Feb 3 04:58:18 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/rizzo/base/apps/app_zapscan.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/apps/app_zapscan.c?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/apps/app_zapscan.c (original)
+++ team/rizzo/base/apps/app_zapscan.c Fri Feb 3 04:58:18 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/rizzo/base/cdr.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/cdr.c?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/cdr.c (original)
+++ team/rizzo/base/cdr.c Fri Feb 3 04:58:18 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;
@@ -528,7 +529,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;
@@ -675,7 +676,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/rizzo/base/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/cdr/Makefile?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/cdr/Makefile (original)
+++ team/rizzo/base/cdr/Makefile Fri Feb 3 04:58:18 2006
@@ -107,6 +107,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/rizzo/base/channel.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/base/channel.c?rev=9134&r1=9133&r2=9134&view=diff
==============================================================================
--- team/rizzo/base/channel.c (original)
+++ team/rizzo/base/channel.c Fri Feb 3 04:58:18 2006
@@ -374,11 +374,8 @@
/*! \brief Set when to hangup channel */
void ast_channel_setwhentohangup(struct ast_channel *chan, time_t offset)
{
- time_t myt = time(NULL);
- struct ast_frame fr = { AST_FRAME_NULL, };
-
- chan->whentohangup = (offset) ? myt + offset : 0;
- ast_queue_frame(chan, &fr);
+ chan->whentohangup = (offset) ? time(NULL) + offset : 0;
+ ast_queue_frame(chan, &ast_null_frame);
return;
}
@@ -618,6 +615,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). */
@@ -657,7 +656,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;
@@ -672,11 +671,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;
@@ -817,37 +816,26 @@
for (retries = 0; retries < 10; retries++) {
AST_LIST_LOCK(&channels);
AST_LIST_TRAVERSE(&channels, c, list) {
- if (!prev) {
- /* want head of list */
- if (!name && !exten)
- break;
- if (name) {
- /* want match by full name */
- if (!namelen) {
- if (!strcasecmp(c->name, name))
- break;
- else
- continue;
- }
- /* want match by name prefix */
- if (!strncasecmp(c->name, name, namelen))
- break;
- } else if (exten) {
- /* want match by context and exten */
- if (context && (strcasecmp(c->context, context) &&
- strcasecmp(c->macrocontext, context)))
- continue;
- /* match by exten */
- if (strcasecmp(c->exten, exten) &&
- strcasecmp(c->macroexten, exten))
- continue;
- else
- break;
- }
[... 13362 lines stripped ...]
More information about the asterisk-commits
mailing list