Commit Graph

29058 Commits

Author SHA1 Message Date
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
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
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
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
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
Joshua Colp
8851c3e088 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.

ASTERISK-26705

Change-Id: I6d30b6427e9d5e69470e11327c7ff203fa7da519
2017-02-16 14:21:14 -06:00
zuul
ab34e46b3a Merge "stream: Rename creates/destroys to allocs/frees" 2017-02-16 13:24:30 -06:00
Sean Bright
e93f2a5142 realtime: Fix LIKE escaping in SQL backends
The realtime framework allows for components to look up values using a
LIKE clause with similar syntax to SQL's. pbx_realtime uses this
functionality to search for pattern matching extensions that start with
an underscore (_).

When passing an underscore to SQL's LIKE clause, it will be interpreted
as a wildcard matching a single character and therefore needs to be
escaped. It is (for better or for worse) the responsibility of the
component that is querying realtime to escape it with a backslash before
passing it in. Some RDBMs support escape characters by default, but the
SQL92 standard explicitly says that there are no escape characters
unless they are specified with an ESCAPE clause, e.g.

	SELECT * FROM table WHERE column LIKE '\_%' ESCAPE '\'

This patch instructs 3 backends - res_config_mysql, res_config_pgsql,
and res_config_sqlite3 - to use the ESCAPE clause where appropriate.

Looking through documentation and source tarballs, I was able to
determine that the ESCAPE clause is supported in:

MySQL 5.0.15   (released 2005-10-22 - earliest version available from
                archives)
PostgreSQL 7.1 (released 2001-04-13)
SQLite 3.1.0   (released 2005-01-21)

The versions of the relevant libraries that we depend on to access MySQL
and PostgreSQL will not work on versions that old, and I've added an
explicit check in res_config_sqlite3 to only use the ESCAPE clause when
we have a sufficiently new version of SQLite3.

res_config_odbc already handles the escape characters appropriately, so
no changes were required there.

ASTERISK-15858 #close
Reported by: Humberto Figuera

ASTERISK-26057 #close
Reported by: Stepan

Change-Id: I93117fbb874189ae819f4a31222df7c82cd20efa
2017-02-16 12:59:50 -06:00
Joshua Colp
11da7b5106 Merge "stream: Add unit tests for channel stream usage." 2017-02-16 11:34:40 -06:00
zuul
63ac09b101 Merge "chan_unistim: fix char type to have consistent behavior on ARM" 2017-02-16 11:32:32 -06:00
Joshua Colp
4ebf6d638a Merge "http: Ensure capath is defined on all http creations" 2017-02-16 10:40:10 -06:00
Joshua Colp
b1edbc4c83 Merge "res_pjsip_pubsub: Correctly implement persisted subscriptions" 2017-02-16 09:48:52 -06:00
George Joseph
f8f513d363 stream: Rename creates/destroys to allocs/frees
To be consistent with sdp implementation.

Change-Id: I714e300939b4188f58ca66ce9d1e84b287009500
2017-02-16 09:10:02 -06:00
zuul
3ed09e2822 Merge "pjsip_distributor.c: Fix off-nominal tdata ref leak." 2017-02-16 07:08:29 -06:00
Sean Bright
30aaeec5a1 res_config_sqlite3: Properly create missing columns when necessary
There were two specific issues resolved here:

1) The code that iterated over the required fields
   (via ast_realtime_require) was broken for the RQ_INTEGER1 field
   type. Iteration would stop when the first RQ_INTEGER1 (0) field
   was encountered.

2) sqlite3_changes() was used to try and count the number of rows
   returned by a SELECT statement. sqlite3_changes() only counts
   affected rows, so this was always returning the value from the
   most recent data modification statement. We now separate read-only
   queries from data modification queries and count rows appropriately
   in both cases.

ASTERISK-23457 #close
Reported by: Scott Griepentrog

Change-Id: I91ed20494efc3fcfbc2a96ac7646999a49814884
2017-02-16 06:10:48 -06:00
Joshua Elson
ac7a34c531 http: Ensure capath is defined on all http creations
ASTERISK-26794 #close

Change-Id: I9cbc3b6b6a8aab590f5ccde9c262a98e4d5253a1
2017-02-16 05:48:41 -06:00
Igor Goncharovsky
135bea931c chan_unistim: fix char type to have consistent behavior on ARM
There is difference exists in behaviour of char type on x86 and ARM.
On x86 by default char variable type means signed char, but in ARM
unsigned char used. This make binary calculations and negative values
works wrong on ARM.

This patch change type of char variables used for store negative
values and binary calculations to signed char.

ASTERISK-26714

Change-Id: Id78716dee9568a58419d4ef63c038affc3dfc7ab
2017-02-15 23:43:04 -06:00
George Joseph
ca7fa7bbd2 Merge "stream: Add stream topology to channel" 2017-02-15 19:29:52 -06:00
George Joseph
4bdf5d329f res_pjsip_pubsub: Correctly implement persisted subscriptions
This patch fixes 2 original issues and more that those 2 exposed.

* When we send a NOTIFY, and the client either doesn't respond or
  responds with a non OK, pjproject only calls our
  pubsub_on_evsub_state callback, no others.  Since
  pubsub_on_evsub_state (which does the sub_tree cleanup) does not
  expect to be called back without the other callbacks being called
  first, it just returns leaving the sub_tree orphaned.  Now
  pubsub_on_evsub_state checks the event for PJSIP_EVENT_TSX_STATE
  which is what pjproject will set to tell us that it was the
  transaction that timed out or failed and not the subscription
  itself timing our or being terminated by the client. If is
  TSX_STATE, pubsub_on_evsub_state now does the proper cleanup
  regardless of the state of the subscription.

* When a client renews a subscription, we don't update the
  persisted subscription with the new expires timestamp.  This causes
  subscription_persistence_recreate to prune the subscription if/when
  asterisk restarts.  Now, pubsub_on_rx_refresh calls
  subscription_persistence_update to apply the new expires timestamp.
  This exposed other issues however...

* When creating a dialog from rdata (which sub_persistence_recreate
  does from the packet buffer) there must NOT be a tag on the To
  header (which there will be when a client refreshes a
  subscription).  If there is one, pjsip_dlg_create_uas will fail.
  To address this, subscription_persistence_update now accepts a flag
  that indicates that the original packet buffer must not be updated.
  New subscribes don't set the flag and renews do.  This makes sure
  that when the rdata is recreated on asterisk startup, it's done
  from the original subscribe packet which won't have the tag on To.

* When creating a dialog from rdata, we were setting the dialog's
  remote (SUBSCRIBE) cseq to be the same as the local (NOTIFY) cseq.
  When the client tried to resubscribe after a restart with the
  correct cseq, we'd reject the request with an Invalid CSeq error.

* The acts of creating a dialog and evsub by themselves when
  recreating a subscription does NOT restart pjproject's subscription
  timer.  The result was that even if we did correctly recreate the
  subscription, we never removed it if the client happened to go away
  or send a non-OK response to a NOTIFY.  However, there is no
  pjproject function exposed to just set the timer on an evsub that
  wasn't created by an incoming subscribe request.  To address this,
  we create our own timer using ast_sip_schedule_task.  This timer is
  used only for re-establishing subscriptions after a restart.

  An earlier approach was to add support for setting pjproject's
  timer (via a pjproject patch) and while that patch is still included
  here, we don't use that call at the moment.

While addressing these issues, additional debugging was added and
some existing messages made more useful.  A few formatting changes
were also made to 'pjsip show scheduled tasks' to make displaying
the subscription timers a little more friendly.

ASTERISK-26696
ASTERISK-26756

Change-Id: I8c605fc1e3923f466a74db087d5ab6f90abce68e
2017-02-15 13:11:46 -06:00