[asterisk-commits] branch oej/sipregister r22261 - in /team/oej/sipregister: ./ apps/ build_tool...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Mon Apr 24 04:41:03 MST 2006 

Author: oej
Date: Mon Apr 24 06:41:02 2006
New Revision: 22261

URL: http://svn.digium.com/view/asterisk?rev=22261&view=rev
Log:
Update

Added:
    team/oej/sipregister/apps/app_speech_utils.c
      - copied unchanged from r22163, trunk/apps/app_speech_utils.c
    team/oej/sipregister/configs/say.conf.sample
      - copied unchanged from r22163, trunk/configs/say.conf.sample
    team/oej/sipregister/doc/datastores.txt
      - copied unchanged from r22163, trunk/doc/datastores.txt
    team/oej/sipregister/doc/speechrec.txt
      - copied unchanged from r22163, trunk/doc/speechrec.txt
    team/oej/sipregister/include/asterisk/speech.h
      - copied unchanged from r22163, trunk/include/asterisk/speech.h
Modified:
    team/oej/sipregister/.cleancount
    team/oej/sipregister/Makefile
    team/oej/sipregister/UPGRADE.txt
    team/oej/sipregister/acl.c
    team/oej/sipregister/app.c
    team/oej/sipregister/apps/app_adsiprog.c
    team/oej/sipregister/apps/app_alarmreceiver.c
    team/oej/sipregister/apps/app_amd.c
    team/oej/sipregister/apps/app_authenticate.c
    team/oej/sipregister/apps/app_cdr.c
    team/oej/sipregister/apps/app_chanisavail.c
    team/oej/sipregister/apps/app_channelredirect.c
    team/oej/sipregister/apps/app_chanspy.c
    team/oej/sipregister/apps/app_controlplayback.c
    team/oej/sipregister/apps/app_db.c
    team/oej/sipregister/apps/app_dial.c
    team/oej/sipregister/apps/app_dictate.c
    team/oej/sipregister/apps/app_directed_pickup.c
    team/oej/sipregister/apps/app_directory.c
    team/oej/sipregister/apps/app_disa.c
    team/oej/sipregister/apps/app_dumpchan.c
    team/oej/sipregister/apps/app_echo.c
    team/oej/sipregister/apps/app_exec.c
    team/oej/sipregister/apps/app_externalivr.c
    team/oej/sipregister/apps/app_festival.c
    team/oej/sipregister/apps/app_flash.c
    team/oej/sipregister/apps/app_forkcdr.c
    team/oej/sipregister/apps/app_getcpeid.c
    team/oej/sipregister/apps/app_hasnewvoicemail.c
    team/oej/sipregister/apps/app_ices.c
    team/oej/sipregister/apps/app_image.c
    team/oej/sipregister/apps/app_ivrdemo.c
    team/oej/sipregister/apps/app_lookupblacklist.c
    team/oej/sipregister/apps/app_lookupcidname.c
    team/oej/sipregister/apps/app_macro.c
    team/oej/sipregister/apps/app_meetme.c
    team/oej/sipregister/apps/app_milliwatt.c
    team/oej/sipregister/apps/app_mixmonitor.c
    team/oej/sipregister/apps/app_morsecode.c
    team/oej/sipregister/apps/app_mp3.c
    team/oej/sipregister/apps/app_nbscat.c
    team/oej/sipregister/apps/app_osplookup.c
    team/oej/sipregister/apps/app_page.c
    team/oej/sipregister/apps/app_parkandannounce.c
    team/oej/sipregister/apps/app_playback.c
    team/oej/sipregister/apps/app_privacy.c
    team/oej/sipregister/apps/app_queue.c
    team/oej/sipregister/apps/app_random.c
    team/oej/sipregister/apps/app_read.c
    team/oej/sipregister/apps/app_readfile.c
    team/oej/sipregister/apps/app_realtime.c
    team/oej/sipregister/apps/app_record.c
    team/oej/sipregister/apps/app_rpt.c
    team/oej/sipregister/apps/app_sayunixtime.c
    team/oej/sipregister/apps/app_senddtmf.c
    team/oej/sipregister/apps/app_sendtext.c
    team/oej/sipregister/apps/app_setcallerid.c
    team/oej/sipregister/apps/app_setcdruserfield.c
    team/oej/sipregister/apps/app_settransfercapability.c
    team/oej/sipregister/apps/app_skel.c
    team/oej/sipregister/apps/app_sms.c
    team/oej/sipregister/apps/app_softhangup.c
    team/oej/sipregister/apps/app_stack.c
    team/oej/sipregister/apps/app_system.c
    team/oej/sipregister/apps/app_talkdetect.c
    team/oej/sipregister/apps/app_test.c
    team/oej/sipregister/apps/app_transfer.c
    team/oej/sipregister/apps/app_url.c
    team/oej/sipregister/apps/app_userevent.c
    team/oej/sipregister/apps/app_verbose.c
    team/oej/sipregister/apps/app_voicemail.c
    team/oej/sipregister/apps/app_waitforring.c
    team/oej/sipregister/apps/app_waitforsilence.c
    team/oej/sipregister/apps/app_while.c
    team/oej/sipregister/apps/app_zapateller.c
    team/oej/sipregister/apps/app_zapbarge.c
    team/oej/sipregister/apps/app_zapras.c
    team/oej/sipregister/apps/app_zapscan.c
    team/oej/sipregister/asterisk.c
    team/oej/sipregister/build_tools/make_defaults_h
    team/oej/sipregister/cdr.c
    team/oej/sipregister/channel.c
    team/oej/sipregister/channels/chan_agent.c
    team/oej/sipregister/channels/chan_alsa.c
    team/oej/sipregister/channels/chan_features.c
    team/oej/sipregister/channels/chan_iax2.c
    team/oej/sipregister/channels/chan_local.c
    team/oej/sipregister/channels/chan_mgcp.c
    team/oej/sipregister/channels/chan_misdn.c
    team/oej/sipregister/channels/chan_nbs.c
    team/oej/sipregister/channels/chan_oss.c
    team/oej/sipregister/channels/chan_phone.c
    team/oej/sipregister/channels/chan_sip.c
    team/oej/sipregister/channels/chan_skinny.c
    team/oej/sipregister/channels/chan_vpb.c
    team/oej/sipregister/channels/chan_zap.c
    team/oej/sipregister/channels/misdn/isdn_lib.c
    team/oej/sipregister/cli.c
    team/oej/sipregister/configs/agents.conf.sample
    team/oej/sipregister/configs/iax.conf.sample
    team/oej/sipregister/configs/indications.conf.sample
    team/oej/sipregister/configs/modules.conf.sample
    team/oej/sipregister/configs/sip.conf.sample
    team/oej/sipregister/configs/voicemail.conf.sample
    team/oej/sipregister/contrib/scripts/safe_asterisk
    team/oej/sipregister/contrib/scripts/safe_asterisk.8
    team/oej/sipregister/doc/00README.1st
    team/oej/sipregister/enum.c
    team/oej/sipregister/funcs/func_base64.c
    team/oej/sipregister/funcs/func_callerid.c
    team/oej/sipregister/funcs/func_cdr.c
    team/oej/sipregister/funcs/func_channel.c
    team/oej/sipregister/funcs/func_curl.c
    team/oej/sipregister/funcs/func_cut.c
    team/oej/sipregister/funcs/func_db.c
    team/oej/sipregister/funcs/func_enum.c
    team/oej/sipregister/funcs/func_env.c
    team/oej/sipregister/funcs/func_groupcount.c
    team/oej/sipregister/funcs/func_language.c
    team/oej/sipregister/funcs/func_logic.c
    team/oej/sipregister/funcs/func_math.c
    team/oej/sipregister/funcs/func_md5.c
    team/oej/sipregister/funcs/func_moh.c
    team/oej/sipregister/funcs/func_odbc.c
    team/oej/sipregister/funcs/func_rand.c
    team/oej/sipregister/funcs/func_sha1.c
    team/oej/sipregister/funcs/func_strings.c
    team/oej/sipregister/funcs/func_timeout.c
    team/oej/sipregister/funcs/func_uri.c
    team/oej/sipregister/http.c
    team/oej/sipregister/image.c
    team/oej/sipregister/include/asterisk.h
    team/oej/sipregister/include/asterisk/adsi.h
    team/oej/sipregister/include/asterisk/channel.h
    team/oej/sipregister/include/asterisk/compat.h
    team/oej/sipregister/include/asterisk/doxyref.h
    team/oej/sipregister/include/asterisk/file.h
    team/oej/sipregister/include/asterisk/frame.h
    team/oej/sipregister/include/asterisk/linkedlists.h
    team/oej/sipregister/include/asterisk/lock.h
    team/oej/sipregister/include/asterisk/module.h
    team/oej/sipregister/include/asterisk/pbx.h
    team/oej/sipregister/include/asterisk/res_odbc.h
    team/oej/sipregister/include/asterisk/say.h
    team/oej/sipregister/include/asterisk/translate.h
    team/oej/sipregister/include/asterisk/utils.h
    team/oej/sipregister/loader.c
    team/oej/sipregister/manager.c
    team/oej/sipregister/pbx.c
    team/oej/sipregister/pbx/pbx_ael.c
    team/oej/sipregister/pbx/pbx_config.c
    team/oej/sipregister/pbx/pbx_dundi.c
    team/oej/sipregister/pbx/pbx_loopback.c
    team/oej/sipregister/pbx/pbx_realtime.c
    team/oej/sipregister/pbx/pbx_spool.c
    team/oej/sipregister/res/res_agi.c
    team/oej/sipregister/res/res_config_odbc.c
    team/oej/sipregister/res/res_monitor.c
    team/oej/sipregister/res/res_osp.c
    team/oej/sipregister/res/res_smdi.c
    team/oej/sipregister/rtp.c
    team/oej/sipregister/say.c
    team/oej/sipregister/sounds.txt
    team/oej/sipregister/translate.c
    team/oej/sipregister/utils.c

Modified: team/oej/sipregister/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/sipregister/.cleancount?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- team/oej/sipregister/.cleancount (original)
+++ team/oej/sipregister/.cleancount Mon Apr 24 06:41:02 2006
@@ -1,1 +1,1 @@
-13
+15

Modified: team/oej/sipregister/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/sipregister/Makefile?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- team/oej/sipregister/Makefile (original)
+++ team/oej/sipregister/Makefile Mon Apr 24 06:41:02 2006
@@ -89,6 +89,10 @@
 
 # Optional debugging parameters
 DEBUG_THREADS = #-DDUMP_SCHEDULER #-DDEBUG_SCHEDULER #-DDEBUG_THREADS #-DDO_CRASH #-DDETECT_DEADLOCKS
+
+# If you want to debug channel locking, try this (depends on code using
+# ast_channel_lock and companions to work)
+DEBUG_THREADS += #-DDEBUG_CHANNEL_LOCKS
 
 # Uncomment next one to enable ast_frame tracing (for debugging)
 TRACE_FRAMES = #-DTRACE_FRAMES
@@ -163,12 +167,13 @@
   ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
 endif
 endif
+ASTDATADIR?=$(ASTVARLIBDIR)
 
 # Asterisk.conf is located in ASTETCDIR or by using the -C flag
 # when starting Asterisk
 ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
 MODULES_DIR=$(ASTLIBDIR)/modules
-AGI_DIR=$(ASTVARLIBDIR)/agi-bin
+AGI_DIR=$(ASTDATADIR)/agi-bin
 
 # If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file
 HTTP_DOCSDIR=/var/www/html
@@ -562,42 +567,42 @@
 	# 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
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/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
+		install -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
+	done
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/priv-callerintros
 	for x in sounds/digits/*.gsm; do \
 		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
+			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/digits ; \
 		else \
 			echo "No description for $$x"; \
 			exit 1; \
 		fi; \
 	done
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/dictate
 	for x in sounds/dictate/*.gsm; do \
 		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \
+			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/dictate ; \
 		else \
 			echo "No description for $$x"; \
 			exit 1; \
 		fi; \
 	done
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/letters
 	for x in sounds/letters/*.gsm; do \
 		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
+			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/letters ; \
 		else \
 			echo "No description for $$x"; \
 			exit 1; \
 		fi; \
 	done
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/phonetic
 	for x in sounds/phonetic/*.gsm; do \
 		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
+			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/phonetic ; \
 		else \
 			echo "No description for $$x"; \
 			exit 1; \
@@ -605,16 +610,16 @@
 	done
 	for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
 		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
 		else \
 			echo "No description for $$x"; \
 			exit 1; \
 		fi; \
 	done
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/images
 	for x in images/*.jpg; do \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
+		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
 	done
 	mkdir -p $(DESTDIR)$(AGI_DIR)
 
@@ -674,26 +679,24 @@
 	if [ -n "$(OLDHEADERS)" ]; then \
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
 	fi
-	rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
 	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
-	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
+	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
 	$(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
 	$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
 	$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
 	$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
 	if [ -d contrib/firmware/iax ]; then \
-		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
+		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
 	else \
 		echo "You need to do cvs update -d not just cvs update" ; \
 	fi 
-	( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds  ; ln -s $(ASTSPOOLDIR)/voicemail . )
 	if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
 	@echo " +---- Asterisk Installation Complete -------+"  
 	@echo " +                                           +"
@@ -777,6 +780,7 @@
 		echo "astetcdir => $(ASTETCDIR)" ; \
 		echo "astmoddir => $(MODULES_DIR)" ; \
 		echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
+		echo "astdatadir => $(ASTDATADIR)" ; \
 		echo "astagidir => $(AGI_DIR)" ; \
 		echo "astspooldir => $(ASTSPOOLDIR)" ; \
 		echo "astrundir => $(ASTVARRUNDIR)" ; \
@@ -794,28 +798,28 @@
 	else \
 		echo "Skipping asterisk.conf creation"; \
 	fi
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds ; \
 	for x in sounds/demo-*; do \
 		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
 		else \
 			echo "No description for $$x"; \
 			exit 1; \
 		fi; \
 	done
-	mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
+	mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3 ; \
 	for x in sounds/*.mp3; do \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
-	done
-	rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
+		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/mohmp3 ; \
+	done
+	rm -f $(DESTDIR)$(ASTDATADIR)/mohmp3/sample-hold.mp3
 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
-		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
+		cat $(DESTDIR)$(ASTDATADIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
 	done
 	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm
 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone; do \
-		cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
+		cat $(DESTDIR)$(ASTDATADIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
 	done
 
 webvmail:
@@ -937,8 +941,8 @@
 	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)$(ASTDATADIR)/sounds
+	rm -rf $(DESTDIR)$(ASTDATADIR)/firmware
 	rm -rf $(DESTDIR)$(ASTMANDIR)/man8
 	for x in $(SUBDIRS); do $(MAKE) -C $$x uninstall || exit 1 ; done
 
@@ -959,6 +963,7 @@
 uninstall-all: _uninstall
 	rm -rf $(DESTDIR)$(ASTLIBDIR)
 	rm -rf $(DESTDIR)$(ASTVARLIBDIR)
+	rm -rf $(DESTDIR)$(ASTDATADIR)
 	rm -rf $(DESTDIR)$(ASTSPOOLDIR)
 	rm -rf $(DESTDIR)$(ASTETCDIR)
 	rm -rf $(DESTDIR)$(ASTLOGDIR)

Modified: team/oej/sipregister/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/sipregister/UPGRADE.txt?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- team/oej/sipregister/UPGRADE.txt (original)
+++ team/oej/sipregister/UPGRADE.txt Mon Apr 24 06:41:02 2006
@@ -1,5 +1,10 @@
 Information for Upgrading From Previous Asterisk Releases
 =========================================================
+
+PBX Core:
+
+* The (very old and undocumented) ability to use BYEXTENSION for dialing
+  instead of ${EXTEN} has been removed.
 
 Command Line Interface:
 
@@ -30,6 +35,15 @@
   using indication tones, so typing in skip would give you unexpected results.
 
 * OSPAuth is added to authenticate OSP tokens in in_bound call setup messages.
+
+Manager:
+
+* After executing the 'status' manager action, the "Status" manager events
+  included the header "CallerID:" which was actually only the CallerID number,
+  and not the full CallerID string.  This header has been renamed to
+  "CallerIDNum".  For compatibility purposes, the CallerID parameter will remain
+  until after the release of 1.4, when it will be removed.  Please use the time
+  during the 1.4 release to make this transition.
 
 Variables:
 

Modified: team/oej/sipregister/acl.c
URL: http://svn.digium.com/view/asterisk/team/oej/sipregister/acl.c?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- team/oej/sipregister/acl.c (original)
+++ team/oej/sipregister/acl.c Mon Apr 24 06:41:02 2006
@@ -70,10 +70,6 @@
 #include "asterisk/lock.h"
 #include "asterisk/srv.h"
 #include "asterisk/compat.h"
-
-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
-AST_MUTEX_DEFINE_STATIC(routeseq_lock);
-#endif
 
 struct ast_ha {
 	/* Host access rule */

Modified: team/oej/sipregister/app.c
URL: http://svn.digium.com/view/asterisk/team/oej/sipregister/app.c?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- team/oej/sipregister/app.c (original)
+++ team/oej/sipregister/app.c Mon Apr 24 06:41:02 2006
@@ -155,10 +155,7 @@
 	struct ast_dsp *sildet;
 	/* Play prompt if requested */
 	if (prompt) {
-		res = ast_streamfile(c, prompt, c->language);
-		if (res < 0)
-			return res;
-		res = ast_waitstream(c,"");
+		res = ast_stream_and_wait(c, prompt, c->language, "");
 		if (res < 0)
 			return res;
 	}
@@ -414,7 +411,7 @@
 		if (filename[0] == '/') 
 			ast_copy_string(tmpf, filename, sizeof(tmpf));
 		else
-			snprintf(tmpf, sizeof(tmpf), "%s/%s/%s", (char *)ast_config_AST_VAR_DIR, "sounds", filename);
+			snprintf(tmpf, sizeof(tmpf), "%s/%s/%s", (char *)ast_config_AST_DATA_DIR, "sounds", filename);
 		fd = open(tmpf, O_RDONLY);
 		if (fd < 0){
 			ast_log(LOG_WARNING, "Unable to open file '%s': %s\n", tmpf, strerror(errno));
@@ -552,7 +549,6 @@
 	struct ast_dsp *sildet=NULL;   	/* silence detector dsp */
 	int totalsilence = 0;
 	int dspsilence = 0;
-	int gotsilence = 0;		/* did we timeout for silence? */
 	int rfmt=0;
 	struct ast_silence_generator *silgen = NULL;
 
@@ -574,9 +570,7 @@
 	if (playfile) {
 		d = ast_play_and_wait(chan, playfile);
 		if (d > -1)
-			d = ast_streamfile(chan, "beep",chan->language);
-		if (!d)
-			d = ast_waitstream(chan,"");
+			d = ast_stream_and_wait(chan, "beep", chan->language, "");
 		if (d < 0)
 			return -1;
 	}
@@ -675,7 +669,7 @@
 						if (option_verbose > 2)
 							ast_verbose( VERBOSE_PREFIX_3 "Recording automatically stopped after a silence of %d seconds\n", totalsilence/1000);
 						ast_frfree(f);
-						gotsilence = 1;
+						res = 'S';
 						outmsg=2;
 						break;
 					}
@@ -740,24 +734,17 @@
 	for (x=0;x<fmtcnt;x++) {
 		if (!others[x])
 			break;
-		if (res > 0) {
-			if (totalsilence)
-				ast_stream_rewind(others[x], totalsilence-200);
-			else
-				ast_stream_rewind(others[x], 200);
-		}
+		if (res > 0)
+			ast_stream_rewind(others[x], totalsilence ? totalsilence-200 : 200);
 		ast_truncstream(others[x]);
 		ast_closestream(others[x]);
 	}
-	if (rfmt) {
-		if (ast_set_read_format(chan, rfmt)) {
-			ast_log(LOG_WARNING, "Unable to restore format %s to channel '%s'\n", ast_getformatname(rfmt), chan->name);
-		}
+	if (rfmt && ast_set_read_format(chan, rfmt)) {
+		ast_log(LOG_WARNING, "Unable to restore format %s to channel '%s'\n", ast_getformatname(rfmt), chan->name);
 	}
 	if (outmsg > 1) {
 		/* Let them know recording is stopped */
-		if(!ast_streamfile(chan, "auth-thankyou", chan->language))
-			ast_waitstream(chan, "");
+		ast_stream_and_wait(chan, "auth-thankyou", chan->language, "");
 	}
 	if (sildet)
 		ast_dsp_free(sildet);
@@ -779,7 +766,6 @@
 	struct ast_dsp *sildet;   	/* silence detector dsp */
 	int totalsilence = 0;
 	int dspsilence = 0;
-	int gotsilence = 0;		/* did we timeout for silence? */
 	int rfmt=0;	
 	char prependfile[80];
 	
@@ -802,9 +788,7 @@
 		if (!beep)
 			d = ast_play_and_wait(chan, playfile);
 		if (d > -1)
-			d = ast_streamfile(chan, "beep",chan->language);
-		if (!d)
-			d = ast_waitstream(chan,"");
+			d = ast_stream_and_wait(chan, "beep",chan->language, "");
 		if (d < 0)
 			return -1;
 	}
@@ -898,7 +882,7 @@
 					if (option_verbose > 2) 
 						ast_verbose( VERBOSE_PREFIX_3 "Recording automatically stopped after a silence of %d seconds\n", totalsilence/1000);
 					ast_frfree(f);
-					gotsilence = 1;
+					res = 'S';
 					outmsg=2;
 					break;
 					}
@@ -984,17 +968,12 @@
 			ast_filedelete(prependfile, sfmt[x]);
 		}
 	}
-	if (rfmt) {
-		if (ast_set_read_format(chan, rfmt)) {
-			ast_log(LOG_WARNING, "Unable to restore format %s to channel '%s'\n", ast_getformatname(rfmt), chan->name);
-		}
-	}
-	if (outmsg) {
-		if (outmsg > 1) {
-			/* Let them know it worked */
-			ast_streamfile(chan, "auth-thankyou", chan->language);
-			ast_waitstream(chan, "");
-		}
+	if (rfmt && ast_set_read_format(chan, rfmt)) {
+		ast_log(LOG_WARNING, "Unable to restore format %s to channel '%s'\n", ast_getformatname(rfmt), chan->name);
+	}
+	if (outmsg > 1) {
+		/* Let them know it worked */
+		ast_stream_and_wait(chan, "auth-thankyou", chan->language, "");
 	}	
 	return res;
 }
@@ -1217,16 +1196,14 @@
 				cmd = '3';
 				break;
 			} else {
-				ast_streamfile(chan, "vm-msgsaved", chan->language);
-				ast_waitstream(chan, "");
+				ast_stream_and_wait(chan, "vm-msgsaved", chan->language, "");
 				cmd = 't';
 				return res;
 			}
 		case '2':
 			/* Review */
 			ast_verbose(VERBOSE_PREFIX_3 "Reviewing the recording\n");
-			ast_streamfile(chan, recordfile, chan->language);
-			cmd = ast_waitstream(chan, AST_DIGIT_ANY);
+			cmd = ast_stream_and_wait(chan, recordfile, chan->language, AST_DIGIT_ANY);
 			break;
 		case '3':
 			message_exists = 0;
@@ -1312,19 +1289,15 @@
 	case AST_ACTION_NOOP:
 		return 0;
 	case AST_ACTION_BACKGROUND:
-		res = ast_streamfile(chan, (char *)option->adata, chan->language);
-		if (!res) {
-			res = ast_waitstream(chan, AST_DIGIT_ANY);
-		} else {
+		res = ast_stream_and_wait(chan, (char *)option->adata, chan->language, AST_DIGIT_ANY);
+		if (res < 0) {
 			ast_log(LOG_NOTICE, "Unable to find file '%s'!\n", (char *)option->adata);
 			res = 0;
 		}
 		return res;
 	case AST_ACTION_PLAYBACK:
-		res = ast_streamfile(chan, (char *)option->adata, chan->language);
-		if (!res) {
-			res = ast_waitstream(chan, "");
-		} else {
+		res = ast_stream_and_wait(chan, (char *)option->adata, chan->language, "");
+		if (res < 0) {
 			ast_log(LOG_NOTICE, "Unable to find file '%s'!\n", (char *)option->adata);
 			res = 0;
 		}
@@ -1353,7 +1326,8 @@
 		c = ast_strdupa(option->adata);
 		if (c) {
 			while((n = strsep(&c, ";")))
-				if ((res = ast_streamfile(chan, n, chan->language)) || (res = ast_waitstream(chan, (option->action == AST_ACTION_BACKLIST) ? AST_DIGIT_ANY : "")))
+				if ((res = ast_stream_and_wait(chan, n, chan->language,
+						(option->action == AST_ACTION_BACKLIST) ? AST_DIGIT_ANY : "")))
 					break;
 			ast_stopstream(chan);
 		}

Modified: team/oej/sipregister/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/oej/sipregister/apps/app_adsiprog.c?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- team/oej/sipregister/apps/app_adsiprog.c (original)
+++ team/oej/sipregister/apps/app_adsiprog.c Mon Apr 24 06:41:02 2006
@@ -49,8 +49,6 @@
 #include "asterisk/utils.h"
 #include "asterisk/lock.h"
 
-static char *tdesc = "Asterisk ADSI Programming Application";
-
 static char *app = "ADSIProg";
 
 static char *synopsis = "Load Asterisk ADSI Scripts into phone";
@@ -60,8 +58,6 @@
 static char *descrip =
 "  ADSIProg(script): This application programs an ADSI Phone with the given\n"
 "script. If nothing is specified, the default script (asterisk.adsi) is used.\n";
-
-LOCAL_USER_DECL;
 
 struct adsi_event {
 	int id;
@@ -1570,35 +1566,32 @@
 	return res;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	int res;
+
+	STANDARD_HANGUP_LOCALUSERS;
 
 	res = ast_unregister_application(app);	
 	
-	STANDARD_HANGUP_LOCALUSERS;
 
 	return res;
 }
 
-int load_module(void)
-{
+static int load_module(void *mod)
+{
+	__mod_desc = mod;
 	return ast_register_application(app, adsi_exec, synopsis, descrip);
 }
 
-const char *description(void)
-{
-	return tdesc;
-}
-
-int usecount(void)
-{
-	int res;
-	STANDARD_USECOUNT(res);
-	return res;
-}
-
-const char *key()
+static const char *description(void)
+{
+	return "Asterisk ADSI Programming Application";
+}
+
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_1, NULL, NULL, NULL);

Modified: team/oej/sipregister/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/oej/sipregister/apps/app_alarmreceiver.c?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- team/oej/sipregister/apps/app_alarmreceiver.c (original)
+++ team/oej/sipregister/apps/app_alarmreceiver.c Mon Apr 24 06:41:02 2006
@@ -68,8 +68,6 @@
 
 typedef struct event_node event_node_t;
 
-static char *tdesc = "Alarm Receiver for Asterisk";
-
 static char *app = "AlarmReceiver";
 
 static char *synopsis = "Provide support for receving alarm reports from a burglar or fire alarm panel";
@@ -98,8 +96,6 @@
 /* Misc variables */
 	
 static char event_file[14] = "/event-XXXXXX";
-
-LOCAL_USER_DECL;
 
 /*
 * Attempt to access a database variable and increment it,
@@ -820,7 +816,7 @@
 */
 
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	int res;
 
@@ -831,25 +827,21 @@
 	return res;
 }
 
-int load_module(void)
-{
+static int load_module(void *mod)
+{
+	__mod_desc = mod;
 	load_config();
 	return ast_register_application(app, alarmreceiver_exec, synopsis, descrip);
 }
 
-const char *description(void)
-{
-	return tdesc;
-}
-
-int usecount(void)
-{
-	int res;
-	STANDARD_USECOUNT(res);
-	return res;
-}
-
-const char *key()
+static const char *description(void)
+{
+	return "Alarm Receiver for Asterisk";
+}
+
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD1;

Modified: team/oej/sipregister/apps/app_amd.c
URL: http://svn.digium.com/view/asterisk/team/oej/sipregister/apps/app_amd.c?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- team/oej/sipregister/apps/app_amd.c (original)
+++ team/oej/sipregister/apps/app_amd.c Mon Apr 24 06:41:02 2006
@@ -35,7 +35,6 @@
 #include "asterisk/app.h"
 
 
-static char *tdesc = "Answering Machine Detection Application";
 static char *app = "AMD";
 static char *synopsis = "Attempts to detect answering machines";
 static char *descrip =
@@ -73,9 +72,6 @@
 "               MAXWORDS-<%d wordsCount>-<%d maximumNumberOfWords>\n"
 "               LONGGREETING-<%d voiceDuration>-<%d greeting>\n";
 
-
-LOCAL_USER_DECL;
-
 #define STATE_IN_WORD       1
 #define STATE_IN_SILENCE    2
 
@@ -393,38 +389,33 @@
 	return;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	STANDARD_HANGUP_LOCALUSERS;
 	return ast_unregister_application(app);
 }
 
-int load_module(void)
-{
+static int load_module(void *mod)
+{
+	__mod_desc = mod;
 	load_config();
 	return ast_register_application(app, amd_exec, synopsis, descrip);
 }
 
-int reload(void)
+static int reload(void *mod)
 {
 	load_config();
 	return 0;
 }
 
-const char *description(void)
-{
-	return tdesc;
-}
-
-int usecount(void)
-{
-	int res;
-	STANDARD_USECOUNT(res);
-	return res;
-}
-
-const char *key()
+static const char *description(void)
+{
+	return "Answering Machine Detection Application";
+}
+
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
 
+STD_MOD(MOD_1, reload, NULL, NULL);

Modified: team/oej/sipregister/apps/app_authenticate.c
URL: http://svn.digium.com/view/asterisk/team/oej/sipregister/apps/app_authenticate.c?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- team/oej/sipregister/apps/app_authenticate.c (original)
+++ team/oej/sipregister/apps/app_authenticate.c Mon Apr 24 06:41:02 2006
@@ -62,7 +62,6 @@
 	AST_APP_OPTION('r', OPT_REMOVE),
 });
 
-static char *tdesc = "Authentication Application";
 
 static char *app = "Authenticate";
 
@@ -91,8 +90,6 @@
 "         press the '#' key).\n"
 "         Defaults to 0 - no limit - wait for the user press the '#' key.\n"
 ;
-
-LOCAL_USER_DECL;
 
 static int auth_exec(struct ast_channel *chan, void *data)
 {
@@ -236,35 +233,31 @@
 	return res;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	int res;
 
+	STANDARD_HANGUP_LOCALUSERS;
+
 	res = ast_unregister_application(app);
 
-	STANDARD_HANGUP_LOCALUSERS;
 	
 	return res;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	return ast_register_application(app, auth_exec, synopsis, descrip);
 }
 
-const char *description(void)
-{
-	return tdesc;
-}
-
-int usecount(void)
-{
-	int res;
-	STANDARD_USECOUNT(res);
-	return res;
-}
-
-const char *key()
+static const char *description(void)
+{
+	return "Authentication Application";
+}
+
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_1, NULL, NULL, NULL);

Modified: team/oej/sipregister/apps/app_cdr.c
URL: http://svn.digium.com/view/asterisk/team/oej/sipregister/apps/app_cdr.c?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- team/oej/sipregister/apps/app_cdr.c (original)
+++ team/oej/sipregister/apps/app_cdr.c Mon Apr 24 06:41:02 2006
@@ -27,8 +27,6 @@
 
 #include <sys/types.h>
 #include <stdlib.h>
-
-#define STATIC_MODULE
 
 #include "asterisk.h"
 
@@ -63,7 +61,7 @@
 	return 0;
 }
 
-STATIC_MODULE int unload_module(void)
+static int unload_module(void *mod)
 {
 	int res;
 
@@ -74,24 +72,17 @@
 	return res;
 }
 
-STATIC_MODULE int load_module(void)
+static int load_module(void *mod)
 {
 	return ast_register_application(nocdr_app, nocdr_exec, nocdr_synopsis, nocdr_descrip);
 }
 
-STATIC_MODULE const char *description(void)
+static const char *description(void)
 {
 	return "Tell Asterisk to not maintain a CDR for the current call";
 }
 
-STATIC_MODULE int usecount(void)
-{
-	int res;
-	STANDARD_USECOUNT(res);
-	return res;
-}
-
-STATIC_MODULE const char *key(void)
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }

Modified: team/oej/sipregister/apps/app_chanisavail.c
URL: http://svn.digium.com/view/asterisk/team/oej/sipregister/apps/app_chanisavail.c?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- team/oej/sipregister/apps/app_chanisavail.c (original)
+++ team/oej/sipregister/apps/app_chanisavail.c Mon Apr 24 06:41:02 2006
@@ -47,8 +47,6 @@
 #include "asterisk/app.h"
 #include "asterisk/devicestate.h"
 #include "asterisk/options.h"
-
-static char *tdesc = "Check channel availability";
 
 static char *app = "ChanIsAvail";
 
@@ -157,7 +155,7 @@
 	return 0;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	int res = 0;
 
@@ -168,24 +166,20 @@
 	return res;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
+	__mod_desc = mod;
 	return ast_register_application(app, chanavail_exec, synopsis, descrip);
 }
 
-const char *description(void)
+static const char *description(void)
 {
-	return tdesc;
+	return "Check channel availability";
 }
 
-int usecount(void)
-{
-	int res;
-	STANDARD_USECOUNT(res);
-	return res;
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD1;

Modified: team/oej/sipregister/apps/app_channelredirect.c
URL: http://svn.digium.com/view/asterisk/team/oej/sipregister/apps/app_channelredirect.c?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- team/oej/sipregister/apps/app_channelredirect.c (original)
+++ team/oej/sipregister/apps/app_channelredirect.c Mon Apr 24 06:41:02 2006
@@ -41,7 +41,6 @@
 #include "asterisk/app.h"
 #include "asterisk/features.h"
 
-static char *tdesc = "Channel Redirect";
 static char *app = "ChannelRedirect";
 static char *synopsis = "Redirects given channel to a dialplan target.";
 static char *descrip = 
@@ -121,7 +120,7 @@
 	return res;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	int res;
 
@@ -132,26 +131,20 @@
 	return res;	
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
+	__mod_desc = mod;
 	return ast_register_application(app, asyncgoto_exec, synopsis, descrip);
 }
 
-const char *description(void)
+static const char *description(void)
 {
-	return tdesc;
+	return "Channel Redirect";
 }
 
-int usecount(void)
-{
-	int res;
-
-	STANDARD_USECOUNT(res);
-
-	return res;
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD1;

Modified: team/oej/sipregister/apps/app_chanspy.c
URL: http://svn.digium.com/view/asterisk/team/oej/sipregister/apps/app_chanspy.c?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- team/oej/sipregister/apps/app_chanspy.c (original)
+++ team/oej/sipregister/apps/app_chanspy.c Mon Apr 24 06:41:02 2006
@@ -554,7 +554,7 @@
 	ALL_DONE(u, res);
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	int res;
 
@@ -565,24 +565,20 @@
 	return res;
 }
 
-int load_module(void)
-{
+static int load_module(void *mod)
+{
+	__mod_desc = mod;
 	return ast_register_application(app, chanspy_exec, synopsis, desc);
 }
 
-const char *description(void)
+static const char *description(void)
 {
 	return (char *) synopsis;
 }
 
-int usecount(void)
-{
-	int res;
-	STANDARD_USECOUNT(res);
-	return res;
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_1, NULL, NULL, NULL);

Modified: team/oej/sipregister/apps/app_controlplayback.c
URL: http://svn.digium.com/view/asterisk/team/oej/sipregister/apps/app_controlplayback.c?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- team/oej/sipregister/apps/app_controlplayback.c (original)
+++ team/oej/sipregister/apps/app_controlplayback.c Mon Apr 24 06:41:02 2006
@@ -43,8 +43,6 @@
 #include "asterisk/translate.h"
 #include "asterisk/utils.h"
 #include "asterisk/options.h"
-
-static const char *tdesc = "Control Playback Application";
 
 static const char *app = "ControlPlayback";
 
@@ -156,36 +154,26 @@
 	return res;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	int res;
-
 	res = ast_unregister_application(app);
-
-	STANDARD_HANGUP_LOCALUSERS;
-
 	return res;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	return ast_register_application(app, controlplayback_exec, synopsis, descrip);
 }
 
-const char *description(void)
+static const char *description(void)
 {
-	return (char *) tdesc;
+	return "Control Playback Application";
 }
 
-int usecount(void)
-{
-	int res;
-
-	STANDARD_USECOUNT(res);
-	return res;
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_1, NULL, NULL, NULL);

Modified: team/oej/sipregister/apps/app_db.c
URL: http://svn.digium.com/view/asterisk/team/oej/sipregister/apps/app_db.c?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- team/oej/sipregister/apps/app_db.c (original)
+++ team/oej/sipregister/apps/app_db.c Mon Apr 24 06:41:02 2006
@@ -47,8 +47,6 @@
 #include "asterisk/astdb.h"
 #include "asterisk/lock.h"
 #include "asterisk/options.h"
-
-static char *tdesc = "Database Access Functions";
 
 static char *d_descrip =
 "  DBdel(family/key): This applicaiton will delete a key from the Asterisk\n"
@@ -145,41 +143,35 @@
 	return 0;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	int retval;
 
 	retval = ast_unregister_application(dt_app);
 	retval |= ast_unregister_application(d_app);
 
-	STANDARD_HANGUP_LOCALUSERS;
-
 	return retval;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	int retval;
 
+	__mod_desc = mod;
 	retval = ast_register_application(d_app, del_exec, d_synopsis, d_descrip);
 	retval |= ast_register_application(dt_app, deltree_exec, dt_synopsis, dt_descrip);
 	
 	return retval;
 }
 
-const char *description(void)
+static const char *description(void)
 {
-	return tdesc;
+	return "Database Access Functions";
 }
 
-int usecount(void)
-{
-	int res;
-	STANDARD_USECOUNT(res);
-	return res;
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_1, NULL, NULL, NULL);

Modified: team/oej/sipregister/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/oej/sipregister/apps/app_dial.c?rev=22261&r1=22260&r2=22261&view=diff
==============================================================================
--- team/oej/sipregister/apps/app_dial.c (original)
+++ team/oej/sipregister/apps/app_dial.c Mon Apr 24 06:41:02 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>
  *
@@ -35,7 +35,6 @@
 #include <sys/signal.h>
 #include <netinet/in.h>
 
-#define STATIC_MODULE
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -60,8 +59,6 @@
 #include "asterisk/manager.h"
 #include "asterisk/privacy.h"
 #include "asterisk/stringfields.h"
-
-static char *tdesc = "Dialing Application";
 
 static char *app = "Dial";
 
@@ -157,6 +154,16 @@

[... 20523 lines stripped ...]

More information about the asterisk-commits mailing list