[asterisk-commits] branch murf/AEL2 r17070 - in /team/murf/AEL2: ./
apps/ channels/ codecs/gsm/ ...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Apr 3 08:10:51 MST 2006
Author: murf
Date: Mon Apr 3 10:10:18 2006
New Revision: 17070
URL: http://svn.digium.com/view/asterisk?rev=17070&view=rev
Log:
Merged revisions 16473,16477,16521,16528,16532-16533,16535,16548,16551,16558,16560-16564,16580,16600-16602,16611,16615-16617,16639-16640,16646,16650-16654,16673,16687-16688,16690,16703,16724,16743,16745,16759,16772,16774-16775,16804,16825,16829,16850,16868-16869,16886,16903,16921-16922,16939,16957,16975,16992,17009,17028-17030,17050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r16473 | oej | 2006-03-29 23:07:04 -0700 (Wed, 29 Mar 2006) | 4 lines
Issue #5374 - Enable internal timing of generators (cmantunes)
Thanks everyone involved for hard work, testing and testing!
................
r16477 | russell | 2006-03-29 23:26:16 -0700 (Wed, 29 Mar 2006) | 2 lines
convert internal timing to be stored as a flag in the ast_options flags
................
r16521 | kpfleming | 2006-03-30 07:19:25 -0700 (Thu, 30 Mar 2006) | 2 lines
be more careful when merging in a branch with automerge properties :-(
................
r16528 | rizzo | 2006-03-30 09:09:23 -0700 (Thu, 30 Mar 2006) | 4 lines
document why there are so many versions of the mutex functions,
with their pros and cons, and that we should converge to a single method.
................
r16532 | rizzo | 2006-03-30 10:10:11 -0700 (Thu, 30 Mar 2006) | 13 lines
do not export the tzlock and the list head, and introduce a new method,
ast_walk_indications(), to walk through the list of indications.
The new method returns an unlocked record, which is no different from the
behaviour of other existing methods in indications.c
(i.e. they all need to be fixed, with refcounts or some similar
method).
Note that ast_walk_indications() uses the pointer argument only as a
search key, so its implementation is completely safe.
In turn, this change allows the removal of AST_MUTEX_DEFINE_EXPORTED.
................
r16533 | rizzo | 2006-03-30 10:11:49 -0700 (Thu, 30 Mar 2006) | 3 lines
remove AST_MUTEX_DEFINE_EXPORTED, which now has no more clients.
................
r16535 | file | 2006-03-30 10:58:16 -0700 (Thu, 30 Mar 2006) | 10 lines
Merged revisions 16534 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r16534 | file | 2006-03-30 13:55:28 -0400 (Thu, 30 Mar 2006) | 2 lines
Do not exceed the array size for maximum allowed moh files. (issue #6842)
........
................
r16548 | kpfleming | 2006-03-30 11:17:36 -0700 (Thu, 30 Mar 2006) | 2 lines
deprecate insecure=very and insecure=yes, since we have more explicit versions available now
................
r16551 | oej | 2006-03-30 12:05:00 -0700 (Thu, 30 Mar 2006) | 2 lines
Doxygen doc updates
................
r16558 | rizzo | 2006-03-30 14:29:39 -0700 (Thu, 30 Mar 2006) | 8 lines
as discussed with Mark a few weeks ago, the 'newstack' argument
in pbx_exec is always 1 so it can be removed.
This change also takes away ast_exec_extension(), and lets all
switch functions (exists, canmatch, exec, matchmore) all use the same
prototype, which makes the code a bit cleaner.
................
r16560 | rizzo | 2006-03-30 14:45:43 -0700 (Thu, 30 Mar 2006) | 3 lines
don't use 8000, use DEFAULT_SAMPLE_RATE
................
r16561 | rizzo | 2006-03-30 14:47:22 -0700 (Thu, 30 Mar 2006) | 3 lines
use ast_strdup instead of strdup
................
r16562 | rizzo | 2006-03-30 14:49:24 -0700 (Thu, 30 Mar 2006) | 3 lines
localize a variable
................
r16563 | file | 2006-03-30 14:52:04 -0700 (Thu, 30 Mar 2006) | 2 lines
Block 1.2 fix for amd64, trunk version coming soon
................
r16564 | file | 2006-03-30 14:57:49 -0700 (Thu, 30 Mar 2006) | 2 lines
Add more 64-bit detection goodness (issue #6850 reported by evilbunny)
................
r16580 | tilghman | 2006-03-30 15:47:11 -0700 (Thu, 30 Mar 2006) | 10 lines
Merged revisions 16579 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r16579 | tilghman | 2006-03-30 16:46:06 -0600 (Thu, 30 Mar 2006) | 2 lines
Bug 6849 - trivial typo fix
........
................
r16600 | tilghman | 2006-03-30 16:05:58 -0700 (Thu, 30 Mar 2006) | 10 lines
Merged revisions 16581 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r16581 | tilghman | 2006-03-30 16:56:35 -0600 (Thu, 30 Mar 2006) | 2 lines
Bug 6853 - Manager fixes: 1) extra ActionID, 2) missing colon
........
................
r16601 | rizzo | 2006-03-30 16:26:22 -0700 (Thu, 30 Mar 2006) | 3 lines
initial implementation of support for native atomic ops.
................
r16602 | markster | 2006-03-30 16:42:57 -0700 (Thu, 30 Mar 2006) | 2 lines
Add NetBSD for credits for editline
................
r16611 | rizzo | 2006-03-30 17:11:45 -0700 (Thu, 30 Mar 2006) | 3 lines
remove useless 'extern' in function declarations.
................
r16615 | oej | 2006-03-30 17:25:50 -0700 (Thu, 30 Mar 2006) | 3 lines
- Change AST_INLINE_AP to AST_INLINE_API for non-386 systems :-)
- Doxygen changes
................
r16616 | oej | 2006-03-30 17:33:28 -0700 (Thu, 30 Mar 2006) | 2 lines
Issue 5852 (casper) Code clean up, adding documentation on new switches. Thanks!
................
r16617 | file | 2006-03-30 17:53:32 -0700 (Thu, 30 Mar 2006) | 2 lines
Do not leave a thread in limbo if an error occurs, or if testing packet loss.
................
r16639 | rizzo | 2006-03-31 02:50:54 -0700 (Fri, 31 Mar 2006) | 4 lines
minor code simplifications - no need to use temporary
variables.
................
r16640 | rizzo | 2006-03-31 02:53:05 -0700 (Fri, 31 Mar 2006) | 3 lines
fix formatting
................
r16646 | rizzo | 2006-03-31 03:02:52 -0700 (Fri, 31 Mar 2006) | 5 lines
remove useless 'extern' and trailing whitespace.
(this is a whitespace-only change)
................
r16650 | rizzo | 2006-03-31 03:06:42 -0700 (Fri, 31 Mar 2006) | 4 lines
another batch of whitespace removal
(trailing space-tabs, and useless 'extern')
................
r16651 | rizzo | 2006-03-31 03:11:10 -0700 (Fri, 31 Mar 2006) | 3 lines
useless 'extern' and trailing whitespace removal
................
r16652 | rizzo | 2006-03-31 03:13:22 -0700 (Fri, 31 Mar 2006) | 3 lines
minor cleanup: localize a variable and replace i++; i++ with i +=2;
................
r16653 | rizzo | 2006-03-31 03:29:50 -0700 (Fri, 31 Mar 2006) | 3 lines
removal of trailing whitespace and useless 'extern'
................
r16654 | rizzo | 2006-03-31 03:35:25 -0700 (Fri, 31 Mar 2006) | 3 lines
more trailing whitespace and extern removal
................
r16673 | bweschke | 2006-03-31 06:51:37 -0700 (Fri, 31 Mar 2006) | 3 lines
Provide warning about current behavior of autofill = yes
................
r16687 | rizzo | 2006-03-31 08:02:52 -0700 (Fri, 31 Mar 2006) | 3 lines
trailing whitespace/ useless extern removal
................
r16688 | oej | 2006-03-31 08:07:36 -0700 (Fri, 31 Mar 2006) | 2 lines
Don't accept new INVITE if we already have one pending.
................
r16690 | oej | 2006-03-31 08:19:04 -0700 (Fri, 31 Mar 2006) | 2 lines
Make REG_STATE_* enum
................
r16703 | oej | 2006-03-31 09:02:29 -0700 (Fri, 31 Mar 2006) | 2 lines
Doxygen fix
................
r16724 | russell | 2006-03-31 10:46:03 -0700 (Fri, 31 Mar 2006) | 4 lines
make an error message more descriptive (issue #6855)
M rtp.c
................
r16743 | kpfleming | 2006-03-31 11:28:52 -0700 (Fri, 31 Mar 2006) | 10 lines
Merged revisions 16742 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r16742 | kpfleming | 2006-03-31 12:24:22 -0600 (Fri, 31 Mar 2006) | 2 lines
ensure that hint watchers (subscribers) cannot be added or removed while the dialplan is being modified
........
................
r16745 | russell | 2006-03-31 11:43:45 -0700 (Fri, 31 Mar 2006) | 10 lines
Merged revisions 16744 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r16744 | russell | 2006-03-31 13:42:09 -0500 (Fri, 31 Mar 2006) | 2 lines
fix the situation where bindport is specified but bindaddr is not (issue #6616)
........
................
r16759 | russell | 2006-03-31 12:02:27 -0700 (Fri, 31 Mar 2006) | 5 lines
- code formatting tweaks
- use the callno stored in a local variable
- store the result of atoi() so it's only called once
(issue #6833)
................
r16772 | russell | 2006-03-31 12:14:28 -0700 (Fri, 31 Mar 2006) | 2 lines
move a NULL check to before the first time the pointer is dereferenced (issue #6832)
................
r16774 | oej | 2006-03-31 12:40:27 -0700 (Fri, 31 Mar 2006) | 3 lines
- Reference to doc/security.txt instead of SECURITY
- Instruct people to READ THE DOCUMENTATION!!!
................
r16775 | oej | 2006-03-31 12:41:35 -0700 (Fri, 31 Mar 2006) | 2 lines
Typo
................
r16804 | bweschke | 2006-03-31 14:02:23 -0700 (Fri, 31 Mar 2006) | 3 lines
Don't process re-subscribes as new subscriptions.
................
r16825 | oej | 2006-03-31 17:24:05 -0700 (Fri, 31 Mar 2006) | 3 lines
Reverse revision 16804 that disables authentication
and a lot of other issues...
................
r16829 | oej | 2006-03-31 17:44:36 -0700 (Fri, 31 Mar 2006) | 2 lines
Don't add ast_extension_state on re-subscribes
................
r16850 | markster | 2006-04-01 01:49:54 -0700 (Sat, 01 Apr 2006) | 3 lines
Flesh out the remainder of the manager + http changes and create a sample application to partially
demonstrate the capability of manager over http.
................
r16868 | jdixon | 2006-04-01 05:54:04 -0700 (Sat, 01 Apr 2006) | 2 lines
Added "frog" CLI command, which performs frog-in-a-blender calculations.
................
r16869 | jdixon | 2006-04-01 05:56:50 -0700 (Sat, 01 Apr 2006) | 2 lines
Removed "frog" command (so it could be moved to cli.c)
................
r16886 | rizzo | 2006-04-01 11:18:20 -0700 (Sat, 01 Apr 2006) | 4 lines
fix style and printf format errors in the frog command.
(it's april first i guess...)
................
r16903 | markster | 2006-04-01 13:39:33 -0700 (Sat, 01 Apr 2006) | 2 lines
Make excessive debug optional
................
r16921 | tilghman | 2006-04-01 23:17:47 -0700 (Sat, 01 Apr 2006) | 2 lines
Fix formatting of the frog code
................
r16922 | tilghman | 2006-04-01 23:27:54 -0700 (Sat, 01 Apr 2006) | 2 lines
Reduce debugging messages from WARNING to DEBUG
................
r16939 | markster | 2006-04-02 03:10:43 -0600 (Sun, 02 Apr 2006) | 2 lines
Properly handle empty prefix
................
r16957 | markster | 2006-04-02 13:59:55 -0600 (Sun, 02 Apr 2006) | 2 lines
Unify manager behind a single event queue
................
r16975 | markster | 2006-04-02 14:11:55 -0600 (Sun, 02 Apr 2006) | 2 lines
Minor cleanup in wakeup logic
................
r16992 | markster | 2006-04-02 17:55:15 -0600 (Sun, 02 Apr 2006) | 2 lines
Cleanup URI (when none is specified) and make sure threads are stand alone
................
r17009 | markster | 2006-04-02 19:48:59 -0600 (Sun, 02 Apr 2006) | 2 lines
Minor demo cleanups
................
r17028 | tilghman | 2006-04-03 01:30:07 -0600 (Mon, 03 Apr 2006) | 2 lines
Bug 6862 - No need to initialize memory to zero twice
................
r17029 | tilghman | 2006-04-03 01:34:40 -0600 (Mon, 03 Apr 2006) | 2 lines
Bug 6861 - Routine should use the specified writetimeout, rather than the default
................
r17030 | oej | 2006-04-03 01:44:29 -0600 (Mon, 03 Apr 2006) | 2 lines
Include new README files in index
................
r17050 | oej | 2006-04-03 04:50:56 -0600 (Mon, 03 Apr 2006) | 2 lines
Issue #6848 - Accept MWI subscriptions with no Accept: header
................
Added:
team/murf/AEL2/doc/ajam.txt (props changed)
- copied unchanged from r17050, trunk/doc/ajam.txt
team/murf/AEL2/static-http/
- copied from r17050, trunk/static-http/
team/murf/AEL2/static-http/ajamdemo.html (props changed)
- copied unchanged from r17050, trunk/static-http/ajamdemo.html
team/murf/AEL2/static-http/astman.css (props changed)
- copied unchanged from r17050, trunk/static-http/astman.css
team/murf/AEL2/static-http/astman.js (props changed)
- copied unchanged from r17050, trunk/static-http/astman.js
team/murf/AEL2/static-http/prototype.js (props changed)
- copied unchanged from r17050, trunk/static-http/prototype.js
Modified:
team/murf/AEL2/ (props changed)
team/murf/AEL2/CREDITS
team/murf/AEL2/Makefile
team/murf/AEL2/README
team/murf/AEL2/apps/app_dial.c
team/murf/AEL2/apps/app_echo.c
team/murf/AEL2/apps/app_exec.c
team/murf/AEL2/apps/app_macro.c
team/murf/AEL2/apps/app_meetme.c
team/murf/AEL2/apps/app_milliwatt.c
team/murf/AEL2/apps/app_page.c
team/murf/AEL2/apps/app_rpt.c
team/murf/AEL2/apps/app_sms.c
team/murf/AEL2/apps/app_voicemail.c
team/murf/AEL2/apps/app_while.c
team/murf/AEL2/asterisk.8
team/murf/AEL2/asterisk.c
team/murf/AEL2/asterisk.sgml
team/murf/AEL2/channel.c
team/murf/AEL2/channels/chan_iax2.c
team/murf/AEL2/channels/chan_local.c
team/murf/AEL2/channels/chan_oss.c
team/murf/AEL2/channels/chan_sip.c
team/murf/AEL2/channels/iax2-provision.h
team/murf/AEL2/cli.c
team/murf/AEL2/codecs/gsm/Makefile
team/murf/AEL2/configs/http.conf.sample
team/murf/AEL2/configs/manager.conf.sample
team/murf/AEL2/configs/queues.conf.sample
team/murf/AEL2/doc/00README.1st
team/murf/AEL2/doc/asterisk-conf.txt
team/murf/AEL2/http.c
team/murf/AEL2/include/asterisk/adsi.h
team/murf/AEL2/include/asterisk/app.h
team/murf/AEL2/include/asterisk/callerid.h
team/murf/AEL2/include/asterisk/channel.h
team/murf/AEL2/include/asterisk/cli.h
team/murf/AEL2/include/asterisk/crypto.h
team/murf/AEL2/include/asterisk/dns.h
team/murf/AEL2/include/asterisk/enum.h
team/murf/AEL2/include/asterisk/features.h
team/murf/AEL2/include/asterisk/fskmodem.h
team/murf/AEL2/include/asterisk/http.h
team/murf/AEL2/include/asterisk/image.h
team/murf/AEL2/include/asterisk/indications.h
team/murf/AEL2/include/asterisk/io.h
team/murf/AEL2/include/asterisk/localtime.h
team/murf/AEL2/include/asterisk/lock.h
team/murf/AEL2/include/asterisk/logger.h
team/murf/AEL2/include/asterisk/manager.h
team/murf/AEL2/include/asterisk/musiconhold.h
team/murf/AEL2/include/asterisk/options.h
team/murf/AEL2/include/asterisk/pbx.h
team/murf/AEL2/include/asterisk/rtp.h
team/murf/AEL2/include/asterisk/sched.h
team/murf/AEL2/include/asterisk/tdd.h
team/murf/AEL2/include/asterisk/term.h
team/murf/AEL2/indications.c
team/murf/AEL2/loader.c
team/murf/AEL2/manager.c
team/murf/AEL2/pbx.c
team/murf/AEL2/pbx/pbx_dundi.c
team/murf/AEL2/pbx/pbx_loopback.c
team/murf/AEL2/pbx/pbx_realtime.c
team/murf/AEL2/res/res_agi.c
team/murf/AEL2/res/res_features.c
team/murf/AEL2/res/res_indications.c
team/murf/AEL2/res/res_musiconhold.c
team/murf/AEL2/res/snmp/agent.c
team/murf/AEL2/rtp.c
team/murf/AEL2/utils.c
Propchange: team/murf/AEL2/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/murf/AEL2/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/murf/AEL2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 3 10:10:18 2006
@@ -1,1 +1,1 @@
-/trunk:1-16471
+/trunk:1-17068
Modified: team/murf/AEL2/CREDITS
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/CREDITS?rev=17070&r1=17069&r2=17070&view=diff
==============================================================================
--- team/murf/AEL2/CREDITS (original)
+++ team/murf/AEL2/CREDITS Mon Apr 3 10:10:18 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/murf/AEL2/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/Makefile?rev=17070&r1=17069&r2=17070&view=diff
==============================================================================
--- team/murf/AEL2/Makefile (original)
+++ team/murf/AEL2/Makefile Mon Apr 3 10:10:18 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/murf/AEL2/README
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/README?rev=17070&r1=17069&r2=17070&view=diff
==============================================================================
--- team/murf/AEL2/README (original)
+++ team/murf/AEL2/README Mon Apr 3 10:10:18 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/murf/AEL2/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/apps/app_dial.c?rev=17070&r1=17069&r2=17070&view=diff
==============================================================================
--- team/murf/AEL2/apps/app_dial.c (original)
+++ team/murf/AEL2/apps/app_dial.c Mon Apr 3 10:10:18 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/murf/AEL2/apps/app_echo.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/apps/app_echo.c?rev=17070&r1=17069&r2=17070&view=diff
==============================================================================
--- team/murf/AEL2/apps/app_echo.c (original)
+++ team/murf/AEL2/apps/app_echo.c Mon Apr 3 10:10:18 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/murf/AEL2/apps/app_exec.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/apps/app_exec.c?rev=17070&r1=17069&r2=17070&view=diff
==============================================================================
--- team/murf/AEL2/apps/app_exec.c (original)
+++ team/murf/AEL2/apps/app_exec.c Mon Apr 3 10:10:18 2006
@@ -88,7 +88,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/murf/AEL2/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/apps/app_macro.c?rev=17070&r1=17069&r2=17070&view=diff
==============================================================================
--- team/murf/AEL2/apps/app_macro.c (original)
+++ team/murf/AEL2/apps/app_macro.c Mon Apr 3 10:10:18 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/murf/AEL2/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/apps/app_meetme.c?rev=17070&r1=17069&r2=17070&view=diff
==============================================================================
--- team/murf/AEL2/apps/app_meetme.c (original)
+++ team/murf/AEL2/apps/app_meetme.c Mon Apr 3 10:10:18 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/murf/AEL2/apps/app_milliwatt.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/apps/app_milliwatt.c?rev=17070&r1=17069&r2=17070&view=diff
==============================================================================
--- team/murf/AEL2/apps/app_milliwatt.c (original)
+++ team/murf/AEL2/apps/app_milliwatt.c Mon Apr 3 10:10:18 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/murf/AEL2/apps/app_page.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/apps/app_page.c?rev=17070&r1=17069&r2=17070&view=diff
==============================================================================
--- team/murf/AEL2/apps/app_page.c (original)
+++ team/murf/AEL2/apps/app_page.c Mon Apr 3 10:10:18 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/murf/AEL2/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/apps/app_rpt.c?rev=17070&r1=17069&r2=17070&view=diff
==============================================================================
--- team/murf/AEL2/apps/app_rpt.c (original)
+++ team/murf/AEL2/apps/app_rpt.c Mon Apr 3 10:10:18 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/murf/AEL2/apps/app_sms.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/apps/app_sms.c?rev=17070&r1=17069&r2=17070&view=diff
==============================================================================
--- team/murf/AEL2/apps/app_sms.c (original)
+++ team/murf/AEL2/apps/app_sms.c Mon Apr 3 10:10:18 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/murf/AEL2/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/apps/app_voicemail.c?rev=17070&r1=17069&r2=17070&view=diff
==============================================================================
--- team/murf/AEL2/apps/app_voicemail.c (original)
+++ team/murf/AEL2/apps/app_voicemail.c Mon Apr 3 10:10:18 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/murf/AEL2/apps/app_while.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/apps/app_while.c?rev=17070&r1=17069&r2=17070&view=diff
==============================================================================
--- team/murf/AEL2/apps/app_while.c (original)
+++ team/murf/AEL2/apps/app_while.c Mon Apr 3 10:10:18 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/murf/AEL2/asterisk.8
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/asterisk.8?rev=17070&r1=17069&r2=17070&view=diff
==============================================================================
--- team/murf/AEL2/asterisk.8 (original)
+++ team/murf/AEL2/asterisk.8 Mon Apr 3 10:10:18 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/murf/AEL2/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/asterisk.c?rev=17070&r1=17069&r2=17070&view=diff
==============================================================================
--- team/murf/AEL2/asterisk.c (original)
+++ team/murf/AEL2/asterisk.c Mon Apr 3 10:10:18 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
[... 5226 lines stripped ...]
More information about the asterisk-commits
mailing list