]> git.ipfire.org Git - thirdparty/asterisk.git/log
thirdparty/asterisk.git
7 years agochannel.c: Fix usage of CHECK_BLOCKING()
Richard Mudgett [Tue, 12 Jun 2018 19:09:54 +0000 (14:09 -0500)] 
channel.c: Fix usage of CHECK_BLOCKING()

The CHECK_BLOCKING() macro is used to indicate if a channel's handling
thread is about to do a blocking operation (poll, read, or write) of
media.  A few operations such as ast_queue_frame(), soft hangup, and
masquerades use the indication to wake up the blocked thread to reevaluate
what is going on.

ASTERISK-27625

Change-Id: I4dfc33e01e60627d962efa29d0a4244cf151a84d

7 years agoautoservice: Don't start channel autoservice if the thread is a user interface.
Richard Mudgett [Mon, 18 Jun 2018 23:04:54 +0000 (18:04 -0500)] 
autoservice: Don't start channel autoservice if the thread is a user interface.

Executing dialplan functions from either AMI or ARI by getting a variable
could place the channel into autoservice.  However, these user interface
threads do not handle the channel's media so we wind up with two threads
attempting to handle the media.

There can be one and only one thread handling a channel's media at a time.
Otherwise, we don't know which thread is going to handle the media frames.

ASTERISK-27625

Change-Id: If2dc94ce15ddabf923ed1e2a65ea0ef56e013e49

7 years agoARI POST DTMF: Make not compete with channel's media thread.
Richard Mudgett [Wed, 13 Jun 2018 21:41:43 +0000 (16:41 -0500)] 
ARI POST DTMF: Make not compete with channel's media thread.

There can be one and only one thread handling a channel's media at a time.
Otherwise, we don't know which thread is going to handle the media frames.

ASTERISK-27625

Change-Id: I4d6a2fe7386ea447ee199003bf8ad681cb30454e

7 years agoAMI PlayDTMF Action: Make not compete with channel's media thread.
Richard Mudgett [Wed, 13 Jun 2018 18:05:03 +0000 (13:05 -0500)] 
AMI PlayDTMF Action: Make not compete with channel's media thread.

There can be one and only one thread handling a channel's media at a time.
Otherwise, we don't know which thread is going to handle the media frames.

ASTERISK-27625

Change-Id: Ia341f1a6f4d54f2022261abec9021fe5b2eb4905

7 years agoapp_mp3: remove 10 seconds of silence after mp3 playback
Sam Wierema [Tue, 12 Jun 2018 14:30:37 +0000 (16:30 +0200)] 
app_mp3: remove 10 seconds of silence after mp3 playback

This patch changes the way asterisk polls output from mpg123, instead
of waiting for 10 seconds(when playing an http url) it now uses a
timeout of one second and iterates 10 times using this same timeout.

The main difference is that for every timeout asterisk receives it now
checks if mpg123 is still running before poll again.

ASTERISK-27752

Change-Id: Ib7df8462e3e380cb328011890ad9270d9e9b4620

7 years agoMerge "tests/test_utils: Repair ./configure --with-ssl=PATH." into 13
Jenkins2 [Thu, 14 Jun 2018 16:41:46 +0000 (11:41 -0500)] 
Merge "tests/test_utils: Repair ./configure --with-ssl=PATH." into 13

7 years agoMerge "res_rtp_asterisk: Instead of ./configure use OPENSSL_NO_SRTP." into 13
Joshua Colp [Thu, 14 Jun 2018 16:27:16 +0000 (11:27 -0500)] 
Merge "res_rtp_asterisk: Instead of ./configure use OPENSSL_NO_SRTP." into 13

7 years agotests/test_utils: Repair ./configure --with-ssl=PATH.
Alexander Traud [Wed, 13 Jun 2018 09:40:00 +0000 (11:40 +0200)] 
tests/test_utils: Repair ./configure --with-ssl=PATH.

ASTERISK-27914

Change-Id: Ibcab8f556ee77776f203cff8b06d776a673b7bc4

7 years agochan_iax2: better handling for timeout and EINTR
ktyerman [Tue, 5 Jun 2018 01:31:39 +0000 (11:31 +1000)] 
chan_iax2: better handling for timeout and EINTR

The iax2 module is not handling timeout and EINTR case properly. Mainly when
there is an interupt to the kernel thread. In case of ast_io_wait recieves a
signal, or timeout it can be an error or return 0 which eventually escapes the
thread loop, so that it cant recieve any data. This then causes the modules
receive queue to build up on the kernel and stop any communications via iax in
asterisk.

The proposed patch is for the iax module, so that timeout and EINTR does not
exit the thread.

ASTERISK-27705
Reported-by: Kirsty Tyerman
Change-Id: Ib4c32562f69335869adc1783608e940c3535fbfb

7 years agores_rtp_asterisk: Instead of ./configure use OPENSSL_NO_SRTP.
Alexander Traud [Wed, 13 Jun 2018 10:14:18 +0000 (12:14 +0200)] 
res_rtp_asterisk: Instead of ./configure use OPENSSL_NO_SRTP.

Previously, Asterisk used its script ./configure, to test whether OpenSSL was
built with no-srtp (or was simply too old). However, the header file
<openssl/opensslconf.h> is the preferred way to detect the local configuration
of OpenSSL.

As a positive side-effect the script ./configure does not interleave the
detection of the Open Settlement Protocol Toolkit (OSPTK) with the detection of
individual features of OpenSSL anymore.

Change-Id: I3c77c7b00b2ffa2e935632097fa057b9fdf480c0

7 years agoMerge "res_rtp_asterisk: Allow OpenSSL configured with no-deprecated." into 13
Jenkins2 [Tue, 12 Jun 2018 15:06:44 +0000 (10:06 -0500)] 
Merge "res_rtp_asterisk: Allow OpenSSL configured with no-deprecated." into 13

7 years agoMerge "crypto.h: Repair ./configure --with-ssl=PATH." into 13
Joshua Colp [Tue, 12 Jun 2018 14:40:01 +0000 (09:40 -0500)] 
Merge "crypto.h: Repair ./configure --with-ssl=PATH." into 13

7 years agoMerge "res_crypto: Allow OpenSSL configured with no-deprecated." into 13
Joshua Colp [Tue, 12 Jun 2018 13:28:16 +0000 (08:28 -0500)] 
Merge "res_crypto: Allow OpenSSL configured with no-deprecated." into 13

7 years agoMerge "res_srtp: Repair ./configure --with-ssl=PATH." into 13
Jenkins2 [Tue, 12 Jun 2018 12:45:19 +0000 (07:45 -0500)] 
Merge "res_srtp: Repair ./configure --with-ssl=PATH." into 13

7 years agoMerge "func_odbc: NODATA if SQLNumResultCols returned 0 columns on readsql" into 13
Jenkins2 [Tue, 12 Jun 2018 12:36:15 +0000 (07:36 -0500)] 
Merge "func_odbc: NODATA if SQLNumResultCols returned 0 columns on readsql" into 13

7 years agoMerge "chan_pjsip: Register for "BEFORE_MEDIA" responses" into 13
Jenkins2 [Mon, 11 Jun 2018 23:05:10 +0000 (18:05 -0500)] 
Merge "chan_pjsip:  Register for "BEFORE_MEDIA" responses" into 13

7 years agoAST-2018-008: Fix enumeration of endpoints from ACL rejected addresses.
Richard Mudgett [Mon, 30 Apr 2018 22:38:58 +0000 (17:38 -0500)] 
AST-2018-008: Fix enumeration of endpoints from ACL rejected addresses.

When endpoint specific ACL rules block a SIP request they respond with a
403 forbidden.  However, if an endpoint is not identified then a 401
unauthorized response is sent.  This vulnerability just discloses which
requests hit a defined endpoint.  The ACL rules cannot be bypassed to gain
access to the disclosed endpoints.

* Made endpoint specific ACL rules now respond with a 401 unauthorized
which is the same as if an endpoint were not identified.  The fix is
accomplished by replacing the found endpoint with the artificial endpoint
which always fails authentication.

ASTERISK-27818

Change-Id: Icb275a54ff8e2df6c671a6d9bda37b5d732b3b32

7 years agores_rtp_asterisk: Allow OpenSSL configured with no-deprecated.
Alexander Traud [Fri, 8 Jun 2018 20:09:00 +0000 (22:09 +0200)] 
res_rtp_asterisk: Allow OpenSSL configured with no-deprecated.

Furthermore, allow OpenSSL configured with no-dh. Additionally, this change
allows auto-negotiation of the elliptic curve/group for servers, not only with
OpenSSL 1.0.2 but also with OpenSSL 1.1.0 and newer. This enables X25519
(since OpenSSL 1.1.0) and X448 (since OpenSSL 1.1.1) as a side-effect.

ASTERISK-27910

Change-Id: I5b0dd47c5194ee17f830f869d629d7ef212cf537

7 years agocrypto.h: Repair ./configure --with-ssl=PATH.
Alexander Traud [Fri, 8 Jun 2018 11:01:53 +0000 (13:01 +0200)] 
crypto.h: Repair ./configure --with-ssl=PATH.

ASTERISK-27908

Change-Id: Iac49d9f82faeb8a4611c6805906bd6d650b1b1d8

7 years agores_crypto: Allow OpenSSL configured with no-deprecated.
Alexander Traud [Fri, 8 Jun 2018 09:06:44 +0000 (11:06 +0200)] 
res_crypto: Allow OpenSSL configured with no-deprecated.

The header <openssl/rsa.h> had to be included explicitly.

ASTERISK-27906

Change-Id: I41743801eed998c039d73db7a0762d104a4f75b2

7 years agores_srtp: Repair ./configure --with-ssl=PATH.
Alexander Traud [Fri, 8 Jun 2018 07:41:01 +0000 (09:41 +0200)] 
res_srtp: Repair ./configure --with-ssl=PATH.

ASTERISK-27905

Change-Id: Ibb7dc148a0048f4f9c3b12937ba4240dff0d15e2

7 years agofunc_odbc: NODATA if SQLNumResultCols returned 0 columns on readsql
Alexei Gradinari [Thu, 31 May 2018 15:25:40 +0000 (11:25 -0400)] 
func_odbc: NODATA if SQLNumResultCols returned 0 columns on readsql

The functions acf_odbc_read/cli_odbc_read ignore a number of columns
returned by the SQLNumResultCols.
If the number of columns is zero it means no data.
In this case, a SQLFetch function has to be not called,
because it will cause an error.

ASTERISK-27888 #close

Change-Id: Ie0f7bdac6c405aa5bbd38932c7b831f90729ee19

7 years agochan_pjsip: Register for "BEFORE_MEDIA" responses
George Joseph [Thu, 7 Jun 2018 13:46:03 +0000 (07:46 -0600)] 
chan_pjsip:  Register for "BEFORE_MEDIA" responses

chan_pjsip wasn't registering for "BEFORE_MEDIA" responses which meant
it was not updating HANGUPCAUSE for 4XX responses.  If the remote end
sent a "180 Ringing", then a "486 Busy", the hangup cause was left at
"180 Normal Clearing".

* Removed chan_pjsip_incoming_response from the original session
  supplement (which was handling only "AFTER MEDIA") and added it to a
  new session supplement which accepts both "BEFORE_MEDIA" and
  "AFTER_MEDIA".

* Also cleaned up some cleanup code in load module.

ASTERISK-27902

Change-Id: If9b860541887aca8ac2c9f2ed51ceb0550fb007a

7 years agoooh323c: GCC 8.1 warned about output truncated before terminating nul.
Alexander Traud [Thu, 7 Jun 2018 12:19:39 +0000 (14:19 +0200)] 
ooh323c: GCC 8.1 warned about output truncated before terminating nul.

ASTERISK-27901

Change-Id: I5a8e894f4924ef52e3094f6870656a559d67f3d7

7 years agoMerge "pjsip_options: handle modification of qualify options in realtime" into 13
Joshua Colp [Wed, 6 Jun 2018 16:21:38 +0000 (11:21 -0500)] 
Merge "pjsip_options: handle modification of qualify options in realtime" into 13

7 years agoMerge "pjsip_options: show/reload AOR qualify options using CLI" into 13
George Joseph [Wed, 6 Jun 2018 15:10:40 +0000 (10:10 -0500)] 
Merge "pjsip_options: show/reload AOR qualify options using CLI" into 13

7 years agoMerge "app_confbridge: Add talking indicator for ConfBridgeList AMI response" into 13
George Joseph [Wed, 6 Jun 2018 14:46:29 +0000 (09:46 -0500)] 
Merge "app_confbridge: Add talking indicator for ConfBridgeList AMI response" into 13

7 years agoMerge "bridge_channel.c: Fix Deadlock when using Local channels and fax gateway"...
Joshua Colp [Wed, 6 Jun 2018 10:46:28 +0000 (05:46 -0500)] 
Merge "bridge_channel.c: Fix Deadlock when using Local channels and fax gateway" into 13

7 years agoMerge "tcptls: Allow OpenSSL configured with no-dh." into 13
George Joseph [Tue, 5 Jun 2018 19:22:35 +0000 (14:22 -0500)] 
Merge "tcptls: Allow OpenSSL configured with no-dh." into 13

7 years agoMerge "tcptls.h: Repair ./configure --with-ssl=PATH." into 13
George Joseph [Tue, 5 Jun 2018 19:20:38 +0000 (14:20 -0500)] 
Merge "tcptls.h: Repair ./configure --with-ssl=PATH." into 13

7 years agoMerge "tcptls: Allow OpenSSL 1.1.x configured with enable-ssl3-method no-deprecated...
George Joseph [Tue, 5 Jun 2018 18:01:08 +0000 (13:01 -0500)] 
Merge "tcptls: Allow OpenSSL 1.1.x configured with enable-ssl3-method no-deprecated." into 13

7 years agoMerge "app_meetme: Fix manager event documentation for several events." into 13
Joshua Colp [Tue, 5 Jun 2018 11:53:33 +0000 (06:53 -0500)] 
Merge "app_meetme: Fix manager event documentation for several events." into 13

7 years agoapp_sendtext: Allow content types other than text/plain
George Joseph [Mon, 4 Jun 2018 14:50:51 +0000 (08:50 -0600)] 
app_sendtext:  Allow content types other than text/plain

There was no real reason to limit the conteny type to text/plain other
than that's what it was limited to before.  Now any text/* content
type will be allowed for channel drivers that don't support enhanced
messaging and any type will be allowed for channel drivers that do
support enhanced messaging.

Change-Id: I94a90cfee98b4bc8e22aa5c0b6afb7b862f979d9

7 years agobridge_channel.c: Fix Deadlock when using Local channels and fax gateway
Pirmin Walthert [Wed, 30 May 2018 06:12:30 +0000 (08:12 +0200)] 
bridge_channel.c: Fix Deadlock when using Local channels and fax gateway

ast_indicate is invoked with the bridge locked. As ast_indicate locks the
other end of the bridge as well this can lead to a deadlock in some situations.
(Especially when a different thread does the same in the reverse order).
This patch calls ast_indicate after unlocking the bridge which fixes the
deadlock. Calling ast_indicate with these parameters without locking the
bridge should be safe as this is done at different places without a
bridge lock.

ASTERISK-27094 #close
Reported-by: David Brillert
Change-Id: I5f86c1e2ce75b9929a36ab589b18c450e62ea35f

7 years agoapp_confbridge: Add talking indicator for ConfBridgeList AMI response
William McCall [Tue, 29 May 2018 00:17:52 +0000 (00:17 +0000)] 
app_confbridge: Add talking indicator for ConfBridgeList AMI response

When an AMI client connects, it cannot determine if a user was talking
prior to a transition in the user speaking state (which would generate
a ConfbridgeTalking event). This patch causes app_confbridge to track the
talking state and make this state available via ConfBridgeList.

ASTERISK-27877 #close

Change-Id: I19b5284f34966c3fda94f5b99a7e40e6b89767c6

7 years agoMerge "ast_coredumper: Fix output directory and variable precedence" into 13
Joshua Colp [Thu, 31 May 2018 10:15:57 +0000 (05:15 -0500)] 
Merge "ast_coredumper:  Fix output directory and variable precedence" into 13

7 years agoapp_meetme: Fix manager event documentation for several events.
Richard Mudgett [Tue, 29 May 2018 17:28:48 +0000 (12:28 -0500)] 
app_meetme: Fix manager event documentation for several events.

The MeetmeJoin, MeetmeLeave, MeetmeEnd, MeetmeMute, MeetmeTalking, and
MeetmeTalkRequest AMI events were documented with sending out a Usernum
header when the User header was actually output.

* Change the online documentation to match reality.

ASTERISK-27873
ASTERISK-25261

Change-Id: I437bc70618d07c183c9624b7069c2fcae7f17a39

7 years agoMerge "libasteriskssl: Allow OpenSSL 1.0.2 configured with no-deprecated." into 13
Joshua Colp [Tue, 29 May 2018 17:07:39 +0000 (12:07 -0500)] 
Merge "libasteriskssl: Allow OpenSSL 1.0.2 configured with no-deprecated." into 13

7 years agotcptls.h: Repair ./configure --with-ssl=PATH.
Alexander Traud [Mon, 28 May 2018 15:32:15 +0000 (17:32 +0200)] 
tcptls.h: Repair ./configure --with-ssl=PATH.

asterisk/tcptls.h was included (explicitly, implicitly, or transitively). Those
inclusions got replaced by forward declarations. As side effect, the inclusions
got completed.

ASTERISK-27878

Change-Id: I9d102728e30336d6522e5e4ae9e964013a0835f7

7 years agopjsip_options: handle modification of qualify options in realtime
Alexei Gradinari [Tue, 22 May 2018 21:21:10 +0000 (17:21 -0400)] 
pjsip_options: handle modification of qualify options in realtime

Currentrly pjsip_options code does not handle the situation when the
qualify options were changed in realtime database.
Only 'module reload res_pjsip' helps.

This patch add a check on contact add/update observers if the contact
qualify options are different than local aor qualify options.
If the qualify options were modified then synchronize
the pjsip_options AOR local state.

ASTERISK-27872

Change-Id: Id55210a18e62ed5d35a88e408d5fe84a3c513c62

7 years agotcptls: Allow OpenSSL configured with no-dh.
Alexander Traud [Fri, 25 May 2018 14:55:26 +0000 (16:55 +0200)] 
tcptls: Allow OpenSSL configured with no-dh.

Additionally, this change allows auto-negotiation of the elliptic curve/group
for servers, not only with OpenSSL 1.0.2 but also with OpenSSL 1.1.0 and newer.
This enables X25519 (since OpenSSL 1.1.0) and X448 (since OpenSSL 1.1.1) as a
side-effect.

ASTERISK-27876

Change-Id: I62c2aba4a630aefc231b71f646207e8c027d9497

7 years agotcptls: Allow OpenSSL 1.1.x configured with enable-ssl3-method no-deprecated.
Alexander Traud [Fri, 25 May 2018 12:24:51 +0000 (14:24 +0200)] 
tcptls: Allow OpenSSL 1.1.x configured with enable-ssl3-method no-deprecated.

ASTERISK-27874

Change-Id: Ica65113511c7a1c13f7988e7d9e7d9e7f3f620dd

7 years agoMerge "res/res_rtp_asterisk: ensure marker bit is correctly set on ssrc change" into 13
Joshua Colp [Thu, 24 May 2018 19:55:59 +0000 (14:55 -0500)] 
Merge "res/res_rtp_asterisk: ensure marker bit is correctly set on ssrc change" into 13

7 years agoast_coredumper: Fix output directory and variable precedence
George Joseph [Tue, 15 May 2018 13:45:20 +0000 (07:45 -0600)] 
ast_coredumper:  Fix output directory and variable precedence

The OUTPUTDIR variable in ast_debug_tools.conf.sample is now set
to "/tmp" instead of "/some/directory".

Variables set on the command line or that are already in the
environment now take predecence over variables set in the config files.

ASTERISK-27846
Reported by: Ted G

Change-Id: Ie8baec52d531886bf5849ec1d59bb59dc87ad387

7 years agoMerge "tcptls: Repair ./configure --with-ssl=PATH." into 13
Joshua Colp [Thu, 24 May 2018 11:07:18 +0000 (06:07 -0500)] 
Merge "tcptls: Repair ./configure --with-ssl=PATH." into 13

7 years agoMerge "channel.c: Fix off nominal channel allocation failure path." into 13
Joshua Colp [Thu, 24 May 2018 10:15:50 +0000 (05:15 -0500)] 
Merge "channel.c: Fix off nominal channel allocation failure path." into 13

7 years agoMerge "config.c: Fix successful DELETE treated as failure" into 13
Joshua Colp [Thu, 24 May 2018 10:10:07 +0000 (05:10 -0500)] 
Merge "config.c: Fix successful DELETE treated as failure" into 13

7 years agores/res_rtp_asterisk: ensure marker bit is correctly set on ssrc change
Torrey Searle [Wed, 9 May 2018 13:31:47 +0000 (15:31 +0200)] 
res/res_rtp_asterisk: ensure marker bit is correctly set on ssrc change

Certain race conditions between changing bridge types and DTMF can
cause the current FLAG_NEED_MARKER_BIT to send the marker bit before
the actual first packet of native bridging.

This logic keeps track of the ssrc the bridge is currently sending
and will correctly ensure the marker bit is set if SSRC as changed
from the previous sent packet.

ASTERISK-27845

Change-Id: I01858bd0235f1e5e629e20de71b422b16f55759b

7 years agopjsip_options: show/reload AOR qualify options using CLI
Alexei Gradinari [Wed, 23 May 2018 21:20:39 +0000 (17:20 -0400)] 
pjsip_options: show/reload AOR qualify options using CLI

Currentrly pjsip_options code does not handle the situation when the
AOR qualify options were changed.

Also there is no way to find out what qualify options are using.

This patch add CLI commands to show and synchronize Aor qualify options:
pjsip show qualify endpoint <id>
    Show the current qualify options for all Aors on the PJSIP endpoint.
pjsip show qualify aor <id>
    Show the PJSIP Aor current qualify options.
pjsip reload qualify endpoint <id>
    Synchronize the qualify options for all Aors on the PJSIP endpoint.
pjsip reload qualify aor <id>
    Synchronize the PJSIP Aor qualify options.

ASTERISK-27872

Change-Id: I1746d10ef2b7954f2293f2e606cdd7428068c38c

7 years agochannel.c: Fix off nominal channel allocation failure path.
Richard Mudgett [Tue, 22 May 2018 22:17:31 +0000 (17:17 -0500)] 
channel.c: Fix off nominal channel allocation failure path.

__ast_channel_alloc_ap() had a failure exit path that hadn't setup the fd
descriptors to -1 yet.  The destructor would then attempt to close these
fd's that had never been opened.

Change-Id: Icf21093f36c60781e8cf6ee9d586536302af33e3

7 years agoconfig.c: Fix successful DELETE treated as failure
Alexei Gradinari [Fri, 18 May 2018 21:45:22 +0000 (17:45 -0400)] 
config.c: Fix successful DELETE treated as failure

The config engine destroy_func callback function returns the number of
rows deleted or -1 on error.  But the function
ast_destroy_realtime_fields treated non-zero return values as error.

ASTERISK-27863

Change-Id: Ied02b38e8196cb03043e609a0679feebd288d17b

7 years agoMerge "app_voicemail: Fix data-type mismatch between app_voicemail and database"...
Joshua Colp [Mon, 21 May 2018 14:05:37 +0000 (09:05 -0500)] 
Merge "app_voicemail: Fix data-type mismatch between app_voicemail and database" into 13

7 years agolibasteriskssl: Allow OpenSSL 1.0.2 configured with no-deprecated.
Alexander Traud [Sun, 20 May 2018 11:41:41 +0000 (13:41 +0200)] 
libasteriskssl: Allow OpenSSL 1.0.2 configured with no-deprecated.

Use CRYPTO_set_id_callback(.) only with OpenSSL 0.9.8 and older.

ASTERISK-27867

Change-Id: Iadd58d5bf6f538eb224203970a4e88e26f259655

7 years agotcptls: Repair ./configure --with-ssl=PATH.
Alexander Traud [Sat, 19 May 2018 13:23:30 +0000 (15:23 +0200)] 
tcptls: Repair ./configure --with-ssl=PATH.

SSL_OP_NO_TLSv1_1 and SSL_OP_NO_TLSv1_2 got discovered without honoring a PATH.

ASTERISK-27865

Change-Id: I8cd358eed7411726d08fa7b01691bef122fbeb71

7 years agoMerge "app_voicemail: Fix incorrect msg leaving/retrieving an ODBC voicemail" into 13
Kevin Harwell [Fri, 18 May 2018 21:43:06 +0000 (16:43 -0500)] 
Merge "app_voicemail: Fix incorrect msg leaving/retrieving an ODBC voicemail" into 13

7 years agoMerge "chan_mobile: support handling of caller-id names ("cnam")." into 13
Jenkins2 [Fri, 18 May 2018 21:06:34 +0000 (16:06 -0500)] 
Merge "chan_mobile: support handling of caller-id names ("cnam")." into 13

7 years agoMerge "res_pjsip_endpoint_identifier_ip: Unregister the module for headers." into 13
Jenkins2 [Fri, 18 May 2018 20:18:33 +0000 (15:18 -0500)] 
Merge "res_pjsip_endpoint_identifier_ip: Unregister the module for headers." into 13

7 years agoapp_voicemail: Fix incorrect msg leaving/retrieving an ODBC voicemail
Nic Colledge [Sat, 12 May 2018 11:53:13 +0000 (12:53 +0100)] 
app_voicemail: Fix incorrect msg leaving/retrieving an ODBC voicemail

Correct the log warning message shown when ODBC voicemail
retrieve_file is called and there is a null value in the category
column.
A more meaningfull message is now written at debug level.

ASTERISK-27853

Change-Id: Ic36e97d5eb070a23a12ba45972f6b53e2182a3f4

7 years agochan_mobile: support handling of caller-id names ("cnam").
Brian P. Martin [Wed, 18 Apr 2018 02:15:08 +0000 (19:15 -0700)] 
chan_mobile: support handling of caller-id names ("cnam").

Add support to handle caller-ID names ("cnam") in addition to caller-ID
numbers.  The prior code ignored the caller-ID name altogether, and
used the local name for the cell phone (e.g. "my-iphone") in its place.

Note: as of this writing, at least some Android phones don't pass cnam to
us. This can be seen by issuing "core set debug 2" in the CLI and watching
the "CLIP" record when a call comes in.  If cnam isn't in the CLIP record,
there's nothing we can do to provide one.  We'll provide a null cnam field,
so later Asterisk processes know to try other sources (e.g. cidname database,
OpenCNAM, etc.).

Reported by: Brian Martin
Tested by: Brian Martin
ASTERISK-27726

Change-Id: I89490d85fa406c36261879c50ae5e65595538ba5

7 years agores_pjsip_endpoint_identifier_ip: Unregister the module for headers.
Alexander Traud [Thu, 17 May 2018 06:58:43 +0000 (08:58 +0200)] 
res_pjsip_endpoint_identifier_ip: Unregister the module for headers.

Asterisk uses Reference Counting to track whether a module can be unloaded.
Every consumer who requires a module, increases the reference count. When the
consumer goes, is unloaded itself, it has to decrease the reference count on
all its used/required modules. That way
 core stop gracefully
works on the command-line interface (CLI): One module after the other is
unloaded. A recent change broke this for the module res_pjsip.

ASTERISK-27861

Change-Id: I261abcb411d026bbb0691cc78f28300bfd3103a3

7 years agores_pjsip: Register pjsip_transport_management not externally but internally.
Alexander Traud [Thu, 17 May 2018 05:34:03 +0000 (07:34 +0200)] 
res_pjsip: Register pjsip_transport_management not externally but internally.

The module (res_)pjsip_transport_management got moved into res_pjsip. It is no
longer an independent/external module with (un)load_module and therefore has to
register just internally with res_pjsip.

ASTERISK-27860

Change-Id: Icd0413be7d2e98b92f51e6d6c353f2570bb4be95

7 years agoMerge "cli: Display correct unit for HTTP timeout in "manager show settings"." into 13
Jenkins2 [Wed, 16 May 2018 14:40:58 +0000 (09:40 -0500)] 
Merge "cli: Display correct unit for HTTP timeout in "manager show settings"." into 13

7 years agoMerge "Fix GCC 8 build issues." into 13
Jenkins2 [Wed, 16 May 2018 14:37:35 +0000 (09:37 -0500)] 
Merge "Fix GCC 8 build issues." into 13

7 years agoMerge "rtp_engine: Remove the double assigned RTP payload ID of H.263+." into 13
Joshua Colp [Tue, 15 May 2018 09:13:41 +0000 (04:13 -0500)] 
Merge "rtp_engine: Remove the double assigned RTP payload ID of H.263+." into 13

7 years agoMerge "rtp_engine: Avoid a typo error in Doxygen for ast_rtp_codecs_find_payload_code...
Joshua Colp [Mon, 14 May 2018 11:25:06 +0000 (06:25 -0500)] 
Merge "rtp_engine: Avoid a typo error in Doxygen for ast_rtp_codecs_find_payload_code." into 13

7 years agoMerge "git: Ignore *.orig." into 13
Jenkins2 [Mon, 14 May 2018 11:24:09 +0000 (06:24 -0500)] 
Merge "git: Ignore *.orig." into 13

7 years agoMerge "pjsip: Rewrite OPTIONS support with new eyes." into 13
Joshua Colp [Mon, 14 May 2018 09:06:20 +0000 (04:06 -0500)] 
Merge "pjsip: Rewrite OPTIONS support with new eyes." into 13

7 years agoapp_voicemail: Fix data-type mismatch between app_voicemail and database
Nic Colledge [Tue, 27 Mar 2018 23:53:07 +0000 (00:53 +0100)] 
app_voicemail: Fix data-type mismatch between app_voicemail and database

Fix data-type mismatch between app_voicemail and database columns
exposed by new version of MariaDB

ASTERISK-27760

Change-Id: I8543ad480a08c98be78bde1ee870e6e6c84b2c5b

7 years agortp_engine: Remove the double assigned RTP payload ID of H.263+.
Alexander Traud [Fri, 11 May 2018 17:49:12 +0000 (19:49 +0200)] 
rtp_engine: Remove the double assigned RTP payload ID of H.263+.

Mantis-3709 (Commit 68ff3c3, Asterisk 1.2) added support for the video format
H.263+. For this, the RTP payload ID 103 got assigned statically. Commit f1aadc8
assigned another payload ID 98 for this format in Asterisk 1.6.

Change-Id: I90e35b158487f8f1f8187da6241b54cd3b74e667

7 years agocli: Display correct unit for HTTP timeout in "manager show settings".
Corey Farrell [Fri, 11 May 2018 17:26:39 +0000 (13:26 -0400)] 
cli: Display correct unit for HTTP timeout in "manager show settings".

HTTP timeout is in seconds, not minutes.

ASTERISK-27852 #close

Change-Id: Ie6640835cb07307555741f9b559c2eb876d9343e

7 years agortp_engine: Avoid a typo error in Doxygen for ast_rtp_codecs_find_payload_code.
Alexander Traud [Fri, 11 May 2018 15:37:57 +0000 (17:37 +0200)] 
rtp_engine: Avoid a typo error in Doxygen for ast_rtp_codecs_find_payload_code.

Change-Id: Ica089d4507a27ddfc4ce3a88d697ffbef378de48

7 years agoFix GCC 8 build issues.
Corey Farrell [Mon, 7 May 2018 15:49:18 +0000 (11:49 -0400)] 
Fix GCC 8 build issues.

This fixes build warnings found by GCC 8.  In some cases format
truncation is intentional so the warning is just suppressed.

ASTERISK-27824 #close

Change-Id: I724f146cbddba8b86619d4c4a9931ee877995c84

7 years agoMerge "makeopts.in: Remove unused/undefined AST_MARCH_NATIVE." into 13
Joshua Colp [Thu, 10 May 2018 08:45:35 +0000 (03:45 -0500)] 
Merge "makeopts.in: Remove unused/undefined AST_MARCH_NATIVE." into 13

7 years agoMerge "sip_to_pjsip: Enable python3 compatibility." into 13
Joshua Colp [Thu, 10 May 2018 00:01:02 +0000 (19:01 -0500)] 
Merge "sip_to_pjsip: Enable python3 compatibility." into 13

7 years agores_hep: Adds hostname resolution support for capture_address
Matthew Fredrickson [Fri, 4 May 2018 21:07:10 +0000 (16:07 -0500)] 
res_hep: Adds hostname resolution support for capture_address

Previously, only an IP address would be accepted for the capture_address config
setting in hep.conf.  This change allows capture_address to be a resolvable
hostname or an IP address.

ASTERISK-27796 #close
Reported-By: Sebastian Gutierrez
Change-Id: I33e1a37a8b86e20505dadeda760b861a9ef51f6f

7 years agoMerge "app_macro: Prevent infinite loop in find_matching_priority." into 13
Jenkins2 [Wed, 9 May 2018 16:27:41 +0000 (11:27 -0500)] 
Merge "app_macro: Prevent infinite loop in find_matching_priority." into 13

7 years agogit: Ignore *.orig.
Corey Farrell [Wed, 9 May 2018 14:30:41 +0000 (10:30 -0400)] 
git: Ignore *.orig.

This prevents accidental commit of files created by patch.

Change-Id: I68380db61f0f9d620046f719ccd978811d0e9964

7 years agosip_to_pjsip: Enable python3 compatibility.
Alexander Traud [Wed, 18 Apr 2018 07:27:51 +0000 (09:27 +0200)] 
sip_to_pjsip: Enable python3 compatibility.

The script remains compatible with Python 2.7 but now also works with
Python 3.3 and newer; to ease the migration from chan_sip to chan_pjsip.

ASTERISK-27811

Change-Id: I59cc6b52a1a89777eebcf25b3023bdf93babf835

7 years agomakeopts.in: Remove unused/undefined AST_MARCH_NATIVE.
Corey Farrell [Tue, 8 May 2018 19:28:10 +0000 (15:28 -0400)] 
makeopts.in: Remove unused/undefined AST_MARCH_NATIVE.

Change-Id: I617a96ebb83ec99f5d3176bbbee2d2a272ccb203

7 years agomanager: fix digest auth for ami/http mechanism.
Jaco Kroon [Tue, 8 May 2018 09:59:02 +0000 (11:59 +0200)] 
manager: fix digest auth for ami/http mechanism.

Due to a fixed size buffer the digest authentication could be
incorrectly calculated if a large URI was provided, causing
authentication failure. The buffer is now dynamically allocated to allow
any size URI within the normal limits of the HTTP request size.

ASTERISK-27841

Change-Id: I660609db13b8f9e5f9567f339dd804f4985d41b3

7 years agoapp_macro: Prevent infinite loop in find_matching_priority.
Corey Farrell [Fri, 4 May 2018 18:47:25 +0000 (14:47 -0400)] 
app_macro: Prevent infinite loop in find_matching_priority.

Use AST_PBX_MAX_STACK to escape if we recurse 128 times.  This will
prevent crash if dialplan contains an include loop.  Log an error when
this occurs, at most one message per call to Macro() so we avoid logger
spam.

ASTERISK-26570 #close

Change-Id: I6c71b76998c31434391b150de055ae9a531e31da

7 years agoMerge "res_ari: Remove requirement that body exists when debug is on." into 13
Jenkins2 [Fri, 4 May 2018 11:08:40 +0000 (06:08 -0500)] 
Merge "res_ari: Remove requirement that body exists when debug is on." into 13

7 years agoMerge "res_pjsip/pjsip_distributor.c: Add missing off-nominal request response."...
Jenkins2 [Thu, 3 May 2018 17:11:00 +0000 (12:11 -0500)] 
Merge "res_pjsip/pjsip_distributor.c: Add missing off-nominal request response." into 13

7 years agoMerge "pjsip: Increase maximum number of usable ciphers & other cleanups" into 13
Joshua Colp [Thu, 3 May 2018 12:25:17 +0000 (07:25 -0500)] 
Merge "pjsip: Increase maximum number of usable ciphers & other cleanups" into 13

7 years agores_ari: Remove requirement that body exists when debug is on.
Joshua Colp [Thu, 3 May 2018 11:34:32 +0000 (11:34 +0000)] 
res_ari: Remove requirement that body exists when debug is on.

The "ari set debug" code for incoming requests incorrectly assumed
that all requests would contain a body. If one did not exist the
request would be incorrectly rejected. The response that was sent
was also incomplete as an incorrect function was used to construct
the response.

The code has now been changed to no longer require a request to have
a body and the response updated to use the correct function.

ASTERISK-27801

Change-Id: I4eef036ad54550a4368118cc348765ecac25e0f8

7 years agopjsip: Increase maximum number of usable ciphers & other cleanups
Sean Bright [Wed, 2 May 2018 12:43:35 +0000 (08:43 -0400)] 
pjsip: Increase maximum number of usable ciphers & other cleanups

* Increase maximum number of ciphers from 100 to 256 (or whatever
  PJ_SSL_SOCK_MAX_CIPHERS is #define'd to)

* Simplify logic in cipher_name_to_id()

* Make signed/unsigned comparison consistent

Re: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=897412

Reported by: OndÅ™ej Holas

Change-Id: Iea620f03915a1b873e79743154255c3148a514e7

7 years agores_pjsip/pjsip_distributor.c: Add missing off-nominal request response.
Richard Mudgett [Mon, 30 Apr 2018 22:24:33 +0000 (17:24 -0500)] 
res_pjsip/pjsip_distributor.c: Add missing off-nominal request response.

Change-Id: I389579b39c523d1d1e8ce020ef549a8bb5781c9b

7 years agores_pjsip/pjsip_distributor.c: Pull some assignments out of if tests.
Richard Mudgett [Mon, 30 Apr 2018 22:20:13 +0000 (17:20 -0500)] 
res_pjsip/pjsip_distributor.c: Pull some assignments out of if tests.

Change-Id: I3d30d638b53a4bbe9bf9aad853c649d583894112

7 years agoMerge "BuildSystem: Add DragonFly BSD." into 13
George Joseph [Mon, 30 Apr 2018 14:06:45 +0000 (09:06 -0500)] 
Merge "BuildSystem: Add DragonFly BSD." into 13

7 years agoMerge "translate: generic plc not filled in after translation" into 13
George Joseph [Mon, 30 Apr 2018 13:38:09 +0000 (08:38 -0500)] 
Merge "translate: generic plc not filled in after translation" into 13

7 years agoMerge "app_sendtext: Enhance SendText to support Enhanced Messaging" into 13
George Joseph [Mon, 30 Apr 2018 12:35:17 +0000 (07:35 -0500)] 
Merge "app_sendtext:  Enhance SendText to support Enhanced Messaging" into 13

7 years agopjsip: Rewrite OPTIONS support with new eyes.
Joshua Colp [Mon, 11 Dec 2017 18:34:53 +0000 (18:34 +0000)] 
pjsip: Rewrite OPTIONS support with new eyes.

The OPTIONS support in PJSIP has organically grown, like many things in
Asterisk.  It has been tweaked, changed, and adapted based on situations
run into.  Unfortunately this has taken its toll.  Configuration file
based objects have poor performance and even dynamic ones aren't that
great.

This change scraps the existing code and starts fresh with new eyes.  It
leverages all of the APIs made available such as sorcery observers and
serializers to provide a better implementation.

1.  The state of contacts, AORs, and endpoints relevant to the qualify
process is maintained.  This state can be updated by external forces (such
as a device registering/unregistering) and also the reload process.  This
state also includes the association between endpoints and AORs.

2.  AORs are scheduled and not contacts.  This reduces the amount of work
spent juggling scheduled items.

3.  Manipulation of which AORs are being qualified and the endpoint states
all occur within a serializer to reduce the conflict that can occur with
multiple threads attempting to modify things.

4.  Operations regarding an AOR use a serializer specific to that AOR.

5.  AORs and endpoint state act as state compositors.  They take input
from lower level objects (contacts feed AORs, AORs feed endpoint state)
and determine if a sufficient enough change has occurred to be fed further
up the chain.

6.  Realtime is supported by using observers to know when a contact has
been registered.  If state does not exist for the associated AOR then it
is retrieved and becomes active as appropriate.

The end result of all of this is best shown with a configuration file of
3000 endpoints each with an AOR that has a static contact.  In the old
code it would take over a minute to load and use all 8 of my cores.  This
new code takes 2-3 seconds and barely touches the CPU even while dealing
with all of the OPTIONS requests.

ASTERISK-26806

Change-Id: I6a5ebbfca9001dfe933eaeac4d3babd8d2e6f082

7 years agoMerge "bridge_softmix: Forward TEXT frames" into 13
George Joseph [Fri, 27 Apr 2018 18:17:27 +0000 (13:17 -0500)] 
Merge "bridge_softmix:  Forward TEXT frames" into 13

7 years agoMerge "BuildSystem: Enable IMAP storage on FreeBSD and DragonFly BSD." into 13
Joshua Colp [Fri, 27 Apr 2018 00:06:31 +0000 (19:06 -0500)] 
Merge "BuildSystem: Enable IMAP storage on FreeBSD and DragonFly BSD." into 13

7 years agoMerge "install_prereq: Add DragonFly BSD." into 13
Joshua Colp [Wed, 25 Apr 2018 18:55:19 +0000 (13:55 -0500)] 
Merge "install_prereq: Add DragonFly BSD." into 13

7 years agoMerge "format_pcm: Correct behavior of fseek and ftell for G.722" into 13
Joshua Colp [Wed, 25 Apr 2018 18:30:42 +0000 (13:30 -0500)] 
Merge "format_pcm: Correct behavior of fseek and ftell for G.722" into 13

7 years agoMerge "menuselect: Add DragonFly BSD." into 13
Joshua Colp [Wed, 25 Apr 2018 18:21:45 +0000 (13:21 -0500)] 
Merge "menuselect: Add DragonFly BSD." into 13

7 years agoMerge "chan_ooh323: fix ooManualProgress/ooManualRingback on ooh323 debuggin on"...
Jenkins2 [Wed, 25 Apr 2018 15:20:42 +0000 (10:20 -0500)] 
Merge "chan_ooh323: fix ooManualProgress/ooManualRingback on ooh323 debuggin on" into 13

7 years agoMerge "res_pjsip: Fix initialization of extended stringfields." into 13
Joshua Colp [Tue, 24 Apr 2018 23:59:01 +0000 (18:59 -0500)] 
Merge "res_pjsip: Fix initialization of extended stringfields." into 13

7 years agoMerge "chan_ooh323: Fix cppcheck warnings" into 13
Joshua Colp [Tue, 24 Apr 2018 23:39:17 +0000 (18:39 -0500)] 
Merge "chan_ooh323: Fix cppcheck warnings" into 13