Jason Parker [Thu, 1 May 2008 16:49:24 +0000 (16:49 +0000)]
Allow dringXrange to properly default to 10, as was done in 1.4.
dringXrange is a new feature that was added, and it attempted to default, but only when the option was specified.
(closes issue #12536)
Reported by: bjm
Patches:
12536-dringXrange.diff uploaded by qwell (license 4)
Tested by: bjm
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114922
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Wed, 30 Apr 2008 20:51:17 +0000 (20:51 +0000)]
Add support for specifying the registration expiry on a per registration basis in the register line. This comes from a Switchvox patch. (issue AST-24)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114912
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 30 Apr 2008 19:30:41 +0000 (19:30 +0000)]
Adding new configuration options to app_queue. This adds two new values
to announce-position, "limit" and "more," as well as a new option,
announce-position-limit. For more information on the use of these options,
see CHANGES or configs/queues.conf.sample.
(closes issue #10991)
Reported by: slavon
Patches:
app_q.diff uploaded by slavon (license 288)
Tested by: slavon, putnopvut
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114906
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Wed, 30 Apr 2008 19:21:04 +0000 (19:21 +0000)]
Lock around variables retrieved, and copy the values, if they stay persistent,
since another thread could remove them.
(closes issue #12541)
Reported by: snuffy
Patches:
bug_12156_apps.diff uploaded by snuffy (license 35)
Several additional changes by me
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114904
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 30 Apr 2008 16:55:49 +0000 (16:55 +0000)]
Merged revisions 114890 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114890 | oej | 2008-04-30 18:23:17 +0200 (Ons, 30 Apr 2008) | 7 lines
Don't crash on bad SIP replys.
Fix created in Huntsville together with Mark M (putnopvut)
(closes issue #12363)
Reported by: jvandal
Tested by: putnopvut, oej
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114899
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 30 Apr 2008 16:34:24 +0000 (16:34 +0000)]
Merged revisions 114891 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114891 | russell | 2008-04-30 11:30:01 -0500 (Wed, 30 Apr 2008) | 28 lines
Merge changes from team/russell/iax2_find_callno and iax2_find_callno_1.4
These changes address a critical performance issue introduced in the latest
release. The fix for the latest security issue included a change that made
Asterisk randomly choose call numbers to make them more difficult to guess by
attackers. However, due to some inefficient (this is by far, an understatement)
code, when Asterisk chose high call numbers, chan_iax2 became unusable after
just a small number of calls. On a small embedded platform, it would not be
able to handle a single call. On my Intel Core 2 Duo @ 2.33 GHz, I couldn't
run more than about 16 IAX2 channels. Ouch.
These changes address some performance issues of the find_callno() function
that have bothered me for a very long time. On every incoming media frame,
it iterated through every possible call number trying to find a matching
active call. This involved a mutex lock and unlock for each call number
checked. So, if the random call number chosen was 20000, then every media
frame would cause 20000 locks and unlocks. Previously, this problem was
not as obvious since Asterisk always chose the lowest call number it could.
A second container for IAX2 pvt structs has been added. It is an astobj2
hash table. When we know the remote side's call number, the pvt goes into
the hash table with a hash value of the remote side's call number. Then,
lookups for incoming media frames are a very fast hash lookup instead of an
absolutely insane array traversal.
In a quick test, I was able to get more than 3600% more IAX2 channels
on my machine with these changes.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114892
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Wed, 30 Apr 2008 16:14:43 +0000 (16:14 +0000)]
Fixes a bug where if a stream monitor thread was not created (caused from failure of opening or starting the stream) pthread_cancel was called with an invalid thread ID.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114888
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Wed, 30 Apr 2008 14:49:51 +0000 (14:49 +0000)]
Merged revisions 114880 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114880 | kpfleming | 2008-04-30 09:46:57 -0500 (Wed, 30 Apr 2008) | 2 lines
use the ARRAY_LEN macro for indexing through the iaxs/iaxsl arrays so that the size of the arrays can be adjusted in one place, and change the size of the arrays from 32768 calls to 2048 calls when LOW_MEMORY is defined
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114884
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Wed, 30 Apr 2008 12:15:43 +0000 (12:15 +0000)]
Merged revisions 114875 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114875 | kpfleming | 2008-04-30 07:14:07 -0500 (Wed, 30 Apr 2008) | 2 lines
pay attention to *all* header files for dependency tracking, not just the local ones (inspired by r578 of asterisk-addons by tilghman)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114876
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Wed, 30 Apr 2008 05:05:25 +0000 (05:05 +0000)]
Document the Incomplete application addition.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114874
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Tue, 29 Apr 2008 22:54:14 +0000 (22:54 +0000)]
Fixes a problem where all the templates were marked as dead no matter what. The templates should only be marked as dead if a configuration file has been successfully loaded and has changes. Bug found while making API documentation for 1.6.0.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114866
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 29 Apr 2008 21:07:36 +0000 (21:07 +0000)]
Patching app_chanspy to jibe better with what is documented. This allows for
a colon-delimited list of spygroups to be specified when calling the ChanSpy application
with the 'g' option. Prior to this, you could only specify a single group when using the
'g' option.
I also have upped the maximum number of spygroups to 128 and added a #define so that this
can be easily increased or decreased later.
(closes issue #12497)
Reported by: jsmith
Patches:
app_chanspy_multiple_groups_v2.patch uploaded by jsmith (license 15)
Tested by: atis, jvandal
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114857
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Tue, 29 Apr 2008 20:05:48 +0000 (20:05 +0000)]
Fix formatting
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114852
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 29 Apr 2008 19:42:04 +0000 (19:42 +0000)]
Merged revisions 114848 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114848 | mmichelson | 2008-04-29 14:40:06 -0500 (Tue, 29 Apr 2008) | 14 lines
Use the MACRO_CONTEXT and MACRO_EXTEN channel variables instead of the channel's macrocontext
and macroexten fields. This is needed because if macros are daisy-chained, the incorrect
context and extension are placed on the new channel. I also added locking to the channel prior
to accessing these variables as noted in trunk's janitor project file.
(closes issue #12549)
Reported by: darren1713
Patches:
app_queue.c.macroextenpatch uploaded by darren1713 (license 116)
(with modifications from me)
Tested by: putnopvut
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114849
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Tue, 29 Apr 2008 18:58:48 +0000 (18:58 +0000)]
fix this logic to actually be correct... the fd can't be *both* -1 and an array index to be checked in rfds/efds (bug found by gcc-4.3)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114845
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 29 Apr 2008 18:48:26 +0000 (18:48 +0000)]
Make app_directory dependent on app_voicemail. This is because the function
which says the person's name is handled inside app_voicemail now.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114841
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 29 Apr 2008 17:56:13 +0000 (17:56 +0000)]
Since there is now a globally available function for saying someone's name, a LOT of
functions in app_directory can be removed since the ODBC-specific lookups are accomplished
within app_voicemail. This change greatly reduces the amount of lines in app_directory that
were solely for the purpose of looking up a name when ODBC_STORAGE is specified for voicemail.
This commit also makes the name-saying interruptable via DTMF.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114834
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 29 Apr 2008 17:31:26 +0000 (17:31 +0000)]
Fix a crash happening in app_directory. This crash would occur if a users.conf existed.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114832
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Tue, 29 Apr 2008 17:10:55 +0000 (17:10 +0000)]
Merged revisions 114829 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114829 | qwell | 2008-04-29 12:08:55 -0500 (Tue, 29 Apr 2008) | 1 line
Change warning message to debug, since there are cases where 0 results is perfectly fine.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114830
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Tue, 29 Apr 2008 12:54:31 +0000 (12:54 +0000)]
Merged revisions 114823 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r114823 | kpfleming | 2008-04-29 07:53:12 -0500 (Tue, 29 Apr 2008) | 10 lines
Merged revisions 114822 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r114822 | kpfleming | 2008-04-29 07:52:32 -0500 (Tue, 29 Apr 2008) | 2 lines
stop script from appending source code if run multiple times
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114824
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 28 Apr 2008 22:38:07 +0000 (22:38 +0000)]
Adding a new option 'n' to app_chanspy. This option allows for the name of the spied-on
party to be spoken instead of the channel name or number.
This was accomplished by adding a new function pointer to point to a function in app_voicemail
which retrieves the name file and plays it. This makes for an easy way that applications may play
a user's name should it be necessary. app_directory, in particular, can be simplified greatly by
this change.
This change comes as a suggestion from Switchvox, which already has this feature. AST-23
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114813
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Fredrickson [Mon, 28 Apr 2008 17:00:38 +0000 (17:00 +0000)]
Fix deadlock issue in chan_zap with libss7 due to channel variables being set with the channel pvt lock being held. #12512
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114776
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 28 Apr 2008 16:37:45 +0000 (16:37 +0000)]
Add incomplete matching to PBX code and app_dial
(closes issue #12351)
Reported by: Corydon76
Patches:
20080402__pbx_incomplete__3.diff.txt uploaded by Corydon76 (license 14)
pbx_incomplete_with_timeout.diff uploaded by fabled (license 448)
Tested by: Corydon76, fabled
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114773
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 28 Apr 2008 13:42:13 +0000 (13:42 +0000)]
Update autoconf logic with latest API change for libss7.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114713
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 28 Apr 2008 04:53:20 +0000 (04:53 +0000)]
Merged revisions 114708 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114708 | tilghman | 2008-04-27 23:47:39 -0500 (Sun, 27 Apr 2008) | 5 lines
When modules are embedded, they take on a different name, without the ".so"
extension. Specifically check for this name, when we're checking if a module
is loaded.
(Closes issue #12534)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114709
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 28 Apr 2008 04:30:02 +0000 (04:30 +0000)]
Fix breakage caused by #12028. (Closes issue #12535)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114706
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sun, 27 Apr 2008 22:54:33 +0000 (22:54 +0000)]
s/chan_zap/chan_skinny/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114703
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Michiel van Baak [Sun, 27 Apr 2008 15:17:18 +0000 (15:17 +0000)]
Make MWI in chan_skinny event based modeled after chan_zap and chan_mgcp.
(closes issue #12214)
Reported by: DEA
Patches:
chan_skinny-vm-events-v3.txt uploaded by DEA (license 3)
Tested by: DEA and me
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114700
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Sun, 27 Apr 2008 01:28:32 +0000 (01:28 +0000)]
Merged revisions 114695 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114695 | seanbright | 2008-04-26 21:26:15 -0400 (Sat, 26 Apr 2008) | 5 lines
When we don't explicitly pass a path to the --with-tds configure option, we
may end up finding tds.h in /usr/local/include instead of /usr/include. If
this happens, the grep that looks for the version (from tdsver.h) will fail
and we'll have some problems during the build.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114696
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Sat, 26 Apr 2008 15:08:51 +0000 (15:08 +0000)]
Unleak reference
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114692
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Sat, 26 Apr 2008 13:17:19 +0000 (13:17 +0000)]
Merged revisions 114689 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114689 | tilghman | 2008-04-26 08:15:21 -0500 (Sat, 26 Apr 2008) | 6 lines
Clicking forward without selecting a message leaves an errant .lock file.
(closes issue #12528)
Reported by: pukepail
Patches:
patch.diff uploaded by pukepail (license 431)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114690
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Sat, 26 Apr 2008 02:48:56 +0000 (02:48 +0000)]
Add 'sip qualify peer <peer>' command (with AMI SIPqualifypeer)
(closes issue #12524)
Reported by: ctooley
Patches:
sip_qualify_peer.diff.2 uploaded by ctooley (license 136)
some modifications for trunk by Corydon76
Tested by: Corydon76
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114683
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 25 Apr 2008 22:24:32 +0000 (22:24 +0000)]
Adding a new option, 'B' to app_chanspy. This option allows the spy to
barge on the call. It is like the existing whisper option, except that
it allows the spy to talk to both sides of the conversation on which
he is spying.
This feature has existed in Switchvox, and this merges the functionality
into Asterisk.
(AST-32)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114678
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 25 Apr 2008 22:04:46 +0000 (22:04 +0000)]
Lock the channel around datastore access
(closes issue #12527)
Reported by: mnicholson
Patches:
pbx_lua4.diff uploaded by mnicholson (license 96)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114676
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 25 Apr 2008 22:00:35 +0000 (22:00 +0000)]
Merged revisions 114673 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114673 | russell | 2008-04-25 16:54:40 -0500 (Fri, 25 Apr 2008) | 3 lines
Use consistent logic for checking to see if a call number has been chosen yet.
Also, remove some redundant logic I recently added in a fix.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114674
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 25 Apr 2008 20:20:10 +0000 (20:20 +0000)]
Whitespace changes only
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114667
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 25 Apr 2008 19:39:26 +0000 (19:39 +0000)]
Oops, this isn't necessarily AGI that is forking anymore
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114665
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 25 Apr 2008 19:33:27 +0000 (19:33 +0000)]
Merged revisions 114662 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114662 | mmichelson | 2008-04-25 14:32:02 -0500 (Fri, 25 Apr 2008) | 4 lines
Move the unlock of the spyee channel to outside the start_spying() function so that
the channel is not unlocked twice when using whisper mode.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114663
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Fri, 25 Apr 2008 18:32:22 +0000 (18:32 +0000)]
Merge app_pickupchan with app_directed_pickup, for AST-27.
Initially, this was to be a new feature, with a patch from Switchvox,
but after discussions, it was noted that this feature already existed in trunk.
The resulting discussions ended in a comment that was along the lines of
"the patch provided here is a lot smaller than what is already in trunk,
because it doesn't create a new application and duplicate existing code"
It was decided that these two applications could be easily merged to reduce
code duplication. SO, that's what this does.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114660
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 25 Apr 2008 18:18:30 +0000 (18:18 +0000)]
This patch allows for forwarding a message with a "comment" attachment
if using IMAP storage for voicemail. The comment will be recorded and attached
as a second attachment in addition to the original message. This will be invoked
if you choose to prepend a message the way you would with file or ODBC storage
(closes issue #12028)
Reported by: jaroth
Patches:
forward_with_comment_v2.patch uploaded by jaroth (license 50)
Tested by: jaroth
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114656
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 25 Apr 2008 18:18:27 +0000 (18:18 +0000)]
Merge code from team/russell/parking_updates
Add some additional features to the core park_call_full() function, and expose
them as options to the Park() application. The functionality being added is the
ability to specify a custom return extension/context/priority, a custom timeout,
and a couple of options. The options are to play ringing instead of MOH to the
parked caller, and to randomize parking spot selection.
(code inspired by the patch in AST-17, code from switchvox)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114655
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 25 Apr 2008 16:25:17 +0000 (16:25 +0000)]
Fix a memory leak and protect against potential dereferences of a NULL
pointer.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114651
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Fri, 25 Apr 2008 15:58:36 +0000 (15:58 +0000)]
Blocked revisions 114649 via svnmerge
........
r114649 | tilghman | 2008-04-25 10:53:52 -0500 (Fri, 25 Apr 2008) | 6 lines
Reference documentation files that actually exist.
(closes issue #12516)
Reported by: linuxmaniac
Patches:
diff_rev114611.patch uploaded by linuxmaniac (license 472)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114650
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Fri, 25 Apr 2008 13:56:05 +0000 (13:56 +0000)]
Speaking of building...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114644
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Michiel van Baak [Thu, 24 Apr 2008 22:16:48 +0000 (22:16 +0000)]
Pass the hangup cause all the way to the calling app/channel.
(closes issue #11328)
Reported by: rain
Patches:
20071207__pass_cause_in_hangup_control_frame.diff.txt uploaded by Corydon76 (license 14)
brought up-to-date to trunk by me
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114637
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 24 Apr 2008 22:11:46 +0000 (22:11 +0000)]
Hey look, it builds.
(closes issue #12519)
Reported by: falves11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114635
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Thu, 24 Apr 2008 21:35:39 +0000 (21:35 +0000)]
Merged revisions 114632 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114632 | mmichelson | 2008-04-24 16:35:08 -0500 (Thu, 24 Apr 2008) | 11 lines
Re-invite RTP during a masquerade so that, for instance, an AMI
redirect of two channels which are natively bridged will preserve audio
on both channels. This prevents a problem with Asterisk not re-inviting
due to one of the channels having being a zombie.
(closes issue #12513)
Reported by: mneuhauser
Patches:
asterisk-1.4-114602_restore-RTP-on-fixup.patch uploaded by mneuhauser (license 425)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114633
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Thu, 24 Apr 2008 20:43:52 +0000 (20:43 +0000)]
Merged revisions 114628 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114628 | mmichelson | 2008-04-24 15:43:03 -0500 (Thu, 24 Apr 2008) | 8 lines
Output of channel variables when eventwhencalled=vars was set
was being truncated two characters. This patch corrects the
problem.
(closes issue #12493)
Reported by: davidw
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114629
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Thu, 24 Apr 2008 20:06:06 +0000 (20:06 +0000)]
Merged revisions 114624 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114624 | mmichelson | 2008-04-24 15:04:24 -0500 (Thu, 24 Apr 2008) | 10 lines
Resolve a deadlock in chan_local by releasing the channel lock
temporarily.
(closes issue #11712)
Reported by: callguy
Patches:
11712.patch uploaded by putnopvut (license 60)
Tested by: acunningham
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114625
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Thu, 24 Apr 2008 19:54:57 +0000 (19:54 +0000)]
Merged revisions 114621 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114621 | tilghman | 2008-04-24 14:53:36 -0500 (Thu, 24 Apr 2008) | 4 lines
Ensure that when we set the accountcode, it actually shows up in the CDR.
(Fix for AMI Originate)
(Closes issue #12007)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114622
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Thu, 24 Apr 2008 19:24:31 +0000 (19:24 +0000)]
Fix DST calculation, and fix bug in calculation of whether conf has started yet or not
(Closes issue #12292)
Reported by: DEA
Patches:
app_meetme-rt-dst-sched-fix.txt uploaded by DEA (license 3)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114617
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Thu, 24 Apr 2008 16:47:01 +0000 (16:47 +0000)]
Merged revisions 51989 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #12496)
Reported by: daniele
Patches:
misdn-moh-1.6.0-beta7.1.patch uploaded by daniele (license 471)
Tested by: daniele
Technically, I didn't use the patch above except to find out what revision to merge - but it's the same thing as this revision.
........
r51989 | crichter | 2007-01-24 06:57:22 -0600 (Wed, 24 Jan 2007) | 1 line
added fix from #8899
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114612
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 24 Apr 2008 15:56:55 +0000 (15:56 +0000)]
Merged revisions 114608 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114608 | russell | 2008-04-24 10:55:21 -0500 (Thu, 24 Apr 2008) | 4 lines
Fix a silly mistake in a change I made yesterday that caused chan_iax2 to blow
up very quickly.
(issue #12515)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114609
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Thu, 24 Apr 2008 14:59:05 +0000 (14:59 +0000)]
Merged revisions 114603 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114603 | oej | 2008-04-24 16:55:18 +0200 (Tor, 24 Apr 2008) | 3 lines
Only have one max-forwards header in outbound REFERs.
Discovered in the Asterisk SIP Masterclass in Orlando. Thanks Joe!
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114606
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 24 Apr 2008 14:55:21 +0000 (14:55 +0000)]
Change a verbose message to debug.
(closes issue #12514)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114604
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 23 Apr 2008 22:53:20 +0000 (22:53 +0000)]
Merged revisions 114600 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114600 | russell | 2008-04-23 17:18:12 -0500 (Wed, 23 Apr 2008) | 6 lines
Improve some broken cookie parsing code. Previously, manager login over HTTP
would only work if the mansession_id cookie was first. Now, the code builds
a list of all of the cookies in the Cookie header. This fixes a problem
observed by users of the Asterisk GUI.
(closes AST-20)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114601
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 23 Apr 2008 20:53:05 +0000 (20:53 +0000)]
Merged revisions 114597 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114597 | russell | 2008-04-23 15:49:18 -0500 (Wed, 23 Apr 2008) | 10 lines
Fix an issue that caused getting the correct next channel to not always work.
Also, remove setting the amount of time to wait for a digit from 5 seconds back
down to 1/10 of a second. I believe this was so the beep didn't get played over
and over really fast, but a while back I put in another fix for that issue.
(closes issue #12498)
Reported by: jsmith
Patches:
app_chanspy_channel_walk.trunk.patch uploaded by jsmith (license 15)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114598
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Wed, 23 Apr 2008 18:33:28 +0000 (18:33 +0000)]
Merged revisions 114594 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114594 | qwell | 2008-04-23 13:28:44 -0500 (Wed, 23 Apr 2008) | 8 lines
Fix reload/unload for res_musiconhold module.
(closes issue #11575)
Reported by: sunder
Patches:
M11575_14_rev3.diff uploaded by junky (license 177)
bug11575_trunk.diff.txt uploaded by jamesgolovich (license 176)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114595
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 23 Apr 2008 18:01:00 +0000 (18:01 +0000)]
Merged revisions 114591 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114591 | russell | 2008-04-23 12:55:31 -0500 (Wed, 23 Apr 2008) | 5 lines
Store the manager session ID explicitly as 4 byte ID instead of a ulong. The
mansession_id cookie is coded to be limited to 8 characters of hex, and this
could break logins from 64-bit machines in some cases.
(inspired by AST-20)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114592
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Wed, 23 Apr 2008 17:18:29 +0000 (17:18 +0000)]
Merged revisions 114587 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114587 | russell | 2008-04-23 12:16:32 -0500 (Wed, 23 Apr 2008) | 2 lines
Fix find_callno_locked() to actually return the callno locked in some more cases.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114588
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 23 Apr 2008 16:53:34 +0000 (16:53 +0000)]
Merged revisions 114584 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114584 | oej | 2008-04-23 18:51:41 +0200 (Ons, 23 Apr 2008) | 2 lines
Add 502 support for both directions, not only one... (see r114571)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114585
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Wed, 23 Apr 2008 14:55:03 +0000 (14:55 +0000)]
Merged revisions 114579 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114579 | file | 2008-04-23 11:54:11 -0300 (Wed, 23 Apr 2008) | 4 lines
Instead of stopping dialplan execution when SayNumber attempts to say a large number that it can not print out a message informing the user and continue on.
(closes issue #12502)
Reported by: bcnit
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114580
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 23 Apr 2008 00:58:49 +0000 (00:58 +0000)]
Round 2 of IMAP_STORAGE app_voicemail.c fixes:
This fixes a bug that was thought to be fixed already.
app_voicemail, if using IMAP_STORAGE, has a problem because
the IMAP header files include syslog.h, which define LOG_WARNING
and LOG_DEBUG to be different than what Asterisk uses for those
same macros. This was "fixed" in the past by including all the
IMAP header files prior to including asterisk.h. This fix worked...
unless you were to try to compile with MALLOC_DEBUG. MALLOC_DEBUG
prepends the inclusion of astmm.h to every file, which means that no
matter what order the includes are in in app_voicemail, the unexpected
values for LOG_WARNING and LOG_DEBUG will be in place.
The action taken for this fix was to define AST_LOG_* macros in addition
to the LOG_* macros already defined. These new macros are used in app_voicemail.c,
logger.h, and astobj.h right now, and their use will be encouraged in the future.
In consideration of those who have written third-party modules which use
the LOG_* macros, these will NOT be removed from the source, however future use
of these macros is discouraged.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114577
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 23 Apr 2008 00:40:30 +0000 (00:40 +0000)]
Round 1 of IMAP_STORAGE-related app_voicemail changes
This makes IMAP_STORAGE include the proper headers if you
have specified the "system" option for --with-imap when running
the configure script and your IMAP-related headers exist in
/usr/include/c-client.
This change is due to a hasty merge of a 1.4 change I made.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114575
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Tue, 22 Apr 2008 23:58:19 +0000 (23:58 +0000)]
Merged revisions 114571 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114571 | tilghman | 2008-04-22 18:51:44 -0500 (Tue, 22 Apr 2008) | 2 lines
Treat a 502 just like a 503, when it comes to processing a response code
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114572
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 22 Apr 2008 22:17:31 +0000 (22:17 +0000)]
Merged revisions 114558 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114558 | russell | 2008-04-22 17:15:36 -0500 (Tue, 22 Apr 2008) | 5 lines
When we receive a full frame that is supposed to contain our call number,
ensure that it has the correct one.
(closes issue #10078)
(AST-2008-006)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114559
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Tue, 22 Apr 2008 21:57:57 +0000 (21:57 +0000)]
(closes issue #12469)
Reported by: triccyx
I had a bit a problem reproducing this in my setup (trying not to disturb my other stuff)
but finally, I got it. The problem appears to be that the extension is being added in
replace mode, which kinda assumes that the pattern trie has been formed, when in fact,
in this case, it was not. The checks being done are not nec. when the tree is not yet
formed, as changes like this will be summarized when the trie is formed in the future.
I tested the fix, and the crash no longer happens. Feel free to open the bug again if
this fix doesn't cure the problem.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114553
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 22 Apr 2008 21:15:41 +0000 (21:15 +0000)]
Blocked revisions 114550 via svnmerge
........
r114550 | russell | 2008-04-22 16:14:55 -0500 (Tue, 22 Apr 2008) | 4 lines
I thought I was going to be able to leave 1.4 alone, but that was not the case.
I ran into some problems with G.722 in 1.4, so I have merged in all of the fixes
in this area that I have made in trunk/1.6.0, and things are happy again.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114551
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 22 Apr 2008 20:25:56 +0000 (20:25 +0000)]
re-add a fix that got lost with a recent change
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114548
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 22 Apr 2008 19:45:12 +0000 (19:45 +0000)]
Blocked revisions 114545 via svnmerge
........
r114545 | russell | 2008-04-22 14:45:00 -0500 (Tue, 22 Apr 2008) | 2 lines
Trivial change to read the number of samples from a frame before calling ast_write()
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114546
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 22 Apr 2008 18:30:47 +0000 (18:30 +0000)]
Blocked revisions 114542 via svnmerge
........
r114542 | russell | 2008-04-22 13:29:56 -0500 (Tue, 22 Apr 2008) | 3 lines
After a parked call times out, allow the call back to the parker to time out.
(closes issue #10890)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114543
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Tue, 22 Apr 2008 18:14:09 +0000 (18:14 +0000)]
Allow setqueuevar=yes (et al) to work, after changes to pbx_builtin_setvar()
(closes issue #12490)
Reported by: bcnit
Patches:
12490-queuevars-3.diff uploaded by qwell (license 4)
Tested by: qwell
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114540
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 22 Apr 2008 18:04:39 +0000 (18:04 +0000)]
Merged revisions 114537 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114537 | russell | 2008-04-22 13:03:33 -0500 (Tue, 22 Apr 2008) | 9 lines
If the dial string passed to the call channel callback does not indicate an
extension, then consider the extension on the channel before falling back
to the default.
(closes issue #12479)
Reported by: darren1713
Patches:
exten_dial_fix_chan_iax2.c.patch uploaded by darren1713 (license 116)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114538
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 22 Apr 2008 16:47:00 +0000 (16:47 +0000)]
Add a c() option for the Jack() application and JACK_HOOK() funciton for supplying
a custom client name. Using the channel name is still the default. This was done
at the request of Jared Smith.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114533
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 22 Apr 2008 15:54:06 +0000 (15:54 +0000)]
Add support for authenticating on a NOTIFY request. This is useful for phones that require it when sending them a special packet to get them to do something (such as reload their configuration).
(closes issue #9896)
Reported by: IgorG
Patches:
sipnotify-113980-v14.patch uploaded by IgorG (license 20)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114529
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 22 Apr 2008 15:46:01 +0000 (15:46 +0000)]
Correct action_ping() and action_events() with regards to Manager 1.1
documentation. Also, fix a bug in xml_translate().
(closes issue #11649)
Reported by: ys
Patches:
trunk_manager.c.diff uploaded by ys (license 281)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114527
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 22 Apr 2008 15:20:53 +0000 (15:20 +0000)]
Blocked revisions 114522 via svnmerge
........
r114522 | russell | 2008-04-22 10:20:37 -0500 (Tue, 22 Apr 2008) | 13 lines
Merge changes from team/russell/issue_9520
These changes make sure that the reference count for sip_peer objects properly
reflects the fact that the peer is sitting in the scheduler for a scheduled
callback for qualifying peers or for expiring registrations. Without this, it
was possible for these callbacks to happen at the same time that the peer was
being destroyed. This was especially likely to happen with realtime peers, and
for people making use of the realtime prune CLI command.
(closes issue #9520)
Reported by: kryptolus
Committed patch by me
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114523
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Tue, 22 Apr 2008 14:38:46 +0000 (14:38 +0000)]
Hopefully, this will resolve the issues that russellb had with this log_show_lock().
I gathered the code that filled the string, and put it in a different func which
I cryptically call "append_lock_information()".
Now, both log_show_lock(), and handle_show_locks() both call this code to do
the work. Tested, seems to work fine.
Also, log_show_lock was modified to use the ast_str stuff, along with checking
for successful ast_str creation, and freeing the ast_str obj when finished.
A break was inserted to terminate the search for the lock; we should never
see it twice.
An example usage in chan_sip.c was created as a comment, for instructional
purposes.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114520
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Mon, 21 Apr 2008 23:42:45 +0000 (23:42 +0000)]
(closes issue #6113)
Reported by: oej
Tested by: jpeeler
This patch implements multiple parking lots for parked calls. The default parkinglot is used by default, however setting the channel variable PARKINGLOT in the dialplan will allow use of any other configured parkinglot. See configs/features.conf.sample for more details on setting up another non-default parkinglot. Also, one can (currently) set the default parkinglot to use in the driver configuration file via the parkinglot option.
Patch initially written by oej, brought up to date and finalized by mvanbaak, and then stabilized and converted to astobj2 by me.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114487
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Doug Bailey [Mon, 21 Apr 2008 22:50:33 +0000 (22:50 +0000)]
Change the time zone offset from a hard code to use res_phoneprov variables
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114456
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Mon, 21 Apr 2008 21:13:02 +0000 (21:13 +0000)]
(closes issue #12467)
Reported by: atis
Tested by: murf
This upgrade adds the ~~ (concatenation) string operator to expr2.
While not needed in normal runtime pbx operation, it is needed when
raw exprs are being syntax checked. This plays into future syntax-
unification plans. By permission of atis, this addition in trunk
and the reason of why things are as they are will suffice to close
this bug.
I also added a short note about the previous addition of "sip show sched"
to the CLI in CHANGES, which I discovered I forgot in a previous commit.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114423
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Fredrickson [Mon, 21 Apr 2008 18:44:35 +0000 (18:44 +0000)]
Add support for generic name transmission (#12484) on SS7 in chan_zap
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114389
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jeff Peeler [Mon, 21 Apr 2008 15:34:37 +0000 (15:34 +0000)]
This removes an invalid warning message for an incorrectly entered pin, but more importantly removes an inapplicable check. If the first argument passed to app_authenticate does not contain a '/', the argument should be treated as the sole fixed "password" to match against and that is all. (Previous behavior was attempting to open a file based on the pin.)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114327
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 21 Apr 2008 15:01:04 +0000 (15:01 +0000)]
Add a simple janitor project
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114325
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 21 Apr 2008 14:40:33 +0000 (14:40 +0000)]
Merged revisions 114322 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114322 | file | 2008-04-21 11:39:32 -0300 (Mon, 21 Apr 2008) | 4 lines
Only drop audio if we receive it without a progress indication. We allow other frames through such as DTMF because they may be needed to complete the call.
(closes issue #12440)
Reported by: aragon
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114323
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 21 Apr 2008 14:34:06 +0000 (14:34 +0000)]
Only print out the error message if ldap_modify_ext_s actually returns an error, and not success.
(closes issue #12438)
Reported by: gservat
Patches:
res_config_ldap.c-patch-code uploaded by gservat (license 466)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114320
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Sun, 20 Apr 2008 14:52:07 +0000 (14:52 +0000)]
Minor logging cleanups
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114314
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Fredrickson [Sat, 19 Apr 2008 16:58:24 +0000 (16:58 +0000)]
SS7:Added - Generic Name / Access Transport / Redirecting Number handling. #12425
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114303
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Sat, 19 Apr 2008 13:58:56 +0000 (13:58 +0000)]
Blocked revisions 114299 via svnmerge
........
r114299 | tilghman | 2008-04-19 08:57:17 -0500 (Sat, 19 Apr 2008) | 2 lines
Ensure that help text terminates with a newline
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114300
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Sat, 19 Apr 2008 13:53:38 +0000 (13:53 +0000)]
Blocked revisions 114297 via svnmerge
........
r114297 | tilghman | 2008-04-19 08:49:50 -0500 (Sat, 19 Apr 2008) | 4 lines
MOH usage information needs a terminating newline, or else
"asterisk -rx 'help moh reload'" will hang. Reported via
-dev list, fixed by me.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114298
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Sat, 19 Apr 2008 00:15:31 +0000 (00:15 +0000)]
Ignore refcounter
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114295
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 18 Apr 2008 21:51:05 +0000 (21:51 +0000)]
Merged revisions 114284 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114284 | russell | 2008-04-18 16:48:06 -0500 (Fri, 18 Apr 2008) | 2 lines
Don't destroy a manager session if poll() returns an error of EAGAIN.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114285
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 18 Apr 2008 20:01:47 +0000 (20:01 +0000)]
Merged revisions 114278 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114278 | russell | 2008-04-18 15:01:09 -0500 (Fri, 18 Apr 2008) | 2 lines
ensure directories are created before we try to install stuff into them
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114279
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 18 Apr 2008 19:59:17 +0000 (19:59 +0000)]
Merged revisions 114275 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114275 | russell | 2008-04-18 14:58:55 -0500 (Fri, 18 Apr 2008) | 2 lines
SUBDIRS_INSTALL is already listed as a subtarget for bininstall
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114276
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 18 Apr 2008 19:35:33 +0000 (19:35 +0000)]
Make sure ADSI is marked as unavailable on Unistim channels so voicemail does not try to do some ADSI jazz.
(closes issue #12460)
Reported by: PerryB
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114271
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 18 Apr 2008 18:15:11 +0000 (18:15 +0000)]
Add MEETME_INFO dialplan function that allows querying various properties of a Meetme conference.
(closes issue #11691)
Reported by: junky
Patches:
meetme_info.patch uploaded by jpeeler (license 325)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114261
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 18 Apr 2008 18:03:06 +0000 (18:03 +0000)]
Merged revisions 114257 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114257 | mmichelson | 2008-04-18 12:44:29 -0500 (Fri, 18 Apr 2008) | 6 lines
Clearing up error messages so they make a bit more sense. Also removing a redundant error
message.
Issue AST-15
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114259
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 18 Apr 2008 16:11:27 +0000 (16:11 +0000)]
If the parsing of the config file fails make sure we unlock ldap_lock.
(closes issue #12477)
Reported by: IgorG
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114254
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Doug Bailey [Fri, 18 Apr 2008 16:05:29 +0000 (16:05 +0000)]
Add g__object_unref to clean up gmime message object
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114253
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 18 Apr 2008 15:25:50 +0000 (15:25 +0000)]
Blocked revisions 114248 via svnmerge
........
r114248 | russell | 2008-04-18 10:24:09 -0500 (Fri, 18 Apr 2008) | 5 lines
Ensure that we don't ast_strdupa(NULL)
(closes issue #12476)
Reported by: davidw
Patch by me
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114249
65c4cc65-6c06-0410-ace0-
fbb531ad65f3