18 months agoMerge "contrib: Update systemd README.txt."
Kevin Harwell [Fri, 20 Jul 2018 17:01:44 +0000 (12:01 -0500)]
Merge "contrib: Update systemd README.txt."

18 months agoMerge "Update UPDATE.txt for 16 and update ARI stubs."
Joshua Colp [Thu, 19 Jul 2018 11:18:34 +0000 (06:18 -0500)]
Merge "Update UPDATE.txt for 16 and update ARI stubs."

18 months agocontrib: Update systemd README.txt.
Corey Farrell [Wed, 18 Jul 2018 22:13:44 +0000 (18:13 -0400)]
contrib: Update systemd README.txt.

Mention need to compile Asterisk with systemd development package


Change-Id: Ib3a973be403c61cbe09572b0f912fb1aa1bff026

18 months agoMerge "Update ARI version for master/16."
George Joseph [Wed, 18 Jul 2018 20:20:29 +0000 (15:20 -0500)]
Merge "Update ARI version for master/16."

18 months agoMerge "pjproject_bundled: Repair ./configure --with-ssl=PATH."
George Joseph [Wed, 18 Jul 2018 20:19:40 +0000 (15:19 -0500)]
Merge "pjproject_bundled: Repair ./configure --with-ssl=PATH."

18 months agoMerge "res_sorcery_config: Allow configuration section to be used based on name."
George Joseph [Wed, 18 Jul 2018 19:47:22 +0000 (14:47 -0500)]
Merge "res_sorcery_config: Allow configuration section to be used based on name."

18 months agoMerge "res_rtp_asterisk: Add support for sending NACK requests."
George Joseph [Wed, 18 Jul 2018 19:46:28 +0000 (14:46 -0500)]
Merge "res_rtp_asterisk: Add support for sending NACK requests."

18 months agoMerge "res_pjsip_sdp_rtp: include ice in ANSWER only if offered"
George Joseph [Wed, 18 Jul 2018 19:29:19 +0000 (14:29 -0500)]
Merge "res_pjsip_sdp_rtp: include ice in ANSWER only if offered"

18 months agoUpdate UPDATE.txt for 16 and update ARI stubs.
Joshua Colp [Wed, 18 Jul 2018 19:20:59 +0000 (19:20 +0000)]
Update UPDATE.txt for 16 and update ARI stubs.

Copied UPGRADE.txt -> UPGRADE-16.txt
Created new UPGRADE.txt

Updated ARI stubs version to 17.

Change-Id: I4210e53f8022a2a68c7653595bdd13fbebac41ee

18 months agoUpdate ARI version for master/16.
Joshua Colp [Wed, 18 Jul 2018 19:18:13 +0000 (19:18 +0000)]
Update ARI version for master/16.

ARI goes from 3.0.0 to 4.0.0

Change-Id: I0649fa34926dc4fc89a166f1d2e3bbd965ef9ebe

18 months agoMerge "module: Remove deprecated modules and update support levels."
George Joseph [Wed, 18 Jul 2018 19:13:45 +0000 (14:13 -0500)]
Merge "module: Remove deprecated modules and update support levels."

18 months agopjproject_bundled: Repair ./configure --with-ssl=PATH.
Alexander Traud [Tue, 29 May 2018 14:31:53 +0000 (16:31 +0200)]
pjproject_bundled: Repair ./configure --with-ssl=PATH.

Previously, Asterisk did not tell its bundled PJProject about this configure
parameter. Therefore, PJProject used the platform provided OpenSSL always.


Change-Id: Iea545aec854dd0e2c061c69bb118a76ce56c5dc6

18 months agores_rtp_asterisk: Add support for sending NACK requests.
Ben Ford [Thu, 10 May 2018 18:11:06 +0000 (13:11 -0500)]
res_rtp_asterisk: Add support for sending NACK requests.

Support has been added for receiving a NACK request and handling it.
Now, Asterisk can detect when a NACK request should be sent and knows
how to construct one based on the packets we've received from the remote
end. A buffer has been added that will store out of order packets until
we receive the packet we are expecting. Then, these packets are handled
like normal and frames are queued to the core like normal. Asterisk
knows which packets to request in the NACK request using a vector
which stores the sequence numbers of the packets we are currently missing.

If a missing packet is received, cycle through the buffer until we reach
another packet we have not received yet. If the buffer reaches a certain
size, send a NACK request. If the buffer reaches its max size, queue all
frames to the core and wipe the buffer and vector.

According to RFC3711, the NACK request must be sent out in a compound
packet. All compound packets must start with a sender or receiver
report, so some work was done to refactor the current sender / receiver
code to allow it to be used without having to also include sdes
information and automatically send the report.

Also added additional functionality to ast_data_buffer, along with some

For more information, refer to the wiki page:

ASTERISK-27810 #close

Change-Id: Idab644b08a1593659c92cda64132ccc203fe991d

18 months agores_sorcery_config: Allow configuration section to be used based on name.
Joshua Colp [Wed, 18 Jul 2018 16:12:59 +0000 (16:12 +0000)]
res_sorcery_config: Allow configuration section to be used based on name.

A problem I've seen countless times is a global or system section
for PJSIP not getting applied. This is inevitably the result of
the "type=" line missing. This change alleviates that problem.

The ability to specify an explicit section name has been
added to res_sorcery_config. If the configured section
name matches this and there are no unknown things configured
the section is taken as being for the given type.

Both the PJSIP "global" and "system" types now support this
so you can just name your section "global" or "system" and it
will be matched and used, even without a "type=" line.


Change-Id: Ie22723663c1ddd24f869af8c9b4c1b59e2476893

18 months agomodule: Remove deprecated modules and update support levels.
Joshua Colp [Tue, 17 Jul 2018 10:24:02 +0000 (10:24 +0000)]
module: Remove deprecated modules and update support levels.

I have removed the STATIC_BUILD option immediately as it has not
been maintained in many years and is non-functional.


Change-Id: I64783d017b86dba9ee3c7bcfb97e59889a3f76d7

18 months agostasis: Improve message type "Use of before/init after destruction"
Chris-Savinovich [Wed, 18 Jul 2018 16:34:04 +0000 (12:34 -0400)]
stasis: Improve message type "Use of before/init after destruction"

Fixes issue where error msg
"Use of before/init after destruction"
was being printed on disabled messages
in dev mode.  With this
fix if message is disabled
a warning will print.

Change-Id: Ie0d866d1cbc60c16dbef08bc65e99505c3c1adfa

18 months agoMerge "SRTP: Lower SDES key lifetime minimum to 2^20"
George Joseph [Wed, 18 Jul 2018 15:22:30 +0000 (10:22 -0500)]
Merge "SRTP: Lower SDES key lifetime minimum to 2^20"

18 months agoMerge "res_pjsip: Remove spurious error logging when printing silent headers"
Joshua Colp [Wed, 18 Jul 2018 10:49:31 +0000 (05:49 -0500)]
Merge "res_pjsip:  Remove spurious error logging when printing silent headers"

18 months agoSRTP: Lower SDES key lifetime minimum to 2^20
Nick French [Tue, 17 Jul 2018 19:12:34 +0000 (14:12 -0500)]
SRTP: Lower SDES key lifetime minimum to 2^20

SRTP SDES key lifetime support was added in ASTERISK_17899.

In that addition, the minimum key lifetime to be accepted was
set at the 10 hours @ 20ms/packet = 1800000 packets.

The firmware in the obi1xx ATA uses a hardcoded lifetime of
2^20 packets.

Lower the limit to 2^20 to support a wider field of clients.

ASTERISK-27967 #close

Change-Id: I81a0703c595a0c9101dfdf02300149a3cc39bf94

18 months agoMerge "loader: Fix startup issues."
Joshua Colp [Tue, 17 Jul 2018 17:16:17 +0000 (12:16 -0500)]
Merge "loader: Fix startup issues."

18 months agoMerge "Build: Fix modules getting their optimization setting overridden."
Joshua Colp [Tue, 17 Jul 2018 17:15:34 +0000 (12:15 -0500)]
Merge "Build: Fix modules getting their optimization setting overridden."

18 months agoCI: Fix merge strategy
George Joseph [Tue, 17 Jul 2018 16:09:01 +0000 (10:09 -0600)]
CI: Fix merge strategy

Change-Id: I5e3fb6adfa6cbf694c0deecf02e3879297b0c12e

18 months agoCI: Fix regex in daily and ref_debug jobs
George Joseph [Tue, 17 Jul 2018 15:41:40 +0000 (09:41 -0600)]
CI: Fix regex in daily and ref_debug jobs

Change-Id: Icf2e67818b2155a158d2390b138613e1f653ea92

18 months agores_pjsip: Remove spurious error logging when printing silent headers
Nick French [Tue, 17 Jul 2018 14:09:04 +0000 (09:09 -0500)]
res_pjsip:  Remove spurious error logging when printing silent headers

Asterisk patched the pjproject source to avoid crashing when pjproject
sip_msg headers are encountered with NULL vptr's, but the patch also
output error messages for some valid headers which simply did not need
to be added to the message itself, such as hidden route headers.

pjproject has since applied a similar patch to their baseline to avoid
crashes, but their version also avoids the spurious error logging.

Lets use their patch instead.

ASTERISK-27961 #close

Change-Id: I2ddbd82c8da10e0dcc9807a48089d1f3c2d6e389

18 months agoCI: Add pre-build merge back in as RECURSIVE
George Joseph [Tue, 17 Jul 2018 15:15:58 +0000 (09:15 -0600)]
CI: Add pre-build merge back in as RECURSIVE

Change-Id: I0ff1730ef4a4f0ac9f18ccc9bc0dfe7a782f57a8

18 months agoMerge "Fix declaration of PBX_CURL for ./configure --without-libcurl"
Jenkins2 [Tue, 17 Jul 2018 14:46:30 +0000 (09:46 -0500)]
Merge "Fix declaration of PBX_CURL for ./configure --without-libcurl"

18 months agoCI: Remove pre-build merge from gates and checks
George Joseph [Tue, 17 Jul 2018 14:01:46 +0000 (08:01 -0600)]
CI: Remove pre-build merge from gates and checks

Change-Id: Ibc151f63dcec4db847915c2f3cbe5b467dd59574

18 months agoCI: Fix logic inversion in runTestsuite
George Joseph [Tue, 17 Jul 2018 12:13:35 +0000 (06:13 -0600)]
CI: Fix logic inversion in runTestsuite

Change-Id: I56399aa384468f45494c2c3650420563a0b6efe1

18 months agoCI: Add teardownRealtime
George Joseph [Tue, 17 Jul 2018 09:03:02 +0000 (03:03 -0600)]
CI: Add teardownRealtime

Change-Id: I2fe55c38607eaec2fbf69ef23a5019e0c443a64b

18 months agoloader: Fix startup issues.
Corey Farrell [Sun, 15 Jul 2018 18:58:15 +0000 (14:58 -0400)]
loader: Fix startup issues.

* Merge the preload and load stages, use load ordering to try preload's
  first.  This fixes an issue where `preload=res_config_curl` would fail
  unless res_curl and func_curl were also preloaded.  Now it is only
  required that those modules be loaded during startup: autoload or
  regular load is good enough.
* The configuration option `require` and `preload-require` were only
  effective if the modules failed to load.  These options will now abort
  Asterisk startup if required modules fail to reach the 'Running'
* Missing or invalid 'module.conf' did not prevent startup.  Asterisk
  doesn't do anything without modules so this a fatal error.

Change-Id: Ie4176699133f0e3a823b43f90c3348677e43a5f3

18 months agoCI: Prevent Jenkins from triggering jobs back to itself
George Joseph [Mon, 16 Jul 2018 18:30:26 +0000 (12:30 -0600)]
CI:  Prevent Jenkins from triggering jobs back to itself

Change-Id: I9cae8bb3d1a2cea335d3ccd88d471832549666fd

18 months agoBuild: Fix modules getting their optimization setting overridden.
Richard Mudgett [Fri, 13 Jul 2018 23:26:46 +0000 (18:26 -0500)]
Build: Fix modules getting their optimization setting overridden.

Asterisk modules that use PJPROJECT services have their compiler
optimization and possibly their symbolic debug options overridden by the
PJPROJECT configure script selected settings.

* We need to filter-out any -O and -g options in PJ_CFLAGS before echoing
out the result so the PJPROJECT_INCLUDE variable does not override the
Asterisk module settings when using bundled PJPROJECT.

NOTE: This patch only has an effect when using bundled PJPROJECT.


Change-Id: If124169735ecf572ad1535cd43bff94cb44d5b30

18 months agoCI: runUnittests: loop a few times on waitfullybooted
George Joseph [Mon, 16 Jul 2018 16:08:57 +0000 (10:08 -0600)]
CI: runUnittests: loop a few times on waitfullybooted

Change-Id: Icebc0d013896f3b2a7214945cac60647435c1651

18 months agoCI: Add realtime checks to dailies
George Joseph [Mon, 16 Jul 2018 15:49:54 +0000 (09:49 -0600)]
CI:  Add realtime checks to dailies

Change-Id: I6dc8ab1679b3505c6dde1d47e1b9276df47814f8

18 months agoCI: Add weekly REF_DEBUG testsuite run
George Joseph [Mon, 16 Jul 2018 14:13:40 +0000 (08:13 -0600)]
CI:  Add weekly REF_DEBUG testsuite run

Change-Id: I5b581d0a0d1d1bb9b38961d40b112fb448355037

18 months agoCI: Fix bad reporting of status by the verification pub
George Joseph [Mon, 16 Jul 2018 13:44:25 +0000 (07:44 -0600)]
CI: Fix bad reporting of status by the verification pub

Change-Id: I6f31a130b3ba0187149aaaa2ce94195a79e0f6a6

18 months agoCI: Make build tag an acceptable docker name
George Joseph [Mon, 16 Jul 2018 12:16:51 +0000 (06:16 -0600)]
CI: Make build tag an acceptable docker name

Change-Id: I3a4b8a4a9c488ddabf9daf651dc1334222056f38

18 months agoFix declaration of PBX_CURL for ./configure --without-libcurl
Corey Farrell [Sat, 14 Jul 2018 03:44:53 +0000 (23:44 -0400)]
Fix declaration of PBX_CURL for ./configure --without-libcurl

When `--without-libcurl` is used PBX_CURL is never set.  Set default
value 0 so the proper value is passed to menuselect.

Change-Id: I03e2842a00899cbca2dbde52bb1f6636d54bae1e

18 months agoMerge "app_confbridge: Use the SDP 'label' attribute to correlate users"
George Joseph [Fri, 13 Jul 2018 18:12:51 +0000 (13:12 -0500)]
Merge "app_confbridge:  Use the SDP 'label' attribute to correlate users"

18 months agoMerge "Bundled PJPROJECT: Disable internal connection oriented keep-alive."
George Joseph [Fri, 13 Jul 2018 18:11:50 +0000 (13:11 -0500)]
Merge "Bundled PJPROJECT: Disable internal connection oriented keep-alive."

18 months agoapp_confbridge: Use the SDP 'label' attribute to correlate users
George Joseph [Tue, 10 Jul 2018 18:28:09 +0000 (12:28 -0600)]
app_confbridge:  Use the SDP 'label' attribute to correlate users

Previously, the msid "label" attribute was used to correlate
participant info but because streams could be reused, the msid
wasn't being updated correctly when someone left the bridge and
another joined.

Now, instead of looking for the msid attribute on a channel's streams,
app_confbridge sets an "SDP:LABEL" attribute on the stream which
res_pjsip_sdp_rtp looks for.  If it finds it, it adds a "label"
attribute to the current sdp.

Change-Id: I6cbaa87fb59a2e0688d956e72d2d09e4ac20d5a5

18 months agoCI: Add daily periodics to CI
George Joseph [Fri, 13 Jul 2018 11:56:38 +0000 (05:56 -0600)]
CI: Add daily periodics to CI

Change-Id: I26933e73928e091ae72e838c02f4f2ec7c3983d6

18 months agoBundled PJPROJECT: Disable internal connection oriented keep-alive.
Alexander Traud [Wed, 11 Jul 2018 16:57:53 +0000 (11:57 -0500)]
Bundled PJPROJECT: Disable internal connection oriented keep-alive.

Turn off the periodic sending of CRLNCRLN.  Default is on (90 seconds),
which conflicts with the global section's keep_alive_interval option in

  pjsip_keep_not_alive.patch submitted by Alexander Traud (License 6520)


Change-Id: I6a197f56e1830d3b7e5ec70f17025840a290b057

18 months agores_pjsip_sdp_rtp: include ice in ANSWER only if offered
Torrey Searle [Mon, 9 Jul 2018 09:42:11 +0000 (11:42 +0200)]
res_pjsip_sdp_rtp: include ice in ANSWER only if offered

Keep track if ICE candidates were in the SDP offer & only put them
in the corresponding SDP answer if the offer condaind ICE candidates

ASTERISK-27957 #close

Change-Id: Idf2597ee48e9a287e07aa4030bfa705430a13a92

18 months agoMerge "res_parking: Add dialplan function for lot channel"
George Joseph [Thu, 12 Jul 2018 22:14:31 +0000 (17:14 -0500)]
Merge "res_parking: Add dialplan function for lot channel"

18 months agoCI: Add Asterisk Gates
George Joseph [Thu, 12 Jul 2018 21:34:14 +0000 (15:34 -0600)]
CI: Add Asterisk Gates

Change-Id: I7e2467f9120812551238d8005deb97f965279205

18 months agoCI: Remove duplicate checkout
George Joseph [Wed, 11 Jul 2018 20:55:55 +0000 (14:55 -0600)]
CI: Remove duplicate checkout

Change-Id: If5f925b4c4ed7000b153f3ed8386ce2140c886f8

18 months agoCI: Update cleanup steps and permissions
George Joseph [Wed, 11 Jul 2018 20:09:19 +0000 (14:09 -0600)]
CI: Update cleanup steps and permissions

Change-Id: I7ca92935979d94845af8e1caf4468cbd6209b7de

18 months agoCI: Fix log artifact paths
George Joseph [Wed, 11 Jul 2018 19:54:04 +0000 (13:54 -0600)]
CI: Fix log artifact paths

Change-Id: I55136de8f4d9c3b56bd4d054306a187bb04a4b7d

18 months agoCI: Remove CleanBeforeCheckout option for testsuite
George Joseph [Wed, 11 Jul 2018 19:45:01 +0000 (13:45 -0600)]
CI: Remove CleanBeforeCheckout option for testsuite

Change-Id: I510231c9087f7be5272b8ef3f3223eadaaffb754

18 months agoCI: Move gates into source repo
George Joseph [Wed, 11 Jul 2018 19:00:38 +0000 (13:00 -0600)]
CI: Move gates into source repo

Change-Id: If028ede5f3b127fa274c63ce166bc04ad7c1e5db

18 months agoCI: Initial commit for moving CI into source repo
George Joseph [Wed, 11 Jul 2018 11:14:49 +0000 (05:14 -0600)]
CI:  Initial commit for moving CI into source repo

Create tests/CI directory and add files used by Jenkins to
build and test Asterisk.

With this commit, Jenkins will run the Asterisk Unit Tests using
the Jenkinsfile at tests/CI/unittests.jenkinsfile.  Bash scripts
to do the actual building and testing are also in the same directory.
Output is placed in tests/CI/output so that directory has been
added to .gitignore.

Change-Id: I9448065465e6de2b878634510ace8fd1ef378608

18 months agores_parking: Add dialplan function for lot channel
Joshua Elson [Fri, 6 Jul 2018 22:00:06 +0000 (16:00 -0600)]
res_parking: Add dialplan function for lot channel

This commit adds a new function to res_parking.

This function, PARK_GET_CHANNEL allows the retrieval
of the channel name of the channel occupying the parking slot.

ASTERISK-22825 #close

Change-Id: Idba6ae55b8a53f734238cb3d995cedb95c0e7b74

18 months agoMerge "res_pjsip_t38.c: Be smarter about how we respond when T.38 is disabled."
Joshua Colp [Tue, 10 Jul 2018 12:21:45 +0000 (07:21 -0500)]
Merge "res_pjsip_t38.c: Be smarter about how we respond when T.38 is disabled."

18 months agoMerge "res_pjsip_pubsub: segfault in function publish_expire"
Jenkins2 [Tue, 10 Jul 2018 11:49:44 +0000 (06:49 -0500)]
Merge "res_pjsip_pubsub: segfault in function publish_expire"

18 months agoMerge "chan_ooh323: IPTOS_MINCOST is not defined on Solaris."
Jenkins2 [Tue, 10 Jul 2018 11:25:51 +0000 (06:25 -0500)]
Merge "chan_ooh323: IPTOS_MINCOST is not defined on Solaris."

18 months agoMerge "res_pjsip/pjsip_transport_management.c: Fix deadlock with transport keep alive."
Joshua Colp [Mon, 9 Jul 2018 12:14:51 +0000 (07:14 -0500)]
Merge "res_pjsip/pjsip_transport_management.c: Fix deadlock with transport keep alive."

18 months agoMerge "test.c: Make output jUnit compatible"
Jenkins2 [Mon, 9 Jul 2018 11:33:58 +0000 (06:33 -0500)]
Merge "test.c:  Make output jUnit compatible"

18 months agoMerge "res_pjsip_session: sdp group:BUNDLE attribute being truncated"
Jenkins2 [Mon, 9 Jul 2018 10:51:14 +0000 (05:51 -0500)]
Merge "res_pjsip_session: sdp group:BUNDLE attribute being truncated"

18 months agoMerge "res_pjsip_t38: Decline T.38 stream on failure case."
Joshua Colp [Mon, 9 Jul 2018 10:32:58 +0000 (05:32 -0500)]
Merge "res_pjsip_t38: Decline T.38 stream on failure case."

18 months agochan_ooh323: IPTOS_MINCOST is not defined on Solaris.
Alexander Traud [Sat, 23 Jun 2018 06:33:34 +0000 (08:33 +0200)]
chan_ooh323: IPTOS_MINCOST is not defined on Solaris.

Furthermore, <sys/sockio.h> is required for SIOCGIF*.


Change-Id: Idc9153ece769944765b66122efb11728d8d8ebde

18 months agores_pjsip_session: sdp group:BUNDLE attribute being truncated
Kevin Harwell [Fri, 6 Jul 2018 20:05:47 +0000 (15:05 -0500)]
res_pjsip_session: sdp group:BUNDLE attribute being truncated

When setting/appending the media id's to the bundle group attribute a '-1' was
being passed to the 'ast_str_set/append' function for the 'max_len' parameter.
This essentially capped the length of the string to what it was originally
allocated with. In this case 64 bytes.

This patch makes it so a '0' is passed as in for the 'max_len', which means
"no maximum length".

ASTERISK-27955 #close

Change-Id: Iec565df6600401d54a502854a53d19bb4cc34876

18 months agores_pjsip_pubsub: segfault in function publish_expire
Alexei Gradinari [Thu, 5 Jul 2018 21:02:00 +0000 (17:02 -0400)]
res_pjsip_pubsub: segfault in function publish_expire

The function pubsub_on_rx_publish_request incorrectly uses

The AST_SCHED_REPLACE_UNREF should unref old '_data'.

Because of this, there may be a double unref
of variable 'publication' when ast_sched_del is unsuccessful
that leads to use after free of the 'publication' in publish_expire.

ASTERISK-27956 #close

Change-Id: Ie0f0cfc7e036953d890b188656010b325a5cdc82

18 months agotest.c: Make output jUnit compatible
George Joseph [Fri, 6 Jul 2018 14:04:56 +0000 (08:04 -0600)]
test.c:  Make output jUnit compatible

Separate "name" into "classname" and "name".
Use '.' for classname separator instead of '/'.
Prefix reserved words with '_'.
Wrap output with a top-level "testsuites" element.

Change-Id: Iec1a985eba1c478e5c1d65d5dfd95cb708442099

18 months agores_pjsip: Add 'suppress_q850_reason_headers' option to endpoint
George Joseph [Fri, 6 Jul 2018 12:57:37 +0000 (06:57 -0600)]
res_pjsip:  Add 'suppress_q850_reason_headers' option to endpoint

A new option 'suppress_q850_reason_headers' has been added to the
endpoint object. Some devices can't accept multiple Reason headers and
get confused when both 'SIP' and 'Q.850' Reason headers are received.
This option allows the 'Q.850' Reason header to be suppressed.
The default value is 'no'.

Reported-by: Ross Beer

Change-Id: I54cf37a827d77de2079256bb3de7e90fa5e1deb1

18 months agores_pjsip_t38: Decline T.38 stream on failure case.
Joshua Colp [Thu, 5 Jul 2018 20:43:35 +0000 (20:43 +0000)]
res_pjsip_t38: Decline T.38 stream on failure case.

When negotiating an incoming T.38 stream the code incorrectly
returned failure instead of a decline for the stream when a
problem occurred or the configuration didn't allow it. This
resulted in SDP offers being rejected with a 488 response
in all cases, even when another valid stream was present.

This change makes it so the stream is now declined. If no
streams are accepted a 488 response is sent while if at least
one stream is accepted all the declined streams are, well,


Change-Id: I88bcf793788c412a9839d111a5c736bf6867807c

18 months agoMerge "bridge_softmix_binaural: Enable FFTW3 in Solaris 11."
Jenkins2 [Thu, 5 Jul 2018 20:41:12 +0000 (15:41 -0500)]
Merge "bridge_softmix_binaural: Enable FFTW3 in Solaris 11."

18 months agores_pjsip_t38.c: Be smarter about how we respond when T.38 is disabled.
Richard Mudgett [Mon, 2 Jul 2018 23:43:10 +0000 (18:43 -0500)]
res_pjsip_t38.c: Be smarter about how we respond when T.38 is disabled.

We were blindly responding with AST_T38_REFUSED when ANY T.38 control
frame came accross the bridge.  This causes T.38 Gateway to get confused
and the T.38 session to get in a strange state.

* Made the T.38 framehook only respond to request frames and ignore
response frames.


Change-Id: I5fb5967c7d1efb30a7ff375f82887ca82a55b05b

18 months agoMerge "res_pjsip_t38.c: Fix crash by ignoring 1xx messages."
Jenkins2 [Thu, 5 Jul 2018 15:53:47 +0000 (10:53 -0500)]
Merge "res_pjsip_t38.c: Fix crash by ignoring 1xx messages."

18 months agores_pjsip/pjsip_transport_management.c: Fix deadlock with transport keep alive.
Richard Mudgett [Tue, 3 Jul 2018 17:10:36 +0000 (12:10 -0500)]
res_pjsip/pjsip_transport_management.c: Fix deadlock with transport keep alive.

Using the keep_alive_interval option can result in a deadlock between the
pjproject transport manager group lock and the monitored transports ao2
container lock.  The pjproject transport manager group lock has to be
superior in the locking order to the monitored transports ao2 container
lock because of pjproject callbacks called when already holding the group
lock.  The lock inversion happens when Asterisk attempts to send a keep
alive packet over the reliable transports.

* Made keepalive_transport_thread() iterate over the monitored transports
container rather than use the ao2_callback() method.  This avoids holding
the container lock when sending the keep alive packet.


Change-Id: I5d5392a52e698bbe41a93f7d8e92bf0e61fe3951

18 months agoMerge "pjsip: Clarify certificate configuration for Websocket."
Joshua Colp [Tue, 3 Jul 2018 16:36:00 +0000 (11:36 -0500)]
Merge "pjsip: Clarify certificate configuration for Websocket."

18 months agopjsip: Clarify certificate configuration for Websocket.
Joshua Colp [Mon, 2 Jul 2018 23:44:53 +0000 (20:44 -0300)]
pjsip: Clarify certificate configuration for Websocket.

The Websocket transport uses the built-in HTTP server. As a result
the TLS configuration is done in http.conf and not in pjsip.conf.

This change adds a warning if this is configured in pjsip.conf and
also clarifies in the sample configuration file.

Change-Id: I187d994d328c3ed274b6754fd4c2a4955bdc6dd9

18 months agobridge_softmix_binaural: Enable FFTW3 in Solaris 11.
Alexander Traud [Sat, 23 Jun 2018 09:50:00 +0000 (11:50 +0200)]
bridge_softmix_binaural: Enable FFTW3 in Solaris 11.


Change-Id: Ice5640e08385a64a0a6555deaccd91e86bca154f

18 months agores_pjsip_t38.c: Fix crash by ignoring 1xx messages.
Richard Mudgett [Fri, 29 Jun 2018 23:28:26 +0000 (18:28 -0500)]
res_pjsip_t38.c: Fix crash by ignoring 1xx messages.

If we initiated a T.38 reINVITE, we would crash if we received any other
1xx response message except 100 if it were followed by a 200 response.

* Made ignore any 1xx response so we do not close out the T.38 negotiation
too early.  For good measure we'll now accept any 2xx response as
acceptance of the reINVITE T.38 offer.


Change-Id: I0ca88aae708d091db7335af73f41035a212adff4

18 months agores_pjsip_pubsub: Hold module reference for publications.
Joshua Colp [Sun, 1 Jul 2018 18:54:05 +0000 (15:54 -0300)]
res_pjsip_pubsub: Hold module reference for publications.

Incoming publications need to ensure that the module remains
loaded for the lifetime of them. This is now done by holding
a reference to the module while the publication exists. This
mirrors that of inbound subscriptions.


Change-Id: Ia98c95a15e11af25728d5fb3e56e12cda0cfc7c0

18 months agoMerge "app_confbridge: Bridge and announcers not removed if conference ends quickly"
Jenkins2 [Mon, 2 Jul 2018 12:16:55 +0000 (07:16 -0500)]
Merge "app_confbridge: Bridge and announcers not removed if conference ends quickly"

18 months agoMerge "main/cdr.c: Alleviate CDR deadlock"
Joshua Colp [Mon, 2 Jul 2018 11:54:18 +0000 (06:54 -0500)]
Merge "main/cdr.c: Alleviate CDR deadlock"

18 months agoMerge "AMI SendText action: Fix to use correct thread to send the text."
Joshua Colp [Mon, 2 Jul 2018 10:47:04 +0000 (05:47 -0500)]
Merge "AMI SendText action: Fix to use correct thread to send the text."

19 months agoapp_confbridge: Bridge and announcers not removed if conference ends quickly
Robert Mordec [Mon, 21 May 2018 12:24:51 +0000 (14:24 +0200)]
app_confbridge: Bridge and announcers not removed if conference ends quickly

If a conference is ended very quickly after it was created (i.e., the
first user immediately hangs up) then the conference bridge and announcer
channels are not removed.

When a conference is created, the push_announcer() function is added to
the playback queue task processor and the conference object reference is
bumped.  If a conference is ended while the push_announcer() function is
still going then the ao2_cleanup(conference) at the end of
push_announcer() will call the destructor function -

The destroy_conference_bridge() function will then add the
hangup_playback() task to the playback queue and will wait for it to end.
Since it is already a current task of the playback queue it will wait

This patch makes the conference thread call push_announcer() directly.
This way the conference object reference bump is not needed.  Since the
playback queue task processor is only used by the conference thread
itself, there is no danger of trying to play announcements before the
announcer is pushed to the bridge.

ASTERISK-27870 #close

Change-Id: I947a50fb121422d90fd1816d643a54d75185a477

19 months agomain/cdr.c: Alleviate CDR deadlock
Matthew Fredrickson [Thu, 21 Jun 2018 05:28:01 +0000 (00:28 -0500)]
main/cdr.c: Alleviate CDR deadlock

There is a rare case (do to the infrequent timing involved) where
CDR submission threads in batch mode can deadlock with a currently
running CDR batch process.  This patch should remove the need for
holding the lock in the scheduler and should clean a few code
paths up that inconsistently submitted new work to the CDR batch


Change-Id: I6333e865db7c593c102c2fd948cecdb96481974d
Reported-by: Denis Lebedev

19 months agopbx_dundi: reordered unloading of module pbx_dundi
Kirsty Tyerman [Tue, 26 Jun 2018 03:08:07 +0000 (13:08 +1000)]
pbx_dundi: reordered unloading of module pbx_dundi

Destroy scheduler after peers are pruned to stop dundi crashing when
unloading module.

Reported-by: Kirsty Tyerman

Change-Id: Ic12e562cd90d8d813a9e97f302045091f59e3c05

19 months agoAMI SendText action: Fix to use correct thread to send the text.
Richard Mudgett [Thu, 28 Jun 2018 17:07:01 +0000 (12:07 -0500)]
AMI SendText action: Fix to use correct thread to send the text.

The AMI action was directly sending the text to the channel driver.
However, this makes two threads attempt to handle media and runs afowl of

* Queue a read action to make the channel's media handling thread actually
send the text message.  This changes the AMI actions success/fail response
to just mean the text was queued to be sent not that the text actually got
sent.  The channel driver may not even support sending text messages.


Change-Id: I9dce343d8fa634ba5a416a1326d8a6340f98c379

19 months agoMerge "app_confbridge: Move participant info code to confbridge_manager."
Joshua Colp [Thu, 28 Jun 2018 18:04:12 +0000 (13:04 -0500)]
Merge "app_confbridge:  Move participant info code to confbridge_manager."

19 months agoMerge "res_pjsip_messaging: Allow application/* for in-dialog MESSAGEs"
Joshua Colp [Thu, 28 Jun 2018 11:46:39 +0000 (06:46 -0500)]
Merge "res_pjsip_messaging:  Allow application/* for in-dialog MESSAGEs"

19 months agoMerge "res_pjsip_session: Add ability to accept multiple sdp answers"
Jenkins2 [Thu, 28 Jun 2018 11:34:22 +0000 (06:34 -0500)]
Merge "res_pjsip_session:  Add ability to accept multiple sdp answers"

19 months agores_pjsip_messaging: Allow application/* for in-dialog MESSAGEs
George Joseph [Mon, 25 Jun 2018 12:37:37 +0000 (06:37 -0600)]
res_pjsip_messaging:  Allow application/* for in-dialog MESSAGEs

In addition to text/* content types, incoming_in_dialog_request now
accepts application/* content types.

Also fixed a length issue when copying the body text.  It was one
character short.


Change-Id: I4e54d8cc6158dc47eb8fdd6ba0108c6fd53f2818

19 months agoMerge "app_queue: Add option for predial handlers on caller and callee channels"
Joshua Colp [Wed, 27 Jun 2018 10:37:32 +0000 (05:37 -0500)]
Merge "app_queue: Add option for predial handlers on caller and callee channels"

19 months agoapp_confbridge: Move participant info code to confbridge_manager.
George Joseph [Mon, 25 Jun 2018 20:42:14 +0000 (14:42 -0600)]
app_confbridge:  Move participant info code to confbridge_manager.

With the participant info code in app_confbridge, we were still
in the process of adding the channel to the bridge when trying to send
an in-dialog MESSAGE.  This caused 2 threads to grab the channel
blocking flag at the same time.  To mitigate this, the participant
info code was moved to confbridge_manager so it runs after all
channel/bridge actions have finished.

Change-Id: I228806ac153074f45e0b35d5236166e92e132abd

19 months agoMerge "uuid: Enable UUID in Solaris 11."
Kevin Harwell [Tue, 26 Jun 2018 16:08:56 +0000 (11:08 -0500)]
Merge "uuid: Enable UUID in Solaris 11."

19 months agores_pjsip_session: Add ability to accept multiple sdp answers
George Joseph [Tue, 19 Jun 2018 02:22:17 +0000 (20:22 -0600)]
res_pjsip_session:  Add ability to accept multiple sdp answers

pjproject by default currently will follow media forked during an INVITE
on outbound calls if the To tag is different on a subsequent response as
that on an earlier response.  We handle this correctly.  There have
been reported cases where the To tag is the same but we still need to
follow the media.  The pjproject patch in this commit adds the
capability to sip_inv and also adds the capability to control it at
runtime.  The original "different tag" behavior was always controllable
at runtime but we never did anything with it and left it to default to

So, along with the pjproject patch, this commit adds options to both the
system and endpoint objects to control the two behaviors, and a small
logic change to session_inv_on_media_update in res_pjsip_session to
control the behavior at the endpoint level.

The default behavior for "different tags" remains the same at TRUE and
the default for "same tag" is FALSE.

Change-Id: I64d071942b79adb2f0a4e13137389b19404fe3d6
Reported-by: Ross Beer

19 months agoMerge "VECTOR: Passing parameters with side effects to macros is dangerous."
George Joseph [Mon, 25 Jun 2018 16:35:33 +0000 (11:35 -0500)]
Merge "VECTOR: Passing parameters with side effects to macros is dangerous."

19 months agouuid: Enable UUID in Solaris 11.
Alexander Traud [Thu, 21 Jun 2018 16:45:11 +0000 (18:45 +0200)]
uuid: Enable UUID in Solaris 11.

Reported by: bautsche

Change-Id: I9b8362824efbfb2a16981e46e85f7c8322908c49

19 months agoMerge "smsq: Remove an left-over special case for Solaris."
George Joseph [Fri, 22 Jun 2018 17:48:44 +0000 (12:48 -0500)]
Merge "smsq: Remove an left-over special case for Solaris."

19 months agoMerge "res_http_post: Enable GMime in Solaris 11."
Jenkins2 [Fri, 22 Jun 2018 17:02:42 +0000 (12:02 -0500)]
Merge "res_http_post: Enable GMime in Solaris 11."

19 months agoMerge "BuildSystem: Enable ./configure in Solaris 11."
George Joseph [Fri, 22 Jun 2018 14:22:11 +0000 (09:22 -0500)]
Merge "BuildSystem: Enable ./configure in Solaris 11."

19 months agoMerge "BuildSystem: Enable autotools in Solaris 11."
George Joseph [Fri, 22 Jun 2018 14:01:06 +0000 (09:01 -0500)]
Merge "BuildSystem: Enable autotools in Solaris 11."

19 months agoMerge "bridge_softmix.c: Fix memory leak."
Jenkins2 [Fri, 22 Jun 2018 13:23:58 +0000 (08:23 -0500)]
Merge "bridge_softmix.c: Fix memory leak."

19 months agoMerge "chan_oss: Compile in Solaris 11."
Jenkins2 [Fri, 22 Jun 2018 13:05:09 +0000 (08:05 -0500)]
Merge "chan_oss: Compile in Solaris 11."

19 months agoMerge "utils: Avoid an unused variable in Solaris 11."
Jenkins2 [Fri, 22 Jun 2018 12:42:53 +0000 (07:42 -0500)]
Merge "utils: Avoid an unused variable in Solaris 11."

19 months agoMerge "func_env: Compile in Solaris 11."
Joshua Colp [Fri, 22 Jun 2018 12:18:45 +0000 (07:18 -0500)]
Merge "func_env: Compile in Solaris 11."