Damien Wedhorn [Sun, 6 Jan 2013 20:45:12 +0000 (20:45 +0000)]
Rewrite skinny dialing to remove threaded simpleswitch
This rewrite changes skinny dialing from the threaded simpleswitch
to a scheduled timeout approach. There were some underlying issues
with the threaded simple switch with occasional corruption and
possible segfaults.
Review: https://reviewboard.asterisk.org/r/2240/
........
Merged revisions 378622 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378623
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Fri, 4 Jan 2013 23:14:54 +0000 (23:14 +0000)]
res_srtp: Prevent a crash from occurring due to srtp_create failures in srtp_create
Under some circumstances, libsrtp's srtp_create function deallocates memory that
it wasn't initially responsible for allocating. Because we weren't initially
aware of this behavior, this memory was still used in spite of being unallocated
during the course of the srtp_unprotect function. A while back I made a patch
which would set this value to NULL, but that exposed a possible condition where
we would then try to check a member of the struct which would cause a segfault.
In order to address these problems, ast_srtp_unprotect will now set an error value
when it ends without a valid SRTP session which will result in the caller of
srtp_unprotect observing this error and hanging up the relevant channel instead of
trying to keep using the invalid session address.
(closes issue ASTERISK-20499)
Reported by: Tootai
Review: https://reviewboard.asterisk.org/r/2228/diff/#index_header
........
Merged revisions 378591 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378592 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378593
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Fri, 4 Jan 2013 22:19:16 +0000 (22:19 +0000)]
Fix pjproject compilation in certain circumstances
On a fresh checkout of Asterisk 11, running make before ./configure
could cause the pjproject subdirectory to get in an odd state that
would prevent compilation. This patch by Tilghman prevents that from
occurring.
(closes issue ASTERISK-20681)
Reported by: Dinesh Ramjuttun
Tested by: danilo borges, Steve Lang
patches:
20121208__ccar_solved.diff.txt uploaded by Tilghman Lesher (license 5003)
........
Merged revisions 378582 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378585
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Michael L. Young [Fri, 4 Jan 2013 21:20:12 +0000 (21:20 +0000)]
Fix SIP Notify Messages To Have The Proper IP Address In The FROM Field
On a multihomed server when sending a NOTIFY message, we were not figuring out
which network should be used to contact the peer.
This patch fixes the problem by calling ast_sip_ouraddrfor() and then
build_via() so that our NOTIFY message contains the correct IP address.
Also, a debug message is being added to help follow the call-id changes that
occur. This was helpful for confirming that the IP address was set properly
since the call-id contains the IP address. It also will be helpful for
troubleshooting purposes when following a call in the debug logs.
(closes issue ASTERISK-20805)
Reported by: Bryan Hunt
Tested by: Bryan Hunt, Michael L. Young
Patches:
asterisk-20805-notify-ip-v2.diff uploaded by Michael L. Young (license 5026)
Review: https://reviewboard.asterisk.org/r/2255/
........
Merged revisions 378554 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378559 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378565
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Fri, 4 Jan 2013 21:18:07 +0000 (21:18 +0000)]
Don't pass STUN packets through the SRTP unprotect function.
(closes issue AST-1036)
Reported by: jbigelow
........
Merged revisions 378553 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378555 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378557
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Fri, 4 Jan 2013 16:44:33 +0000 (16:44 +0000)]
Doxygen Cleanups
Baseline clean up of formating to make room for extended documentation
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378543
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Michael L. Young [Thu, 3 Jan 2013 22:14:20 +0000 (22:14 +0000)]
Fix Queue Log Reporting Every Call COMPLETECALLER With "h" Extension Present
When the "h" extension is present within the context of the queue, all calls
are being reported COMPLETECALLER even when the agent is hanging up the call.
This patch checks to see if the agent hung-up or not instead of only relying on
checking if the queue (caller) channel hung-up or not. It would appear that
having the h extension in the mix, the pbx goes to the h extension,
"hanging-up" the queue channel and triggering the reporting of COMPLETECALLER.
(closes issue ASTERISK-20743)
Reported by: call
Tested by: call, Michael L. Young
Patches:
asterisk-20743-q-cmplt-caller.diff
uploaded by Michael L. Young (license 5026)
Review: https://reviewboard.asterisk.org/r/2256/
........
Merged revisions 378514 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378515 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378516
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Thu, 3 Jan 2013 19:42:54 +0000 (19:42 +0000)]
chan_agent: Fix wrapup time wait response.
* Made agent_cont_sleep() and agent_ack_sleep() stop waiting if the wrapup
time expires. agent_cont_sleep() had tried but returned the wrong value
to stop waiting.
* Made agent_ack_sleep() take a struct agent_pvt pointer instead of a void
pointer for better type safety.
........
Merged revisions 378486 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378487 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378488
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Thu, 3 Jan 2013 18:51:43 +0000 (18:51 +0000)]
Add missing test event
This test event was missing from channel.c causing the dial_LS_options
test to fail intermittently because of a race condition where most code
paths emitted the test event but this one did not. The dial_LS_options
test should stop bouncing now.
........
Merged revisions 378455 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378459 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378460
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Thu, 3 Jan 2013 18:47:29 +0000 (18:47 +0000)]
chan_agent: Misc code cleanup.
* Fix off-nominal path resource cleanup in agent_request().
* Create agent_pvt_destroy() to eliminate inlined versions in many places.
* Pull invariant code out of loop in add_agent().
* Remove redundant module user references in login_exec().
* Remove unused struct agent_pvt logincallerid[] member.
........
Merged revisions 378456 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378457 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378458
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Thu, 3 Jan 2013 17:48:14 +0000 (17:48 +0000)]
chan_agent: Fix agent_indicate() locking.
Avoid deadlock potential with local channels and simplify the locking.
........
Merged revisions 378427 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378428 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378429
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Thu, 3 Jan 2013 16:04:11 +0000 (16:04 +0000)]
Add aliases to the Directory.
This is an interesting feature that allows additional strings to be used to
search the Directory, primarily intended to be used with nicknames, but could
be used with affiliations and the like. Because the name field is used in
more than one place (such as email notifications), it is important that these
additional strings not be placed in the name field, but be specified
separately.
Review: https://reviewboard.asterisk.org/r/2244/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378414
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 3 Jan 2013 15:40:21 +0000 (15:40 +0000)]
Prevent exhaustion of system resources through exploitation of event cache
This patch changes res_xmpp to no longer cache events under certain circumstances.
(issue ASTERISK-20175)
Reported by: Russell Bryant, Leif Madsen, Joshua Colp
Tested by: kmoore
........
Merged revisions 378411 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378412
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Thu, 3 Jan 2013 15:37:31 +0000 (15:37 +0000)]
Prevent crashes in res_xmpp when receiving large messages
Similar to r378287, res_xmpp was marshaling data read from an external source
onto the stack. For a sufficiently large message, this could cause a stack
overflow. This patch modifies res_xmpp in a similar fashion to res_jabber by
removing the stack allocation, as it was unnecessary.
(issue ASTERISK-20658)
Reported by: wdoekes
........
Merged revisions 378409 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378410
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Wed, 2 Jan 2013 22:19:32 +0000 (22:19 +0000)]
Clean up app_mysql's application entry points to properly parse arguments
When parsing arguments, application entry points should not attempt to
directly modify the parameters to the function. This patch properly duplicates
the passed in parameters before attempting to parse them.
(issue ASTERISK-20658)
Reported by: wdoekes
patches:
issueA20658_sanitize_app_mysql.patch uploaded by wdoekes (license 5674)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378384
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Wed, 2 Jan 2013 22:10:32 +0000 (22:10 +0000)]
Prevent crashes from occurring when reading from data sources with large values
When reading configuration data from an Asterisk .conf file or when pulling
data from an Asterisk RealTime backend, Asterisk was copying the data on the
stack for manipulation. Unfortunately, it is possible to read configuration
data or realtime data from some data source that provides a large blob of
characters. This could potentially cause a crash via a stack overflow.
This patch prevents large sets of data from being read from an ARA backend or
from an Asterisk conf file.
(issue ASTERISK-20658)
Reported by: wdoekes
Tested by: wdoekes, mmichelson
patches:
* issueA20658_dont_process_overlong_config_lines.patch uploaded by wdoekes (license 5674)
* issueA20658_func_realtime_limit.patch uploaded by wdoekes (license 5674)
........
Merged revisions 378375 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378376 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378377
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Wed, 2 Jan 2013 21:23:16 +0000 (21:23 +0000)]
Fix AMI redirect action with two channels failing to redirect both channels.
The AMI redirect action can fail to redirect two channels that are bridged
together. There is a race between the AMI thread redirecting the two
channels and the bridge thread noticing that a channel is hungup from the
redirects.
* Made the bridge wait for both channels to be redirected before exiting.
* Made the AMI redirect check that all required headers are present before
proceeding with the redirection.
* Made the AMI redirect require that any supplied ExtraChannel exist
before proceeding. Previously the code fell back to a single channel
redirect operation.
(closes issue ASTERISK-18975)
Reported by: Ben Klang
(closes issue ASTERISK-19948)
Reported by: Brent Dalgleish
Patches:
jira_asterisk_19948_v11.patch (license #5621) patch uploaded by rmudgett
Tested by: rmudgett, Thomas Sevestre, Deepak Lohani, Kayode
Review: https://reviewboard.asterisk.org/r/2243/
........
Merged revisions 378356 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378358 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378374
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Wed, 2 Jan 2013 18:11:59 +0000 (18:11 +0000)]
Prevent exhaustion of system resources through exploitation of event cache
Asterisk maintains an internal cache for devices in the event subsystem. The
device state cache holds the state of each device known to Asterisk, such that
consumers of device state information can query for the last known state for
a particular device, even if it is not part of an active call. The concept of
a device in Asterisk can include entities that do not have a physical
representation. One way that this occurred was when anonymous calls are allowed
in Asterisk. A device was automatically created and stored in the cache for
each anonymous call that occurred; this was possible in the SIP and IAX2
channel drivers and through channel drivers that utilized the
res_jabber/res_xmpp resource modules (Gtalk, Jingle, and Motif). These devices
are never removed from the system, allowing anonymous calls to potentially
exhaust a system's resources.
This patch changes the event cache subsystem and device state management to
no longer cache devices that are not associated with a physical entity.
(issue ASTERISK-20175)
Reported by: Russell Bryant, Leif Madsen, Joshua Colp
Tested by: kmoore
patches:
event-cachability-3.diff uploaded by jcolp (license 5000)
........
Merged revisions 378303 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378320 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 378321 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378322
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Wed, 2 Jan 2013 15:39:42 +0000 (15:39 +0000)]
Resolve crashes due to large stack allocations when using TCP
Asterisk had several places where messages received over various network
transports may be copied in a single stack allocation. In the case of TCP,
since multiple packets in a stream may be concatenated together, this can
lead to large allocations that overflow the stack.
This patch modifies those portions of Asterisk using TCP to either
favor heap allocations or use an upper bound to ensure that the stack will not
overflow:
* For SIP, the allocation now has an upper limit
* For HTTP, the allocation is now a heap allocation instead of a stack
allocation
* For XMPP (in res_jabber), the allocation has been eliminated since it was
unnecesary.
Note that the HTTP portion of this issue was independently found by Brandon
Edwards of Exodus Intelligence.
(issue ASTERISK-20658)
Reported by: wdoekes, Brandon Edwards
Tested by: mmichelson, wdoekes
patches:
ASTERISK-20658_res_jabber.c.patch uploaded by mmichelson (license 5049)
issueA20658_http_postvars_use_malloc2.patch uploaded by wdoekes (license 5674)
issueA20658_limit_sip_packet_size3.patch uploaded by wdoekes (license 5674)
........
Merged revisions 378269 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378286 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 378287 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378288
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Tue, 1 Jan 2013 19:02:52 +0000 (19:02 +0000)]
Add UUID packages now required to configure
In ASTERISK-20726 UUID was added to Asterisk. This commit is to add the dependancies to the install script
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378259
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Tue, 1 Jan 2013 17:10:42 +0000 (17:10 +0000)]
Revert 378248. I changed the logic of this function unitentionally, pointed out by file.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378249
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Tue, 1 Jan 2013 17:03:59 +0000 (17:03 +0000)]
Bail out early when building an ast_trans_pvt and the translator doesn't supply a 'newpvt'
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378248
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Mon, 31 Dec 2012 14:46:06 +0000 (14:46 +0000)]
Ensure chan_sip rejects encrypted streams without crypto info
This ensures that Asterisk rejects encrypted media streams (RTP/SAVP
audio and video) that are missing cryptographic keys and ensures that
the incoming SDP is consistent with RFC4568 as far as having a crypto
attribute present for any SAVP streams.
Review: https://reviewboard.asterisk.org/r/2204/
........
Merged revisions 378217 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378218 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 378219 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378220
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Thu, 20 Dec 2012 21:51:03 +0000 (21:51 +0000)]
Give the causes[] a struct name.
........
Merged revisions 378164 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378165 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378166
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Tue, 18 Dec 2012 17:48:36 +0000 (17:48 +0000)]
Add test events for time limit-related hangups
This patch adds hangup-related test events in order to support testing
of time-limited bridges. This aids in testing the S() and L() bridge
options.
(issue SWP-4713)
........
Merged revisions 378119 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378120 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 378121 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378122
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Mon, 17 Dec 2012 23:10:42 +0000 (23:10 +0000)]
Fix potential double free when unloading a module.
........
Merged revisions 378092 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378093 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 378094 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378095
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Mon, 17 Dec 2012 23:02:54 +0000 (23:02 +0000)]
Make chan_local module references tied to local_pvt lifetime.
The chan_local module references were manually tied to the existence of
the ;1 and ;2 channel links.
* Made chan_local module references tied to the existence of the local_pvt
structure as well as automatically take care of the module references.
* Tweaked the wording of the local_fixup() failure warning message to make
sense.
Review: https://reviewboard.asterisk.org/r/2181/
........
Merged revisions 378088 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378089 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 378090 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378091
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Mon, 17 Dec 2012 21:22:21 +0000 (21:22 +0000)]
chan_local: Parse dial string consistently.
* Fix local_alloc() unexpected limitation of exten and context length from
a combined length of 80 characters to a normal 80 characters each.
* Made local_alloc() and local_devicestate() parse the same way.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378081
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Mon, 17 Dec 2012 20:59:51 +0000 (20:59 +0000)]
Make libasteriskssl.so symlink use a relative path.
This was causing issues when using DESTDIR, since the path to which the link
pointed is not likely to exist (and not useful to exist) on the target system.
(issue ASTNOW-284)
........
Merged revisions 378073 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378074
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Mon, 17 Dec 2012 20:34:25 +0000 (20:34 +0000)]
chan_local: Misc lock and ref tweaks.
* awesome_locking() does not need to thrash the pvt lock as much.
* local_setoption() does not need to check for NULL pvt on cleanup since
it will never be NULL.
* Made ref the pvt before locking for consistency.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378072
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Fri, 14 Dec 2012 22:45:03 +0000 (22:45 +0000)]
chan_agent: Remove some duplicated code.
No need to check for an agent twice. Santa does that.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378064
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Fri, 14 Dec 2012 22:34:18 +0000 (22:34 +0000)]
Features: BRIDGE_FEATURES variable automixmonitor support and use proper party
BRIDGE_FEATURES did not previously support the automixmonitor feature. Now it
does. In addition, the BRIDGE_FEATURES variable would not apply features to
the proper party based on whether the feature option letter was in caps or
in lowercase (both ways would apply it to the caller). Now uppercase applies
to the caller while lowercase applies to the callee (like with the dial option)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378063
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Fri, 14 Dec 2012 21:35:44 +0000 (21:35 +0000)]
app_queue: Revert bad ringinuse=no patch.
With the option ringinuse=no set, the patch committed for ASTERISK-16115
causes non-SIP queue members to never be called because the device state
is checked after a channel is created to determine if the member is busy.
These queue members always get the "Member %s is busy, cannot dial"
message.
Most channel drivers other than chan_sip use the default device state
handling. The default device-state state is considered in use or unknown
if the channel exists or not respectively.
(closes issue ASTERISK-20801)
Reported by: rmudgett
Patches:
jira_asterisk_16115_revert_r370418_v1.8.patch (license #5621) patch uploaded by rmudgett
........
Merged revisions 378036 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 378037 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 378038 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378039
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Fri, 14 Dec 2012 20:22:36 +0000 (20:22 +0000)]
app_queue: Make update_status() not return anything.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378029
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Damien Wedhorn [Fri, 14 Dec 2012 01:55:43 +0000 (01:55 +0000)]
Fix skinny to recognise vmexten in general section of conf
Fixup the vmexten so if globally set in general section will be honored by
chan_skinny. Also get rid of the 'global_' part of variable name to match
regexten.
(closes issue ASTERISK-20790)
Reported by: snuffy
Tested by: snuffy, myself
Patches:
skinny-vm.diff uploaded by snuffy (license 5024)
........
Merged revisions 378010 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378011
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Damien Wedhorn [Fri, 14 Dec 2012 01:02:15 +0000 (01:02 +0000)]
Add g722 codec support to skinny
(closes issue ASTERISK-20788)
Reported by: snuffy
Tested by: snuffy, myself
Patches:
skinny-g722.diff uploaded by snuffy (license 5024)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378006
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Thu, 13 Dec 2012 21:28:15 +0000 (21:28 +0000)]
confbridge: Fix MOH on simultaneous user entry to a new conference.
When two users entered a new conference simultaneously, one of the callers
hears MOH. This happened if two unmarked users entered simultaneously and
also if a waitmarked and a marked user entered simultaneously.
* Created a confbridge internal MOH API to eliminate the inlined MOH
handling code. Note that the conference mixing bridge needs to be locked
when actually starting/stopping MOH because there is a small window
between the conference join unsuspend MOH and actually joining the mixing
bridge.
* Created the concept of suspended MOH so it can be interrupted while
conference join announcements to the user and DTMF features can operate.
* Suspend any MOH until the user is about to actually join the mixing
bridge of the conference. This way any pre-join file playback does not
need to worry about MOH.
* Made post-join actions only play deferred entry announcement files.
Changing the user/conference state during that time is not protected or
controlled by the state machine.
(closes issue ASTERISK-20606)
Reported by: Eugenia Belova
Tested by: rmudgett
Review: https://reviewboard.asterisk.org/r/2232/
........
Merged revisions 377992 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377993 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378002
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Damien Wedhorn [Thu, 13 Dec 2012 21:25:31 +0000 (21:25 +0000)]
Minor fixes for chan_skinny
Whitespace, change SUBSTATE_ONHOOK to correct SKINNY_ONHOOK and
correct len of 2 strcmp in skinny_setdebug(). (see opticron's review
on https://reviewboard.asterisk.org/r/2240/)
........
Merged revisions 377991 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378001
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Thu, 13 Dec 2012 21:20:32 +0000 (21:20 +0000)]
Make generate_exchange_uuid() always return the passed ast_str pointer.
I changed this code earlier to return NULL if it wasn't able to generate a UUID,
whereas the earlier code would always return the ast_str that was passed in.
Switch back to returning the ast_str, only set it to the empty string instead if
UUID generation fails. We still do a validity check later which will catch this
and blow up if necessary.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378000
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Thu, 13 Dec 2012 21:15:44 +0000 (21:15 +0000)]
Fixed svn merge property breakage from r377986
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377994
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Damien Wedhorn [Thu, 13 Dec 2012 18:28:41 +0000 (18:28 +0000)]
Fix skinny debug tab completion
Review the syntax of the 'skinny debug' command to show more than
just 'show' for options to 'skinny debug' command.
(closes issue ASTERISK-20789)
Reported by: snuffy
Tested by: snuffy, myself
Patches:
skinny-debug.diff uploaded by snuffy (license 5024)
........
Merged revisions 377985 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377986
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Thu, 13 Dec 2012 16:43:40 +0000 (16:43 +0000)]
Bail configure if it can't find libuuid.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377981
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 13 Dec 2012 16:18:52 +0000 (16:18 +0000)]
Remove compile time check HAVE_DEV_URANDOM.
The code was doing a runtime check, anyway. The compile time check isn't
always valid (cross-compiling, packages).
Review: https://reviewboard.asterisk.org/r/2245/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377977
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Thu, 13 Dec 2012 15:40:03 +0000 (15:40 +0000)]
Re-add taskprocessor cleanup code that was removed by the UUID merge.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377975
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Thu, 13 Dec 2012 15:37:55 +0000 (15:37 +0000)]
Use the UUID API to generate and validate UUIDs for res_calendar_exchange.
Currently the res_calendar_exchange module uses its own method of generating
UUIDs using ast_random(). Now that we have a UUID API we should use that
instead.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377974
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Thu, 13 Dec 2012 15:37:45 +0000 (15:37 +0000)]
The UUID commit removed changes made in res_clialiases.c
This puts back in the changes that are designed to work
around a memory leak fix in the CLI code.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377973
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Thu, 13 Dec 2012 15:24:22 +0000 (15:24 +0000)]
Fixed configure.ac to look for proper uuid.h file
Introduced in r377846, the configure script was looking for uuid.h instead
of uuid/uuid.h.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377972
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Brent Eagles [Thu, 13 Dec 2012 15:22:27 +0000 (15:22 +0000)]
This change adds a SIP peer configuration feature to allow the peer's
configured codecs to take precedence on an outgoing call.
This change introduces a new peer configuration property named
'ignore_requested_pref' that causes the requested codec to be ignored when
determining the preferred codec for an outgoing call leg. The consequence is
that Asterisk's usual efforts to prefer avoiding transcoding can be overridden
on a peer-by-peer basis where appropriate.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377971
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Thu, 13 Dec 2012 14:28:57 +0000 (14:28 +0000)]
Ensure Min-SE is included in outbound INVITEs
Asterisk now includes Min-SE in outbound INVITEs when the value is not
90 (the default) and session timers are not disabled. This has the
effect of Asterisk following RFC4028 more closely with regard to 422
responses and preventing situations in which Asterisk would be forced
to temporarily accept a call to tear it down based on a Session-Expires
below the locally configured Min-SE.
(issue SWP-5051)
Review: https://reviewboard.asterisk.org/r/2222/
Reported-by: Kinsey Moore
Patch-by: Kinsey Moore
........
Merged revisions 377946 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377947 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377948 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377966
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Rusty Newton [Wed, 12 Dec 2012 22:43:40 +0000 (22:43 +0000)]
Incremented EXTRA_SOUNDS_VERSION in sounds/Makefile to 1.4.12 for new Extra Sounds releases
See CHANGES-* files in English extra 1.4.12 tarballs for new sound prompts added.
(closes ASTERISK-20328)
Reported by: Matt Jordan
(closes AST-755)
Reported by: John Bigelow
........
Merged revisions 377922 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377923 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377924 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377925
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Michael L. Young [Wed, 12 Dec 2012 04:43:18 +0000 (04:43 +0000)]
Convert Dynamic Features Buffer To Use ast_str
Currently, the buffer for the dynamic features list is set to a fixed size of
128. If the list is bigger than that, it results in the dynamic feature(s) not
being recognized.
This patch changes the buffer from a fixed size to a dynamic one.
(closes issue ASTERISK-20680)
Reported by: Clod Patry
Tested by: Michael L. Young
Patches:
asterisk-20680-dynamic-features-v2.diff
uploaded by Michael L. Young (license 5026)
Review: https://reviewboard.asterisk.org/r/2221/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377915
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 12 Dec 2012 00:02:31 +0000 (00:02 +0000)]
Fix a potential deadlock in chan_sip during transfers.
The issue comes from the fact that transfers may perform
a redirecting update on a channel. The issue is that lock
inversion between the channel and its tech_pvt occurs since
the channel lock is released during the transfer process.
The fix is to move when the redirecting update occurs to a
place where neither the tech_pvt or the channel is locked so
that the two can be locked in the proper order.
(closes issue ASTERISK-20708)
reported by Mark Michelson
patches:
ASTERISK-20708-3.patch uploaded by Mark Michelson (License #5049)
Tested by:
Tim Ringenbach at Asteria Solutions Group
........
Merged revisions 377910 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377911
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 11 Dec 2012 22:42:11 +0000 (22:42 +0000)]
Add test events necessary for bridging tests to be able to properly run.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377906
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 11 Dec 2012 22:03:23 +0000 (22:03 +0000)]
Cleanup CLI commands on exit for several files.
(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
unregister-cli-multiple-all.patch (license #5909) patch uploaded by Corey Farrell
........
Merged revisions 377881 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377882 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377883 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377884
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 11 Dec 2012 21:53:06 +0000 (21:53 +0000)]
And remove svnmerge-integrated property.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377880
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 11 Dec 2012 21:47:53 +0000 (21:47 +0000)]
Remove automerge properties.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377878
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 11 Dec 2012 21:22:45 +0000 (21:22 +0000)]
Cleanup udptl on exit.
* Cleanup CLI commands on exit.
(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
udptl-shutdown-1_8-10.patch (license #5909) patch uploaded by Corey Farrell
udptl-shutdown-11-trunk.patch (license #5909) patch uploaded by Corey Farrell
Modified
........
Merged revisions 377847 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377848 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377849 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377867
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 11 Dec 2012 21:04:45 +0000 (21:04 +0000)]
Add UUID support to Asterisk.
This provides a common API for dealing with unique identifiers.
The API provides methods to create, parse, copy, and stringify UUIDs.
An accompanying unit test is provided that tests all operations.
(closes issue ASTERISK-20726)
reported by Matt Jordan
Review: https://reviewboard.asterisk.org/r/2217
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377846
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 11 Dec 2012 20:53:34 +0000 (20:53 +0000)]
Fix crash that can occur if CLI registration fails for an aliased command.
A recent memory leak fix in main/cli.c causes an ast_cli_entry's command
field to be freed and NULLed if ast_cli_register() fails. res_clialiases
was ignoring the return value of ast_cli_register() and was then passing
the NULL command off to a a hash function. This resulted in a crash.
The fix is not to ignore the erroneous return value. If ast_cli_register()
fails, then we do not continue trying to process the current alias.
........
Merged revisions 377840 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377842 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377843 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377844
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 11 Dec 2012 20:46:23 +0000 (20:46 +0000)]
Cleanup taskprocessor on exit.
* Cleanup CLI commands on exit.
(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
taskprocessor-cleanup-1_8-11-trunk.patch (license #5909) patch uploaded by Corey Farrell
taskprocessor-cleanup-10-only.patch (license #5909) patch uploaded by Corey Farrell
Modified
........
Merged revisions 377837 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377838 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377839 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377841
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 11 Dec 2012 20:05:32 +0000 (20:05 +0000)]
Cleanup pbx on exit.
* Cleanup CLI commands on exit.
* Unreference hints and statecbs containers on exit.
(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
pbx-cleanup-1_8.patch (license #5909) patch uploaded by Corey Farrell
pbx-cleanup-10.patch (license #5909) patch uploaded by Corey Farrell
pbx-cleanup-11-trunk.patch (license #5909) patch uploaded by Corey Farrell
Modified
........
Merged revisions 377806 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377807 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377808 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377809
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 11 Dec 2012 02:44:53 +0000 (02:44 +0000)]
Cleanup logger on exit.
* Cleanup CLI commands, destroy verbosers and logchannels lists on exit.
(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
logger-cleanup-all.patch (license #5909) patch uploaded by Corey Farrell
Modified
........
Merged revisions 377771 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377772 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377773 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377774
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 11 Dec 2012 02:13:37 +0000 (02:13 +0000)]
Cleanup indications on exit.
* Made ast_unregister_indication_country() unlink the found tone zone
before selecting a new default_tone_zone to make it impossible to select
the tone zone being unregistered again.
* Ringcadence is no longer parsed twice in store_config_tone_zone().
* Cleanup CLI commands and destroy default_tone_zone on exit.
(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
indications-cleanup-all.patch (license #5909) patch uploaded by Corey Farrell
Modified
........
Merged revisions 377740 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377741 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377742 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377743
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 11 Dec 2012 01:04:50 +0000 (01:04 +0000)]
Cleanup event on exit.
* Cleanup CLI commands on exit.
(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
event_shutdown-10-only.patch (license #5909) patch uploaded by Corey Farrell
event_shutdown-1_8-11-trunk.patch (license #5909) patch uploaded by Corey Farrell
........
Merged revisions 377708 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377709 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377710 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377711
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 11 Dec 2012 00:37:01 +0000 (00:37 +0000)]
Cleanup dnsmgr on exit.
* Cleanup dnsmgr thread and CLI commands on exit.
(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
dnsmgr-cleanup-1_8.patch (license #5909) patch uploaded by Corey Farrell
dnsmgr-cleanup-10-11-trunk.patch (license #5909) patch uploaded by Corey Farrell
Modified
........
Merged revisions 377704 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377705 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377706 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377707
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Mon, 10 Dec 2012 16:56:37 +0000 (16:56 +0000)]
Ensure ReceiveFax provides a CED tone via T.38
When using res_fax_digium, the T.38 CED tone was not being provided
properly which would cause some incoming faxes to fail. This was not an
issue with res_fax_spandsp since it does not strictly honor the
send_ced flag and sends the CED tone whenever receiving a T.38 fax.
(closes issue FAX-343)
Reported-by: Benjamin Tietz
Patch-by: Kinsey Moore
........
Merged revisions 377655 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377656 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377657 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377658
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Mon, 10 Dec 2012 14:45:52 +0000 (14:45 +0000)]
Handle Session-Expires less than local Min-SE in 200 OK
Ensure that a call is immediately torn down if a Session-Expires value
received in a 200 OK is less than the local Min-SE. This also prevents
Asterisk from allowing calls with Session-Expires below the
RFC4028-mandated minimum (90s).
(closes issue ASTERISK-20653)
Review: https://reviewboard.asterisk.org/r/2237/
Patch-by: Kinsey Moore
........
Merged revisions 377623 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377624 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377625 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377626
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Igor Goncharovskiy [Mon, 10 Dec 2012 07:03:48 +0000 (07:03 +0000)]
Add firmware information to CLI devices listing
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377595
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Igor Goncharovskiy [Mon, 10 Dec 2012 06:56:04 +0000 (06:56 +0000)]
Fix codec mismatch
Fix code to send in both rx and tx open stream messages correct codecs. Found that on phase 0/1 phones wrong codecs cause to no audio in some situations.
(issue ASTERISK-20183)
........
Merged revisions 377591 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377592 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377593 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377594
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Igor Goncharovskiy [Mon, 10 Dec 2012 05:29:04 +0000 (05:29 +0000)]
Remove trailing whitespaces in number from incoming redial list.
Reported by: Igor Olhovskiy
........
Merged revisions 377577 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377579
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 10 Dec 2012 01:41:50 +0000 (01:41 +0000)]
Improve documentation by making all of the colors used readable,
no matter what the background color is.
Dark blue on a black background is unreadable, as is yellow on a
light background. This patch turns on the bright attribute for
colors when on a dark background and turns *off* the bright
attribute when the -W command line option is used (indicating a
_light_ background). This ensures that text is readable in both
cases.
Patch by: tilghman
Review: https://reviewboard.asterisk.org/r/2224
........
Merged revisions 377509 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377510 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377511 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377512
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Mon, 10 Dec 2012 01:29:32 +0000 (01:29 +0000)]
Remove some dead code and additionally handle a case that wasn't handled.
........
Merged revisions 377487 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377504 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377505 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377506
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Sun, 9 Dec 2012 01:23:44 +0000 (01:23 +0000)]
Add missing support for "who hung up" to chan_motif.
(closes issue ASTERISK-20671)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2208/
........
Merged revisions 377462 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377463
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Sat, 8 Dec 2012 00:30:40 +0000 (00:30 +0000)]
Fix order of SIP allow/disallow in MySQL contrib script.
Using the contrib sippeers.sql script to create the sippeers MySQL table
would result in being unable to place calls if you set the disallow value
to all.
(closes issue ASTERISK-20756)
Reported by: Andre Luis
Patches:
sippeers.patch patch uploaded by Andre Luis
........
Merged revisions 377431 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377432 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377433 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377434
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Fri, 7 Dec 2012 23:45:15 +0000 (23:45 +0000)]
MALLOC_DEBUG: Only wait if we want atexit allocation dumps.
........
Merged revisions 377398 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377399 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377401 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377402
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Fri, 7 Dec 2012 22:08:48 +0000 (22:08 +0000)]
codec_dahdi: Fix output of "transcoder show" CLI command.
In r306010 "Asterisk media architecture conversion - no more format
bitfields", the logic for incrementing encoders and decoders when
opening transcoder channels was changed without making the corresponding
change when decrementing encoder / decoder channels. The result being
that when a channel was destroyed, codec_dahdi couldn't properly tell if
it was an encoder or decoder, and the default case is to assume it was a
decoder.
This could result in negative numbers for decoders in use like in:
VOIP6*CLI> transcoder show
2/-2 encoders/decoders of 92 channels are in use.
(closes issue ASTERISK-19921)
Patch-by: Shaun Ruffell
........
Merged revisions 377382 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377383 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377384
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Fri, 7 Dec 2012 00:00:39 +0000 (00:00 +0000)]
confbridge: Fix some resource leaks on conference teardown.
* Made destroy_conference_bridge() destroy a missed ast_mutex_t and ast_cond_t.
* Made join_conference_bridge() init the ast_mutex_t's and ast_cond_t so
destroy_conference_bridge() can destroy them unconditionally.
* Made join_conference_bridge() abort if the new conference could not be
added to the conferences container.
* Made leave_conference() discard any post-join actions if
join_conference_bridge() had to abort early.
* Made the join_conference_bridge() diagnostic messages better describe
what happened.
* Renamed leave_conference_bridge() to leave_conference() and made it only
take a conference user pointer. The conference pointer was redundant.
* Made conf_bridge_profile_copy() use struct copy instead of memcpy().
* No need to lock the conference in start_conf_record_thread() since all
of the callers already have it locked.
........
Merged revisions 377354 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377355 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377356
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 6 Dec 2012 17:29:13 +0000 (17:29 +0000)]
Recorded merge of revisions 377340 from svn.asterisk.org/svn/asterisk/branches/11
........
Add CLI tab completion to 'acl show'.
The 'acl show' CLI command allows you to show the details about a specific
named ACL in acl.conf. This patch adds tab completion to the command.
Review: https://reviewboard.asterisk.org/r/2230/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377341
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 6 Dec 2012 15:13:37 +0000 (15:13 +0000)]
Minor code cleanup in named_acl.c.
This patch makes a few little cleanups to named_acl.c. A couple non-public
functions were made static and an opening brace for a function was moved to
its own line, per the coding guidelines.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377330
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 6 Dec 2012 15:06:47 +0000 (15:06 +0000)]
Add CLI tab completion to 'acl show'.
The 'acl show' CLI command allows you to show the details about a specific
named ACL in acl.conf. This patch adds tab completion to the command.
Review: https://reviewboard.asterisk.org/r/2230/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377329
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Thu, 6 Dec 2012 14:26:13 +0000 (14:26 +0000)]
Fix memory leak in 'manager show event' when command entered incorrectly
When the CLI command 'manager show event' was run incorrectly and its usage
instructions returned, a reference to the event container was leaked. This
would prevent the container from being reclaimed when Asterisk exits. We now
properly decrement the count on the ao2 object using the nifty RAII_VAR macro.
Thanks to Russell for helping me stumble on this, and Terry for writing that
ridiculously helpful macro.
........
Merged revisions 377319 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377324
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Wed, 5 Dec 2012 17:17:06 +0000 (17:17 +0000)]
res_srtp: Fix a crash caused by srtp_dealloc on an already dealloced session
When srtp_create fails, the session may be dealloced or just not alloced. At
the same time though, the session pointer might not be set to NULL in this
process and attempting to srtp_dealloc it again will cause a segfault. This
patch checks for failure of srtp_create and sets the session pointer to NULL
if it fails.
(closes issue ASTERISK-20499)
Reported by: tootai
Review: https://reviewboard.asterisk.org/r/2228/
........
Merged revisions 377256 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377261 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377262 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377263
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Wed, 5 Dec 2012 16:51:58 +0000 (16:51 +0000)]
Fix a SIP request memory leak with TLS connections.
During the TLS re-work in chan_sip some TLS specific code was moved
into a separate function. This function operates on a copy of the
incoming SIP request. This copy was never deinitialized causing a
memory leak for each request processed.
This function is now given a SIP request structure which it can use
to copy the incoming request into. This reduces the amount of memory
allocations done since the internal allocated components are reused
between packets and also ensures the SIP request structure is
deinitialized when the TLS connection is torn down.
(closes issue ASTERISK-20763)
Reported by: deti
........
Merged revisions 377257 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377258 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377259 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377260
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Wed, 5 Dec 2012 02:23:10 +0000 (02:23 +0000)]
Remove init_framer(). It no longer does anything.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377246
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Wed, 5 Dec 2012 02:20:57 +0000 (02:20 +0000)]
Fix registering core show codecs/codec CLI commands twice.
........
Merged revisions 377241 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377244 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377245
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Wed, 5 Dec 2012 01:11:26 +0000 (01:11 +0000)]
confbridge: Fix several small issues.
* Made func_confbridge_helper() allow an empty value when setting options.
You previously could not Set(CONFBRIDGE(user,pin)=) and clear the
configured pin from the dialplan.
* Made func_confbridge_helper() handle its datastore better if multiple
threads attempt to set the first CONFBRIDGE option value on the channel.
* Made the func_confbridge_helper() only output one diagnostic message
concerning the option.
* Made the bridge video_mode able to repeatedly change in the config file
and CONFBRIDGE dialplan function. The video_mode option values are an
enum and not independent of each other.
* Made handle_cli_confbridge_show_bridge_profile() better handle the
video_mode option.
* Simplified datastore handling code in conf_find_user_profile() and
conf_find_bridge_profile().
(closes issue ASTERISK-20655)
Reported by: Birger "WIMPy" Harzenetter
........
Merged revisions 377227 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377228 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377229
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 4 Dec 2012 22:34:05 +0000 (22:34 +0000)]
confbridge: Update online XML documentation.
........
Merged revisions 377212 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377213 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377214
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Tue, 4 Dec 2012 13:01:23 +0000 (13:01 +0000)]
Add libuuid to install_prereq for Fedora.
I ran this script and my build failed. pjproject requires this.
........
Merged revisions 377195 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377196
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Mon, 3 Dec 2012 23:00:08 +0000 (23:00 +0000)]
Cleanup ast_run_atexits() atexits list.
* Convert atexits list to a mutex instead of a rd/wr lock. The lock is
only write locked.
* Move CLI verbose Asterisk ending message to where AMI message is output
in really_quit() to avoid further surprises about using stuff already
shutdown.
(issue ASTERISK-20649)
Reported by: Corey Farrell
........
Merged revisions 377165 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377166 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377167 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377168
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Mon, 3 Dec 2012 20:46:11 +0000 (20:46 +0000)]
Cleanup core main on exit.
* Cleanup time zones on exit.
* Make exit clean/unclean report consistent for AMI and CLI in
really_quit().
(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
core-cleanup-1_8-10.patch (license #5909) patch uploaded by Corey Farrell
core-cleanup-11-trunk.patch (license #5909) patch uploaded by Corey Farrell
Modified
........
Merged revisions 377135 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377136 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377137 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377138
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Mon, 3 Dec 2012 19:33:06 +0000 (19:33 +0000)]
Cleanup config cache on exit.
(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
config-cleanup-all.patch (license #5909) patch uploaded by Corey Farrell
........
Merged revisions 377104 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377105 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377106 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377107
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Mon, 3 Dec 2012 19:17:24 +0000 (19:17 +0000)]
Cleanup CLI resources on exit and CLI command registration errors.
(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
cli-leaks-1_8-10.patch (license #5909) patch uploaded by Corey Farrell
cli-leaks-11-trunk.patch (license #5909) patch uploaded by Corey Farrell
Modified
........
Merged revisions 377073 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377074 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377075 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377077
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Mon, 3 Dec 2012 18:45:18 +0000 (18:45 +0000)]
Cleanup CDR resources on exit.
* Simplify do_reload() return handling since it never returned anything
other than 0.
(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
cdr-cleanup-1_8.patch (license #5909) patch uploaded by Corey Farrell
cdr-cleanup-10-11-trunk.patch (license #5909) patch uploaded by Corey Farrell
Modified
........
Merged revisions 377069 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377070 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377071 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377072
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Mon, 3 Dec 2012 17:10:40 +0000 (17:10 +0000)]
Fix CCSS CLI commands and logger level not unregistered.
(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
ccss-cleanup-all.patch (license #5909) patch uploaded by Corey Farrell
........
Merged revisions 377037 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377038 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377039 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377040
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 3 Dec 2012 16:45:49 +0000 (16:45 +0000)]
Formatting fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377035
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 3 Dec 2012 14:56:36 +0000 (14:56 +0000)]
Fix an RTP instance reference count leak in chan_motif.
When setting up an RTP instance the RTCP portion of the instance
keeps a reference to the instance itself. In order to release this
reference and stop RTCP the stop API call must be called before
destroying the instance.
(closes issue ASTERISK-20751)
Reported by: joshoa
........
Merged revisions 377021 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377022
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 3 Dec 2012 14:46:02 +0000 (14:46 +0000)]
Move functions to AFTER the block of forward declarations of functions.
It was a mess. The first part of chan_sip.c is constants, declarations, structures and stuff,
then forward declarations and then actual code. It's still a mess, but a bit less messy ;-)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377018
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 3 Dec 2012 09:35:55 +0000 (09:35 +0000)]
Formatting changes
Found a large amount of missing {} in the code before patching in another branch
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@376998
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Sat, 1 Dec 2012 00:47:42 +0000 (00:47 +0000)]
Tweak extension used for incoming calls received on Motif.
Based on feedback from numerous individuals this patch tweaks incoming calls
to first look for an extension with the name of the endpoint. If no such extension
exists the call will silently fall back to the "s" extension as it previously
did.
........
Merged revisions 376983 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@376984
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Fri, 30 Nov 2012 21:38:01 +0000 (21:38 +0000)]
chan_misdn: Fix sending RELEASE_COMPLETE in response to SETUP.
Fix sending a RELEASE_COMPLETE in response to a SETUP if chan_misdn does
not have a B channel available to assign to the call.
(closes issue ABE-2869)
Reported by: Guenther Kelleter
Patches:
setup-reject_2.diff (license #6372) patch uploaded by Guenther Kelleter
Modified
........
Merged revision 376949 from https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier
........
Merged revisions 376950 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 376951 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 376952 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@376953
65c4cc65-6c06-0410-ace0-
fbb531ad65f3