3 years agocodec.c: Defensively check the returned samples.
Richard Mudgett [Wed, 25 Oct 2017 19:38:19 +0000 (14:38 -0500)]
codec.c: Defensively check the returned samples.

Earlier versions of the codec_opus samples_count callback can return
negative error values on undecodable frames.  This resulted in a divide by
zero exception.

* Added a defensive check in ast_codec_samples_count() for a "negative"
samples count return value.  Log the event and set the count to zero.


Change-Id: Icf69350307ecbbc80a3d74de46af9bd80ea17819

3 years agoMerge "Single API for ast_store_lock_info and ast_remove_lock_info."
Joshua Colp [Wed, 25 Oct 2017 23:09:16 +0000 (18:09 -0500)]
Merge "Single API for ast_store_lock_info and ast_remove_lock_info."

3 years agohttp.c: Fix http header send content.
Ben Ford [Wed, 25 Oct 2017 14:23:55 +0000 (09:23 -0500)]
http.c: Fix http header send content.

Currently ast_http_send barricades a portion of the content that
needs to be sent in order to establish a connection for things
like the ARI client. The conditional and contents have been changed
to ensure that everything that needs to be sent, will be sent.


Change-Id: I8816d2d8f80f4fefc6dcae4b5fdfc97f1e46496d

3 years agoMerge "Bundled pjproject: Enable pj_assert when dev-mode is enabled."
Joshua Colp [Wed, 25 Oct 2017 14:03:19 +0000 (09:03 -0500)]
Merge "Bundled pjproject: Enable pj_assert when dev-mode is enabled."

3 years agoMerge "chan_sip: Fix SUBSCRIBE with missing "Expires" header."
Joshua Colp [Wed, 25 Oct 2017 13:17:40 +0000 (08:17 -0500)]
Merge "chan_sip: Fix SUBSCRIBE with missing "Expires" header."

3 years agoMerge "hashtab: Use ast_free."
Joshua Colp [Wed, 25 Oct 2017 12:34:23 +0000 (07:34 -0500)]
Merge "hashtab: Use ast_free."

3 years agoMerge "res_pjsip_sdp_rtp: Fix setting of address type for rtp_ipv6"
Joshua Colp [Wed, 25 Oct 2017 11:39:29 +0000 (06:39 -0500)]
Merge "res_pjsip_sdp_rtp:  Fix setting of address type for rtp_ipv6"

3 years agoMerge "main/Makefile: Remove rule for non-existant testexpr2."
Joshua Colp [Wed, 25 Oct 2017 10:24:52 +0000 (05:24 -0500)]
Merge "main/Makefile: Remove rule for non-existant testexpr2."

3 years agoMerge "res_xmpp: Ensure the connection filter is available."
Joshua Colp [Tue, 24 Oct 2017 20:40:54 +0000 (15:40 -0500)]
Merge "res_xmpp: Ensure the connection filter is available."

3 years agoSingle API for ast_store_lock_info and ast_remove_lock_info.
Corey Farrell [Mon, 23 Oct 2017 05:55:18 +0000 (01:55 -0400)]
Single API for ast_store_lock_info and ast_remove_lock_info.

This makes the 'bt' parameter unconditional for ast_store_lock_info and
ast_remove_lock_info.  The 'bt' parameter is unused when HAVE_BKTR is

Change-Id: Ieced0e920928b735a39c3b5952b806c473d67453

3 years agoMerge "lpc10: Avoid compiler warning when DONT_OPTIMIZE/COMPILE_DOUBLE."
George Joseph [Tue, 24 Oct 2017 19:26:15 +0000 (14:26 -0500)]
Merge "lpc10: Avoid compiler warning when DONT_OPTIMIZE/COMPILE_DOUBLE."

3 years agoMerge "test_config: Fix failure and segfault when config_hook is run twice."
Joshua Colp [Tue, 24 Oct 2017 18:56:43 +0000 (13:56 -0500)]
Merge "test_config: Fix failure and segfault when config_hook is run twice."

3 years agochan_sip: Fix SUBSCRIBE with missing "Expires" header.
Corey Farrell [Tue, 24 Oct 2017 14:43:15 +0000 (10:43 -0400)]
chan_sip: Fix SUBSCRIBE with missing "Expires" header.

When chan_sip receives a SUBSCRIBE request with no "Expires" header it
processes the request as an unsubscribe.  This is incorrect, per RFC3264
when the "Expires" header is missing a default expiry should be used.


Change-Id: Ibf6dcd4fdd07a32c2bc38be1dd557981f08188b5

3 years agoMerge "res_pjproject.c: Upgrade bundled PJPROJECT to 2.7"
Joshua Colp [Tue, 24 Oct 2017 15:04:24 +0000 (10:04 -0500)]
Merge "res_pjproject.c: Upgrade bundled PJPROJECT to 2.7"

3 years agoMerge "chan_sip: Crypto attribute not last but first on SDP media level."
Joshua Colp [Tue, 24 Oct 2017 14:28:36 +0000 (09:28 -0500)]
Merge "chan_sip: Crypto attribute not last but first on SDP media level."

3 years agolpc10: Avoid compiler warning when DONT_OPTIMIZE/COMPILE_DOUBLE.
Alexander Traud [Tue, 24 Oct 2017 12:24:17 +0000 (14:24 +0200)]
lpc10: Avoid compiler warning when DONT_OPTIMIZE/COMPILE_DOUBLE.

Reported by: Marcello Ceschia

Change-Id: Ic27e88e0336a0d83877dc857938659dc5560b93c

3 years agohashtab: Use ast_free.
Corey Farrell [Sat, 7 Oct 2017 17:14:08 +0000 (13:14 -0400)]
hashtab: Use ast_free.

A few places in hashtab use free instead of ast_free, remove declaration
of ASTMM_LIBC from hashtab.c as it's no longer needed.

Change-Id: I2ff089bad71640c03c3ce97f1b00fc962ef79427

3 years agoBundled pjproject: Enable pj_assert when dev-mode is enabled.
Corey Farrell [Mon, 23 Oct 2017 06:02:22 +0000 (02:02 -0400)]
Bundled pjproject: Enable pj_assert when dev-mode is enabled.


Change-Id: Ib01fb6c01f9bb87129374a51cb9318c474147517

3 years agomain/Makefile: Remove rule for non-existant testexpr2.
Corey Farrell [Mon, 23 Oct 2017 18:44:36 +0000 (14:44 -0400)]
main/Makefile: Remove rule for non-existant testexpr2.

Change-Id: Ibb3e47f27a395d74d8c5263db015b05434f5969b

3 years agotest_config: Fix failure and segfault when config_hook is run twice.
Corey Farrell [Mon, 23 Oct 2017 17:42:37 +0000 (13:42 -0400)]
test_config: Fix failure and segfault when config_hook is run twice.

On second run the config_hook test was unexpectedly failing to load
test_config.conf because it was still unmodified since the last load.
This is fixed by not passing CONFIG_FLAG_FILEUNCHANGED for the initial
loads, only using it when we are tested that a reload of unmodified
files do not initiate the hook.


Change-Id: Ifd679509a23ed163e5cc647490bf7df4ae3cd856

3 years agores_pjsip_sdp_rtp: Fix setting of address type for rtp_ipv6
George Joseph [Mon, 23 Oct 2017 17:23:04 +0000 (11:23 -0600)]
res_pjsip_sdp_rtp:  Fix setting of address type for rtp_ipv6

create_outgoing_sdp_stream was setting "addr_type = STR_IP6" only
when an ipv6 media_address was specified on the endpoint.  If
rtp_ipv6 was set and ast_sip_get_host_ip_string returned an ipv6
address, we were leaving the addr_type set at the default of
STR_IP4.  This caused the address type to be set incorrectly on the
"o" and "c" SDP attributes even though the address was set
correctly.  Some clients don't like the mismatch.

 * Removed the test for endpoint/media_address and now check all
   addresses for ipv6.

Reported by: Martin Cisárik

Change-Id: I5214fc31b728117842243807e7927a319cf77592

3 years agoMerge "bridge_softmix: Reduce topology cloning and improve renegotiation."
Joshua Colp [Mon, 23 Oct 2017 16:07:16 +0000 (11:07 -0500)]
Merge "bridge_softmix: Reduce topology cloning and improve renegotiation."

3 years agoapp_agent_pool.c: Fix online documentation typo.
Richard Mudgett [Mon, 23 Oct 2017 12:53:48 +0000 (07:53 -0500)]
app_agent_pool.c: Fix online documentation typo.

Change-Id: Ib0bc95fd0ec288c78c313823254d7a84ebfc4429

3 years agores_xmpp: Ensure the connection filter is available.
Joshua Colp [Sun, 22 Oct 2017 22:32:20 +0000 (19:32 -0300)]
res_xmpp: Ensure the connection filter is available.

Users of the API that res_xmpp provides expect that a
filter be available on the client at all times. When
OAuth authentication support was added this requirement
was not maintained.

This change merely moves the OAuth authentication to
after the filter is created, ensuring users of res_xmpp
can add things to the filter as needed.


Change-Id: I4ac474afe220e833288ff574e32e2b9a23394886

3 years agochan_sip: Crypto attribute not last but first on SDP media level.
Alexander Traud [Sat, 21 Oct 2017 08:44:21 +0000 (10:44 +0200)]
chan_sip: Crypto attribute not last but first on SDP media level.

This matches the behavior of the other SIP channel driver, chan_pjsip.


Change-Id: I8f23a51290a58b75816da2999ed1965441dfc5d6

3 years agores_pjproject.c: Upgrade bundled PJPROJECT to 2.7
Richard Mudgett [Tue, 17 Oct 2017 15:53:52 +0000 (10:53 -0500)]
res_pjproject.c: Upgrade bundled PJPROJECT to 2.7

Update patches included in bundled PJPROJECT for the new version.


Change-Id: I9ac5dbbffaadca25ad24fac8b9ab615e5ace6083

3 years agores_pjsip_pubsub: Prevent unload except during shutdown.
Corey Farrell [Wed, 18 Oct 2017 18:41:25 +0000 (14:41 -0400)]
res_pjsip_pubsub: Prevent unload except during shutdown.

Prevent unload of the module as certain pjsip initialization functions
cannot be reversed.  This required a reorder of the module_load so that
the non-reversable pjsip functions are not called until all potential
errors have been ruled out.


Change-Id: Iee900f20bdd6ee1bfe23efdec0d87765eadce8a7

3 years agoMerge "chan_sip: Fix output of 'sip set debug off'."
Joshua Colp [Thu, 19 Oct 2017 13:14:22 +0000 (08:14 -0500)]
Merge "chan_sip: Fix output of 'sip set debug off'."

3 years agoMerge "res_pjsip_refer: Prevent unload except during shutdown."
Joshua Colp [Thu, 19 Oct 2017 12:24:59 +0000 (07:24 -0500)]
Merge "res_pjsip_refer: Prevent unload except during shutdown."

3 years agoMerge "app_macro deprecation."
Joshua Colp [Thu, 19 Oct 2017 00:22:12 +0000 (19:22 -0500)]
Merge "app_macro deprecation."

3 years agores_pjsip_refer: Prevent unload except during shutdown.
Corey Farrell [Wed, 18 Oct 2017 18:37:57 +0000 (14:37 -0400)]
res_pjsip_refer: Prevent unload except during shutdown.

Prevent unload of the module as certain pjsip initialization functions
cannot be reversed.


Change-Id: I94597ec8b8491f5af9c57bf66dbc3b078fe2d49d

3 years agochan_sip: Fix output of 'sip set debug off'.
Corey Farrell [Wed, 18 Oct 2017 17:04:29 +0000 (13:04 -0400)]
chan_sip: Fix output of 'sip set debug off'.

When sip.conf contains 'sipdebug=yes' it is impossible to disable it
using CLI 'sip set debug off'.  This corrects the output of that CLI
command to instruct the user to turn sipdebug off in the configuration

ASTERISK-23462 #close

Change-Id: I1cceade9caa9578e1b060feb832e3495ef5ad318

3 years agoapp_macro deprecation.
Corey Farrell [Mon, 16 Oct 2017 15:53:07 +0000 (11:53 -0400)]
app_macro deprecation.

* Mark the module deprecated.
* Disable the module by default.
* Produce a warning the first time a macro is used.
* Note deprecation related options in app_dial and app_queue.


Change-Id: I560ea043bacdbc5534a17d97854273d52c2f1bdc

3 years agores_srtp: Add support for libsrtp2 with AES-GCM.
Alexander Traud [Wed, 18 Oct 2017 08:30:25 +0000 (10:30 +0200)]
res_srtp: Add support for libsrtp2 with AES-GCM.

Beside allowing AES-GCM again, this adds AES-192 again.


Change-Id: Ia97a435faf26300335d9552fa676b5d17e5f7233

3 years agoMerge "res_corosync: Fix linking issue with Corosync 2.x"
Jenkins2 [Tue, 17 Oct 2017 16:08:13 +0000 (11:08 -0500)]
Merge "res_corosync: Fix linking issue with Corosync 2.x"

3 years agoMerge "cdr.c: Rename the Party A CDR container."
Joshua Colp [Tue, 17 Oct 2017 16:06:16 +0000 (11:06 -0500)]
Merge "cdr.c: Rename the Party A CDR container."

3 years agoMerge "cdr.c: Add container to key off of Party B channel names."
Jenkins2 [Tue, 17 Oct 2017 15:44:34 +0000 (10:44 -0500)]
Merge "cdr.c: Add container to key off of Party B channel names."

3 years agoMerge "contrib/script/sip_to_pjsip: implement 'all' for allow/disallow"
Jenkins2 [Tue, 17 Oct 2017 14:32:00 +0000 (09:32 -0500)]
Merge "contrib/script/sip_to_pjsip: implement 'all' for allow/disallow"

3 years agoMerge "bridge_simple: Improve renegotiation success rate."
Jenkins2 [Tue, 17 Oct 2017 13:49:20 +0000 (08:49 -0500)]
Merge "bridge_simple: Improve renegotiation success rate."

3 years agoMerge "chan_dahdi: wrap include file which is not present on BSD systems in #ifdef"
Jenkins2 [Tue, 17 Oct 2017 13:21:12 +0000 (08:21 -0500)]
Merge "chan_dahdi: wrap include file which is not present on BSD systems in #ifdef"

3 years agoMerge "res_pjsip_session: Rewrite o= with external_media_address."
Jenkins2 [Tue, 17 Oct 2017 11:34:42 +0000 (06:34 -0500)]
Merge "res_pjsip_session: Rewrite o= with external_media_address."

3 years agobridge_softmix: Reduce topology cloning and improve renegotiation.
Joshua Colp [Sat, 14 Oct 2017 19:41:37 +0000 (19:41 +0000)]
bridge_softmix: Reduce topology cloning and improve renegotiation.

As channels join and leave an SFU the bridge_softmix module
needs to renegotiate to add and remove their streams from
the other participants. Previously this was done by constructing
the ideal stream topology every time but in the case of leave
this was incomplete.

This change makes it so bridge_softmix keeps an ideal stream
topology for each channel and uses it when making changes. This
ensures that when we request a renegotiation we are always
certain that we are aiming for the best stream topology
possible. In the case of a channel leaving this ensures that
we try to have an existing participant fill their place if
a participant has a fixed limit on the maximum number of video
streams they allow.


Change-Id: I58070f421ddeadd2844a33b869b052630cf2e514

3 years agocdr.c: Rename the Party A CDR container.
Richard Mudgett [Fri, 6 Oct 2017 20:55:26 +0000 (15:55 -0500)]
cdr.c: Rename the Party A CDR container.

* Rename the Party A CDR container from active_cdrs_by_channel to

* Renamed the support functions associated with active_cdrs_master


Change-Id: I6104bb3edc3a0b7243ce502e45e8832b0cff14f7

3 years agocdr.c: Add container to key off of Party B channel names.
Richard Mudgett [Mon, 2 Oct 2017 22:42:48 +0000 (17:42 -0500)]
cdr.c: Add container to key off of Party B channel names.

The CDR performance gets worse the further it gets behind in processing
stasis messages.  One of the reasons is because of a n*m loop used when
processing Party B information.

* Added a new CDR container that is keyed to Party B so we don't need such
a large loop when processing Party B information.

NOTE: To reduce the size of the patch I deferred to another patch the
renaming of the Party A active_cdrs_by_channel container to
active_cdrs_master and renaming the container's hash and cmp functions


Change-Id: I0bf66e8868f8adaa4b5dcf9e682e34951c350249

3 years agoMerge "declare optional openssl dependencies in moduleinfo"
Jenkins2 [Mon, 16 Oct 2017 14:19:56 +0000 (09:19 -0500)]
Merge "declare optional openssl dependencies in moduleinfo"

3 years agocontrib/script/sip_to_pjsip: implement 'all' for allow/disallow
Torrey Searle [Wed, 11 Oct 2017 11:04:12 +0000 (13:04 +0200)]
contrib/script/sip_to_pjsip: implement 'all' for allow/disallow

when 'all' is specified in an allow or disallow section, it should erase
all values from the inverse section in the default config. E.G.
allow=all should erase any deny values from default config &

ASTERISK-27333 #close

Change-Id: I99219478fb98f08751d769daaee0b7795118a5a6

3 years agoMerge "cdr.c: Eliminated many calls to ao2_global_obj_ref()."
Joshua Colp [Mon, 16 Oct 2017 10:45:11 +0000 (05:45 -0500)]
Merge "cdr.c: Eliminated many calls to ao2_global_obj_ref()."

3 years agoMerge "cdr.c: Defer getting ao2_global_obj_ref() until needed."
Joshua Colp [Mon, 16 Oct 2017 10:45:01 +0000 (05:45 -0500)]
Merge "cdr.c: Defer getting ao2_global_obj_ref() until needed."

3 years agoMerge "ast_bt_get_symbols: Prevent double-free."
Jenkins2 [Sun, 15 Oct 2017 19:52:57 +0000 (14:52 -0500)]
Merge "ast_bt_get_symbols: Prevent double-free."

3 years agoMerge "tcptls: NULL-check the parameter of ast_ssl_teardown before accessing it."
Joshua Colp [Sun, 15 Oct 2017 19:29:39 +0000 (14:29 -0500)]
Merge "tcptls: NULL-check the parameter of ast_ssl_teardown before accessing it."

3 years agochan_dahdi: wrap include file which is not present on BSD systems in #ifdef
Guido Falsi [Sat, 14 Oct 2017 09:11:24 +0000 (11:11 +0200)]
chan_dahdi: wrap include file which is not present on BSD systems in #ifdef

The sys/sysmacros.h include file does not exist in BSD systems and
is not required to build this module there.
Since an "#if defined(__NetBSD__) || defined(__FreeBSD__)" section
already exist I moved that include line inside it's #else branch.

ASTERISK-27343 #close

Change-Id: Ibfb64f4e9a0ce8b6eda7a7695cfe57916f175dc1

3 years agores_pjsip_session: Rewrite o= with external_media_address.
Alexander Traud [Fri, 13 Oct 2017 14:43:12 +0000 (16:43 +0200)]
res_pjsip_session: Rewrite o= with external_media_address.

PJSIP allows a domain name as external_media_address. This allows chan_pjsip to
be used behind a NAT with changing IP addresses. The IP address of that domain
is resolved to the c= line already. This change sets also the o= line to that

ASTERISK-27341 #close

Change-Id: I690163b6e762042ec38b3995aa5c9bea909d8ec4

3 years agoMerge "cdr.c: Set stringfields only if they are different."
Jenkins2 [Fri, 13 Oct 2017 22:42:49 +0000 (17:42 -0500)]
Merge "cdr.c: Set stringfields only if they are different."

3 years agobridge_simple: Improve renegotiation success rate.
Joshua Colp [Thu, 12 Oct 2017 17:03:45 +0000 (17:03 +0000)]
bridge_simple: Improve renegotiation success rate.

When making channels compatible the bridge_simple module
will renegotiate one to better match the other. Some
endpoints incorrectly terminate the call if this process

To better handle this scenario the audio streams present
on the new requested topology will include any existing
negotiated formats that happen to exist on the first
valid audio stream. This ensures formats are persent that
are known to be acceptable to the remote endpoint.


Change-Id: I8fc0cc03e8bcfd0be8302f13b9f32d8268977f43

3 years agoMerge "cdr.c: Fix setting dnid, callingsubaddr, and calledsubaddr"
Kevin Harwell [Fri, 13 Oct 2017 22:11:53 +0000 (17:11 -0500)]
Merge "cdr.c: Fix setting dnid, callingsubaddr, and calledsubaddr"

3 years agoast_bt_get_symbols: Prevent double-free.
Corey Farrell [Fri, 13 Oct 2017 13:51:09 +0000 (09:51 -0400)]
ast_bt_get_symbols: Prevent double-free.

It's possible for bfdobj to be created but syms not created.  If syms
was not allocated in the current loop iteration but was allocated in the
previous iteration it would crash.


Change-Id: I5b110c609f6dfe91339f782a99a431bca5837363

3 years agotcptls: NULL-check the parameter of ast_ssl_teardown before accessing it.
Alexander Traud [Fri, 13 Oct 2017 13:12:07 +0000 (15:12 +0200)]
tcptls: NULL-check the parameter of ast_ssl_teardown before accessing it.

This avoids a crash on stopping a chan_sip which failed to start its TLS server.

ASTERISK-27339 #close

Change-Id: I327fc70db68eaaca5b50a15c7fd687fde79263d5

3 years agocdr.c: Eliminated many calls to ao2_global_obj_ref().
Richard Mudgett [Fri, 29 Sep 2017 19:26:41 +0000 (14:26 -0500)]
cdr.c: Eliminated many calls to ao2_global_obj_ref().

The CDR performance gets worse the further it gets behind in processing
stasis messages.  One of the reasons is we were getting the global config
to determine if we needed to log a debugging message.

* Many calls to ao2_global_obj_ref() were just so we could determine if
debug mode is enabled.  Made a global flag to check instead.

* Eliminated many RAII_VAR() usages associated with the remaining
ao2_global_obj_ref() calls.

* Added missing NULL checks for the returned ao2_global_obj_ref() value.


Change-Id: Iceaad93172862f610cad0188956634187bfcc7cd

3 years agocdr.c: Defer getting ao2_global_obj_ref() until needed.
Richard Mudgett [Fri, 6 Oct 2017 18:45:30 +0000 (13:45 -0500)]
cdr.c: Defer getting ao2_global_obj_ref() until needed.

The CDR performance gets worse the further it gets behind in processing
stasis messages.  One of the reasons is we were getting the global config
even if we didn't need it.

* Most uses of the global config were only needed on off nominal code
paths so it makes sense to not get it until absolutely needed.


Change-Id: I00c63b7ec233e5bfffd5d976f05568613d3c2365

3 years agocdr.c: Set stringfields only if they are different.
Richard Mudgett [Thu, 5 Oct 2017 23:08:33 +0000 (18:08 -0500)]
cdr.c: Set stringfields only if they are different.

The CDR performance gets worse the further it gets behind in processing
stasis messages.  One of the reasons is we were repeatedly setting string
fields to potentially the same string in base_process_party_a().  Setting
a string field involves allocating room for the new string out of a memory
pool which may have to allocate even more memory.

* Check to see if the string field is already set to the desired string.


Change-Id: I3ccb7e23f1488417e08cafe477755033eed65a7c

3 years agocdr.c: Fix setting dnid, callingsubaddr, and calledsubaddr
Richard Mudgett [Thu, 5 Oct 2017 23:03:11 +0000 (18:03 -0500)]
cdr.c: Fix setting dnid, callingsubaddr, and calledsubaddr

The string comparisons for setting these CDR variables was inverted.  We
were repeatedly setting these CDR variables only if the channel snapshots
had the same value.


Change-Id: I9482073524411e7ea6c03805b16de200cb1669ea

3 years agofeatures, manager : Add CancelAtxfer AMI action
Thomas Sevestre [Fri, 25 Aug 2017 13:19:00 +0000 (13:19 +0000)]
features, manager : Add CancelAtxfer AMI action

Add action to cancel feature attended transfer with AMI interface

ASTERISK-27215 #close

Change-Id: Iab8a81362b5a1757e2608f70b014ef863200cb42

3 years agoMerge "res_pjsip_session: Prevent user=phone being added to anonimized URIs."
Jenkins2 [Thu, 12 Oct 2017 17:51:03 +0000 (12:51 -0500)]
Merge "res_pjsip_session: Prevent user=phone being added to anonimized URIs."

3 years agoMerge "sorcery: Use ao2_weakproxy to hold list of instances."
Jenkins2 [Thu, 12 Oct 2017 16:25:12 +0000 (11:25 -0500)]
Merge "sorcery: Use ao2_weakproxy to hold list of instances."

3 years agores_pjsip_session: Prevent user=phone being added to anonimized URIs.
Daniel Tryba [Fri, 6 Oct 2017 09:55:38 +0000 (11:55 +0200)]
res_pjsip_session: Prevent user=phone being added to anonimized URIs.

Move ast_sip_add_usereqphone to be called after anonymization of URIs,
to prevent the user_eq_phone adding "user=phone" to URIs containing a
username that is not a phonenumber (RFC3261 19.1.1). An extra call to
ast_sip_add_usereqphone on the saved version before anonymization is
added to add user=phone" to the PAI.

ASTERISK-27047 #close

Change-Id: Ie5644bc66341b86dc08b1f7442210de2e6acdec6

3 years agoMerge "named_locks: Use ao2_weakproxy_find."
Jenkins2 [Thu, 12 Oct 2017 15:16:45 +0000 (10:16 -0500)]
Merge "named_locks: Use ao2_weakproxy_find."

3 years agoMerge "astobj2: Add ao2_weakproxy_find function."
Jenkins2 [Thu, 12 Oct 2017 14:26:29 +0000 (09:26 -0500)]
Merge "astobj2: Add ao2_weakproxy_find function."

3 years agoMerge "astobj2: Run weakproxy callbacks outside of lock."
Jenkins2 [Thu, 12 Oct 2017 14:02:47 +0000 (09:02 -0500)]
Merge "astobj2: Run weakproxy callbacks outside of lock."

3 years agoMerge "cdr.c: Defer misc checks."
Joshua Colp [Thu, 12 Oct 2017 13:02:36 +0000 (08:02 -0500)]
Merge "cdr.c: Defer misc checks."

3 years agoMerge "res_pjsip: Prevent "user=phone" being added multiple times to header"
Jenkins2 [Thu, 12 Oct 2017 12:03:59 +0000 (07:03 -0500)]
Merge "res_pjsip: Prevent "user=phone" being added multiple times to header"

3 years agoMerge "cdr_mysql: avoid releasing a config string"
Jenkins2 [Thu, 12 Oct 2017 00:12:56 +0000 (19:12 -0500)]
Merge "cdr_mysql: avoid releasing a config string"

3 years agoMerge "chan_vpb: Fix a gcc 7 out-of-bounds complaint"
Joshua Colp [Wed, 11 Oct 2017 22:06:17 +0000 (17:06 -0500)]
Merge "chan_vpb:  Fix a gcc 7 out-of-bounds complaint"

3 years agoMerge "app_originate: Set ORIGINATE_STATUS correctly on failure"
Joshua Colp [Wed, 11 Oct 2017 21:03:21 +0000 (16:03 -0500)]
Merge "app_originate: Set ORIGINATE_STATUS correctly on failure"

3 years agores_pjsip: Prevent "user=phone" being added multiple times to header
Daniel Tryba [Fri, 6 Oct 2017 10:14:40 +0000 (12:14 +0200)]
res_pjsip: Prevent "user=phone" being added multiple times to header

ast_sip_add_usereqphone adds "user=phone" to the header every time is is
called without checking whether the param already exists. Preventing
this by searching to string representation of header for "user=phone".

ASTERISK-26988 #close

Change-Id: Ib84383b07254de357dc6a98d91fc1d2c2c3719e6

3 years agocdr.c: Defer misc checks.
Richard Mudgett [Thu, 5 Oct 2017 23:12:04 +0000 (18:12 -0500)]
cdr.c: Defer misc checks.

Try to defer some checks until needed in case there is an early exit.

Change-Id: Ibc6b34c38a4f60ad4f9b67984b7d070a07257064

3 years agoMerge "cdr.c: Eliminated simple RAII_VAR usages."
Jenkins2 [Wed, 11 Oct 2017 17:04:09 +0000 (12:04 -0500)]
Merge "cdr.c: Eliminated simple RAII_VAR usages."

3 years agoMerge "ari/bridge: Add mute, dtmf suppression controls"
Jenkins2 [Wed, 11 Oct 2017 16:34:08 +0000 (11:34 -0500)]
Merge "ari/bridge: Add mute, dtmf suppression controls"

3 years agoMerge "app_queue.c: clear moh field in init_queue"
Jenkins2 [Wed, 11 Oct 2017 16:30:46 +0000 (11:30 -0500)]
Merge "app_queue.c: clear moh field in init_queue"

3 years agoari/bridge: Add mute, dtmf suppression controls
Seán C McCord [Sat, 7 Oct 2017 01:48:48 +0000 (21:48 -0400)]
ari/bridge: Add mute, dtmf suppression controls

Add bridge_features structure to bridge creation.  Specifically, this
implements mute and DTMF suppression, but others should be able to be
easily added to the same structure.

ASTERISK-27322 #close
Reported by: Darren Sessions
Sponsored by: AVOXI

Change-Id: Id4002adfb65c9a8027ee9e1a5f477e0f01cf9d61

3 years agochan_vpb: Fix a gcc 7 out-of-bounds complaint
George Joseph [Wed, 11 Oct 2017 12:03:41 +0000 (06:03 -0600)]
chan_vpb:  Fix a gcc 7 out-of-bounds complaint

chan_vpb was trying to use sizeof(*p->play_dtmf), where
p->play_dtmf is defined as char[16], to get the length of the array
but since p->play_dtmf is an actual array, sizeof(*p->play_dtmf)
returns the size of the first array element, which is 1.  gcc7
validly complains because the context in which it's used could
cause an out-of-bounds condition.

Change-Id: If9c4bfdb6b02fa72d39e0c09bf88900663c000ba

3 years agoMerge "res_pjsip_registrar.c: Update remove_existing AOR contact handling."
Jenkins2 [Wed, 11 Oct 2017 11:49:54 +0000 (06:49 -0500)]
Merge "res_pjsip_registrar.c: Update remove_existing AOR contact handling."

3 years agoapp_queue.c: clear moh field in init_queue
Nathan Bruning [Fri, 6 Oct 2017 07:39:42 +0000 (09:39 +0200)]
app_queue.c: clear moh field in init_queue

ASTERISK-27301 #close

Change-Id: Ic31361f34e2de3b6470e68fc37205a7711082eba

3 years agosorcery: Use ao2_weakproxy to hold list of instances.
Corey Farrell [Tue, 10 Oct 2017 02:00:45 +0000 (22:00 -0400)]
sorcery: Use ao2_weakproxy to hold list of instances.

* Store weak proxy objects in instances container.
* Remove special unreference function and replace with macro that calls
* Add REF_DEBUG information to ast_sorcery_open.

Change-Id: I5a150a4e13cee319d46b5a4654f95a4623a978f8

3 years agonamed_locks: Use ao2_weakproxy_find.
Corey Farrell [Tue, 10 Oct 2017 02:55:44 +0000 (22:55 -0400)]
named_locks: Use ao2_weakproxy_find.

Change-Id: I0ce8a1b7101b6caac6a19f83a89f00eaba1e9d9c

3 years agoastobj2: Add ao2_weakproxy_find function.
Corey Farrell [Mon, 9 Oct 2017 22:51:05 +0000 (18:51 -0400)]
astobj2: Add ao2_weakproxy_find function.

This function finds a weak proxy in an ao2_container and returns the
real object associated with it.

Change-Id: I9da822049747275f5961b5c0a7f14e87157d65d8

3 years agoastobj2: Run weakproxy callbacks outside of lock.
Corey Farrell [Tue, 10 Oct 2017 20:09:14 +0000 (16:09 -0400)]
astobj2: Run weakproxy callbacks outside of lock.

Copy the list of weakproxy callbacks to temporary memory so they can be
run without holding the weakproxy lock.

Change-Id: Ib167622a8a0f873fd73938f7611b2a5914308047

3 years agoMerge "contrib/thirdparty/sip_to_pjsip: add additional flag mappings"
Jenkins2 [Tue, 10 Oct 2017 17:51:42 +0000 (12:51 -0500)]
Merge "contrib/thirdparty/sip_to_pjsip: add additional flag mappings"

3 years agoapp_originate: Set ORIGINATE_STATUS correctly on failure
Sean Bright [Tue, 10 Oct 2017 17:01:05 +0000 (13:01 -0400)]
app_originate: Set ORIGINATE_STATUS correctly on failure

We were ignoring the return value from ast_pbx_outgoing_exten() and
ast_pbx_outgoing_app() which could fail before setting the reason code.
This resulted in failures being reported as success.

ASTERISK-25266 #close
Reported by: Allen Ford

Change-Id: Idf16237b7e41b527d2c69c865829128686beeb3b

3 years agoMerge "res_pjsip: Add REF_DEBUG info to module references."
Jenkins2 [Tue, 10 Oct 2017 17:28:13 +0000 (12:28 -0500)]
Merge "res_pjsip: Add REF_DEBUG info to module references."

3 years agocontrib/thirdparty/sip_to_pjsip: add additional flag mappings
Torrey Searle [Tue, 3 Oct 2017 20:16:49 +0000 (22:16 +0200)]
contrib/thirdparty/sip_to_pjsip: add additional flag mappings

add mappings for udptl redundancy, rtptimeout, and debug flags

Change-Id: Ie73cf5c83c05dee01eb9624ede76c1a30225d73a

3 years agocdr.c: Eliminated simple RAII_VAR usages.
Richard Mudgett [Mon, 2 Oct 2017 21:46:19 +0000 (16:46 -0500)]
cdr.c: Eliminated simple RAII_VAR usages.

Change-Id: I150505db307249a962987e7b941bdd369bb91f35

3 years agocdr_mysql: avoid releasing a config string
Tzafrir Cohen [Tue, 10 Oct 2017 14:49:15 +0000 (17:49 +0300)]
cdr_mysql: avoid releasing a config string

Fixes a memory corruption issue after a reload of cdr_mysql.

Issue was accidentally included in 747beb1ed159f89a3b58742e4257740b3d6d6bba .

ASTERISK-27270 #close

Change-Id: I90b6a9d18710c0f9009466370bd5f4bac5d5d12e

3 years agoMerge "res_pjproject: Fix cleanup of buildopts vector."
Jenkins2 [Tue, 10 Oct 2017 13:12:25 +0000 (08:12 -0500)]
Merge "res_pjproject: Fix cleanup of buildopts vector."

3 years agoMerge "tcptls: Do not re-bind to wildcard on client creation."
Joshua Colp [Tue, 10 Oct 2017 12:53:04 +0000 (07:53 -0500)]
Merge "tcptls: Do not re-bind to wildcard on client creation."

3 years agodeclare optional openssl dependencies in moduleinfo
Tzafrir Cohen [Tue, 10 Oct 2017 12:42:46 +0000 (15:42 +0300)]
declare optional openssl dependencies in moduleinfo

Declare optional openssl dependencies in:
* res_rtp_asterisk.c
* tcptls.c

ASTERISK-27328 #close

Change-Id: I2636f1c05b8104b4fe6f36cce0ebd9a98b9c78ab

3 years agores_pjproject: Fix cleanup of buildopts vector.
Corey Farrell [Tue, 10 Oct 2017 03:51:03 +0000 (23:51 -0400)]
res_pjproject: Fix cleanup of buildopts vector.


Change-Id: I3bed0edf3f55b1d4adcbabb25ec14f11dc766c72

3 years agoMerge "cdr.c: Replace redundant check with an ast_assert()"
Jenkins2 [Tue, 10 Oct 2017 01:04:33 +0000 (20:04 -0500)]
Merge "cdr.c: Replace redundant check with an ast_assert()"

3 years agoMerge "cdr.h: Fix doxygen comments."
Jenkins2 [Tue, 10 Oct 2017 00:01:19 +0000 (19:01 -0500)]
Merge "cdr.h: Fix doxygen comments."

3 years agoMerge "cdr.c: Use current ao2 flag names"
Joshua Colp [Mon, 9 Oct 2017 23:08:26 +0000 (18:08 -0500)]
Merge "cdr.c: Use current ao2 flag names"

3 years agoMerge "res_pjsip: Fix issues that prevented shutdown of modules."
Jenkins2 [Mon, 9 Oct 2017 22:29:26 +0000 (17:29 -0500)]
Merge "res_pjsip: Fix issues that prevented shutdown of modules."