Michael L. Young [Mon, 5 Aug 2013 20:20:41 +0000 (20:20 +0000)]
Fix Registration Failure When A Peer And TLS Are Used
If a peer is used in a register line and TLS is defined as the transport, the
registration fails since the transport on the dialog is never set properly
resulting in UDP being used instead of TLS.
This patch sets the dialog's transport based on the transport that was defined
in the register line. If the register line does not specify a transport, the
parsing function for the register line always defaults back to UDP.
(closes issue ASTERISK-21964)
Reported by: Doug Bailey
Tested by: Doug Bailey
Patches:
asterisk-21964-set-reg-dialog-transport.diff
by Michael L. Young (license 5026)
........
Merged revisions 396240 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 396248 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396253
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Mon, 5 Aug 2013 20:18:54 +0000 (20:18 +0000)]
bridge features: Dial and Queue add features instead of replace them.
Dial and Queue would previously apply a new set of features whenever
bridging. These options would be based purely on the options supplied
to the dial/queue applications. This patch changes the function those
applications use to bridge calls so that the features will be added
to the set of existing features for each channel rather than having
them override the existing features.
(closes issue ASTERISK-22209)
Reported by: Jonathan Rose
Review: https://reviewboard.asterisk.org/r/2713/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396245
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Mon, 5 Aug 2013 19:01:45 +0000 (19:01 +0000)]
Add AMI registration events for PJSIP outbound registration attempts
This patch adds AMI events whenever an outbound registration attempt succeeds
or fails from res_pjsip_outbound_registration. This brings it inline with
the existing SIP channel driver and IAX channel driver.
Review: https://reviewboard.asterisk.org/r/2729/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396201
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Michael L. Young [Mon, 5 Aug 2013 18:52:22 +0000 (18:52 +0000)]
Change "from" to "From".
(related to issue ASTERISK-21903)
........
Merged revisions 396199 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396200
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Michael L. Young [Mon, 5 Aug 2013 18:46:57 +0000 (18:46 +0000)]
Adding a note to UPGRADE.txt about a change made to res_agi in order to
indicate when streaming an audio file fails like it is done in other parts
of the code to indicate an error.
Note was requested by Paul Belanger:
http://lists.digium.com/pipermail/asterisk-dev/2013-July/061420.html
(related to issue ASTERISK-21903)
........
Merged revisions 396196 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 396197 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396198
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Mon, 5 Aug 2013 17:48:03 +0000 (17:48 +0000)]
bridge_holding: Add suspsend/unsuspend callbacks
Suspend and unsuspend callbacks are added to the holding bridge so
that entertainment can be disabled and re-enabled when operations
would suspend a channel on the bridge (such as playback operations).
This fixes entertainment so that when those operations end, the
entertainment can pick back up and it also serves as an optimization.
Also, this patch fixes a bug caused by triggering ringing frames
immediately instead of pushing them to the queue which created a race
condition where sometimes parking with ringing during attended
transfers would cause the ringing to be interrupted by an unhold
frame.
(closes issue ASTERISK-22006)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2711/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396189
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Mon, 5 Aug 2013 16:59:13 +0000 (16:59 +0000)]
ARI: bridges/{bridgeID}/addChannel: add roles parameter
Roles are now cleared with each entry into a bridge with addChannel.
If the roles parameter is present, the role specified will be applied
to all channels being added with the addChannel command.
(closes issue ASTERISK-21973)
Reported by: Matt Jordan
https://reviewboard.asterisk.org/r/2691/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396182
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Mon, 5 Aug 2013 16:00:01 +0000 (16:00 +0000)]
res_parking: Unit tests
Adds the following unit tests:
* create_lot: tests adding and removal of a new parking lot (baseline)
* park_extensions: creates a parking lot that registers extensions and
then confirms that all of the expected extensions exist
* extensions_conflicts: creates numerous parking lots to test that
extension conflicts in parking lots result in parking lot
creation failing
* dynamic_parking_variables: Tests that the creation of dynamic
parking lots respects the related channel variables set on the
channel that requests them.
* park_call: Tests adding a channel to a parking lot's holding bridge
by standard parking functions.
* retrieve_call: Tests pulling a channel out of a parking lot's
holding bridge via parked call retrieval functions.
(closes issue ASTERISK-22138)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2714/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396175
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Mon, 5 Aug 2013 14:35:00 +0000 (14:35 +0000)]
Fix res_ari_asterisk load issue
The new res_ari_asterisk.so module presents several config options
from asterisk main. Unfortunately, they aren't exported, so the module
won't load on Linux.
This patch renames the variables, adding the ast_ prefix so they will
be exported.
Review: https://reviewboard.asterisk.org/r/2737
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396166
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Sat, 3 Aug 2013 03:53:46 +0000 (03:53 +0000)]
Don't unsubscribe from the AMI message router from manager_bridges
The AMI message router is owned wholly by manager.c. Previously, each of the
manager_{item} source files had their own message router and they unsubscribed
from each; once they moved over to using a single message router only a single
unsubscribe became necessary.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396158
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 2 Aug 2013 17:50:40 +0000 (17:50 +0000)]
And get rid of another ast_bridged_channel()
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396145
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Fri, 2 Aug 2013 17:29:52 +0000 (17:29 +0000)]
Clean up ast_json with ast_json_unref
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396143
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Fri, 2 Aug 2013 16:59:15 +0000 (16:59 +0000)]
Removed svnmerge-integrated from trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396136
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 2 Aug 2013 15:01:37 +0000 (15:01 +0000)]
Get the SNMP code to compile.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396126
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Fri, 2 Aug 2013 14:46:21 +0000 (14:46 +0000)]
ARI - GET /ari/asterisk/info
This patch adds basic system information access to ARI.
The results are roughly what you get from 'core show settings', with a
few minor differences.
* Data is structured, with 'build', 'system', 'config' and 'status'
sub-objects.
* Each sub-object is selectable, using the ?only= parameter. A comma
separated list can be provided to select multiple sections.
* A few config options are numeric, for which 0 means 'unlimited'.
Instead of having a special interpretation of those fields, they
are simply omitted if they're 0.
* The information is limited to what might be useful to building
external applications.
(closes issue ASTERISK-21575)
Review: https://reviewboard.asterisk.org/r/2702/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396125
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Fri, 2 Aug 2013 14:36:32 +0000 (14:36 +0000)]
ARI - implement allowMultiple for parameters
Swagger allows parameters to be specified as 'allowMultiple', meaning
that the parameter may be specified as a comma separated list of
values.
I had written some of the API docs using that, but promptly forgot
about implementing it. This patch finally fills in that gap.
The codegen template was updated to represent 'allowMultiple' fields
as array/size fields in the _args structs. It also parses the comma
separated list using ast_app_separate_args(), so quoted strings in the
argument will be handled properly.
Review: https://reviewboard.asterisk.org/r/2698/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396122
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Fri, 2 Aug 2013 14:27:35 +0000 (14:27 +0000)]
Address JSON thread safety issues.
In tracking down some unit tests failures, I ended up reading the fine
print[1] regarding Jansson's thread safety.
In short:
1. Ref-counting is non-atomic.
2. json_dumps() and friends are not thread safe.
This patch adds locking where necessary to our ast_json_* wrapper API,
with documentation in json.h describing the thread safety limitations of
the API.
[1]: http://www.digip.org/jansson/doc/2.4/portability.html#thread-safety
Review: https://reviewboard.asterisk.org/r/2716/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396119
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 2 Aug 2013 14:13:04 +0000 (14:13 +0000)]
Make a couple of changes to help AMI events to be more clear in what is occurring.
* BridgeEnter now contains the unique ID of the channel that is to be swapped out, if applicable.
* There is a ParkedCallSwap event that is sent when a parked channel has a new channel take its place.
(closes issue ASTERISK-22193)
reported by Mark Michelson
Review: https://reviewboard.asterisk.org/r/2712
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396107
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Fri, 2 Aug 2013 14:08:34 +0000 (14:08 +0000)]
Move ast_str_container_alloc and friends
This moves ast_str_container_alloc, ast_str_container_add,
ast_str_container_remove, and related private functions into
strings.c/h since they really don't belong in astobj2.c/h.
As a result of this move, utils also had to be updated.
Review: https://reviewboard.asterisk.org/r/2719/
(closes issue ASTERISK-22041)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396105
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 2 Aug 2013 14:05:07 +0000 (14:05 +0000)]
Get rid of ast_bridged_channel() and the bridged_channel field on ast_channels.
This commit is smaller than the initial review placed on review board. This is because
a change to allow for channel drivers to access parking functionality externally was
committed and invalidated quite a few of the changes initially made.
(closes issue ASTERISK-22039)
reported by Matt Jordan
Review: https://reviewboard.asterisk.org/r/2717
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396103
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 2 Aug 2013 13:54:31 +0000 (13:54 +0000)]
Make sure that pickup.h does not use an include guard name used elsewhere.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396102
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Fri, 2 Aug 2013 13:29:01 +0000 (13:29 +0000)]
Correct the last of the Newchannel xi:includes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396099
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Fri, 2 Aug 2013 12:40:03 +0000 (12:40 +0000)]
Add CLI/AMI commands to force chan_pjsip actions
For chan_pjsip, this introduces CLI/AMI remote unregistration commands,
reworks CLI syntax for sending NOTIFYs, adds AMI qualification support,
and adds documentation for PJSIPNotify.
This also fixes two refcounting bugs in the outbound registration code.
Review: https://reviewboard.asterisk.org/r/2695/
(closes issue ASTERISK-21939)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396087
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Fri, 2 Aug 2013 04:48:12 +0000 (04:48 +0000)]
Fixed chan_dahdi compilation failure
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396075
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Fri, 2 Aug 2013 03:12:38 +0000 (03:12 +0000)]
Fix test modules
More missing include files. :-\
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396062
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Fri, 2 Aug 2013 02:51:33 +0000 (02:51 +0000)]
Add pickup.h include lines for chan_dahdi and chan_mgcp
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396061
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Fri, 2 Aug 2013 02:32:44 +0000 (02:32 +0000)]
Remove dead code from features.c; refactor pickup code into pickup.c
This patch does the following:
* It moves the pickup code out of features.c and into pickup.c
* It removes the vast majority of dead code out of features.c. In particular,
this includes the parking code.
(issue ASTERISK-22134)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396060
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 1 Aug 2013 23:38:00 +0000 (23:38 +0000)]
Fix a crash due to performing full URI validation on a contact which only contains '*'.
(closes issue AST-1198)
Reported by: John Bigelow
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396048
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Thu, 1 Aug 2013 21:19:27 +0000 (21:19 +0000)]
Fix sorcery for some rather picky regex implementations.
Some regex implementations won't compile an empty string. Assuming that
it's equivalent of a regex that will match anything, use ".?" instead.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396035
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Thu, 1 Aug 2013 20:55:17 +0000 (20:55 +0000)]
Support externally initiated parking requests; remove some dead code
This patch does the following:
* It adds support for externally initiated parking requests. In particular,
chan_skinny has a protocol level message that initiates a call park.
This patch now supports that option, as well as the protocol specific
mechanisms in chan_dahdi/sig_analog and chan_mgcp.
* A parking bridge features virtual table has been added that provides
access to the parking functionality that the Bridging API needs. This
includes requests to park an entire 'call' (with little or no additional
information, thank you chan_skinny), perform a blind transfer to a parking
extension, determine if an extension is a parking extension, as well as the
actual "do the parking" request from the Bridging API.
* Refactoring in chan_mgcp, chan_skinny, and chan_dahdi to make use of the new
functions
* The removal of some - but not all - dead parking code from features.c
This also fixed blind transferring a multi-party bridge to a parking lot (which
was implemented, but had at least one code path where using the parking features
kK might not have worked)
Review: https://reviewboard.asterisk.org/r/2710
(closes issue ASTERISK-22134)
Reported by: Matt Jordan
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396028
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Thu, 1 Aug 2013 19:11:46 +0000 (19:11 +0000)]
Add queue member paused hints
This patch adds the ability in Queue to raise a hint when a member's paused
state changes. The hint uses the form 'Queue:{queue_name}_pause_{member_name}',
where {queue_name} and {member_name} are the name of the queue and the name
of the member to subscribe to, respectively.
For example: exten => 8501,hint,Queue:sales_pause_mark.
Members will show as In Use when paused.
Note that the format of the queue pause hint was changed slightly from what
is on the issue to accomodate suggestion on the code review.
Review: https://reviewboard.asterisk.org/r/2254
(closes issue ASTERISK-20842)
Reported by: Philippe Lindheimer
patches:
qpause-10-378206.diff uploaded by Philippe Lindheimer (license 5519)
qpause-11-378206.diff uploaded by Philippe Lindheimer (license 5519)
qpause-trunk-378206.diff uploaded by Philippe Lindheimer (license 5519)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396010
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Thu, 1 Aug 2013 17:23:10 +0000 (17:23 +0000)]
Regenerate configure for configure.ac changes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395998
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Thu, 1 Aug 2013 17:07:52 +0000 (17:07 +0000)]
Fix documentation replication issues
This prevents XML documentation duplication by expanding channel and
bridge snapshot tags into channel and bridge snapshot parameter sets
with a given prefix or defaulting to no prefix. This also prevents
documentation from becoming fractured and out of date by keeping all
variations of the documentation in template form such that it only
needs to be updated once and keeps maintenance to a minimum.
Review: https://reviewboard.asterisk.org/r/2708/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395985
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Thu, 1 Aug 2013 16:56:51 +0000 (16:56 +0000)]
Fixed warning in astman for gcc-4.8.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395984
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Thu, 1 Aug 2013 15:31:03 +0000 (15:31 +0000)]
Fixed compile errors introduced in r395954.
Just a merge error due to a file rename. Grrr...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395971
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Thu, 1 Aug 2013 13:49:34 +0000 (13:49 +0000)]
Split caching out from the stasis_caching_topic.
In working with res_stasis, I discovered a significant limitation to
the current structure of stasis_caching_topics: you cannot subscribe
to cache updates for a single channel/bridge/endpoint/etc.
To address this, this patch splits the cache away from the
stasis_caching_topic, making it a first class object. The stasis_cache
object is shared amongst individual stasis_caching_topics that are
created per channel/endpoint/etc. These are still forwarded to global
whatever_all_cached topics, so their use from most of the code does
not change.
In making these changes, I noticed that we frequently used a similar
pattern for bridges, endpoints and channels:
single_topic ----------------> all_topic
^
|
single_topic_cached ----+----> all_topic_cached
|
+----> cache
This pattern was extracted as the 'Stasis Caching Pattern', defined in
stasis_caching_pattern.h. This avoids a lot of duplicate code between
the different domain objects.
Since the cache is now disassociated from its upstream caching topics,
this also necessitated a change to how the 'guaranteed' flag worked
for retrieving from a cache. The code for handling the caching
guarantee was extracted into a 'stasis_topic_wait' function, which
works for any stasis_topic.
(closes issue ASTERISK-22002)
Review: https://reviewboard.asterisk.org/r/2672/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395954
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 1 Aug 2013 11:21:28 +0000 (11:21 +0000)]
Answer with multiple codecs if the underlying pjproject supports it.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395938
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Thu, 1 Aug 2013 00:07:59 +0000 (00:07 +0000)]
Raise Registry AMI events on registration failures
This patch makes it so that all registration attempts that fail that
also permanently modify the registration state will raise an appropriate
AMI event.
Note that this patch was forward ported to trunk and the Stasis Core
message bus by mjordan.
(closes issue ASTERISK-21368)
Reported by: Dmitriy Serov
patches:
chan_sip.c.diff uploaded by Demon (license 6479)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395907
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Wed, 31 Jul 2013 23:48:35 +0000 (23:48 +0000)]
Update CONTROL STREAM FILE to accept an 'offsetms' parameter
This patch allows starting playback of audio through the CONTROL STREAM FILE
AGI command to start at a particular offset. It will also return the final
position of the file in the 'endpos' attribute.
(closes issue ASTERISK-17803)
Reported by: Murray Melvin
patches:
res_agi.c.r316293.diff uploaded by murraytm (license 6221)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395906
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 31 Jul 2013 15:43:43 +0000 (15:43 +0000)]
Found another missed "sip" -> "pjsip" CLI command.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395884
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Wed, 31 Jul 2013 15:27:29 +0000 (15:27 +0000)]
Disable CEL tests that need rearchitecting to operate properly
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395881
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Wed, 31 Jul 2013 14:45:58 +0000 (14:45 +0000)]
Remove "constant" endpoint identifier.
This was created as a debugging tool before proper endpoint identifiers
were created. Using it now can actually lead to harmful results.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395868
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Wed, 31 Jul 2013 14:29:11 +0000 (14:29 +0000)]
Fix hold/unhold in bridge_native_rtp, use tech_pvt instead of bridge_pvt, reduce bridging attempts, and fix breaking native RTP bridges.
(closes issue ASTERISK-22128)
(closes issue ASTERISK-22104)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395866
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Wed, 31 Jul 2013 13:31:55 +0000 (13:31 +0000)]
Fix remnants of the pjsip renaming
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395851
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Wed, 31 Jul 2013 03:49:44 +0000 (03:49 +0000)]
Enforce conference exit order for CEL tests
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395837
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 30 Jul 2013 22:41:05 +0000 (22:41 +0000)]
Missed a conversion to pjsip.conf in documentation and sorcery.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395824
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 30 Jul 2013 21:43:29 +0000 (21:43 +0000)]
Remove ast_bridged_channel call from abstract_jb.c
Interestingly, this only happens in dead code.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395810
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Tue, 30 Jul 2013 20:44:10 +0000 (20:44 +0000)]
Setting svn:ignore for res/res_pjsip
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395793
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 30 Jul 2013 19:10:30 +0000 (19:10 +0000)]
Update res_pjsip_endpoint_identifier_constant.c to use reorganized endpoint structure.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395779
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 30 Jul 2013 18:14:50 +0000 (18:14 +0000)]
The large GULP->PJSIP renaming effort.
The general gist is to have a clear boundary between old SIP stuff
and new SIP stuff by having the word "SIP" for old stuff and "PJSIP"
for new stuff. Here's a brief rundown of the changes:
* The word "Gulp" in dialstrings, functions, and CLI commands is now
"PJSIP"
* chan_gulp.c is now chan_pjsip.c
* Function names in chan_gulp.c that were "gulp_*" are now "chan_pjsip_*"
* All files that were "res_sip*" are now "res_pjsip*"
* The "res_sip" directory is now "res_pjsip"
* Files in the "res_pjsip" directory that began with "sip_*" are now "pjsip_*"
* The configuration file is now "pjsip.conf" instead of "res_sip.conf"
* The module info for all PJSIP-related files now uses "PJSIP" instead of "SIP"
* CLI and AMI commands created by Asterisk's PJSIP modules now have "pjsip" as
the starting word instead of "sip"
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395764
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 30 Jul 2013 15:17:56 +0000 (15:17 +0000)]
Reorganize the ast_sip_endpoint structure into substructures.
(closes issue ASTERISK-22135)
reported by Matt Jordan
Review: https://reviewboard.asterisk.org/r/2707
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395748
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 30 Jul 2013 14:16:41 +0000 (14:16 +0000)]
Add support for T.38 fax to chan_pjsip.
Review: https://reviewboard.asterisk.org/r/2692/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395731
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Tue, 30 Jul 2013 13:46:16 +0000 (13:46 +0000)]
Fix compilation on gcc 4.8.1
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395728
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Mon, 29 Jul 2013 17:51:25 +0000 (17:51 +0000)]
Removed quotes from svn:keywords props on a few files.
Subversion doesn't do quote processing, so it actually thinks that the
closing quote in 'Revision"' is a part of the keyword.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395686
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 29 Jul 2013 16:16:33 +0000 (16:16 +0000)]
Clarify documentation for trust of identification.
(closes issue ASTERISK-22023)
Reported by Rusty Newton
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395674
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Mon, 29 Jul 2013 15:58:52 +0000 (15:58 +0000)]
Put the include in there
Mea culpa...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395673
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Mon, 29 Jul 2013 15:57:44 +0000 (15:57 +0000)]
When performing a reload, reload the new features_config and not the old
Performing a module reload of core components causes specific functions
compiled into the Asterisk binary to be reloaded. The table of said functions
was still pointing to the old features reload mechanism, and not the new one.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395672
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Mon, 29 Jul 2013 14:51:00 +0000 (14:51 +0000)]
Clean up and improve test_cel
Improve reliability of attended transfer merge and link tests.
Stop using ast_log(LOG_ERROR, ...); in favor of ast_test_status_update
Remove fred and eve channel helpers since they are not necessary
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395653
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Mon, 29 Jul 2013 14:08:42 +0000 (14:08 +0000)]
Set svn:ignore in res/ari directory
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395636
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Mon, 29 Jul 2013 12:10:10 +0000 (12:10 +0000)]
Remove comment that no longer applies
The monitor thread is already properly torn down on unload and load
failure.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395619
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Sat, 27 Jul 2013 23:11:02 +0000 (23:11 +0000)]
Rename everything Stasis-HTTP to ARI
This renames all files and API calls from several variants of
Stasis-HTTP to ARI including:
* Stasis-HTTP -> ARI
* STASIS_HTTP -> ARI
* stasis_http -> ari (ast_ari for global symbols, file names as well)
* stasis http -> ARI
Review: https://reviewboard.asterisk.org/r/2706/
(closes issue ASTERISK-22136)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395603
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Sat, 27 Jul 2013 04:05:03 +0000 (04:05 +0000)]
Improve reliability of bridge merge CEL test
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395588
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Fri, 26 Jul 2013 21:34:23 +0000 (21:34 +0000)]
Remove the unsafe bridge parameter from ast_bridge_hook_callback's.
Most hook callbacks did not need the bridge parameter. The pointer value
could become invalid if the channel is moved to another bridge while it is
executing.
* Fixed some issues in feature_attended_transfer() as a result.
* Reduce the bridge inhibit count in
attended_transfer_properties_shutdown() after it has restored the bridge
channel hooks.
* Removed basic bridge requirement on feature_blind_transfer(). It does
not require the basic bridge like feature_attended_transfer().
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395574
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Fri, 26 Jul 2013 21:10:24 +0000 (21:10 +0000)]
Improved feature limits interval hook implementaion.
* Fixed feature limits to not use special members of struct
ast_bridge_features.
* Fixed memory leak in off nominal paths of bridge_builtin_set_limits().
* Fixed off nominal path in ast_bridge_features_limits_construct() freeing
unallocated memory if it was not called by bridge_builtin_set_limits().
* Made bridge_builtin_interval_features.so unloadable.
* Simplified parking's use of its duration interval hook.
* Made BridgeWait S option not depend upon another module being loaded.
(closes issue ASTERISK-22107)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2701/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395559
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Fri, 26 Jul 2013 17:42:08 +0000 (17:42 +0000)]
Fix /stasis/res/app_replaced unit test.
A typo in recent changes caused the JSON ApplicationReplaced message to
fail to build, so the message wasn't being sent out the WebSocket.
Related, the replaced application would also unregister itself when it
disconnected, which would actually unregister the new application. This
was also fixed.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395527
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Fri, 26 Jul 2013 16:34:56 +0000 (16:34 +0000)]
Add name argument to BridgeWait() so multiple holding bridges may be used
Changes arguments for BridgeWait from BridgeWait(role, options) to
BridgeWait(bridge_name, role, options). Now multiple holding bridges may
be created and referenced by this application.
(closes issue ASTERISK-21922)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2642/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395509
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Fri, 26 Jul 2013 00:03:13 +0000 (00:03 +0000)]
Remove some unnecessary parentheses.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395477
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Thu, 25 Jul 2013 21:39:49 +0000 (21:39 +0000)]
Revision
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395466
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 25 Jul 2013 20:54:17 +0000 (20:54 +0000)]
Fix crash due to trying to send a re-invite while in the incorrect state.
This crash would occur if a re-invite was queued while the initial INVITE
transaction was still occurring and the response to the INVITE was not ACKed.
This lack of ACK would cause the INVITE session state to never reach confirmed.
Once the transaction terminated, however, the queued re-invite would occur and
cause a crash due to this lack of state change.
This fix checks the INVITE session state before performing the re-invite to
ensure it is in the required confirmed state.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395455
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 25 Jul 2013 19:18:42 +0000 (19:18 +0000)]
Change the default value for "allowsubscribe" to yes to match chan_sip.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395439
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Thu, 25 Jul 2013 18:27:10 +0000 (18:27 +0000)]
Restore bridging files history.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395430
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Thu, 25 Jul 2013 15:29:55 +0000 (15:29 +0000)]
Remove some dead parking call
Since nothing is using these global parking functions, remove them!
The first of many.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395410
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Thu, 25 Jul 2013 14:34:09 +0000 (14:34 +0000)]
Remove dead bridging code from features
This removes the previously #if 0'd code. The functionality removed has either
been subsumed by the Bridging API or is no longer applicable.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395400
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Thu, 25 Jul 2013 04:18:05 +0000 (04:18 +0000)]
Fix incorrect reference to stasis/bridging.h
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395381
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Thu, 25 Jul 2013 04:06:32 +0000 (04:06 +0000)]
A great big renaming patch
This patch renames the bridging* files to bridge*. This may seem pedantic
and silly, but it fits better in line with current Asterisk naming conventions:
* channel is not "channeling"
* monitor is not "monitoring"
etc.
A bridge is an object. It is a first class citizen in Asterisk. "Bridging" is
the act of using a bridge on a set of channels - and the API that fulfills that
role is more than just the action.
(closes issue ASTERISK-22130)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395378
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Thu, 25 Jul 2013 02:20:23 +0000 (02:20 +0000)]
Move after bridge callbacks into their own file
One more major refactoring to go.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395367
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 25 Jul 2013 00:44:24 +0000 (00:44 +0000)]
Improve initial INVITE handling and fix crash due to rapidly arriving CANCEL.
(closes issue ASTERISK-22150)
Review: https://reviewboard.asterisk.org/r/2696/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395351
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Wed, 24 Jul 2013 23:40:12 +0000 (23:40 +0000)]
Simplify interval hooks since there is only one bridge threading model now.
* Convert interval timers to use the ast_waitfor_nandfds() timeout.
* Remove bridge channel action for intervals. Now the main loop handles
running interval hooks.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395340
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Wed, 24 Jul 2013 21:13:00 +0000 (21:13 +0000)]
Refactor ast_bridge_features struct.
* Reduced the number of hook containers to just dtmf_hooks,
interval_hooks, and other_hooks. As a result, several functions dealing
with the different hook containers could be combined.
* Extended the generic hook struct for DTMF and interval hooks instead of
using a variant record.
* Merged the special talk detector hook into the other_hooks container.
* Replaced ast_bridge_features_set_talk_detector() with
ast_bridge_talk_detector_hook().
(issue ASTERISK-22107)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395322
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Wed, 24 Jul 2013 20:28:59 +0000 (20:28 +0000)]
* Refactor setup_bridge_features_builtin().
* Add an error message so you know when a feature is not available and you
tried to use it. It usually means the module has not been loaded.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395316
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Wed, 24 Jul 2013 19:32:23 +0000 (19:32 +0000)]
Export exports.in as well
Because is is rather needed.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395298
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Wed, 24 Jul 2013 19:24:09 +0000 (19:24 +0000)]
Update bridge_channel refactorings; export bridge_ symbol
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395295
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Wed, 24 Jul 2013 18:51:06 +0000 (18:51 +0000)]
Add pjproject to install_prereq.
Also fixes spacing, in passing.
(closes issue ASTERISK-22131)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395283
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Wed, 24 Jul 2013 18:08:19 +0000 (18:08 +0000)]
Tweak another magic number
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395271
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Wed, 24 Jul 2013 17:49:56 +0000 (17:49 +0000)]
Make AMI BridgeInfo action more verbose
Ensure that the BridgeInfo command provides adequate state information
about channels by publishing the full channel snapshot for
BridgeInfoChannel subevents. This prevents a two-stage lookup since
most consumers will be keying on channel names instead of uniqueids.
(closes issue ASTERISK-22140)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395270
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Wed, 24 Jul 2013 17:33:45 +0000 (17:33 +0000)]
Tweak a magic number
(closes issue ASTERISK-22146)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395267
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Wed, 24 Jul 2013 16:01:20 +0000 (16:01 +0000)]
Add missing end-of-file line terminators.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395255
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Wed, 24 Jul 2013 15:50:51 +0000 (15:50 +0000)]
Add missing line terminator to debug message.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395254
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Wed, 24 Jul 2013 15:38:18 +0000 (15:38 +0000)]
Perform the initial renaming of the Bridging API
This patch does the following:
* It pulls out bridge_channel and puts it into its own translation unit
* It adds public and protected headers for bridging_channel. Protected
functions are appropriate only for the Bridging API and sub-classes of a
bridge.
(issue ASTERISK-22130)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395253
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Wed, 24 Jul 2013 14:35:03 +0000 (14:35 +0000)]
Let the compiler do more type checking with bridge hook callbacks.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395243
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 23 Jul 2013 22:32:39 +0000 (22:32 +0000)]
Fix a check in bridge_native_rtp which determined if attaching the framehook failed or not.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395227
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Tue, 23 Jul 2013 21:32:33 +0000 (21:32 +0000)]
func_channel: dtmf_features setting
Allows reading andsetting dtmf features via a channel function
CHANNEL(dtmf_features)
(closes issue ASTERISK-21876)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2648/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395215
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 23 Jul 2013 21:14:24 +0000 (21:14 +0000)]
Add some debug messages to make it clear what RTP bridging functionality is in use.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395205
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 23 Jul 2013 21:01:06 +0000 (21:01 +0000)]
Fix some logic so native RTP bridge will occur when monitor, audiohooks, or framehooks are not present.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395203
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 23 Jul 2013 19:14:44 +0000 (19:14 +0000)]
Pull softmix bridge parameters into a sub structure.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395188
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 23 Jul 2013 18:41:29 +0000 (18:41 +0000)]
Drop the reference count on the correct object.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395183
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 23 Jul 2013 18:41:18 +0000 (18:41 +0000)]
Reinclude sys/stat.h in chan_dahdi.c and remove redundant include in utils.c
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395182
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 23 Jul 2013 16:26:36 +0000 (16:26 +0000)]
Some chan_dahdi protected function renaming.
analog_lib_handles --> dahdi_analog_lib_handles
enable_dtmf_detect --> dahdi_dtmf_detect_enable
disable_dtmf_detect --> dahdi_dtmf_detect_disable
dahdi_enable_ec --> dahdi_ec_enable
dahdi_disable_ec --> dahdi_ec_disable
update_conf --> dahdi_conf_update
dahdi_link --> dahdi_master_slave_link
dahdi_unlink --> dahdi_master_slave_unlink
(closes issue ASTERISK-22129)
Reported by: rmudgett
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395167
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 23 Jul 2013 15:59:32 +0000 (15:59 +0000)]
Restore chan_dahdi native bridging and PRI tromboned call elimination.
Created a native_dahdi bridging technology for use with the new bridging
API.
The new bridging technology is part of the chan_dahdi channel driver
because it is very specific to that driver. Rather than include the new
code directly into chan_dahdi.c the new bridge technology is in its own
file and linked into chan_dahdi.so. A large part of this change is the
mechanical process of moving declarations around so chan_dahdi.c can be
split up into more files later.
* Changed the bridging core to pass NULL frames into the channel
technologies instead of discarding them. The channel technologies may
need the proding to determine if their configuration is still valid.
(closes issue ASTERISK-21886)
Reported by: Matt Jordan
Review: https://reviewboard.asterisk.org/r/2681/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395154
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Tue, 23 Jul 2013 15:28:11 +0000 (15:28 +0000)]
Make DTMF attended transfer support feature-complete.
This greatly modifies the operation of DTMF attended transfers so that
the full range of options from features.conf applies.
In addition, a new option has been added that allows for a transferer
to switch between bridges during a transfer before completing the
transfer.
(closes issue ASTERISK-21543)
reported by Matt Jordan
Review: https://reviewboard.asterisk.org/r/2654
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395151
65c4cc65-6c06-0410-ace0-
fbb531ad65f3