[asterisk-commits] branch group/codecs-luigi r17450 - in /team/group/codecs-luigi: ./ apps/ chan...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Tue Apr 4 17:46:26 MST 2006


Author: kpfleming
Date: Tue Apr  4 19:45:28 2006
New Revision: 17450

URL: http://svn.digium.com/view/asterisk?rev=17450&view=rev
Log:
update to trunk

Added:
    team/group/codecs-luigi/doc/ajam.txt
      - copied unchanged from r17415, trunk/doc/ajam.txt
    team/group/codecs-luigi/static-http/
      - copied from r17415, trunk/static-http/
    team/group/codecs-luigi/static-http/ajamdemo.html
      - copied unchanged from r17415, trunk/static-http/ajamdemo.html
    team/group/codecs-luigi/static-http/astman.css
      - copied unchanged from r17415, trunk/static-http/astman.css
    team/group/codecs-luigi/static-http/astman.js
      - copied unchanged from r17415, trunk/static-http/astman.js
    team/group/codecs-luigi/static-http/prototype.js
      - copied unchanged from r17415, trunk/static-http/prototype.js
Removed:
    team/group/codecs-luigi/formats/format_au.c
    team/group/codecs-luigi/formats/format_pcm_alaw.c
Modified:
    team/group/codecs-luigi/   (props changed)
    team/group/codecs-luigi/.cleancount
    team/group/codecs-luigi/CREDITS
    team/group/codecs-luigi/Makefile
    team/group/codecs-luigi/README
    team/group/codecs-luigi/apps/app_alarmreceiver.c
    team/group/codecs-luigi/apps/app_dial.c
    team/group/codecs-luigi/apps/app_echo.c
    team/group/codecs-luigi/apps/app_exec.c
    team/group/codecs-luigi/apps/app_macro.c
    team/group/codecs-luigi/apps/app_meetme.c
    team/group/codecs-luigi/apps/app_milliwatt.c
    team/group/codecs-luigi/apps/app_page.c
    team/group/codecs-luigi/apps/app_queue.c
    team/group/codecs-luigi/apps/app_rpt.c
    team/group/codecs-luigi/apps/app_senddtmf.c
    team/group/codecs-luigi/apps/app_sms.c
    team/group/codecs-luigi/apps/app_stack.c
    team/group/codecs-luigi/apps/app_voicemail.c
    team/group/codecs-luigi/apps/app_while.c
    team/group/codecs-luigi/asterisk.8
    team/group/codecs-luigi/asterisk.c
    team/group/codecs-luigi/asterisk.sgml
    team/group/codecs-luigi/callerid.c
    team/group/codecs-luigi/channel.c
    team/group/codecs-luigi/channels/chan_h323.c
    team/group/codecs-luigi/channels/chan_iax2.c
    team/group/codecs-luigi/channels/chan_local.c
    team/group/codecs-luigi/channels/chan_misdn.c
    team/group/codecs-luigi/channels/chan_oss.c
    team/group/codecs-luigi/channels/chan_sip.c
    team/group/codecs-luigi/channels/chan_zap.c
    team/group/codecs-luigi/channels/h323/ast_h323.cpp
    team/group/codecs-luigi/channels/iax2-provision.h
    team/group/codecs-luigi/channels/misdn/Makefile
    team/group/codecs-luigi/channels/misdn/isdn_lib.c
    team/group/codecs-luigi/channels/misdn/isdn_lib.h
    team/group/codecs-luigi/channels/misdn/isdn_msg_parser.c
    team/group/codecs-luigi/cli.c
    team/group/codecs-luigi/codecs/gsm/Makefile
    team/group/codecs-luigi/configs/extensions.conf.sample
    team/group/codecs-luigi/configs/features.conf.sample
    team/group/codecs-luigi/configs/http.conf.sample
    team/group/codecs-luigi/configs/manager.conf.sample
    team/group/codecs-luigi/configs/oss.conf.sample
    team/group/codecs-luigi/configs/queues.conf.sample
    team/group/codecs-luigi/configs/sip.conf.sample
    team/group/codecs-luigi/configs/skinny.conf.sample
    team/group/codecs-luigi/devicestate.c
    team/group/codecs-luigi/doc/00README.1st
    team/group/codecs-luigi/doc/CODING-GUIDELINES
    team/group/codecs-luigi/doc/asterisk-conf.txt
    team/group/codecs-luigi/doc/manager.txt
    team/group/codecs-luigi/enum.c
    team/group/codecs-luigi/file.c
    team/group/codecs-luigi/formats/Makefile
    team/group/codecs-luigi/formats/format_g723.c
    team/group/codecs-luigi/formats/format_g726.c
    team/group/codecs-luigi/formats/format_g729.c
    team/group/codecs-luigi/formats/format_gsm.c
    team/group/codecs-luigi/formats/format_h263.c
    team/group/codecs-luigi/formats/format_h264.c
    team/group/codecs-luigi/formats/format_ilbc.c
    team/group/codecs-luigi/formats/format_ogg_vorbis.c
    team/group/codecs-luigi/formats/format_pcm.c
    team/group/codecs-luigi/formats/format_sln.c
    team/group/codecs-luigi/formats/format_vox.c
    team/group/codecs-luigi/formats/format_wav.c
    team/group/codecs-luigi/formats/format_wav_gsm.c
    team/group/codecs-luigi/http.c
    team/group/codecs-luigi/include/asterisk/adsi.h
    team/group/codecs-luigi/include/asterisk/app.h
    team/group/codecs-luigi/include/asterisk/callerid.h
    team/group/codecs-luigi/include/asterisk/channel.h
    team/group/codecs-luigi/include/asterisk/cli.h
    team/group/codecs-luigi/include/asterisk/crypto.h
    team/group/codecs-luigi/include/asterisk/dns.h
    team/group/codecs-luigi/include/asterisk/doxyref.h
    team/group/codecs-luigi/include/asterisk/enum.h
    team/group/codecs-luigi/include/asterisk/features.h
    team/group/codecs-luigi/include/asterisk/file.h
    team/group/codecs-luigi/include/asterisk/fskmodem.h
    team/group/codecs-luigi/include/asterisk/http.h
    team/group/codecs-luigi/include/asterisk/image.h
    team/group/codecs-luigi/include/asterisk/indications.h
    team/group/codecs-luigi/include/asterisk/io.h
    team/group/codecs-luigi/include/asterisk/linkedlists.h
    team/group/codecs-luigi/include/asterisk/localtime.h
    team/group/codecs-luigi/include/asterisk/lock.h
    team/group/codecs-luigi/include/asterisk/logger.h
    team/group/codecs-luigi/include/asterisk/manager.h
    team/group/codecs-luigi/include/asterisk/musiconhold.h
    team/group/codecs-luigi/include/asterisk/options.h
    team/group/codecs-luigi/include/asterisk/pbx.h
    team/group/codecs-luigi/include/asterisk/rtp.h
    team/group/codecs-luigi/include/asterisk/sched.h
    team/group/codecs-luigi/include/asterisk/tdd.h
    team/group/codecs-luigi/include/asterisk/term.h
    team/group/codecs-luigi/include/solaris-compat/compat.h
    team/group/codecs-luigi/indications.c
    team/group/codecs-luigi/loader.c
    team/group/codecs-luigi/manager.c
    team/group/codecs-luigi/pbx.c
    team/group/codecs-luigi/pbx/pbx_config.c
    team/group/codecs-luigi/pbx/pbx_dundi.c
    team/group/codecs-luigi/pbx/pbx_loopback.c
    team/group/codecs-luigi/pbx/pbx_realtime.c
    team/group/codecs-luigi/res/res_agi.c
    team/group/codecs-luigi/res/res_features.c
    team/group/codecs-luigi/res/res_indications.c
    team/group/codecs-luigi/res/res_musiconhold.c
    team/group/codecs-luigi/res/snmp/agent.c
    team/group/codecs-luigi/rtp.c
    team/group/codecs-luigi/strcompat.c
    team/group/codecs-luigi/translate.c
    team/group/codecs-luigi/utils.c
    team/group/codecs-luigi/utils/astman.c

Propchange: team/group/codecs-luigi/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/group/codecs-luigi/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/group/codecs-luigi/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr  4 19:45:28 2006
@@ -1,1 +1,1 @@
-/trunk:1-16001
+/trunk:1-17449

Modified: team/group/codecs-luigi/.cleancount
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/.cleancount?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/.cleancount (original)
+++ team/group/codecs-luigi/.cleancount Tue Apr  4 19:45:28 2006
@@ -1,1 +1,1 @@
-12
+13

Modified: team/group/codecs-luigi/CREDITS
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/CREDITS?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/CREDITS (original)
+++ team/group/codecs-luigi/CREDITS Tue Apr  4 19:45:28 2006
@@ -90,6 +90,11 @@
 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/group/codecs-luigi/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/Makefile?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/Makefile (original)
+++ team/group/codecs-luigi/Makefile Tue Apr  4 19:45:28 2006
@@ -566,6 +566,13 @@
 
 datafiles: all
 	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 \
@@ -788,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/group/codecs-luigi/README
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/README?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/README (original)
+++ team/group/codecs-luigi/README Tue Apr  4 19:45:28 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
@@ -84,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 
@@ -99,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/group/codecs-luigi/apps/app_alarmreceiver.c
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/apps/app_alarmreceiver.c?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/apps/app_alarmreceiver.c (original)
+++ team/group/codecs-luigi/apps/app_alarmreceiver.c Tue Apr  4 19:45:28 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/group/codecs-luigi/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/apps/app_dial.c?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/apps/app_dial.c (original)
+++ team/group/codecs-luigi/apps/app_dial.c Tue Apr  4 19:45:28 2006
@@ -1449,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/group/codecs-luigi/apps/app_echo.c
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/apps/app_echo.c?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/apps/app_echo.c (original)
+++ team/group/codecs-luigi/apps/app_echo.c Tue Apr  4 19:45:28 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/group/codecs-luigi/apps/app_exec.c
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/apps/app_exec.c?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/apps/app_exec.c (original)
+++ team/group/codecs-luigi/apps/app_exec.c Tue Apr  4 19:45:28 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/group/codecs-luigi/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/apps/app_macro.c?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/apps/app_macro.c (original)
+++ team/group/codecs-luigi/apps/app_macro.c Tue Apr  4 19:45:28 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);
+			oldargs[argc] = ast_strdup(s);
 		pbx_builtin_setvar_helper(chan, varname, cur);
 		argc++;
 	}

Modified: team/group/codecs-luigi/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/apps/app_meetme.c?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/apps/app_meetme.c (original)
+++ team/group/codecs-luigi/apps/app_meetme.c Tue Apr  4 19:45:28 2006
@@ -1143,7 +1143,7 @@
 		app = pbx_findapp("agi");
 		if (app) {
 			char *s = ast_strdupa(agifile);
-			ret = pbx_exec(chan, app, s, 1);
+			ret = pbx_exec(chan, app, s);
 		} else {
 			ast_log(LOG_WARNING, "Could not find application (agi)\n");
 			ret = -2;

Modified: team/group/codecs-luigi/apps/app_milliwatt.c
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/apps/app_milliwatt.c?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/apps/app_milliwatt.c (original)
+++ team/group/codecs-luigi/apps/app_milliwatt.c Tue Apr  4 19:45:28 2006
@@ -71,20 +71,27 @@
 {
 	struct ast_frame wf;
 	unsigned char buf[AST_FRIENDLY_OFFSET + 640];
-	int i,*indexp = (int *) data;
+	const int maxsamples = sizeof (buf) / sizeof (buf[0]);
+	int i, *indexp = (int *) data;
 
-	if (len + AST_FRIENDLY_OFFSET > sizeof(buf))
-	{
-		ast_log(LOG_WARNING,"Only doing %d bytes (%d bytes requested)\n",(int)(sizeof(buf) - AST_FRIENDLY_OFFSET),len);
-		len = sizeof(buf) - AST_FRIENDLY_OFFSET;
+	/* Instead of len, use samples, because channel.c generator_force
+	* generate(chan, tmp, 0, 160) ignores len. In any case, len is
+	* a multiple of samples, given by number of samples times bytes per
+	* sample. In the case of ulaw, len = samples. for signed linear
+	* len = 2 * samples */
+
+	if (samples > maxsamples) {
+		ast_log(LOG_WARNING, "Only doing %d samples (%d requested)\n", maxsamples, samples);
+		samples = maxsamples;
 	}
+	len = samples * sizeof (buf[0]);
 	wf.frametype = AST_FRAME_VOICE;
 	wf.subclass = AST_FORMAT_ULAW;
 	wf.offset = AST_FRIENDLY_OFFSET;
 	wf.mallocd = 0;
 	wf.data = buf + AST_FRIENDLY_OFFSET;
 	wf.datalen = len;
-	wf.samples = wf.datalen;
+	wf.samples = samples;
 	wf.src = "app_milliwatt";
 	wf.delivery.tv_sec = 0;
 	wf.delivery.tv_usec = 0;

Modified: team/group/codecs-luigi/apps/app_page.c
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/apps/app_page.c?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/apps/app_page.c (original)
+++ team/group/codecs-luigi/apps/app_page.c Tue Apr  4 19:45:28 2006
@@ -186,7 +186,7 @@
 	}
 	if (!res) {
 		snprintf(meetmeopts, sizeof(meetmeopts), "%ud|A%sqxd", confid, ast_test_flag(&flags, PAGE_DUPLEX) ? "" : "t");
-		pbx_exec(chan, app, meetmeopts, 1);
+		pbx_exec(chan, app, meetmeopts);
 	}
 
 	LOCAL_USER_REMOVE(u);

Modified: team/group/codecs-luigi/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/apps/app_queue.c?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/apps/app_queue.c (original)
+++ team/group/codecs-luigi/apps/app_queue.c Tue Apr  4 19:45:28 2006
@@ -1211,7 +1211,7 @@
 
 	ast_mutex_lock(&qe->parent->lock);
 	if (newvalue <= qe->parent->servicelevel)
-       		qe->parent->callscompletedinsl++;
+		qe->parent->callscompletedinsl++;
 	oldvalue = qe->parent->holdtime;
 	qe->parent->holdtime = (((oldvalue << 2) - oldvalue) + newvalue) >> 2;
 	ast_mutex_unlock(&qe->parent->lock);
@@ -1753,7 +1753,7 @@
 				if (f) {
 					if (f->frametype == AST_FRAME_CONTROL) {
 						switch(f->subclass) {
-		    			case AST_CONTROL_ANSWER:
+						case AST_CONTROL_ANSWER:
 							/* This is our guy if someone answered. */
 							if (!peer) {
 								if (option_verbose > 2)
@@ -2193,7 +2193,7 @@
 				/* Agent must have hung up */
 				ast_log(LOG_WARNING, "Agent on %s hungup on the customer.  They're going to be pissed.\n", peer->name);
 				ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "AGENTDUMP", "%s", "");
-                                record_abandoned(qe);
+				record_abandoned(qe);
 				if (qe->parent->eventwhencalled) {
 					manager_event(EVENT_FLAG_AGENT, "AgentDump",
 						      "Queue: %s\r\n"
@@ -2223,7 +2223,7 @@
 		if (res < 0) {
 			ast_queue_log(queuename, qe->chan->uniqueid, peer->name, "SYSCOMPAT", "%s", "");
 			ast_log(LOG_WARNING, "Had to drop call because I couldn't make %s compatible with %s\n", qe->chan->name, peer->name);
-                        record_abandoned(qe);
+		record_abandoned(qe);
 			ast_hangup(peer);
 			return -1;
 		}
@@ -2403,7 +2403,7 @@
 				free(last_member);
 
 				if (queue_persistent_members)
-				    dump_queue_members(q);
+					dump_queue_members(q);
 
 				res = RES_OKAY;
 			} else {
@@ -2440,17 +2440,17 @@
 				new_member->next = q->members;
 				q->members = new_member;
 				manager_event(EVENT_FLAG_AGENT, "QueueMemberAdded",
-					"Queue: %s\r\n"
-					"Location: %s\r\n"
-					"Membership: %s\r\n"
-					"Penalty: %d\r\n"
-					"CallsTaken: %d\r\n"
-					"LastCall: %d\r\n"
-					"Status: %d\r\n"
-					"Paused: %d\r\n",
-				q->name, new_member->interface, new_member->dynamic ? "dynamic" : "static",
-				new_member->penalty, new_member->calls, (int)new_member->lastcall, new_member->status, new_member->paused);
-					
+						"Queue: %s\r\n"
+						"Location: %s\r\n"
+						"Membership: %s\r\n"
+						"Penalty: %d\r\n"
+						"CallsTaken: %d\r\n"
+						"LastCall: %d\r\n"
+						"Status: %d\r\n"
+						"Paused: %d\r\n",
+						q->name, new_member->interface, new_member->dynamic ? "dynamic" : "static",
+						new_member->penalty, new_member->calls, (int)new_member->lastcall, new_member->status, new_member->paused);
+
 				if (dump)
 					dump_queue_members(q);
 
@@ -2489,7 +2489,7 @@
 				mem->paused = paused;
 
 				if (queue_persistent_members)
-				    dump_queue_members(q);
+					dump_queue_members(q);
 
 				ast_queue_log(q->name, "NONE", interface, (paused ? "PAUSE" : "UNPAUSE"), "%s", "");
 
@@ -2944,7 +2944,7 @@
 check_turns:
 		if (ringing) {
 			ast_indicate(chan, AST_CONTROL_RINGING);
-		} else {              
+		} else {
 			ast_moh_start(chan, qe.moh);
 		}
 		for (;;) {
@@ -2958,8 +2958,8 @@
 				 ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON", "%d|%d|%ld", qe.pos, qe.opos, (long)time(NULL) - qe.start);
 				if (option_verbose > 2) {
 					ast_verbose(VERBOSE_PREFIX_3 "User disconnected from queue %s while waiting their turn\n", args.queuename);
-					res = -1;
 				}
+				res = -1;
 				break;
 			}
 			if (!res) 
@@ -2981,7 +2981,7 @@
 
 				/* Leave if we have exceeded our queuetimeout */
 				if (qe.expire && (time(NULL) > qe.expire)) {
-                                        record_abandoned(&qe);
+					record_abandoned(&qe);
 					reason = QUEUE_TIMEOUT;
 					res = 0;
 					ast_queue_log(args.queuename, chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d", qe.pos);
@@ -3057,8 +3057,8 @@
 					ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON", "%d|%d|%ld", qe.pos, qe.opos, (long)time(NULL) - qe.start);
 					if (option_verbose > 2) {
 						ast_verbose(VERBOSE_PREFIX_3 "User disconnected from queue %s when they almost made it\n", args.queuename);
-						res = -1;
 					}
+					res = -1;
 					break;
 				}
 				if (res && valid_exit(&qe, res)) {
@@ -3067,12 +3067,10 @@
 				}
 				/* exit after 'timeout' cycle if 'n' option enabled */
 				if (go_on) {
-					if (option_verbose > 2) {
+					if (option_verbose > 2)
 						ast_verbose(VERBOSE_PREFIX_3 "Exiting on time-out cycle\n");
-						res = -1;
-					}
 					ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHTIMEOUT", "%d", qe.pos);
-                                        record_abandoned(&qe);
+					record_abandoned(&qe);
 					reason = QUEUE_TIMEOUT;
 					res = 0;
 					break;

Modified: team/group/codecs-luigi/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/apps/app_rpt.c?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/apps/app_rpt.c (original)
+++ team/group/codecs-luigi/apps/app_rpt.c Tue Apr  4 19:45:28 2006
@@ -608,7 +608,6 @@
 /* Debug mode */
 static int rpt_do_debug(int fd, int argc, char *argv[]);
 static int rpt_do_dump(int fd, int argc, char *argv[]);
-static int rpt_do_frog(int fd, int argc, char *argv[]);
 
 static char debug_usage[] =
 "Usage: rpt debug level {0-7}\n"
@@ -618,10 +617,6 @@
 "Usage: rpt dump <nodename>\n"
 "       Dumps struct debug info to log\n";
 
-static char frog_usage[] =
-"Usage: frog [warp_factor]\n"
-"       Performs frog-in-a-blender calculations (Jacobsen Corollary)\n";
-
 static struct ast_cli_entry  cli_debug =
         { { "rpt", "debug", "level" }, rpt_do_debug, 
 		"Enable app_rpt debugging", debug_usage };
@@ -629,10 +624,6 @@
 static struct ast_cli_entry  cli_dump =
         { { "rpt", "dump" }, rpt_do_dump,
 		"Dump app_rpt structs for debugging", dump_usage };
-
-static struct ast_cli_entry  cli_frog =
-        { { "frog" }, rpt_do_frog,
-		"Perform frog-in-a-blender calculations", frog_usage };
 
 /*
 * Telemetry defaults
@@ -777,26 +768,6 @@
 		        return RESULT_SUCCESS;
 		}
 	}
-	return RESULT_FAILURE;
-}
-
-/*
-* Perform frong-in-a-blender calculations (Jacobsen Corollary) 
-*/
-                                                                                                                                 
-static int rpt_do_frog(int fd, int argc, char *argv[])
-{
-	double warpone = 75139293848.398696166028333356763;
-	double warpfactor = 1.0;
-
-        if (argc > 2) return RESULT_SHOWUSAGE;
-	if ((argc > 1) && (sscanf(argv[1],"%lf",&warpfactor) != 1))
-                return RESULT_SHOWUSAGE;
-
-        ast_cli(fd, "A frog in a blender with a base diameter of 3 inches going\n");
-        ast_cli(fd, "%lf RPM will be travelling at warp factor %lf,\n",
-		warpfactor * warpfactor * warpfactor * warpone,warpfactor);
-	ast_cli(fd,"based upon the Jacobsen Frog Corollary.\n");
 	return RESULT_FAILURE;
 }
 
@@ -7066,7 +7037,6 @@
 	/* Unregister cli extensions */
 	ast_cli_unregister(&cli_debug);
 	ast_cli_unregister(&cli_dump);
-	ast_cli_unregister(&cli_frog);
 
 	return i;
 }
@@ -7078,7 +7048,6 @@
 	/* Register cli extensions */
 	ast_cli_register(&cli_debug);
 	ast_cli_register(&cli_dump);
-	ast_cli_register(&cli_frog);
 
 	return ast_register_application(app, rpt_exec, synopsis, descrip);
 }

Modified: team/group/codecs-luigi/apps/app_senddtmf.c
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/apps/app_senddtmf.c?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/apps/app_senddtmf.c (original)
+++ team/group/codecs-luigi/apps/app_senddtmf.c Tue Apr  4 19:45:28 2006
@@ -52,7 +52,7 @@
 
 static char *descrip = 
 " SendDTMF(digits[|timeout_ms]): Sends DTMF digits on a channel. \n"
-" Accepted digits: 0-9, *#abcd\n"
+" Accepted digits: 0-9, *#abcd, w (.5s pause)\n"
 " The application will either pass the assigned digits or terminate if it\n"
 " encounters an error.\n";
 

Modified: team/group/codecs-luigi/apps/app_sms.c
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/apps/app_sms.c?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/apps/app_sms.c (original)
+++ team/group/codecs-luigi/apps/app_sms.c Tue Apr  4 19:45:28 2006
@@ -1177,32 +1177,31 @@
 {
 	struct ast_frame f = { 0 };
 	unsigned char waste[AST_FRIENDLY_OFFSET];
+#define MAXSAMPLES (800)
 #ifdef OUTALAW
-	unsigned char buf[800];
+	unsigned char buf[MAXSAMPLES];
 #else
-	signed short buf[800];
+	signed short buf[MAXSAMPLES];
 #endif
+#define SAMPLE2LEN (sizeof (buf[0]))
 	sms_t *h = data;
 	int i;
 
-	if (len > sizeof (buf)) {
-		ast_log (LOG_WARNING, "Only doing %d bytes (%d bytes requested)\n", (int)(sizeof (buf) / sizeof (signed short)), len);
-		len = sizeof (buf);
-#ifdef OUTALAW
-		samples = len;
-#else
-		samples = len / 2;
-#endif
-	}
-	waste[0] = 0;					 /* make compiler happy */
+	if (samples > MAXSAMPLES) {
+		ast_log (LOG_WARNING, "Only doing %d samples (%d requested)\n",
+			 MAXSAMPLES, samples);
+		samples = MAXSAMPLES;
+	}
+	len = samples * SAMPLE2LEN;
+
+	waste[0] = 0;				 /* make compiler happy */
 	f.frametype = AST_FRAME_VOICE;
 #ifdef OUTALAW
 	f.subclass = AST_FORMAT_ALAW;
-	f.datalen = samples;
 #else
 	f.subclass = AST_FORMAT_SLINEAR;
-	f.datalen = samples * 2;
 #endif
+	f.datalen = len;
 	f.offset = AST_FRIENDLY_OFFSET;
 	f.mallocd = 0;
 	f.data = buf;
@@ -1254,6 +1253,8 @@
 		return -1;
 	}
 	return 0;
+#undef SAMPLE2LEN
+#undef MAXSAMPLES
 }
 
 static void sms_process (sms_t * h, int samples, signed short *data)

Modified: team/group/codecs-luigi/apps/app_stack.c
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/apps/app_stack.c?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/apps/app_stack.c (original)
+++ team/group/codecs-luigi/apps/app_stack.c Tue Apr  4 19:45:28 2006
@@ -140,7 +140,7 @@
 	label1 = strsep(&args, ":");
 	label2 = args;
 
-	if (ast_true(condition)) {
+	if (pbx_checkcondition(condition)) {
 		if (label1) {
 			res = gosub_exec(chan, label1);
 		}

Modified: team/group/codecs-luigi/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/apps/app_voicemail.c?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/apps/app_voicemail.c (original)
+++ team/group/codecs-luigi/apps/app_voicemail.c Tue Apr  4 19:45:28 2006
@@ -3422,7 +3422,7 @@
 				old_priority = chan->priority;
 				
 				/* call the the Directory, changes the channel */
-				res = pbx_exec(chan, app, context ? context : "default", 1);
+				res = pbx_exec(chan, app, context ? context : "default");
 				
 				ast_copy_string(username, chan->exten, sizeof(username));
 				

Modified: team/group/codecs-luigi/apps/app_while.c
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/apps/app_while.c?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/apps/app_while.c (original)
+++ team/group/codecs-luigi/apps/app_while.c Tue Apr  4 19:45:28 2006
@@ -101,7 +101,7 @@
 
 		if (ast_true(expr)) { 
 			if ((app = pbx_findapp(myapp))) {
-				res = pbx_exec(chan, app, mydata, 1);
+				res = pbx_exec(chan, app, mydata);
 			} else {
 				ast_log(LOG_WARNING, "Count not find application! (%s)\n", myapp);
 				res = -1;

Modified: team/group/codecs-luigi/asterisk.8
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/asterisk.8?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/asterisk.8 (original)
+++ team/group/codecs-luigi/asterisk.8 Tue Apr  4 19:45:28 2006
@@ -9,7 +9,7 @@
 asterisk \- All-purpose telephony server.
 .SH SYNOPSIS
 
-\fBasterisk\fR [ \fB-tThfdvVqpRgcin\fR ] [ \fB-C \fIfile\fB\fR ] [ \fB-U \fIuser\fB\fR ] [ \fB-G \fIgroup\fB\fR ] [ \fB-x \fIcommand\fB\fR ] [ \fB-M \fIvalue\fB\fR ]
+\fBasterisk\fR [ \fB-tThfdvVqpRgciIn\fR ] [ \fB-C \fIfile\fB\fR ] [ \fB-U \fIuser\fB\fR ] [ \fB-G \fIgroup\fB\fR ] [ \fB-x \fIcommand\fB\fR ] [ \fB-M \fIvalue\fB\fR ]
 
 
 \fBasterisk -r\fR [ \fB-v\fR ] [ \fB-x \fIcommand\fB\fR ]
@@ -114,6 +114,12 @@
 for controlling it. Additionally, if connection to the Asterisk 
 process is lost, attempt to reconnect for as long as 30 seconds.
 .TP
+\fB-I\fR
+Enable internal timing if Zaptel timer is available
+The default behaviour is that outbound packets are phase locked
+to inbound packets. Enabling this switch causes them to be
+locked to the internal Zaptel timer instead.
+.TP
 \fB-t\fR
 When recording files, write them first into a temporary holding directory, 
 then move them into the final location when done.

Modified: team/group/codecs-luigi/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/group/codecs-luigi/asterisk.c?rev=17450&r1=17449&r2=17450&view=diff
==============================================================================
--- team/group/codecs-luigi/asterisk.c (original)
+++ team/group/codecs-luigi/asterisk.c Tue Apr  4 19:45:28 2006
@@ -30,7 +30,7 @@
  *
  * \section copyright Copyright and author
  *
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2006, Digium, Inc.
  * Asterisk is a trade mark registered by Digium, Inc.
  *
  * \author Mark Spencer <markster at digium.com>
@@ -216,7 +216,7 @@
 char ast_config_AST_CTL_OWNER[AST_CONFIG_MAX_PATH] = "\0";
 char ast_config_AST_CTL_GROUP[AST_CONFIG_MAX_PATH] = "\0";
 char ast_config_AST_CTL[AST_CONFIG_MAX_PATH] = "asterisk.ctl";
-char ast_config_AST_SYSTEM_NAME[20]="";
+char ast_config_AST_SYSTEM_NAME[20] = "";
 
 static char *_argv[256];
 static int shuttingdown = 0;
@@ -462,7 +462,7 @@
 static void ast_network_puts(const char *string)
 {
 	int x;
-	for (x=0;x<AST_MAX_CONNECTS; x++) {
+	for (x=0; x < AST_MAX_CONNECTS; x++) {
 		if (consoles[x].fd > -1) 
 			fdprint(consoles[x].p[1], string);
 	}
@@ -503,7 +503,7 @@
 static void *netconsole(void *vconsole)
 {
 	struct console *con = vconsole;
-	char hostname[MAXHOSTNAMELEN]="";
+	char hostname[MAXHOSTNAMELEN] = "";
 	char tmp[512];
 	int res;
 	struct pollfd fds[2];
@@ -566,11 +566,11 @@
 	pthread_attr_t attr;
 	pthread_attr_init(&attr);
 	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
-	for(;;) {
+	for (;;) {
 		if (ast_socket < 0)
 			return NULL;
 		fds[0].fd = ast_socket;
-		fds[0].events= POLLIN;
+		fds[0].events = POLLIN;
 		s = poll(fds, 1, -1);
 		if (s < 0) {
 			if (errno != EINTR)
@@ -583,7 +583,7 @@
 			if (errno != EINTR)
 				ast_log(LOG_WARNING, "Accept returned %d: %s\n", s, strerror(errno));
 		} else {
-			for (x=0;x<AST_MAX_CONNECTS;x++) {
+			for (x = 0; x < AST_MAX_CONNECTS; x++) {
 				if (consoles[x].fd < 0) {
 					if (socketpair(AF_LOCAL, SOCK_STREAM, 0, consoles[x].p)) {
 						ast_log(LOG_ERROR, "Unable to create pipe: %s\n", strerror(errno));
@@ -829,7 +829,7 @@
 			if (option_verbose && ast_opt_console)
 				ast_verbose("Beginning asterisk %s....\n", restart ? "restart" : "shutdown");
 			time(&s);
-			for(;;) {
+			for (;;) {
 				time(&e);
 				/* Wait up to 15 seconds for all channels to go away */
 				if ((e - s) > 15)
@@ -846,7 +846,7 @@
 				ast_begin_shutdown(0);
 			if (option_verbose && ast_opt_console)
 				ast_verbose("Waiting for inactivity to perform %s...\n", restart ? "restart" : "halt");
-			for(;;) {
+			for (;;) {
 				if (!ast_active_channels())
 					break;
 				if (!shuttingdown)
@@ -895,7 +895,7 @@
 		if (option_verbose || ast_opt_console)
 			ast_verbose("Preparing for Asterisk restart...\n");
 		/* Mark all FD's for closing on exec */
-		for (x=3;x<32768;x++) {
+		for (x=3; x < 32768; x++) {
 			fcntl(x, F_SETFD, FD_CLOEXEC);
 		}
 		if (option_verbose || ast_opt_console)
@@ -940,7 +940,7 @@
 static void console_verboser(const char *s, int pos, int replace, int complete)
 {
 	char tmp[80];
-	const char *c=NULL;
+	const char *c = NULL;
 	/* Return to the beginning of the line */
 	if (!pos) {
 		fprintf(stdout, "\r");
@@ -964,7 +964,7 @@
 
 static int ast_all_zeros(char *s)
 {
-	while(*s) {
+	while (*s) {
 		if (*s > 32)
 			return 0;
 		s++;  
@@ -1234,8 +1234,8 @@
 
 static int ast_el_read_char(EditLine *el, char *cp)
 {
-	int num_read=0;
-	int lastpos=0;
+	int num_read = 0;
+	int lastpos = 0;
 	struct pollfd fds[2];
 	int res;
 	int max;
@@ -1276,7 +1276,7 @@
 					int tries;
 					int reconnects_per_second = 20;
 					fprintf(stderr, "Attempting to reconnect for 30 seconds\n");
-					for (tries=0;tries<30 * reconnects_per_second;tries++) {
+					for (tries=0; tries < 30 * reconnects_per_second; tries++) {
 						if (ast_tryconnect()) {
 							fprintf(stderr, "Reconnect succeeded after %.3f seconds\n", 1.0 / reconnects_per_second * tries);
 							printf(term_quit());
@@ -1315,7 +1315,7 @@
 {
 	static char prompt[200];
 	char *pfmt;
-	int color_used=0;
+	int color_used = 0;
 	char term_code[20];
 
 	if ((pfmt = getenv("ASTERISK_PROMPT"))) {
@@ -1334,100 +1334,100 @@
 
 				t++;
 				switch (*t) {
-					case 'C': /* color */
-						t++;
-						if (sscanf(t, "%d;%d%n", &fgcolor, &bgcolor, &i) == 2) {
-							strncat(p, term_color_code(term_code, fgcolor, bgcolor, sizeof(term_code)),sizeof(prompt) - strlen(prompt) - 1);
-							t += i - 1;
-						} else if (sscanf(t, "%d%n", &fgcolor, &i) == 1) {
-							strncat(p, term_color_code(term_code, fgcolor, 0, sizeof(term_code)),sizeof(prompt) - strlen(prompt) - 1);
-							t += i - 1;
-						}
-
-						/* If the color has been reset correctly, then there's no need to reset it later */
-						if ((fgcolor == COLOR_WHITE) && (bgcolor == COLOR_BLACK)) {
-							color_used = 0;
-						} else {
-							color_used = 1;
-						}
-						break;
-					case 'd': /* date */
-						memset(&tm, 0, sizeof(tm));
-						time(&ts);
-						if (localtime_r(&ts, &tm)) {
-							strftime(p, sizeof(prompt) - strlen(prompt), "%Y-%m-%d", &tm);
-						}
-						break;
-					case 'h': /* hostname */
-						if (!gethostname(hostname, sizeof(hostname) - 1)) {
-							strncat(p, hostname, sizeof(prompt) - strlen(prompt) - 1);
-						} else {
-							strncat(p, "localhost", sizeof(prompt) - strlen(prompt) - 1);
-						}
-						break;
-					case 'H': /* short hostname */
-						if (!gethostname(hostname, sizeof(hostname) - 1)) {
-							for (i=0;i<sizeof(hostname);i++) {
-								if (hostname[i] == '.') {
-									hostname[i] = '\0';
-									break;
-								}
-							}
-							strncat(p, hostname, sizeof(prompt) - strlen(prompt) - 1);
-						} else {
-							strncat(p, "localhost", sizeof(prompt) - strlen(prompt) - 1);
-						}
-						break;
-#ifdef linux
-					case 'l': /* load avg */
-						t++;
-						if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
-							float avg1, avg2, avg3;
-							int actproc, totproc, npid, which;
-							fscanf(LOADAVG, "%f %f %f %d/%d %d",
-								&avg1, &avg2, &avg3, &actproc, &totproc, &npid);
-							if (sscanf(t, "%d", &which) == 1) {
-								switch (which) {
-									case 1:
-										snprintf(p, sizeof(prompt) - strlen(prompt), "%.2f", avg1);
-										break;
-									case 2:
-										snprintf(p, sizeof(prompt) - strlen(prompt), "%.2f", avg2);
-										break;
-									case 3:
-										snprintf(p, sizeof(prompt) - strlen(prompt), "%.2f", avg3);
-										break;
-									case 4:
-										snprintf(p, sizeof(prompt) - strlen(prompt), "%d/%d", actproc, totproc);
-										break;
-									case 5:
-										snprintf(p, sizeof(prompt) - strlen(prompt), "%d", npid);
-										break;
-								}
+				case 'C': /* color */
+					t++;
+					if (sscanf(t, "%d;%d%n", &fgcolor, &bgcolor, &i) == 2) {
+						strncat(p, term_color_code(term_code, fgcolor, bgcolor, sizeof(term_code)),sizeof(prompt) - strlen(prompt) - 1);
+						t += i - 1;
+					} else if (sscanf(t, "%d%n", &fgcolor, &i) == 1) {
+						strncat(p, term_color_code(term_code, fgcolor, 0, sizeof(term_code)),sizeof(prompt) - strlen(prompt) - 1);
+						t += i - 1;
+					}
+
+					/* If the color has been reset correctly, then there's no need to reset it later */
+					if ((fgcolor == COLOR_WHITE) && (bgcolor == COLOR_BLACK)) {
+						color_used = 0;
+					} else {
+						color_used = 1;
+					}
+					break;
+				case 'd': /* date */
+					memset(&tm, 0, sizeof(tm));
+					time(&ts);
+					if (localtime_r(&ts, &tm)) {
+						strftime(p, sizeof(prompt) - strlen(prompt), "%Y-%m-%d", &tm);
+					}
+					break;
+				case 'h': /* hostname */
+					if (!gethostname(hostname, sizeof(hostname) - 1)) {
+						strncat(p, hostname, sizeof(prompt) - strlen(prompt) - 1);
+					} else {
+						strncat(p, "localhost", sizeof(prompt) - strlen(prompt) - 1);
+					}
+					break;
+				case 'H': /* short hostname */
+					if (!gethostname(hostname, sizeof(hostname) - 1)) {
+						for (i = 0; i < sizeof(hostname); i++) {
+							if (hostname[i] == '.') {
+								hostname[i] = '\0';
+								break;
 							}
 						}
-						break;
+						strncat(p, hostname, sizeof(prompt) - strlen(prompt) - 1);
+					} else {
+						strncat(p, "localhost", sizeof(prompt) - strlen(prompt) - 1);
+					}
+					break;
+#ifdef linux
+				case 'l': /* load avg */
+					t++;
+					if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
+						float avg1, avg2, avg3;
+						int actproc, totproc, npid, which;
+						fscanf(LOADAVG, "%f %f %f %d/%d %d",
+							&avg1, &avg2, &avg3, &actproc, &totproc, &npid);
+						if (sscanf(t, "%d", &which) == 1) {
+							switch (which) {
+							case 1:
+								snprintf(p, sizeof(prompt) - strlen(prompt), "%.2f", avg1);
+								break;
+							case 2:

[... 15175 lines stripped ...]


More information about the asterisk-commits mailing list