Commit Graph

29401 Commits

Author SHA1 Message Date
Jenkins2
271780019a Merge "hashtab: Use ast_free." into 13 2017-10-25 07:10:14 -05:00
Jenkins2
02538548e6 Merge "res_pjsip_sdp_rtp: Fix setting of address type for rtp_ipv6" into 13 2017-10-25 06:26:27 -05:00
Corey Farrell
23d05ebc49 hashtab: Use ast_free.
A few places in hashtab use free instead of ast_free.

Change-Id: I2ff089bad71640c03c3ce97f1b00fc962ef79427
2017-10-24 17:17:53 -04:00
Jenkins2
65b3c68230 Merge "main/Makefile: Remove rule for non-existant testexpr2." into 13 2017-10-24 15:55:05 -05:00
Jenkins2
8cb61c6f40 Merge "res_xmpp: Ensure the connection filter is available." into 13 2017-10-24 14:59:56 -05:00
Jenkins2
56082b6b4d Merge "lpc10: Avoid compiler warning when DONT_OPTIMIZE/COMPILE_DOUBLE." into 13 2017-10-24 14:31:27 -05:00
Jenkins2
529e8e2afa Merge "test_config: Fix failure and segfault when config_hook is run twice." into 13 2017-10-24 13:42:28 -05:00
Corey Farrell
c95ab4c1ce 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:35 -05:00
Jenkins2
e7d8b4ebe7 Merge "res_pjproject.c: Upgrade bundled PJPROJECT to 2.7" into 13 2017-10-24 09:26:47 -05:00
Jenkins2
3440f535db Merge "chan_sip: Crypto attribute not last but first on SDP media level." into 13 2017-10-24 08:50:47 -05:00
Alexander Traud
5351e862ee lpc10: Avoid compiler warning when DONT_OPTIMIZE/COMPILE_DOUBLE.
ASTERISK-23556
Reported by: Marcello Ceschia

Change-Id: Ic27e88e0336a0d83877dc857938659dc5560b93c
2017-10-24 07:28:49 -05:00
Corey Farrell
ec278955a3 main/Makefile: Remove rule for non-existant testexpr2.
Change-Id: Ibb3e47f27a395d74d8c5263db015b05434f5969b
2017-10-23 14:46:03 -04:00
Corey Farrell
6cec3149be 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:46:09 -05:00
George Joseph
4a2575a107 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:23:04 -06:00
Jenkins2
302626c115 Merge "app_agent_pool.c: Fix online documentation typo." into 13 2017-10-23 09:05:03 -05:00
Richard Mudgett
b4cb0050bd app_agent_pool.c: Fix online documentation typo.
Change-Id: Ib0bc95fd0ec288c78c313823254d7a84ebfc4429
2017-10-23 07:53:48 -05:00
Joshua Colp
07e17fd04f 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 19:33:13 -03:00
Alexander Traud
c7a9a6ef0c 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:46:08 -05:00
Richard Mudgett
b57dcc8d9c 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:26:14 -05:00
Corey Farrell
fb4ed70e62 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:35:07 -05:00
Joshua Colp
63e536d97f Merge "chan_sip: Fix output of 'sip set debug off'." into 13 2017-10-19 07:45:38 -05:00
Corey Farrell
216251abcb 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:24 -05:00
Corey Farrell
7dd7ca2858 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:32 -05:00
Jenkins2
dbafed0ed5 Merge "res_corosync: Fix linking issue with Corosync 2.x" into 13 2017-10-17 11:19:02 -05:00
Joshua Colp
c5f671e2df Merge "cdr.c: Rename the Party A CDR container." into 13 2017-10-17 11:06:25 -05:00
Jenkins2
4c83f685e6 Merge "cdr.c: Add container to key off of Party B channel names." into 13 2017-10-17 10:41:26 -05:00
Jenkins2
e1d713c40c Merge "contrib/script/sip_to_pjsip: implement 'all' for allow/disallow" into 13 2017-10-17 09:06:44 -05:00
Jenkins2
0d4febb1c8 Merge "chan_dahdi: wrap include file which is not present on BSD systems in #ifdef" into 13 2017-10-17 08:05:15 -05:00
Jenkins2
e7e181c2bc Merge "res_pjsip_session: Rewrite o= with external_media_address." into 13 2017-10-17 06:26:47 -05:00
Matt Jordan
0a11097a22 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 11:22:43 +00:00
Richard Mudgett
7f8c212e75 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:23:35 -05:00
Richard Mudgett
85723a9e50 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:23:35 -05:00
Tzafrir Cohen
944e500e95 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:13 -05:00
Jenkins2
ce0ef34020 Merge "ast_bt_get_symbols: Prevent double-free." into 13 2017-10-15 14:20:37 -05:00
Jenkins2
3b1324b13e Merge "tcptls: NULL-check the parameter of ast_ssl_teardown before accessing it." into 13 2017-10-15 13:53:45 -05:00
Alexander Traud
dcbf61a31e 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:13:55 -05:00
Guido Falsi
85cada85d6 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 11:11:24 +02:00
Jenkins2
6fc88e80e8 Merge "cdr.c: Eliminated many calls to ao2_global_obj_ref()." into 13 2017-10-13 18:43:03 -05:00
Jenkins2
31cbb53a0a Merge "cdr.c: Defer getting ao2_global_obj_ref() until needed." into 13 2017-10-13 17:55:34 -05:00
Jenkins2
bf21ba9c2d Merge "cdr.c: Set stringfields only if they are different." into 13 2017-10-13 17:00:10 -05:00
Jenkins2
d0cd6cb1a7 Merge "cdr.c: Fix setting dnid, callingsubaddr, and calledsubaddr" into 13 2017-10-13 16:44:38 -05:00
Kevin Harwell
4bc2aca9b7 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:11:21 -05:00
Corey Farrell
89f11364f6 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 09:51:09 -04:00
Alexander Traud
114ed320ea 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:14:47 -05:00
Joshua Colp
7215d07ca2 Merge "features, manager : Add CancelAtxfer AMI action" into 13 2017-10-13 07:44:39 -05:00
Richard Mudgett
a8c6c3bd7d 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.

ASTERISK-27335

Change-Id: Iceaad93172862f610cad0188956634187bfcc7cd
2017-10-12 19:11:02 -05:00
Richard Mudgett
b56fa63db8 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.

ASTERISK-27335

Change-Id: I00c63b7ec233e5bfffd5d976f05568613d3c2365
2017-10-12 19:11:02 -05:00
Richard Mudgett
92c5cf3920 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.

ASTERISK-27335

Change-Id: I3ccb7e23f1488417e08cafe477755033eed65a7c
2017-10-12 19:11:02 -05:00
Richard Mudgett
6393c106ca 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.

ASTERISK-27335

Change-Id: I9482073524411e7ea6c03805b16de200cb1669ea
2017-10-12 19:11:02 -05:00
Jenkins2
28a3ff75d5 Merge "res_pjsip_session: Prevent user=phone being added to anonimized URIs." into 13 2017-10-12 12:22:10 -05:00