Commit Graph

29072 Commits

Author SHA1 Message Date
zuul afcdadcd19 Merge "pbx_dundi: DUNDi weight parameter not processed correctly" 2017-02-22 10:19:45 -06:00
zuul 02356d36f7 Merge "realtime: Fix ast_load_realtime_multientry handling" 2017-02-22 10:11:49 -06:00
Joshua Colp 8f248f7a1c Merge "realtime: Centralize some common realtime backend code" 2017-02-22 05:53:50 -06:00
zuul 911252d7b5 Merge "res_pjsip_authenticator_digest.c: Fix sorcery's immutable contract violation." 2017-02-21 23:13:44 -06:00
zuul 1774f778f6 Merge "res_pjsip: Update artificial auth whenever default_realm changes." 2017-02-21 22:55:13 -06:00
zuul ac6e0fdcdb Merge "res_pjsip: Update authentication realm documentation." 2017-02-21 22:39:09 -06:00
zuul 28ee2642e1 Merge "pjproject: Fixes to resolve DNS SRV crashes." 2017-02-21 20:23:20 -06:00
zuul f4f3936d86 Merge "pjproject: Increase SENDER_WIDTH column size for 64-bit system logs." 2017-02-21 20:14:26 -06:00
zuul 26d1bd2490 Merge "pjsip_distributor.c: Update some debug messages to get transaction name." 2017-02-21 20:01:08 -06:00
zuul d90047fec3 Merge "res_config_ldap: Don't try to delete non-existent attributes" 2017-02-21 18:58:28 -06:00
zuul fa7803e697 Merge "res_config_ldap: Remove extraneous line numbers from log messages" 2017-02-21 18:58:27 -06:00
zuul 66e3edada9 Merge "res_config_ldap: Make memory allocation more consistent" 2017-02-21 18:58:26 -06:00
zuul da2ba22248 Merge "res_config_ldap: Fix configuration inheritance from _general" 2017-02-21 18:24:05 -06:00
zuul d5e25d8e3d Merge "res_config_ldap: Fix erroneous LDAP_MOD_REPLACE in LDAP modify" 2017-02-21 17:57:24 -06:00
Sean Bright fc70ca9499 pbx_dundi: DUNDi weight parameter not processed correctly
The DUNDi weight field is not always converted from network byte order
to host byte order. This can result in incorrect weight values and
incorrect selection of DUNDi destinations.

ASTERISK-18731 #close
Reported by: Peter Racz
Patches:
	dundi_weight.patch (license #6290) patch uploaded by Peter Racz

Change-Id: Iba3e1a700ff539db57211a7bbc26f7b22ea9a1be
2017-02-21 17:10:34 -06:00
Joshua Colp 16b0bb39c1 Merge changes from topic 'sdp_state_beginnings'
* changes:
  Add SDP translator and PJMEDIA implementation.
  Add initial SDP options.
2017-02-21 13:37:03 -06:00
Joshua Colp cf7abc9dde Merge "build: Execute ldconfig to build cache." 2017-02-21 13:36:38 -06:00
Sean Bright ab04a018e4 realtime: Fix ast_load_realtime_multientry handling
ast_load_realtime_multientry() returns an ast_config structure whose
ast_categorys are keyed with the empty strings. Several modules were
giving semantic meaning to the category names causing problems at
runtime.

* app_directory: Treated the category name as the mailbox name, and
  would fail to direct calls to the appropriate extension after an
  entry was chosen.

* app_queue: Queues, queue members, and queue rules were all affected
  and needed to be updated.

* pbx_realtime: Pattern matching would never succeed because the
  extension entered by the user was always compared to the empty
  string.

Change-Id: Ie7e44986344b0b76ea8f6ddb5879f5040c6ca8a7
2017-02-21 13:06:29 -06:00
Sean Bright 6e6c96d713 realtime: Centralize some common realtime backend code
All of the realtime backends create artificial ast_categorys to pass
back into the core as query results. These categories have no filename
or line number information associated with them and the backends differ
slightly on how they create them. So create a couple helper macros to
help make things more consistent.

Also updated the call sites to remove redundant error messages about
memory allocation failure.

Note that res_config_ldap sets the category filename to the 'table name'
but that is not read by anything in the core, so I've dropped it.

Change-Id: I3a1fd91e0c807dea1ce3b643b0a6fe5be9002897
2017-02-21 10:53:17 -06:00
zuul 144b09ab41 Merge "realtime: Fix LIKE escaping in SQL backends" 2017-02-21 06:26:30 -06:00
Joshua Colp 28c8e4f58f build: Execute ldconfig to build cache.
On some platforms a multiarch approach is used for libraries.
The build system does not take this into account and still
places libraries into the lib directory if no --libdir is
specified to configure. On initial startup this results in
libasteriskssl.so not being found, as it is not in the multiarch
lib directory.

This change does the minimally invasive thing and executes
ldconfig so that the libraries in the lib directory are found
and their location cached. By doing so Asterisk starts up fine.

If DESTDIR is specified, however, the old logic is executed as
the install process may not have permission to alter the ldconfig
cache.

ASTERISK-26705

Change-Id: If4eca46ac510c6fea5568256280ffdb3888d7bb4
2017-02-21 05:25:13 -06:00
Richard Mudgett 6f15500ced res_pjsip_authenticator_digest.c: Fix sorcery's immutable contract violation.
The inbound authentication object is supposed to be immutable when it is
stored in sorcery.  However, the immutable property is violated if the
authentication object does not have a realm set.

The immutable contract violation has a different effect depending upon
what sorcery back end is used.  If it is the config file back end you
would get the same object back until res_pjsip is reloaded.  If it is the
real-time or AstDB back end you would get a new object on each query.  If
it is cached you would get the same object back until it is refreshed from
the database.

Once an inbound authentication object has its realm set it may or may not
get updated again if the default_realm changes.

If the same authentication object is used for inbound and outbound
authentication then the immutable violation can make it very hard to
determine why the outbound authentication now fails.  The only diagnostic
message is a complaint about no realms matching when it had worked
earlier.  It fails because of the difference in behaviour for an empty
realm setting between inbound and outbound authentication objects.

* Fixed the sorcery object immutable violation by creating a new object
and setting the default_realm on it instead.  The new object is a shallow
copy for speed.

* The auth_store thread storage no longer holds an auth ref.  It
interferes with the shallow copy and never needed a ref anyway.

ASTERISK-26799 #close

Change-Id: I2328a52f61b78ed5fbba38180b7f183ee7e08956
2017-02-20 22:24:31 -06:00
Richard Mudgett 6400f5f309 res_pjsip: Update artificial auth whenever default_realm changes.
There was code attempting to update the artificial authentication object
whenever the default_realm changed.  However, once the artificial
authentication object was created it would never get updated.  The
artificial authentication object would require a system restart for a
change to the default_realm to take effect.

ASTERISK-26799

Change-Id: Id59036e9529c2d3ed728af2ed904dc36e7094802
2017-02-20 22:24:31 -06:00
Richard Mudgett 0b660c9989 res_pjsip: Update authentication realm documentation.
Using the same auth section for inbound and outbound authentication is not
recommended.  There is a difference in meaning for an empty realm setting
between inbound and outbound authentication uses.

An empty inbound auth realm represents the global section's default_realm
value when the authentication object is used to challenge an incoming
request.  An empty outgoing auth realm is treated as a don't care wildcard
when the authentication object is used to respond to an incoming
authentication challenge.

ASTERISK-26799

Change-Id: Id3952f7cfa1b6683b9954f2c5d2352d2f11059ce
2017-02-20 22:24:31 -06:00
zuul 50e984115d Merge "app_voicemail: vm_authenticate accesses uninitialized memory" 2017-02-20 18:29:24 -06:00
zuul 8dde33d184 Merge "tcptls.c: Add some missing allocation failure checks." 2017-02-20 17:43:27 -06:00
Richard Mudgett 7f83bcd63d pjproject: Fixes to resolve DNS SRV crashes.
* Re #1945 (misc): Don't trigger SRV complete callback when there is a
parse error.

* srv_resolver.c: Don't try to send query if already considered resolved.

** In resolve_hostnames() don't try to resolve a query that is already
considered resolved.

** In resolve_hostnames() fix DNS typo in comments.

** In build_server_entries() move a common expression assigning to cnt
earlier.

* sip_transport.c: Fix tdata object name to actually contain the pointer.

It helps if the logs referencing a tdata object buffer actually have a
name that includes the correct pointer as part of the name.  Also since
the tdata has its own pool it helps if any logs referencing the pool have
the same name as the tdata object.  This change brings tdata logging in
line with how tsx objects are named.

ASTERISK-26669 #close
ASTERISK-26738 #close

Change-Id: I56af2ded25476b3e870ca586ee69ed6954ef75af
2017-02-20 16:27:54 -06:00
Richard Mudgett bf78c3c9c3 pjproject: Increase SENDER_WIDTH column size for 64-bit system logs.
ASTERISK-26669
ASTERISK-26738

Change-Id: Ibae6fc8cae69a1f04df0c577c4c11200499d6fe0
2017-02-20 16:27:54 -06:00
Richard Mudgett 54812f18b5 pjsip_distributor.c: Update some debug messages to get transaction name.
* Removed overloaded unmatched response ignore.  We obviously sent the
request so we shouldn't ignore it because it isn't new work.

ASTERISK-26669
ASTERISK-26738

Change-Id: I55fb5cadc83a8e6699b347c6dc7fa32c5a617d37
2017-02-20 16:27:54 -06:00
zuul 10ef644d66 Merge "pjproject cli: Add object count after object lists" 2017-02-20 16:25:34 -06:00
zuul e5897c92ff Merge "res_config_sqlite3: Properly create missing columns when necessary" 2017-02-20 15:43:16 -06:00
Sean Bright b18f1bfb13 app_voicemail: vm_authenticate accesses uninitialized memory
vm_authenticate doesn't always set the passed ast_vm_user argument, so
we initialize to 0 before passing it in.

ASTERISK-25893 #close
Reported by: Filip Jenicek

Change-Id: Ia3cc0128f93d352ed9add8d5c2f0f7232c2cbe4a
2017-02-20 15:09:35 -06:00
zuul 496a7b0b4c Merge "Revert "build: Execute ldconfig to build cache."" 2017-02-20 14:09:27 -06:00
Joshua Colp 7739b0b3ae Revert "build: Execute ldconfig to build cache."
This reverts commit 8851c3e088.

Change-Id: I124380be5e3bd57da978428a2a93604336ccd0db
2017-02-20 11:19:55 -06:00
Joshua Colp fe88f2e5ca Merge "Binaural synthesis (confbridge): Adds utils/conf_bridge_binaural_hrir_importer" 2017-02-20 10:24:55 -06:00
George Joseph ffa7d69766 pjproject cli: Add object count after object lists
When listing a container, we now print the number of objects
in the container at the end of the list.

Change-Id: I791cbc3ee9da9a2af9adc655164b5d32953df812
2017-02-20 08:07:31 -06:00
Sean Bright e84353b8a8 res_config_ldap: Don't try to delete non-existent attributes
OpenLDAP will raise an error when we try to delete an LDAP attribute
that doesn't exist. We need to filter out LDAP_MOD_DELETE requests
based on which attributes the current LDAP entry actually has. There
is of course a small window of opportunity for this to still fail,
but it is much less likely now.

Change-Id: I3fe1b04472733e43151563aaf9f8b49980273e6b
2017-02-20 07:06:00 -05:00
Sean Bright 9f392574f9 res_config_ldap: Remove extraneous line numbers from log messages
Extraneous line numbers were being output in many log messages. These
have been removed.

Change-Id: Ice9efa3d252ee87f37fa8f5ea852fda482675431
2017-02-20 07:05:54 -05:00
Sean Bright ef0944395e res_config_ldap: Make memory allocation more consistent
The code in update_ldap() and update2_ldap() was using both Asterisk's
memory allocation routines as well as OpenLDAP's. I've changed it so
that everything that is passed to OpenLDAP's functions are allocated
with their routines.

Change-Id: Iafec9c1fd8ea49ccc496d6316769a6a426daa804
2017-02-20 07:05:47 -05:00
Sean Bright dd3efdf525 res_config_ldap: Fix configuration inheritance from _general
The "_general" configuration section allows administrators to provide
both general configuration options (host, port, url, etc.) as well as a
global realtime-to-LDAP-attribute mapping that is a fallback if one of
the later sections do not override it. This neglected to exclude the
general configuration options from the mapping. As an example, during
my testing, chan_sip requested 'port' from realtime, and because I did
not have it defined, it pulled in the 'port' configuration option from
"_general." We now filter those out explicitly.

Change-Id: I1fc61560bf96b8ba623063cfb7e0a49c4690d778
2017-02-20 07:05:41 -05:00
Sean Bright d6d86f1c09 res_config_ldap: Fix erroneous LDAP_MOD_REPLACE in LDAP modify
We always treat the first change of our modification batch as a
replacement when it sometimes is actually a delete. So we have to pass
the correct arguments to the OpenLDAP library.

ASTERISK-26580 #close
Reported by: Nicholas John Koch
Patches:
	res_config_ldap.c-11.24.1.patch (license #6833) patch uploaded
	by Nicholas John Koch

Change-Id: I0741d25de07c9539f1edc6eff3696165dfb64fbe
2017-02-20 07:05:31 -05:00
zuul a6225d100e Merge "res_config_sqlite3: Fix crash when loading with invalid config" 2017-02-19 13:24:44 -06:00
Joshua Colp 0d9cfff45e Merge "pjproject-bundled: Fix checksum verification when using cURL" 2017-02-19 12:46:09 -06:00
Sean Bright 44abe214d2 res_config_sqlite3: Fix crash when loading with invalid config
When ast_config_load() fails with CONFIG_STATUS_FILEINVALID, it has
already destroyed the ast_config struct for us. Trying to do it again
results in a crash.

Change-Id: If6a5c0ca718ad428e01a1fb25beb209a9ac18bc6
2017-02-18 12:19:37 -06:00
zuul c227745bc7 Merge "Remove extra ast_iostream_close() calls." 2017-02-17 17:41:06 -06:00
Sean Bright 51e3b11989 pjproject-bundled: Fix checksum verification when using cURL
ASTERISK-26802 #close
Reported by: Michael L. Young

Change-Id: Iad293080f55d4d69ab615717a15211d916eed613
2017-02-17 17:08:20 -06:00
Richard Mudgett 0b427f9b59 tcptls.c: Add some missing allocation failure checks.
* Fix tcptls_session ref and fd leak in ast_tcptls_server_root().

Change-Id: I0ddf01cd3c10d3b6666d7bf68d4e206a37f4fbdb
2017-02-17 17:00:24 -06:00
Mark Michelson dbc3598014 Remove extra ast_iostream_close() calls.
When AMI encounters an error at the beginning of a session, it would
explicitly call ast_iostream_close() on its tcptls session's iostream.
It then would jump to a label where it would shut down the tcptls
session instance. The tcptls session instance would again attempt to
close the iostream.

Under normal circumstances, this might go by unnoticed. However, when
MALLOC_DEBUG is enabled, all fields on the iostream get set to
0xdeaddead when the iostream is freed. Thus a second call to
ast_iostream_close() after the iostream has been freed would reslt in an
attempt to call SSL_shutdown on 0xdeaddead, which would crash and burn
horribly.

The fix here is to not directly close the iostream from the dangerous
scenarios. The specific scenarios are:
* Exceeding the configured authlimit
* Failing to build a mansession on a new connection

Change-Id: I908f98d516afd5a263bd36b072221008a4731acd
2017-02-17 15:12:30 -06:00
Mark Michelson 5a130b2e17 Add SDP translator and PJMEDIA implementation.
This creates the following:
* Asterisk's internal representation of an SDP
* An API for translating SDPs from one format to another
* An implementation of a translator for PJMEDIA

Change-Id: Ie2ecd3cbebe76756577be9b133e84d2ee356d46b
2017-02-17 09:47:47 -06:00
Mark Michelson 8af6342555 Add initial SDP options.
This is step one of adding an SDP API: defining some
configurable settings for SDPs. This is based on options
that are currently supported in Asterisk.

Change-Id: I1ede91aafed403b12a9ccdfb91a88389baa7e5d7
2017-02-17 09:23:12 -06:00