Commit Graph

30242 Commits

Author SHA1 Message Date
Joshua Colp
b78d63c45e Merge "hashtab: Use ast_free." into 15 2017-10-25 07:30:07 -05:00
Joshua Colp
b8140176e7 Merge "res_pjsip_sdp_rtp: Fix setting of address type for rtp_ipv6" into 15 2017-10-25 06:44:27 -05:00
Joshua Colp
4990048d9d Merge "res_pjproject.c: Upgrade bundled PJPROJECT to 2.7" into 15 2017-10-25 05:26:14 -05:00
Jenkins2
cbd9263080 Merge "main/Makefile: Remove rule for non-existant testexpr2." into 15 2017-10-24 16:13:25 -05:00
Joshua Colp
ad7a185417 Merge "res_xmpp: Ensure the connection filter is available." into 15 2017-10-24 15:35:24 -05:00
Jenkins2
da359db93d Merge "lpc10: Avoid compiler warning when DONT_OPTIMIZE/COMPILE_DOUBLE." into 15 2017-10-24 15:00:02 -05:00
Joshua Colp
cad9079339 Merge "test_config: Fix failure and segfault when config_hook is run twice." into 15 2017-10-24 13:57:06 -05:00
Corey Farrell
c75a7351bd 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.

ASTERISK-18140

Change-Id: Ibf6dcd4fdd07a32c2bc38be1dd557981f08188b5
2017-10-24 11:03:22 -05:00
Joshua Colp
558431635c Merge "chan_sip: Crypto attribute not last but first on SDP media level." into 15 2017-10-24 09:28:15 -05:00
Alexander Traud
24ed38129c lpc10: Avoid compiler warning when DONT_OPTIMIZE/COMPILE_DOUBLE.
ASTERISK-23556
Reported by: Marcello Ceschia

Change-Id: Ic27e88e0336a0d83877dc857938659dc5560b93c
2017-10-24 07:29:03 -05:00
Corey Farrell
62c5a263b3 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
2017-10-23 19:26:25 -05:00
Corey Farrell
a9ee06b497 main/Makefile: Remove rule for non-existant testexpr2.
Change-Id: Ibb3e47f27a395d74d8c5263db015b05434f5969b
2017-10-23 13:46:02 -05:00
Corey Farrell
ddce3ddab5 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.

ASTERISK-25960

Change-Id: Ifd679509a23ed163e5cc647490bf7df4ae3cd856
2017-10-23 12:45:57 -05:00
George Joseph
942f5ab2c2 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.

ASTERISK-27198
Reported by: Martin Cisárik

Change-Id: I5214fc31b728117842243807e7927a319cf77592
2017-10-23 11:36:13 -06:00
Joshua Colp
415c8e9c8f Merge "bridge_softmix: Reduce topology cloning and improve renegotiation." into 15 2017-10-23 10:23:03 -05:00
Richard Mudgett
b148657526 app_agent_pool.c: Fix online documentation typo.
Change-Id: Ib0bc95fd0ec288c78c313823254d7a84ebfc4429
2017-10-23 07:54:22 -05:00
Joshua Colp
0efeb7885a 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.

ASTERISK-27346

Change-Id: I4ac474afe220e833288ff574e32e2b9a23394886
2017-10-22 17:34:07 -05:00
Alexander Traud
3eeb37b6fd chan_sip: Crypto attribute not last but first on SDP media level.
This matches the behavior of the other SIP channel driver, chan_pjsip.

ASTERISK-27365

Change-Id: I8f23a51290a58b75816da2999ed1965441dfc5d6
2017-10-21 03:45:52 -05:00
Richard Mudgett
0f3dcb250a res_pjproject.c: Upgrade bundled PJPROJECT to 2.7
Update patches included in bundled PJPROJECT for the new version.

ASTERISK-27355

Change-Id: I9ac5dbbffaadca25ad24fac8b9ab615e5ace6083
2017-10-20 14:28:13 -05:00
Corey Farrell
f2c95fb7e4 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.

ASTERISK-24483

Change-Id: Iee900f20bdd6ee1bfe23efdec0d87765eadce8a7
2017-10-19 10:34:56 -05:00
Jenkins2
2e028b5859 Merge "chan_sip: Fix output of 'sip set debug off'." into 15 2017-10-19 08:00:37 -05:00
Corey Farrell
e89a0a7770 res_pjsip_refer: Prevent unload except during shutdown.
Prevent unload of the module as certain pjsip initialization functions
cannot be reversed.

ASTERISK-24483

Change-Id: I94597ec8b8491f5af9c57bf66dbc3b078fe2d49d
2017-10-18 13:40:15 -05:00
Corey Farrell
91d02bdcfc 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
file.

ASTERISK-23462 #close

Change-Id: I1cceade9caa9578e1b060feb832e3495ef5ad318
2017-10-18 12:13:22 -05:00
Alexander Traud
4865a05d4e res_srtp: Add support for libsrtp2 with AES-GCM.
Beside allowing AES-GCM again, this adds AES-192 again.

ASTERISK-27356

Change-Id: Ia97a435faf26300335d9552fa676b5d17e5f7233
2017-10-18 03:35:57 -05:00
Jenkins2
1525104534 Merge "res_corosync: Fix linking issue with Corosync 2.x" into 15 2017-10-17 11:45:10 -05:00
Joshua Colp
93ebe00c28 Merge "cdr.c: Rename the Party A CDR container." into 15 2017-10-17 11:06:36 -05:00
Joshua Colp
b66738b86b Merge "cdr.c: Add container to key off of Party B channel names." into 15 2017-10-17 11:05:56 -05:00
Joshua Colp
0555cf8da1 Merge "contrib/script/sip_to_pjsip: implement 'all' for allow/disallow" into 15 2017-10-17 09:38:52 -05:00
Jenkins2
4de4a45359 Merge "bridge_simple: Improve renegotiation success rate." into 15 2017-10-17 08:37:25 -05:00
Joshua Colp
493ba5ebe4 Merge "chan_dahdi: wrap include file which is not present on BSD systems in #ifdef" into 15 2017-10-17 08:16:08 -05:00
Matt Jordan
312a338531 res_corosync: Fix linking issue with Corosync 2.x
At some point in time in the history of Corosync (certainly within the
2.x branch), the corosync_cfg_state_track function was removed.
Unfortunately, the cfg library is only linked if this function is
present. Without the cfg library being linked to res_corosync, loading
of res_corosync will fail.

This patch makes it so that detecting corosync's core libraries,
determined by the COROSYNC external library checks, links both the cpg
and cfg libraries with res_corosync.

Change-Id: I674e9e1c8fea11c3bf81154aaa7c1fd43f945465
2017-10-17 07:13:19 -05:00
Jenkins2
f3225025a1 Merge "res_pjsip_session: Rewrite o= with external_media_address." into 15 2017-10-17 06:30:19 -05:00
Joshua Colp
fe9406e02d 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.

ASTERISK-27354

Change-Id: I58070f421ddeadd2844a33b869b052630cf2e514
2017-10-17 10:45:23 +00:00
Richard Mudgett
0b66442350 cdr.c: Rename the Party A CDR container.
* Rename the Party A CDR container from active_cdrs_by_channel to
active_cdrs_master.

* Renamed the support functions associated with active_cdrs_master
appropriately.

ASTERISK-27335

Change-Id: I6104bb3edc3a0b7243ce502e45e8832b0cff14f7
2017-10-16 12:25:42 -05:00
Richard Mudgett
7920708ffd 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
appropriately.

ASTERISK-27335

Change-Id: I0bf66e8868f8adaa4b5dcf9e682e34951c350249
2017-10-16 12:25:42 -05:00
Torrey Searle
e682580df4 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 &
vice-versa

ASTERISK-27333 #close

Change-Id: I99219478fb98f08751d769daaee0b7795118a5a6
2017-10-16 06:25:56 -05:00
Tzafrir Cohen
ed7c6b3975 declare optional openssl dependencies in moduleinfo
Declare optional openssl dependencies in:
* res_rtp_asterisk.c
* tcptls.c

ASTERISK-27328 #close

Change-Id: I2636f1c05b8104b4fe6f36cce0ebd9a98b9c78ab
2017-10-16 06:03:05 -05:00
Joshua Colp
dd72eac574 Merge "cdr.c: Eliminated many calls to ao2_global_obj_ref()." into 15 2017-10-16 05:44:27 -05:00
Joshua Colp
0ae451ce05 Merge "ast_bt_get_symbols: Prevent double-free." into 15 2017-10-15 14:42:11 -05:00
Joshua Colp
f218761169 Merge "tcptls: NULL-check the parameter of ast_ssl_teardown before accessing it." into 15 2017-10-15 14:10:32 -05:00
Guido Falsi
c78afba71f 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
2017-10-14 14:34:23 +02:00
Alexander Traud
39c83d30d1 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
domain.

ASTERISK-27341 #close

Change-Id: I690163b6e762042ec38b3995aa5c9bea909d8ec4
2017-10-14 06:14:06 -05:00
Jenkins2
49759a5782 Merge "cdr.c: Defer getting ao2_global_obj_ref() until needed." into 15 2017-10-13 18:13:38 -05:00
Jenkins2
f584e10d9d Merge "cdr.c: Set stringfields only if they are different." into 15 2017-10-13 17:29:57 -05:00
Joshua Colp
0014a98cc9 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
fails.

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.

ASTERISK-27259

Change-Id: I8fc0cc03e8bcfd0be8302f13b9f32d8268977f43
2017-10-13 22:23:21 +00:00
Jenkins2
5e5383c47e Merge "cdr.c: Fix setting dnid, callingsubaddr, and calledsubaddr" into 15 2017-10-13 16:57:00 -05:00
Kevin Harwell
f1b646805e AMI: Increase version number
Bump the AMI patch number since the following new addition was made:

* Added a new CancelAtxfer action that cancels an attended transfer.

Change-Id: I9bac528791bd62ef0e99243903b6bc7a6c7ab182
2017-10-13 12:12:34 -05:00
Corey Farrell
09301ddc4f 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.

ASTERISK-27340

Change-Id: I5b110c609f6dfe91339f782a99a431bca5837363
2017-10-13 10:32:48 -05:00
Alexander Traud
5ef8377334 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
2017-10-13 08:15:21 -05:00
Joshua Colp
9f9371952c Merge "features, manager : Add CancelAtxfer AMI action" into 15 2017-10-13 07:53:29 -05:00