Russell Bryant
3d7cf301d8
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)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82803 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-18 16:34:05 +00:00
Jason Parker
9a5f7c5764
(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.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82800 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-18 16:16:36 +00:00
Russell Bryant
384aea6257
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.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-18 16:14:14 +00:00
Russell Bryant
96f4079dac
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.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82776 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-18 16:10:48 +00:00
Jason Parker
a9c2f441d3
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
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82752 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-18 15:29:26 +00:00
Russell Bryant
ded76a8988
convert various places that access the channel lock directly to use the channel lock wrappers
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82728 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-17 22:59:36 +00:00
Jason Parker
0d1abc92fe
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.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82712 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-17 21:52:07 +00:00
Jason Parker
cb8c4122bc
Fix the sample redirect to point to a valid file in the Asterisk GUI.
...
Closes issue #10748 , patch by bkruse
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82710 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-17 21:44:38 +00:00
Russell Bryant
3dc9e8f38a
Add support for #include, var_metric, and cat_metric in res_config_sqlite
...
(closes issue #10738 , rbraun_proformatique)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82679 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-17 20:24:50 +00:00
Russell Bryant
96d9f820e9
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 )
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-17 20:19:58 +00:00
Russell Bryant
f498599e56
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.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82660 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-17 20:10:10 +00:00
Russell Bryant
9388173f85
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
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-17 18:57:56 +00:00
Russell Bryant
13183a8f99
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)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-17 16:58:23 +00:00
Kevin P. Fleming
6cdc9ced97
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!
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82593 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-17 16:44:13 +00:00
Doug Bailey
410bdaf535
Fix memory leak introduced when POST support was added.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82568 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-17 14:58:19 +00:00
Joshua Colp
3d22579ca9
(closes issue #10715 )
...
Reported by: the-chopper
Don't bother hanging up the new channel if it does not exist yet.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82546 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-17 02:20:40 +00:00
Joshua Colp
abe84c029f
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.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82516 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-17 02:02:09 +00:00
Tilghman Lesher
6c97fd4cb4
Option maxmessage should be maxsecs per-folder, too (closes issue #10729 )
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82496 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-16 15:32:00 +00:00
Steve Murphy
6a98adc357
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.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82457 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-14 21:30:44 +00:00
Russell Bryant
da5930c234
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)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82454 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-14 21:21:23 +00:00
Jason Parker
4baba7c951
Add support in chan_skinny for sending RTP directly to the endpoints.
...
Closes issue #9154 , patch by DEA
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82401 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-14 19:49:05 +00:00
Mark Michelson
fb54c967a5
Blocking revision 82398
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82400 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-14 18:37:00 +00:00
Mark Michelson
38460271f2
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)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82397 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-14 18:34:53 +00:00
Jason Parker
7fa9eebd99
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.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82395 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-14 17:51:22 +00:00
Tilghman Lesher
bc494164c8
Add a direct execute method to res_odbc (closes issue #10722 )
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82393 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-14 17:29:23 +00:00
Russell Bryant
1e29c3aefa
use the standard license header for the xpmr files
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82391 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-14 16:02:39 +00:00
Russell Bryant
78dba0007e
Add chan_usbradio to trunk
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82389 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-14 15:58:31 +00:00
Russell Bryant
bf28185fce
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
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82386 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-14 15:52:28 +00:00
Mark Michelson
e14ac6f380
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)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82377 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-14 14:44:15 +00:00
Philippe Sultan
4291976429
Fix DTMF following what has been done in issue #9401 . Thanks irroot.
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82373 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-14 13:02:31 +00:00
Jason Parker
584a510d20
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
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 23:12:16 +00:00
Mark Michelson
899ddcee92
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
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82352 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 21:53:01 +00:00
Mark Michelson
eb39b71fba
Added the ability to pause and unpause members via the CLI
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82349 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 21:23:32 +00:00
Mark Michelson
c04887e428
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.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82347 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 20:17:41 +00:00
Jason Parker
28fbbde310
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..)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82345 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 20:13:58 +00:00
Russell Bryant
37dbcf6422
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
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82341 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 19:16:24 +00:00
Russell Bryant
79d79ac840
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.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82338 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 18:52:35 +00:00
Kevin P. Fleming
12a8ae6c91
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
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82336 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 18:13:44 +00:00
Joshua Colp
5460e72015
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!)
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82329 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 16:58:59 +00:00
Mark Michelson
10d22b6e13
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).
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 16:27:42 +00:00
Russell Bryant
1282de797d
Various code and documentation cleanups for res_config_sqlite
...
(closes issue #10711 , rbraun_proformatique)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82321 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 15:26:40 +00:00
Philippe Sultan
5b1668603f
Modify rule filters to match with the Jingle namespace constant
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82320 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 15:25:18 +00:00
Philippe Sultan
43d63b1027
Assign namespace properly
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82318 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 15:10:08 +00:00
Philippe Sultan
92cc7aeff1
Changed Jingle and Jingle DTMF namespaces.
...
As both specifications are in the Experimental status, the namespaces
specified therein shall be of the form
"http://www.xmpp.org/extensions/xep-XXXX.html#ns ".
See the Namespace issuance section in XEP-0053 :
http://www.xmpp.org/extensions/xep-0053.html#namespaces
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 15:05:16 +00:00
Philippe Sultan
848e59aa1e
Reflect Jingle DTMF specification changes
...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82312 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 14:00:56 +00:00
Russell Bryant
a0e8ee0a3d
Fix a missing unref of a member struct. This was pointed out by Marta. Thanks!
...
This function in 1.4 didn't have the problem.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82311 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 13:34:24 +00:00
Philippe Sultan
5734c0df49
Merged revisions 82309 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82309 | phsultan | 2007-09-13 13:47:14 +0200 (Thu, 13 Sep 2007) | 4 lines
Closes issue #9401 , reported and patched by irrot, with slight
modifications by me.
Handle DTMF sent by Asterisk properly.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82310 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-13 11:54:56 +00:00
Russell Bryant
a955df8eb9
Merged revisions 82296 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82296 | russell | 2007-09-12 16:56:32 -0500 (Wed, 12 Sep 2007) | 3 lines
Fix a check of the wrong pointer, as pointed out by an XXX comment left in
the code. The problem was harmless, however.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-12 21:57:30 +00:00
Jason Parker
6a90ea5cf4
After some discussions, we decided that the return values here were a bit messy.
...
This also fixes a bug on reload, where peers may not have reregistered properly.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82294 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-12 21:55:32 +00:00
Tilghman Lesher
22436131f7
Merged revisions 82291 via svnmerge from
...
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82291 | tilghman | 2007-09-12 16:28:33 -0500 (Wed, 12 Sep 2007) | 2 lines
Oops, wrong location for FreeBSD zone files
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82292 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-09-12 21:32:24 +00:00