[asterisk-commits] simon.perreault: branch group/v6 r83228 - in /team/group/v6/trunk: ./ apps/ b...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Sep 20 09:43:31 CDT 2007
Author: simon.perreault
Date: Thu Sep 20 09:43:29 2007
New Revision: 83228
URL: http://svn.digium.com/view/asterisk?view=rev&rev=83228
Log:
Merged revisions 82320-82321,82327,82329,82336,82338,82341,82345,82347,82349,82352,82359,82373,82377,82386,82389,82391,82393,82395,82397,82400-82401,82454,82457,82496,82516,82546,82568,82593,82595,82628,82660,82678-82679,82710,82712,82728,82752,82776,82793,82800,82803,82835,82866,82868,82871,82930-82931,82962,82993,83025,83055,83071-83073,83075-83076,83105,83114,83126,83155-83157,83176,83178,83180-83183,83213 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r82320 | phsultan | 2007-09-13 11:25:18 -0400 (Thu, 13 Sep 2007) | 1 line
Modify rule filters to match with the Jingle namespace constant
................
r82321 | russell | 2007-09-13 11:26:40 -0400 (Thu, 13 Sep 2007) | 3 lines
Various code and documentation cleanups for res_config_sqlite
(closes issue #10711, rbraun_proformatique)
................
r82327 | mmichelson | 2007-09-13 12:27:42 -0400 (Thu, 13 Sep 2007) | 15 lines
Merged revisions 82326 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82326 | mmichelson | 2007-09-13 11:25:59 -0500 (Thu, 13 Sep 2007) | 7 lines
Added logic to handle the unlikely case that someone has two queues with the same name.
Asterisk will log a warning message letting the user know that one was already defined with that
name and is it skipping all further instances. This also will work for realtime queues but in order
for that to happen, the user would have to trigger a perfectly timed reload as a realtime queue is being
looked up, which is highly unlikely (but taken care of nonetheless).
........
................
r82329 | file | 2007-09-13 12:58:59 -0400 (Thu, 13 Sep 2007) | 2 lines
Add setvar support to chan_zap. Just like you can in chan_sip and chan_iax2 you can now use it with zaptel channels. (done while in Montreal at the Asterisk bootcamp!)
................
r82336 | kpfleming | 2007-09-13 14:13:44 -0400 (Thu, 13 Sep 2007) | 18 lines
Merged revisions 82335 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r82335 | kpfleming | 2007-09-13 11:12:00 -0700 (Thu, 13 Sep 2007) | 10 lines
Merged revisions 82334 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r82334 | kpfleming | 2007-09-13 11:10:12 -0700 (Thu, 13 Sep 2007) | 2 lines
clarify the OpenSSL and OpenH323 license exceptions
........
................
................
r82338 | russell | 2007-09-13 14:52:35 -0400 (Thu, 13 Sep 2007) | 12 lines
Merged revisions 82337 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82337 | russell | 2007-09-13 13:45:59 -0500 (Thu, 13 Sep 2007) | 4 lines
Only compile in tracking astobj2 statistics if dev-mode is enabled. Also, when
dev mode is enabled, register the CLI command that can be used to run the astobj2
test and print out statistics.
........
................
r82341 | russell | 2007-09-13 15:16:24 -0400 (Thu, 13 Sep 2007) | 9 lines
Merged revisions 82339 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82339 | russell | 2007-09-13 13:57:08 -0500 (Thu, 13 Sep 2007) | 1 line
resolve a warning when not building under dev mode
........
................
r82345 | qwell | 2007-09-13 16:13:58 -0400 (Thu, 13 Sep 2007) | 17 lines
Merged revisions 82344 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82344 | qwell | 2007-09-13 15:11:40 -0500 (Thu, 13 Sep 2007) | 9 lines
Fix a crash that could occur in cdr_csv when mutliple threads tried to close the same file.
Do we actually need the locking here? What happens if you open the same file twice, and
two threads try to write to it at the same time? Is fputs() going to write out the entire
line at once? I suspect that it could be possible for the second fopen to run during the
first fputs, so the position could be in the middle of the previously written line...
Issue 10347, initial patch by explidous (but I removed all of the paranoia stuff..)
........
................
r82347 | mmichelson | 2007-09-13 16:17:41 -0400 (Thu, 13 Sep 2007) | 12 lines
Merged revisions 82346 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82346 | mmichelson | 2007-09-13 15:16:37 -0500 (Thu, 13 Sep 2007) | 4 lines
Preemptively fixing a possible segfault. It is possible that queuename is NULL
(meaning pause ALL queues), so use q->name instead.
........
................
r82349 | mmichelson | 2007-09-13 17:23:32 -0400 (Thu, 13 Sep 2007) | 3 lines
Added the ability to pause and unpause members via the CLI
................
r82352 | mmichelson | 2007-09-13 17:53:01 -0400 (Thu, 13 Sep 2007) | 4 lines
Changed "in" to "queue" in "queue {pause|unpause} member" command to be more clear.
Also added check to be sure that sixth argument is the word "reason" if full command is given
................
r82359 | qwell | 2007-09-13 19:12:16 -0400 (Thu, 13 Sep 2007) | 12 lines
Merged revisions 82358 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82358 | qwell | 2007-09-13 18:11:27 -0500 (Thu, 13 Sep 2007) | 4 lines
Fix a small typo.
retrytime > waittime
........
................
r82373 | phsultan | 2007-09-14 09:02:31 -0400 (Fri, 14 Sep 2007) | 1 line
Fix DTMF following what has been done in issue #9401. Thanks irroot.
................
r82377 | mmichelson | 2007-09-14 10:44:15 -0400 (Fri, 14 Sep 2007) | 13 lines
Merged revisions 82376 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82376 | mmichelson | 2007-09-14 09:42:29 -0500 (Fri, 14 Sep 2007) | 5 lines
Fixing a typo in the coding guidelines
(closes issue #10717, reported and patched by leedm777)
........
................
r82386 | russell | 2007-09-14 11:52:28 -0400 (Fri, 14 Sep 2007) | 11 lines
Merged revisions 82385 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82385 | russell | 2007-09-14 10:50:49 -0500 (Fri, 14 Sep 2007) | 3 lines
Add checking for libusb here, so nobody has to deal with conflicts in the
chan_usbradio-1.4 branch every time the configure script gets changed
........
................
r82389 | russell | 2007-09-14 11:58:31 -0400 (Fri, 14 Sep 2007) | 2 lines
Add chan_usbradio to trunk
................
r82391 | russell | 2007-09-14 12:02:39 -0400 (Fri, 14 Sep 2007) | 2 lines
use the standard license header for the xpmr files
................
r82393 | tilghman | 2007-09-14 13:29:23 -0400 (Fri, 14 Sep 2007) | 2 lines
Add a direct execute method to res_odbc (closes issue #10722)
................
r82395 | qwell | 2007-09-14 13:51:22 -0400 (Fri, 14 Sep 2007) | 13 lines
Merged revisions 82394 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82394 | qwell | 2007-09-14 12:48:05 -0500 (Fri, 14 Sep 2007) | 5 lines
If a channel does not have an owner, do not try to set a channel variable.
This will end up making the channel variable global, which is not right.
Closes issue #10720, patch by flefoll.
........
................
r82397 | mmichelson | 2007-09-14 14:34:53 -0400 (Fri, 14 Sep 2007) | 13 lines
Merged revisions 82396 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82396 | mmichelson | 2007-09-14 13:28:36 -0500 (Fri, 14 Sep 2007) | 5 lines
Adding member name field to manager events where they were missing before
(closes issue #10721, reported by snar)
........
................
r82400 | mmichelson | 2007-09-14 14:37:00 -0400 (Fri, 14 Sep 2007) | 3 lines
Blocking revision 82398
................
r82401 | qwell | 2007-09-14 15:49:05 -0400 (Fri, 14 Sep 2007) | 4 lines
Add support in chan_skinny for sending RTP directly to the endpoints.
Closes issue #9154, patch by DEA
................
r82454 | russell | 2007-09-14 17:21:23 -0400 (Fri, 14 Sep 2007) | 11 lines
Merged revisions 82435 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82435 | russell | 2007-09-14 16:17:08 -0500 (Fri, 14 Sep 2007) | 3 lines
Add a note to help clarify the value set with the echocancel option.
(inspired by Malcolm's blog post on blogs.digium.com about HPEC)
........
................
r82457 | murf | 2007-09-14 17:30:44 -0400 (Fri, 14 Sep 2007) | 9 lines
Merged revisions 82444 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82444 | murf | 2007-09-14 15:19:27 -0600 (Fri, 14 Sep 2007) | 1 line
closes issue #10668; thanks to arkadia for his patch; had to leave out the bit about ending the previous cdr in the fork; it would destroy current implementations.
........
................
r82496 | tilghman | 2007-09-16 11:32:00 -0400 (Sun, 16 Sep 2007) | 2 lines
Option maxmessage should be maxsecs per-folder, too (closes issue #10729)
................
r82516 | file | 2007-09-16 22:02:09 -0400 (Sun, 16 Sep 2007) | 12 lines
Merged revisions 82514 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82514 | file | 2007-09-16 23:00:59 -0300 (Sun, 16 Sep 2007) | 4 lines
(closes issue #10734)
Reported by: asgaroth
Instead of passing a NULL pointer into snprintf pass "". It makes Solaris much happier.
........
................
r82546 | file | 2007-09-16 22:20:40 -0400 (Sun, 16 Sep 2007) | 4 lines
(closes issue #10715)
Reported by: the-chopper
Don't bother hanging up the new channel if it does not exist yet.
................
r82568 | dbailey | 2007-09-17 10:58:19 -0400 (Mon, 17 Sep 2007) | 2 lines
Fix memory leak introduced when POST support was added.
................
r82593 | kpfleming | 2007-09-17 12:44:13 -0400 (Mon, 17 Sep 2007) | 15 lines
Merged revisions 82590,82592 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82590 | kpfleming | 2007-09-17 11:33:30 -0500 (Mon, 17 Sep 2007) | 2 lines
fix a couple of places where a logical member name (if specified) was not used, but instead the direct interface was listed
........
r82592 | kpfleming | 2007-09-17 11:40:12 -0500 (Mon, 17 Sep 2007) | 2 lines
revert a change that wasn't supposed to be committed... doh!
........
................
r82595 | russell | 2007-09-17 12:58:23 -0400 (Mon, 17 Sep 2007) | 13 lines
Merged revisions 82594 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82594 | russell | 2007-09-17 11:46:59 -0500 (Mon, 17 Sep 2007) | 5 lines
Handle the case where there are multiple dynamic features with the same digit
mapping, but won't always match the activated on/by access controls. In that
case, the code needs to keep trying features for a match.
(reported by Atis on the asterisk-dev list, patched by me)
........
................
r82628 | russell | 2007-09-17 14:57:56 -0400 (Mon, 17 Sep 2007) | 3 lines
Make the MALLOC_DEBUG output for free() useful again. After changing calls to
free to be ast_free, astmm said all calls to free were coming from utils.h
................
r82660 | russell | 2007-09-17 16:10:10 -0400 (Mon, 17 Sep 2007) | 14 lines
Merged revisions 82644 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82644 | russell | 2007-09-17 15:00:32 -0500 (Mon, 17 Sep 2007) | 6 lines
Initialize some memory to fix crashes when leaving voicemail. This problem
was fixed by running Asterisk under valgrind.
(closes issue #10746, reported by arcivanov, patched by me)
*** IMPORTANT NOTE: We need to check to see if this same bug exists elsewhere.
........
................
r82678 | russell | 2007-09-17 16:19:58 -0400 (Mon, 17 Sep 2007) | 12 lines
Merged revisions 82676 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82676 | russell | 2007-09-17 15:16:25 -0500 (Mon, 17 Sep 2007) | 4 lines
Put a memset in ast_localtime() instead of a couple places in app_voicemail
to prevent the problem everywhere instead of just a couple of places.
(related to issue #10746)
........
................
r82679 | russell | 2007-09-17 16:24:50 -0400 (Mon, 17 Sep 2007) | 3 lines
Add support for #include, var_metric, and cat_metric in res_config_sqlite
(closes issue #10738, rbraun_proformatique)
................
r82710 | qwell | 2007-09-17 17:44:38 -0400 (Mon, 17 Sep 2007) | 4 lines
Fix the sample redirect to point to a valid file in the Asterisk GUI.
Closes issue #10748, patch by bkruse
................
r82712 | qwell | 2007-09-17 17:52:07 -0400 (Mon, 17 Sep 2007) | 4 lines
Don't try to continue loading cdr_sqlite3_custom on a module load failure (such as the config not existing)
Closes issue #10749, patch by seanbright.
................
r82728 | russell | 2007-09-17 18:59:36 -0400 (Mon, 17 Sep 2007) | 1 line
convert various places that access the channel lock directly to use the channel lock wrappers
................
r82752 | qwell | 2007-09-18 11:29:26 -0400 (Tue, 18 Sep 2007) | 13 lines
Merged revisions 82751 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(Closes issue #10753)
........
r82751 | qwell | 2007-09-18 10:28:21 -0500 (Tue, 18 Sep 2007) | 4 lines
Correct the allowexternaldomains option in SIP sample config.
Issue 10753
........
................
r82776 | russell | 2007-09-18 12:10:48 -0400 (Tue, 18 Sep 2007) | 4 lines
Don't use ast_channel_lock_both() here, it only exists in one of my branches.
This is theoretically a potential deadlock, but it's the way it was before so
I'm going to leave it this way for now.
................
r82793 | russell | 2007-09-18 12:14:14 -0400 (Tue, 18 Sep 2007) | 4 lines
Make sure that libpthread doesn't try to call free() directly when MALLOC_DEBUG
is enabled. If it does, Asterisk will crash as the address isn't the real
beginning of the allocation.
................
r82800 | qwell | 2007-09-18 12:16:36 -0400 (Tue, 18 Sep 2007) | 9 lines
(closes issue #10755)
Reported by: snar
Patches:
app-queue-cdr-trunk.patch uploaded by snar (license 245)
queues.conf.patch uploaded by snar (license 245)
Add an updatecdr option to queues.conf, so that if a "member name" is specified,
the cdr record will be updated with that, rather than the channel.
................
r82803 | russell | 2007-09-18 12:34:05 -0400 (Tue, 18 Sep 2007) | 12 lines
Merged revisions 82802 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82802 | russell | 2007-09-18 11:31:01 -0500 (Tue, 18 Sep 2007) | 4 lines
When copying the contents from the wildcard peer, do a deep copy instead of
shallow copy so that it doesn't crash when beging destroyed.
(closes issue #10546, patch by me)
........
................
r82835 | kpfleming | 2007-09-18 15:06:34 -0400 (Tue, 18 Sep 2007) | 10 lines
Merged revisions 82834 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82834 | kpfleming | 2007-09-18 13:59:52 -0500 (Tue, 18 Sep 2007) | 2 lines
there is no need for conditional logic to select ->interface or ->membername, snince ->membername will always be populated
........
................
r82866 | mmichelson | 2007-09-18 16:10:59 -0400 (Tue, 18 Sep 2007) | 12 lines
Merged revisions 82865 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82865 | mmichelson | 2007-09-18 15:09:02 -0500 (Tue, 18 Sep 2007) | 4 lines
Moving the logic for handling an empty membername to the create_member function so that there is a common place
where this occurs instead of being spread out to several different places.
........
................
r82868 | russell | 2007-09-18 16:59:21 -0400 (Tue, 18 Sep 2007) | 18 lines
Merged revisions 82867 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82867 | russell | 2007-09-18 15:56:43 -0500 (Tue, 18 Sep 2007) | 10 lines
Fix a memory leak that can occur on systems under higher load. The issue is
that when events are appended to the master event queue, they use the number
of active sessions as a use count so it will know when all active sessions
at the time the event happened have consumed it. However, the handling of
the number of sessions was not properly synchronized, so the use count was
not always correct, causing an event to disappear early, or get stuck in
the event queue for forever.
(closes issue #9238, reported by bweschke, patch from Ivan, modified by me)
........
................
r82871 | qwell | 2007-09-18 17:07:08 -0400 (Tue, 18 Sep 2007) | 9 lines
(closes issue #10739)
Reported by: ruffle
Patches:
app_voicemail.c.diff uploaded by ruffle (license 201)
10739-moveheard.diff uploaded by qwell (license 4)
Tested by: callguy, ruffle
Add an option to disable the automatic moving of "heard" messages to the Old folder.
................
r82930 | qwell | 2007-09-18 18:43:45 -0400 (Tue, 18 Sep 2007) | 24 lines
(issue #10724)
Reported by: eliel
Patches:
res_features.c.patch uploaded by eliel (license 64)
res_agi.c.patch uploaded by seanbright (license 71)
res_musiconhold.c.patch uploaded by seanbright (license 71)
pbx.c.patch uploaded by moy (license 222)
logger.c.patch uploaded by moy (license 222)
frame.c.patch uploaded by moy (license 222)
manager.c.patch uploaded by moy (license 222)
http.c.patch uploaded by moy (license 222)
dnsmgr.c.patch uploaded by moy (license 222)
res_realtime.c.patch uploaded by eliel (license 64)
res_odbc.c.patch uploaded by seanbright (license 71)
res_jabber.c.patch uploaded by eliel (license 64)
chan_local.c.patch uploaded by eliel (license 64)
chan_agent.c.patch uploaded by eliel (license 64)
chan_alsa.c.patch uploaded by eliel (license 64)
chan_features.c.patch uploaded by eliel (license 64)
chan_sip.c.patch uploaded by eliel (license 64)
RollUp.1.patch (includes all of the above patches) uploaded by seanbright (license 71)
Convert many CLI commands to the NEW_CLI format.
................
r82931 | russell | 2007-09-18 18:46:05 -0400 (Tue, 18 Sep 2007) | 19 lines
Merged revisions 82929 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82929 | russell | 2007-09-18 17:42:27 -0500 (Tue, 18 Sep 2007) | 11 lines
Add a new patch to handle interrupting the fgets() call when using FastAGI.
This version of the patch maintains the original behavior of the code when
not using FastAGI.
(closes issue #10553)
Reported by: juggie
Patches:
res_agi_fgets-4.patch uploaded by juggie (license 24)
res_agi_fgets_1.4svn.patch uploaded by juggie (license 24)
Slight mods by me
Tested by: juggie, festr
........
................
r82962 | file | 2007-09-18 19:42:24 -0400 (Tue, 18 Sep 2007) | 10 lines
Merged revisions 82961 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82961 | file | 2007-09-18 20:41:02 -0300 (Tue, 18 Sep 2007) | 2 lines
Initialize a variable to NULL to make the world happy.
........
................
r82993 | russell | 2007-09-18 20:21:41 -0400 (Tue, 18 Sep 2007) | 12 lines
Merged revisions 82992 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82992 | russell | 2007-09-18 19:19:49 -0500 (Tue, 18 Sep 2007) | 4 lines
Change the description of app_flash to note how it can be a useful tool instead
of just saying that it is generally a worthless feature.
(Thanks to Jim Van Meggelen for pointing it out and providing the proposed text)
........
................
r83025 | crichter | 2007-09-19 05:48:33 -0400 (Wed, 19 Sep 2007) | 13 lines
Merged revisions 83023-83024 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83023 | crichter | 2007-09-19 11:31:55 +0200 (Mi, 19 Sep 2007) | 1 line
added 'astdtmf' option to allow configuring the asterisk dtmf detector instead of the mISDN_dsp ones. also added the patch from irroot #10190, so that dtmf tones detected by the asterisk detector are passed outofband to asterisk, to make any use of dtmf tones at all.
........
r83024 | crichter | 2007-09-19 11:32:42 +0200 (Mi, 19 Sep 2007) | 1 line
removed comment which violates the coding guidelines.
........
................
r83055 | phsultan | 2007-09-19 08:23:56 -0400 (Wed, 19 Sep 2007) | 4 lines
Transmit proper invitation, thus conforming to XEP-0166 (Jingle general
specifications), XEP-0167 (Jingle Audio via RTP) and XEP-0176 (Jingle ICE
Transport).
................
r83071 | file | 2007-09-19 09:21:41 -0400 (Wed, 19 Sep 2007) | 14 lines
Merged revisions 83070 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83070 | file | 2007-09-19 10:18:22 -0300 (Wed, 19 Sep 2007) | 6 lines
(closes issue #10760)
Reported by: dimas
Patches:
chan_sip.patch uploaded by dimas (license 88)
Read in subscribecontext option in general to be the default.
........
................
r83072 | phsultan | 2007-09-19 09:29:44 -0400 (Wed, 19 Sep 2007) | 1 line
Remove namespaces in payload-type tags.
................
r83073 | file | 2007-09-19 09:30:01 -0400 (Wed, 19 Sep 2007) | 6 lines
Extend manager show connected with additional information.
(closes issue #10757)
Reported by: outtolunc
Patches:
manager.c.sessionstart.diff uploaded by outtolunc (license 237)
................
r83075 | file | 2007-09-19 09:49:47 -0400 (Wed, 19 Sep 2007) | 14 lines
Merged revisions 83074 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83074 | file | 2007-09-19 10:47:59 -0300 (Wed, 19 Sep 2007) | 6 lines
Protect the CDR record from modification by pbx_exec so that the application data contains the Queue data.
(closes issue #10761)
Reported by: snar
Patches:
app-queue-mixmonitor.patch uploaded by snar (license 245)
........
................
r83076 | phsultan | 2007-09-19 09:55:08 -0400 (Wed, 19 Sep 2007) | 2 lines
Replace Google namespace occurrences with Jingle. The former namespace
is handled by chan_gtalk.
................
r83105 | file | 2007-09-19 11:05:35 -0400 (Wed, 19 Sep 2007) | 2 lines
Clean up app_disa code a bit.
................
r83114 | file | 2007-09-19 11:08:43 -0400 (Wed, 19 Sep 2007) | 2 lines
DISA only needs to know about the end of DTMF, not the beginning/duration.
................
r83126 | russell | 2007-09-19 11:11:12 -0400 (Wed, 19 Sep 2007) | 12 lines
Merged revisions 83121 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83121 | russell | 2007-09-19 10:10:14 -0500 (Wed, 19 Sep 2007) | 4 lines
Fix up another potential race condition. Do the loop decrementing use count
on events with the eventq protected from being changed.
(reported on IRC by Ivan)
........
................
r83155 | file | 2007-09-19 13:14:02 -0400 (Wed, 19 Sep 2007) | 2 lines
Clean up code in app_adsiprog.
................
r83156 | file | 2007-09-19 13:20:43 -0400 (Wed, 19 Sep 2007) | 2 lines
Clean up code in app_authenticate.
................
r83157 | file | 2007-09-19 13:22:42 -0400 (Wed, 19 Sep 2007) | 2 lines
Fix indentation in app_db.
................
r83176 | russell | 2007-09-19 15:14:58 -0400 (Wed, 19 Sep 2007) | 16 lines
Merged revisions 83175 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83175 | russell | 2007-09-19 14:13:29 -0500 (Wed, 19 Sep 2007) | 8 lines
When handling a reload of chan_iax2, don't use an ao2_callback() to POKE all
peers. Instead, use an iterator. By using an iterator, the peers container
is not locked while the POKE is being done. It can cause a deadlock if the
peers container is locked because poking a peer will try to lock pvt structs,
while there is a lot of other code that will hold a pvt lock when trying to
go lock the peers container.
(reported to me directly by Loic Didelot. Thank you for the debug info!)
........
................
r83178 | russell | 2007-09-19 15:36:34 -0400 (Wed, 19 Sep 2007) | 12 lines
Merged revisions 83177 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83177 | russell | 2007-09-19 14:34:25 -0500 (Wed, 19 Sep 2007) | 4 lines
Using curl can take a substantial amount of time, so the channel should be
autoserviced while waiting for it to complete.
(closes issue #10725, reported by mnicholson)
........
................
r83180 | russell | 2007-09-19 15:51:47 -0400 (Wed, 19 Sep 2007) | 13 lines
Merged revisions 83179 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r83179 | russell | 2007-09-19 14:50:48 -0500 (Wed, 19 Sep 2007) | 5 lines
The System() and TrySystem() applications can take a substantial amount of
time to execute while not servicing the channel. So, put the channel in
autoservice while the command is being executed.
(closes issue #10726, reported by mnicholson)
........
................
r83181 | russell | 2007-09-19 15:54:58 -0400 (Wed, 19 Sep 2007) | 2 lines
put the channel in autoservice when executing func_shell
................
r83182 | file | 2007-09-19 16:01:34 -0400 (Wed, 19 Sep 2007) | 2 lines
Clean up code in res_adsi.
................
r83183 | file | 2007-09-19 16:06:31 -0400 (Wed, 19 Sep 2007) | 2 lines
Clean up code in cdr_csv. (Are you sensing a theme for me today?)
................
r83213 | qwell | 2007-09-19 19:16:51 -0400 (Wed, 19 Sep 2007) | 9 lines
More conversions to NEW_CLI
(issue #10724)
Patches:
chan_zap.c.patch uploaded by moy (license 222)
app_queue.c.patch uploaded by eliel (license 64)
app_voicemail.c.patch uploaded by eliel (license 64)
app_meetme.c.patch uploaded by eliel (license 64)
................
Added:
team/group/v6/trunk/channels/xpmr/
- copied from r83213, trunk/channels/xpmr/
Modified:
team/group/v6/trunk/ (props changed)
team/group/v6/trunk/CHANGES
team/group/v6/trunk/LICENSE
team/group/v6/trunk/apps/app_adsiprog.c
team/group/v6/trunk/apps/app_authenticate.c
team/group/v6/trunk/apps/app_db.c
team/group/v6/trunk/apps/app_dial.c
team/group/v6/trunk/apps/app_disa.c
team/group/v6/trunk/apps/app_flash.c
team/group/v6/trunk/apps/app_meetme.c
team/group/v6/trunk/apps/app_queue.c
team/group/v6/trunk/apps/app_system.c
team/group/v6/trunk/apps/app_voicemail.c
team/group/v6/trunk/apps/app_zapscan.c
team/group/v6/trunk/build_tools/menuselect-deps.in
team/group/v6/trunk/cdr/cdr_csv.c
team/group/v6/trunk/cdr/cdr_sqlite3_custom.c
team/group/v6/trunk/channels/chan_agent.c
team/group/v6/trunk/channels/chan_alsa.c
team/group/v6/trunk/channels/chan_features.c
team/group/v6/trunk/channels/chan_iax2.c
team/group/v6/trunk/channels/chan_jingle.c
team/group/v6/trunk/channels/chan_local.c
team/group/v6/trunk/channels/chan_mgcp.c
team/group/v6/trunk/channels/chan_misdn.c
team/group/v6/trunk/channels/chan_sip.c
team/group/v6/trunk/channels/chan_skinny.c
team/group/v6/trunk/channels/chan_zap.c
team/group/v6/trunk/channels/misdn/chan_misdn_config.h
team/group/v6/trunk/channels/misdn_config.c
team/group/v6/trunk/configs/http.conf.sample
team/group/v6/trunk/configs/queues.conf.sample
team/group/v6/trunk/configs/res_config_sqlite.conf
team/group/v6/trunk/configs/sip.conf.sample
team/group/v6/trunk/configs/skinny.conf.sample
team/group/v6/trunk/configs/voicemail.conf.sample
team/group/v6/trunk/configs/zapata.conf.sample
team/group/v6/trunk/configure
team/group/v6/trunk/configure.ac
team/group/v6/trunk/doc/CODING-GUIDELINES
team/group/v6/trunk/doc/res_config_sqlite.txt
team/group/v6/trunk/funcs/func_curl.c
team/group/v6/trunk/funcs/func_shell.c
team/group/v6/trunk/include/asterisk.h
team/group/v6/trunk/include/asterisk/agi.h
team/group/v6/trunk/include/asterisk/autoconfig.h.in
team/group/v6/trunk/include/asterisk/doxyref.h
team/group/v6/trunk/include/asterisk/jingle.h
team/group/v6/trunk/include/asterisk/res_odbc.h
team/group/v6/trunk/include/asterisk/threadstorage.h
team/group/v6/trunk/include/asterisk/utils.h
team/group/v6/trunk/main/asterisk.c
team/group/v6/trunk/main/astobj2.c
team/group/v6/trunk/main/cdr.c
team/group/v6/trunk/main/dnsmgr.c
team/group/v6/trunk/main/frame.c
team/group/v6/trunk/main/http.c
team/group/v6/trunk/main/logger.c
team/group/v6/trunk/main/manager.c
team/group/v6/trunk/main/pbx.c
team/group/v6/trunk/main/stdtime/localtime.c
team/group/v6/trunk/makeopts.in
team/group/v6/trunk/pbx/pbx_config.c
team/group/v6/trunk/pbx/pbx_dundi.c
team/group/v6/trunk/pbx/pbx_spool.c
team/group/v6/trunk/res/ael/pval.c
team/group/v6/trunk/res/res_adsi.c
team/group/v6/trunk/res/res_agi.c
team/group/v6/trunk/res/res_config_sqlite.c
team/group/v6/trunk/res/res_features.c
team/group/v6/trunk/res/res_jabber.c
team/group/v6/trunk/res/res_musiconhold.c
team/group/v6/trunk/res/res_odbc.c
team/group/v6/trunk/res/res_realtime.c
Propchange: team/group/v6/trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/group/v6/trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/group/v6/trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Sep 20 09:43:29 2007
@@ -1,1 +1,1 @@
-/trunk:1-82318
+/trunk:1-83227
Modified: team/group/v6/trunk/CHANGES
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/CHANGES?view=diff&rev=83228&r1=83227&r2=83228
==============================================================================
--- team/group/v6/trunk/CHANGES (original)
+++ team/group/v6/trunk/CHANGES Thu Sep 20 09:43:29 2007
@@ -1,4 +1,4 @@
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------
--- Functionality changes since Asterisk 1.4-beta was branched ----------------
-------------------------------------------------------------------------------
@@ -50,6 +50,7 @@
* New CLI command "core show settings"
* Added 'core show channels count' CLI command.
* Added the ability to set the core debug and verbose values on a per-file basis.
+ * Added 'queue pause member' and 'queue unpause member' CLI commands
SIP changes
-----------
@@ -220,6 +221,7 @@
those carriers that transmit CID via dtmf after a polarity change.
* CID matching information is now shown when doing 'dialplan show'.
* Added zap show version CLI command to chan_zap.
+ * Added setvar support to zapata.conf channel entries.
H.323 Changes
-------------
Modified: team/group/v6/trunk/LICENSE
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/LICENSE?view=diff&rev=83228&r1=83227&r2=83228
==============================================================================
--- team/group/v6/trunk/LICENSE (original)
+++ team/group/v6/trunk/LICENSE Thu Sep 20 09:43:29 2007
@@ -32,7 +32,7 @@
would strongly encourage you to make the same exception that we do).
Specific permission is also granted to link Asterisk with OpenSSL and
-OpenH323.
+OpenH323 and distribute the resulting binary files.
In addition, Asterisk implements two management/control protocols: the
Asterisk Manager Interface (AMI) and the Asterisk Gateway Interface
Modified: team/group/v6/trunk/apps/app_adsiprog.c
URL: http://svn.digium.com/view/asterisk/team/group/v6/trunk/apps/app_adsiprog.c?view=diff&rev=83228&r1=83227&r2=83228
==============================================================================
--- team/group/v6/trunk/apps/app_adsiprog.c (original)
+++ team/group/v6/trunk/apps/app_adsiprog.c Thu Sep 20 09:43:29 2007
@@ -228,9 +228,9 @@
static char *get_token(char **buf, char *script, int lineno)
{
- char *tmp = *buf;
- char *keyword;
+ char *tmp = *buf, *keyword;
int quoted = 0;
+
/* Advance past any white space */
while(*tmp && (*tmp < 33))
tmp++;
@@ -260,19 +260,21 @@
static int send_dtmf(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
{
- char dtmfstr[80];
- char *a;
- int bytes=0;
- a = get_token(&args, script, lineno);
- if (!a) {
+ char dtmfstr[80], *a;
+ int bytes = 0;
+
+ if (!(a = get_token(&args, script, lineno))) {
ast_log(LOG_WARNING, "Expecting something to send for SENDDTMF at line %d of %s\n", lineno, script);
return 0;
}
+
if (process_token(dtmfstr, a, sizeof(dtmfstr) - 1, ARG_STRING)) {
ast_log(LOG_WARNING, "Invalid token for SENDDTMF at line %d of %s\n", lineno, script);
return 0;
}
+
a = dtmfstr;
+
while(*a) {
if (strchr(validdtmf, *a)) {
*buf = *a;
@@ -282,21 +284,22 @@
ast_log(LOG_WARNING, "'%c' is not a valid DTMF tone at line %d of %s\n", *a, lineno, script);
a++;
}
+
return bytes;
}
static int goto_line(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
{
- char *page;
- char *gline;
+ char *page = get_token(&args, script, lineno);
+ char *gline = get_token(&args, script, lineno);
int line;
unsigned char cmd;
- page = get_token(&args, script, lineno);
- gline = get_token(&args, script, lineno);
+
if (!page || !gline) {
ast_log(LOG_WARNING, "Expecting page and line number for GOTOLINE at line %d of %s\n", lineno, script);
return 0;
}
+
if (!strcasecmp(page, "INFO")) {
cmd = 0;
} else if (!strcasecmp(page, "COMM")) {
@@ -305,28 +308,31 @@
ast_log(LOG_WARNING, "Expecting either 'INFO' or 'COMM' page, got got '%s' at line %d of %s\n", page, lineno, script);
return 0;
}
+
if (process_token(&line, gline, sizeof(line), ARG_NUMBER)) {
ast_log(LOG_WARNING, "Invalid line number '%s' at line %d of %s\n", gline, lineno, script);
return 0;
}
+
cmd |= line;
buf[0] = 0x8b;
buf[1] = cmd;
+
return 2;
}
static int goto_line_rel(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
{
- char *dir;
- char *gline;
+ char *dir = get_token(&args, script, lineno);
+ char *gline = get_token(&args, script, lineno);
int line;
unsigned char cmd;
- dir = get_token(&args, script, lineno);
- gline = get_token(&args, script, lineno);
+
if (!dir || !gline) {
ast_log(LOG_WARNING, "Expecting direction and number of lines for GOTOLINEREL at line %d of %s\n", lineno, script);
return 0;
}
+
if (!strcasecmp(dir, "UP")) {
cmd = 0;
} else if (!strcasecmp(dir, "DOWN")) {
@@ -335,267 +341,315 @@
ast_log(LOG_WARNING, "Expecting either 'UP' or 'DOWN' direction, got '%s' at line %d of %s\n", dir, lineno, script);
return 0;
}
+
if (process_token(&line, gline, sizeof(line), ARG_NUMBER)) {
ast_log(LOG_WARNING, "Invalid line number '%s' at line %d of %s\n", gline, lineno, script);
return 0;
}
+
cmd |= line;
buf[0] = 0x8c;
buf[1] = cmd;
+
return 2;
}
static int send_delay(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
{
- char *gtime;
+ char *gtime = get_token(&args, script, lineno);
int ms;
- gtime = get_token(&args, script, lineno);
+
if (!gtime) {
ast_log(LOG_WARNING, "Expecting number of milliseconds to wait at line %d of %s\n", lineno, script);
return 0;
}
+
if (process_token(&ms, gtime, sizeof(ms), ARG_NUMBER)) {
ast_log(LOG_WARNING, "Invalid delay milliseconds '%s' at line %d of %s\n", gtime, lineno, script);
return 0;
}
+
buf[0] = 0x90;
+
if (id == 11)
buf[1] = ms / 100;
else
buf[1] = ms / 10;
+
return 2;
}
static int set_state(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
{
- char *gstate;
+ char *gstate = get_token(&args, script, lineno);
int state;
- gstate = get_token(&args, script, lineno);
+
if (!gstate) {
ast_log(LOG_WARNING, "Expecting state number at line %d of %s\n", lineno, script);
return 0;
}
+
if (process_token(&state, gstate, sizeof(state), ARG_NUMBER)) {
ast_log(LOG_WARNING, "Invalid state number '%s' at line %d of %s\n", gstate, lineno, script);
return 0;
}
+
buf[0] = id;
buf[1] = state;
+
return 2;
}
static int cleartimer(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
{
- char *tok;
- tok = get_token(&args, script, lineno);
+ char *tok = get_token(&args, script, lineno);
+
if (tok)
ast_log(LOG_WARNING, "Clearing timer requires no arguments ('%s') at line %d of %s\n", tok, lineno, script);
buf[0] = id;
+
/* For some reason the clear code is different slightly */
if (id == 7)
buf[1] = 0x10;
else
buf[1] = 0x00;
+
return 2;
}
static struct adsi_flag *getflagbyname(struct adsi_script *state, char *name, char *script, int lineno, int create)
{
int x;
- for (x=0;x<state->numflags;x++)
+
+ for (x = 0; x < state->numflags; x++) {
if (!strcasecmp(state->flags[x].vname, name))
return &state->flags[x];
+ }
+
/* Return now if we're not allowed to create */
if (!create)
return NULL;
+
if (state->numflags > 6) {
ast_log(LOG_WARNING, "No more flag space at line %d of %s\n", lineno, script);
return NULL;
}
+
ast_copy_string(state->flags[state->numflags].vname, name, sizeof(state->flags[state->numflags].vname));
state->flags[state->numflags].id = state->numflags + 1;
state->numflags++;
+
return &state->flags[state->numflags-1];
}
static int setflag(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
{
- char *tok;
+ char *tok = get_token(&args, script, lineno);
char sname[80];
struct adsi_flag *flag;
- tok = get_token(&args, script, lineno);
+
if (!tok) {
ast_log(LOG_WARNING, "Setting flag requires a flag number at line %d of %s\n", lineno, script);
return 0;
}
+
if (process_token(sname, tok, sizeof(sname) - 1, ARG_STRING)) {
ast_log(LOG_WARNING, "Invalid flag '%s' at line %d of %s\n", tok, lineno, script);
return 0;
}
- flag = getflagbyname(state, sname, script, lineno, 0);
- if (!flag) {
+
+ if (!(flag = getflagbyname(state, sname, script, lineno, 0))) {
ast_log(LOG_WARNING, "Flag '%s' is undeclared at line %d of %s\n", sname, lineno, script);
return 0;
}
+
buf[0] = id;
buf[1] = ((flag->id & 0x7) << 4) | 1;
+
return 2;
}
static int clearflag(char *buf, char *name, int id, char *args, struct adsi_script *state, char *script, int lineno)
{
- char *tok;
+ char *tok = get_token(&args, script, lineno);
struct adsi_flag *flag;
char sname[80];
- tok = get_token(&args, script, lineno);
+
if (!tok) {
ast_log(LOG_WARNING, "Clearing flag requires a flag number at line %d of %s\n", lineno, script);
return 0;
}
+
if (process_token(sname, tok, sizeof(sname) - 1, ARG_STRING)) {
ast_log(LOG_WARNING, "Invalid flag '%s' at line %d of %s\n", tok, lineno, script);
return 0;
}
- flag = getflagbyname(state, sname, script, lineno, 0);
- if (!flag) {
+
+ if (!(flag = getflagbyname(state, sname, script, lineno, 0))) {
ast_log(LOG_WARNING, "Flag '%s' is undeclared at line %d of %s\n", sname, lineno, script);
return 0;
}
+
buf[0] = id;
buf[1] = ((flag->id & 0x7) << 4);
+
return 2;
}
static int starttimer(char *buf, char *name, int id, char *args, struct adsi_script *istate, char *script, int lineno)
{
- char *tok;
+ char *tok = get_token(&args, script, lineno);
int secs;
- tok = get_token(&args, script, lineno);
+
if (!tok) {
ast_log(LOG_WARNING, "Missing number of seconds at line %d of %s\n", lineno, script);
return 0;
}
+
if (process_token(&secs, tok, sizeof(secs), ARG_NUMBER)) {
ast_log(LOG_WARNING, "Invalid number of seconds '%s' at line %d of %s\n", tok, lineno, script);
return 0;
}
+
[... 14292 lines stripped ...]
More information about the asterisk-commits
mailing list