15 months agoMerge "dialplan_functions: wrong srtp use status report of a dialplan function"
Joshua Colp [Mon, 6 Aug 2018 13:34:20 +0000 (08:34 -0500)]
Merge "dialplan_functions: wrong srtp use status report of a dialplan function"

15 months agoMerge "pjproject_bundled: Find shared libraries in root --with-ssl=PATH."
Joshua Colp [Mon, 6 Aug 2018 10:28:47 +0000 (05:28 -0500)]
Merge "pjproject_bundled: Find shared libraries in root --with-ssl=PATH."

15 months agodialplan_functions: wrong srtp use status report of a dialplan function
Salah Ahmed [Thu, 2 Aug 2018 19:37:16 +0000 (14:37 -0500)]
dialplan_functions: wrong srtp use status report of a dialplan function

If asterisk offer an endpoint with SRTP and that endpoint respond
with non srtp, in that case channel(rtp,secure,audio) reply wrong

Why delete flag AST_SRTP_CRYPTO_OFFER_OK while check identical remote_key:
Currently this flag has being set redundantly. In either case identical
or different remote_key this flag has being set. So if we
don't set it while we receive identical remote_key or non SRTP SDP
response then we can take decision of srtp use by using that flag.


Change-Id: I29dc2843cf4e5ae2604301cb4ff258f1822dc2d7

15 months agoMerge "BuildSystem: Enable ncurses for menuselect in Solaris 11."
Kevin Harwell [Fri, 3 Aug 2018 18:29:11 +0000 (13:29 -0500)]
Merge "BuildSystem: Enable ncurses for menuselect in Solaris 11."

15 months agoMerge "pjsip_wizard.conf.sample: Update remote_hosts description."
Kevin Harwell [Fri, 3 Aug 2018 18:27:24 +0000 (13:27 -0500)]
Merge "pjsip_wizard.conf.sample: Update remote_hosts description."

15 months agoMerge "res_pjsip_endpoint_identifier_ip.c: Added regex support to match_header"
Kevin Harwell [Fri, 3 Aug 2018 18:26:30 +0000 (13:26 -0500)]
Merge "res_pjsip_endpoint_identifier_ip.c: Added regex support to match_header"

15 months agopjproject_bundled: Find shared libraries in root --with-ssl=PATH.
Alexander Traud [Mon, 30 Jul 2018 11:05:34 +0000 (13:05 +0200)]
pjproject_bundled: Find shared libraries in root --with-ssl=PATH.

The script configure from Teluu expects shared libraries (.so) in a subfolder
called 'lib', when --with-xyz=PATH is specified. However for OpenSSL, the
default location is the root of the source folder = PATH. Furthermore, Asterisk
supports both, 'lib' and root. For consistency and because Asterisk is using
(only) OpenSSL in PJProject, it is enhanced to support both locations, just
like Asterisk.


Change-Id: I8eb916a88b6b8c22e29bb40bee8faaca6c73406f

15 months agoMerge "thirdparty/pjproject: fix deadlock in response retransmissions"
Joshua Colp [Thu, 2 Aug 2018 12:12:35 +0000 (07:12 -0500)]
Merge "thirdparty/pjproject: fix deadlock in response retransmissions"

15 months agoMerge "BuildSystem: Enable Jansson in Solaris 11."
Joshua Colp [Thu, 2 Aug 2018 11:39:07 +0000 (06:39 -0500)]
Merge "BuildSystem: Enable Jansson in Solaris 11."

15 months agothirdparty/pjproject: fix deadlock in response retransmissions
Torrey Searle [Tue, 17 Jul 2018 12:13:43 +0000 (14:13 +0200)]
thirdparty/pjproject: fix deadlock in response retransmissions

The tdata containing the response can be shared by both the dialog
object and the tsx object.  In order to prevent the race condition
between the tsx retransmission and the dialog sending a response,
clone the tdata before modifying it for the dialog send response.

ASTERISK-27966 #close

Change-Id: Ic381004a3a212fe1d8eca0e707fe09dba4a6ab4e

15 months agoMerge "res_rtp_asterisk: In Developer Mode, do not require OpenSSL."
Joshua Colp [Wed, 1 Aug 2018 09:23:06 +0000 (04:23 -0500)]
Merge "res_rtp_asterisk: In Developer Mode, do not require OpenSSL."

15 months agoMerge "res_pjsip_pubsub: Use ast_true for "prune_on_boot"."
Joshua Colp [Tue, 31 Jul 2018 21:11:32 +0000 (16:11 -0500)]
Merge "res_pjsip_pubsub: Use ast_true for "prune_on_boot"."

15 months agopjsip_wizard.conf.sample: Update remote_hosts description.
Richard Mudgett [Tue, 31 Jul 2018 16:24:08 +0000 (11:24 -0500)]
pjsip_wizard.conf.sample: Update remote_hosts description.

Remove the note that SRV records are not supported as that is no longer


Change-Id: Id0dd6ef40e52702be9727a2b6122216cb00bb4ca

15 months agoCI: Add optional uninstall step before installing asterisk
George Joseph [Fri, 27 Jul 2018 18:23:02 +0000 (12:23 -0600)]
CI: Add optional uninstall step before installing asterisk

Change-Id: I7dedf1e925eafc3a0adf01dd9dfbe44eb642aab7

15 months agoBuildSystem: Enable ncurses for menuselect in Solaris 11.
Alexander Traud [Sat, 28 Jul 2018 16:49:17 +0000 (18:49 +0200)]
BuildSystem: Enable ncurses for menuselect in Solaris 11.

The check for the library ncurses should use not use the header <curses.h> but
<ncurses.h>, because on some platforms <curses.h> is not a drop-in replacement
for <ncurses.h>: For example in Solaris, the symbol initscr is a typedef in
<curses.h> to a symbol which does not exist in the library ncurses (initscr32).
Simply use <ncurses.h> when you link to ncurses.

Furthermore in Solaris, the header <ncurses.h> is in a subdirectory
/usr/include/ncurses and not available via pkg-config.


Change-Id: Ife367776b0ccf17d3fefed868245376bfb93745d

15 months agores_pjsip_pubsub: Use ast_true for "prune_on_boot".
Joshua Colp [Sat, 28 Jul 2018 13:00:40 +0000 (13:00 +0000)]
res_pjsip_pubsub: Use ast_true for "prune_on_boot".

Change-Id: Iedec4e7390b3e821987681da24d0298632b9873d

15 months agoBuildSystem: Enable Jansson in Solaris 11.
Alexander Traud [Sat, 28 Jul 2018 12:39:40 +0000 (14:39 +0200)]
BuildSystem: Enable Jansson in Solaris 11.

In Solaris, the header <jansson.h> is in /usr/include/jansson. To find
Jansson even in such a subdirectory, the tool pkg-config is queried via
AST_PKG_CONFIG_CHECK. For those platforms, which do not list Jansson via
pkg-config, the previous check remains and is executed thereafter.

Because the check for the NetBSD Editline library uses the tool pkg-config
the code of PKG_PROG_PKG_CONFIG must be used. Because that check happens
earlier than Jansson, it must be placed in front of that.


Change-Id: I69ea0f379f87a50049654b2487c76ee1c04fa53a

15 months agores_pjsip_endpoint_identifier_ip.c: Added regex support to match_header
Richard Mudgett [Tue, 24 Jul 2018 18:44:41 +0000 (13:44 -0500)]
res_pjsip_endpoint_identifier_ip.c: Added regex support to match_header

This patch adds regular expression support to make the identify section's
match_header option more useful when attempting to match complex headers
like the 'To' or 'From' headers.  The 'From' header has variable
components such as the tag parameter that you cannot predict.  To specify
a regular expression put slashes around the regular expression in place of
the header value.

match_header=From: /<sip:alice@127\\.0\\.0\\.1>/

* Added regex support to match_header so you could match a 'To' header
among other complex headers.

Fixed reported crashes when trying to match special headers like 'Contact'.
The identify section's match_header method used code that assumed you were
matching a generic header.  Any other type of header could cause a crash
if the header structure variant did not match the generic header enough.

* Made use code that will work for any header type instead of code
specific to generic headers.

Other fixes while in the area:

* Made check all headers of the requested name.
* Added some more sanity checks to the configured identify matching
options when applying the configuration.


Change-Id: I27dfd4ff5e2259b906640e3c330681b76b4ed1f1

15 months agores_pjsip_pubsub: Treat "prune_on_boot" as a yes / no.
Joshua Colp [Fri, 27 Jul 2018 15:46:12 +0000 (15:46 +0000)]
res_pjsip_pubsub: Treat "prune_on_boot" as a yes / no.

The alembic for the PJSIP subscription persistence table has the
"prune_on_boot" field as a boolean. While in Asterisk we are
tolerant of many different definitions of true and false in the
database we only accept "yes" and "no". This change makes the
field treated as a yes/no instead of an integer, thus storing
"yes" and "no" instead of "1" and "0".

Change-Id: Ic8b9211b36babefe78f70def6828a135a6ae7ab6

15 months agores_rtp_asterisk: In Developer Mode, do not require OpenSSL.
Alexander Traud [Fri, 27 Jul 2018 13:26:51 +0000 (15:26 +0200)]
res_rtp_asterisk: In Developer Mode, do not require OpenSSL.

OpenSSL is an optional external library and should stay optional even when
Developer Mode is configured.


Change-Id: Ia68a4cd5474b26d45e0f43b04032ad598022853b

15 months agoMerge "devicestate: Don't create topic when change isn't cached."
Joshua Colp [Fri, 27 Jul 2018 11:09:50 +0000 (06:09 -0500)]
Merge "devicestate: Don't create topic when change isn't cached."

15 months agoMerge "loader: Process dependencies for built-in modules."
Joshua Colp [Fri, 27 Jul 2018 11:04:51 +0000 (06:04 -0500)]
Merge "loader: Process dependencies for built-in modules."

15 months agoMerge "Build System: Create 'make install-configs' target."
Joshua Colp [Fri, 27 Jul 2018 10:51:44 +0000 (05:51 -0500)]
Merge "Build System: Create 'make install-configs' target."

15 months agoMerge "res_rtp_asterisk: Avoid merging command and regular T.140 text packets"
Joshua Colp [Fri, 27 Jul 2018 10:35:17 +0000 (05:35 -0500)]
Merge "res_rtp_asterisk: Avoid merging command and regular T.140 text packets"

15 months agoCI: Fix placement of job summary statments
George Joseph [Thu, 26 Jul 2018 23:54:36 +0000 (17:54 -0600)]
CI: Fix placement of job summary statments

Change-Id: Iace19e718f4e8fb48eb7dc9f98af53b115cc45f3

15 months agoloader: Process dependencies for built-in modules.
Corey Farrell [Thu, 26 Jul 2018 17:52:46 +0000 (13:52 -0400)]
loader: Process dependencies for built-in modules.

With the new module loader it was missed that built-in modules never
parsed dependencies from mod->info into vectors of mod.  This caused
manager to be initialized before acl (named_acl).  If manager.conf
used any named ACL's they would not be found and result in no ACL being
applied to the AMI user.

In addition to the manager ACL fix this adds "extconfig" to all builtin
modules which support realtime configuration.  This only matters if one
of the builtin modules is configured with 'preload', depending on
"extconfig" will cause config.c to automatically be initialize during
the preload stage.

Change-Id: I482ed6bca6c1064b05bb538d7861cd7a4f02d9fc

15 months agores_rtp_asterisk: Avoid merging command and regular T.140 text packets
neutrino88 [Wed, 18 Jul 2018 14:32:34 +0000 (10:32 -0400)]
res_rtp_asterisk: Avoid merging command and regular T.140 text packets

When realtime text packets are to be sent, the text is accumulated in a
buffer and sent regularly by a timer.  It can happen that commands such as
a backspace, CR, or LF get merged with regular text.  This breaks some

The proposed change:
* We test if the current packet contains a command.  If so we send the
buffer immediately.
* We test if the buffer contained a command.  If so we send the buffer
* We accumulate the text (or the command) in the buffer.


Change-Id: Ifbe993311410fa855cb8aa4a12084db75f413462

15 months agoMerge "CI: Add docker info to job summary"
Jenkins2 [Thu, 26 Jul 2018 16:44:30 +0000 (11:44 -0500)]
Merge "CI:  Add docker info to job summary"

15 months agoCI: Add docker info to job summary
George Joseph [Thu, 26 Jul 2018 16:34:20 +0000 (10:34 -0600)]
CI:  Add docker info to job summary

Change-Id: I45d52005a9b692ad303c11792f226ace1e449901

15 months agoBuild System: Create 'make install-configs' target.
Corey Farrell [Mon, 23 Jul 2018 18:49:33 +0000 (14:49 -0400)]
Build System: Create 'make install-configs' target.

This target requires specifying CONFIG_SRC=path_to_configs.  This can be
used to install custom configs for the Asterisk build while still
performing directory replacements on asterisk.conf.

Modify internal INSTALL_CONFIGS so first argument requires full path to
the config sources relative to Asterisk source root.

Change-Id: Idcd841df3c8d5bfe23d566bb9e2e448e9df4f8ab

15 months agojson.c: improve ast_json_to_ast_variables performance
Kevin Harwell [Wed, 25 Jul 2018 20:33:22 +0000 (15:33 -0500)]
json.c: improve ast_json_to_ast_variables performance

When converting from a json object to an ast variables list the conversion
algorithm was doing a complete traversal of the entire variables list for
every item appended from the json structure.

This patch makes it so the list is no longer traversed for each new ast
variable being appended.

Change-Id: I8bf496a1fc449485150d6db36bfc0354934a3977

15 months agodevicestate: Don't create topic when change isn't cached.
Joshua Colp [Wed, 25 Jul 2018 10:32:31 +0000 (10:32 +0000)]
devicestate: Don't create topic when change isn't cached.

When publishing a device state the change can be marked as being
cachable or not. If it is not cached the change is just published
to all interested and not stored away for later query. This was not
fully taken into account when publishing in stasis. The act of
publishing would create a topic for the device even if it may be

This change makes it so messages which are not cached won't create
a topic for the device. If a topic does already exist it will be
published to but otherwise the change will only be published to
the device state all topic.


Change-Id: I18da0e8cbb18e79602e731020c46ba4101e59f0a

15 months agoMerge "res_pjsip: Change log message from error to warning for valid use cases"
Joshua Colp [Wed, 25 Jul 2018 18:59:27 +0000 (13:59 -0500)]
Merge "res_pjsip: Change log message from error to warning for valid use cases"

15 months agoMerge "Build System: Silence build of bundled jansson."
George Joseph [Wed, 25 Jul 2018 18:59:22 +0000 (13:59 -0500)]
Merge "Build System: Silence build of bundled jansson."

15 months agoMerge "CI: Explicitly pass BRANCH_NAME to buildAsterisk and installAsterisk"
Jenkins2 [Wed, 25 Jul 2018 17:48:48 +0000 (12:48 -0500)]
Merge "CI: Explicitly pass BRANCH_NAME to buildAsterisk and installAsterisk"

15 months agoMerge "CI: Add options to initialize and cleanup database to"
Jenkins2 [Wed, 25 Jul 2018 17:48:18 +0000 (12:48 -0500)]
Merge "CI: Add options to initialize and cleanup database to"

15 months agoCI: Explicitly pass BRANCH_NAME to buildAsterisk and installAsterisk
George Joseph [Wed, 25 Jul 2018 15:20:20 +0000 (09:20 -0600)]
CI: Explicitly pass BRANCH_NAME to buildAsterisk and installAsterisk

Change-Id: I652f4a0ea5107c778e27a78bccb67b18b0c4e087

15 months agoCI: Add options to initialize and cleanup database to
George Joseph [Tue, 24 Jul 2018 18:29:19 +0000 (12:29 -0600)]
CI: Add options to initialize and cleanup database to

Change-Id: I352333233bab5377723bf37d490ba84fc55bc853

15 months agoCI: Do not `mkdir 2`.
Corey Farrell [Wed, 25 Jul 2018 14:07:51 +0000 (10:07 -0400)]
CI: Do not `mkdir 2`.

Change-Id: Ib7377d26a6c98b38bad463f47c84f1875ac84eb7

15 months agoBuild System: Silence build of bundled jansson.
Corey Farrell [Wed, 25 Jul 2018 12:34:54 +0000 (08:34 -0400)]
Build System: Silence build of bundled jansson.

Change-Id: I7392c79c0173057f5378010bf1fe65e300e8fc56

15 months agoCI: RefDebug: Fix reference to testsuite URL
George Joseph [Wed, 25 Jul 2018 12:13:43 +0000 (06:13 -0600)]
CI: RefDebug: Fix reference to testsuite URL

Change-Id: I0ee41d95a87f0d97b01f2757012b846bcfe6443d

15 months agoBuild System: Fix bundled jansson install.
Corey Farrell [Tue, 24 Jul 2018 19:28:04 +0000 (15:28 -0400)]
Build System: Fix bundled jansson install.

Update the bundled jansson Makefile to do nothing during Asterisk
install, use a target that is not phony to initiate the jansson make and

Change-Id: I7643cc3d39af9feba8fc0da676b646efc5f8b3bb

15 months agoCI: Use bundled jansson if needed.
Corey Farrell [Tue, 24 Jul 2018 15:43:45 +0000 (11:43 -0400)]
CI: Use bundled jansson if needed.

Use pkg-config to determine if jansson is at least 2.11, enabled bundled
version otherwise.

Change-Id: Ib555a8b72ff6f6925f9280ef035caa0b91ca4bd2

15 months agoMerge "Enable bundling of jansson, require 2.11."
Jenkins2 [Tue, 24 Jul 2018 15:07:23 +0000 (10:07 -0500)]
Merge "Enable bundling of jansson, require 2.11."

15 months agoMerge "res_pjsip: Update default keepalive interval to 90 seconds."
George Joseph [Tue, 24 Jul 2018 13:30:13 +0000 (08:30 -0500)]
Merge "res_pjsip: Update default keepalive interval to 90 seconds."

15 months agores_pjsip: Change log message from error to warning for valid use cases
Florian Floimair [Tue, 24 Jul 2018 09:57:25 +0000 (11:57 +0200)]
res_pjsip: Change log message from error to warning for valid use cases

If a SIP MESSAGE is triggered for an endpoint that is currently not registered
- and therefore has no valid contact associated - an error message was logged.
Since this is a valid request in a valid use cases this is now changed to a
warning, as discussed with Matt Fredrickson on the asterisk-dev mailing list.

Change-Id: I55eb62d2712818a58c7532119dec288bd98cf0c0

15 months agoMerge "CI: Set correct user:group when publishing docs"
Jenkins2 [Tue, 24 Jul 2018 11:03:03 +0000 (06:03 -0500)]
Merge "CI: Set correct user:group when publishing docs"

15 months agoMerge "CI: Add --privileged flag to docker options"
Jenkins2 [Tue, 24 Jul 2018 11:03:01 +0000 (06:03 -0500)]
Merge "CI:  Add --privileged flag to docker options"

15 months agoMerge "core: AST_DEVMODE no longer affects ABI."
George Joseph [Tue, 24 Jul 2018 10:41:39 +0000 (05:41 -0500)]
Merge "core: AST_DEVMODE no longer affects ABI."

15 months agoCI: Add --privileged flag to docker options
George Joseph [Tue, 24 Jul 2018 10:39:30 +0000 (04:39 -0600)]
CI:  Add --privileged flag to docker options

Change-Id: If92d55f15306e55dd7091ac3c47b13ebbbb03488

15 months agoMerge "build_tools/make_version: Get MAINLINE_BRANCH from .gitreview."
George Joseph [Tue, 24 Jul 2018 10:40:49 +0000 (05:40 -0500)]
Merge "build_tools/make_version: Get MAINLINE_BRANCH from .gitreview."

15 months agoCI: Set correct user:group when publishing docs
George Joseph [Tue, 24 Jul 2018 10:22:36 +0000 (04:22 -0600)]
CI: Set correct user:group when publishing docs

Change-Id: Ibabeb9ac730d9755cf54318d0da74771c939b86b

15 months agoMerge "asterisk.c: Make displayed copyright always consistent"
George Joseph [Tue, 24 Jul 2018 09:32:09 +0000 (04:32 -0500)]
Merge "asterisk.c: Make displayed copyright always consistent"

15 months agocore: AST_DEVMODE no longer affects ABI.
Richard Mudgett [Mon, 23 Jul 2018 17:21:44 +0000 (12:21 -0500)]
core: AST_DEVMODE no longer affects ABI.

calculation as it no longer affects API/ABI compatibility.

Change-Id: Id5bd6dfade173a53b3a49f715586b86e3fb24acb

15 months agoMerge "CI: Split --test-command argument."
Jenkins2 [Mon, 23 Jul 2018 18:45:19 +0000 (13:45 -0500)]
Merge "CI: Split --test-command argument."

15 months agoMerge "sched: Make ABI compatible between dev mode and non-dev mode."
George Joseph [Mon, 23 Jul 2018 18:32:01 +0000 (13:32 -0500)]
Merge "sched: Make ABI compatible between dev mode and non-dev mode."

15 months agoasterisk.c: Make displayed copyright always consistent
Richard Mudgett [Fri, 20 Jul 2018 21:21:51 +0000 (16:21 -0500)]
asterisk.c: Make displayed copyright always consistent

Change-Id: I4f5499486e8ec90d7c7ffeebc659ceda1db6d5b5

15 months agoCI: Split --test-command argument.
Corey Farrell [Mon, 23 Jul 2018 15:23:22 +0000 (11:23 -0400)]
CI: Split --test-command argument.

The --test-command argument has now been split, unit tests now use
`--unittest-command` and the testsuite uses --testsuite-command.

This will make it easier to create a script which run everything by
forwarding the same arguments to all CI scripts.

Change-Id: Ia54aa4848eaffbdf13175fcda40fc0b23080ad71

15 months agoMerge "asterisk.c: Update displayed copyright year for v16 release."
George Joseph [Mon, 23 Jul 2018 14:40:37 +0000 (09:40 -0500)]
Merge "asterisk.c: Update displayed copyright year for v16 release."

15 months agoMerge "res_pjsip: Update endpoint transport option documentation."
Joshua Colp [Mon, 23 Jul 2018 14:14:09 +0000 (09:14 -0500)]
Merge "res_pjsip: Update endpoint transport option documentation."

15 months agoMerge "CI: Fix mkdir CACHE_DIR."
Jenkins2 [Mon, 23 Jul 2018 13:39:13 +0000 (08:39 -0500)]
Merge "CI: Fix mkdir CACHE_DIR."

15 months agoMerge "CI: Fix logger.conf for unit tests."
Jenkins2 [Mon, 23 Jul 2018 13:37:33 +0000 (08:37 -0500)]
Merge "CI: Fix logger.conf for unit tests."

15 months agoxmldoc.c: Fix dump of xml document
George Joseph [Fri, 20 Jul 2018 11:20:25 +0000 (05:20 -0600)]
xmldoc.c:  Fix dump of xml document

The "xmldoc dump" cli command was simply concatenating xml documents
into the output file.  The resulting file had multiple "xml"
processing instructions and multiple root elements which is illegal.
Normally this isn't an issue because Asterisk has only 1 main xml
documentation file but codec_opus has its own file so if it's
downloaded and you do "xmldoc dump", the result is invalid.

* Added 2 new functions to xml.c:
    ast_xml_copy_node_list creates a copy of a list of children.
    ast_xml_add_child_list adds a list to an existing list.

* Modified handle_dump_docs to create a new output document and
  add to it the children from each input file.  It then dumps the
  new document to the output file.

Change-Id: I3f182d38c75776aee76413dadd2d489d54a85c07

15 months agoMerge "CI: Add wiki doc publish to periodics"
Jenkins2 [Mon, 23 Jul 2018 11:46:52 +0000 (06:46 -0500)]
Merge "CI:  Add wiki doc publish to periodics"

15 months agoCI: Fix mkdir CACHE_DIR.
Corey Farrell [Sat, 21 Jul 2018 16:58:16 +0000 (12:58 -0400)]
CI: Fix mkdir CACHE_DIR.

Change-Id: Ic9f9a61e230047836c836206731f8ff7eb3538c9

15 months agobuild_tools/make_version: Get MAINLINE_BRANCH from .gitreview.
Corey Farrell [Sat, 21 Jul 2018 15:48:29 +0000 (11:48 -0400)]
build_tools/make_version: Get MAINLINE_BRANCH from .gitreview.

Use .gitreview defaultbranch setting to determine the mainline branch.
This allows the script to be used against other directories which might
not be on the same defaultbranch.  This can be used by CI scripts to
report the testsuite version being used:
./build_tools/make_version ${TESTSUITE_DIR}

Change-Id: Ifdad4a9d8a26138c41bc6b630ecc3e34ea1c2758

15 months agosched: Make ABI compatible between dev mode and non-dev mode.
Joshua Colp [Sun, 22 Jul 2018 15:41:03 +0000 (15:41 +0000)]
sched: Make ABI compatible between dev mode and non-dev mode.

In the past there was an assertion in the ast_sched_del function
and in order to ensure it was useful the calling function name,
line number, and filename had to be passed in. This cause the ABI
to be different between dev mode and non-dev mode.

This assertion is no longer present so the special logic can be
removed to make it the same between them both.

Change-Id: Icbc69c801e357d7004efc5cf2ab936d9b83b6ab8

15 months agoasterisk.c: Update displayed copyright year for v16 release.
Richard Mudgett [Fri, 20 Jul 2018 20:52:12 +0000 (15:52 -0500)]
asterisk.c: Update displayed copyright year for v16 release.

Change-Id: I60622731d928ee9506b1d28934095f0dc3e5306e

15 months agoMerge "pjsip_resolver.c: Use replacement function"
Kevin Harwell [Fri, 20 Jul 2018 19:44:00 +0000 (14:44 -0500)]
Merge "pjsip_resolver.c: Use replacement function"

15 months agoEnable bundling of jansson, require 2.11.
Corey Farrell [Mon, 16 Jul 2018 20:08:20 +0000 (16:08 -0400)]
Enable bundling of jansson, require 2.11.

Change-Id: Ib3111b151d37cbda40768cf2a8a9c6cf6c5c7cbd

15 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."

15 months agoCI: Fix logger.conf for unit tests.
Corey Farrell [Fri, 20 Jul 2018 14:25:25 +0000 (10:25 -0400)]
CI: Fix logger.conf for unit tests.

Change-Id: Idea59d60eab20105de50b34f0f0d506e6ef55d5c

15 months agoCI: Add wiki doc publish to periodics
George Joseph [Thu, 19 Jul 2018 15:34:51 +0000 (09:34 -0600)]
CI:  Add wiki doc publish to periodics

Change-Id: I29ba26134e5083bc6788ede235f1a5d4383c148a

15 months agores_pjsip: Update default keepalive interval to 90 seconds.
Joshua Colp [Fri, 20 Jul 2018 11:54:35 +0000 (11:54 +0000)]
res_pjsip: Update default keepalive interval to 90 seconds.

A change recently went in which disabled the built-in PJSIP
keepalive. This defaulted to 90 seconds and kept TCP/TLS
connections alive. Disabling this functionality has resulted
in a behavior change of not doing keepalives by default resulting
in TCP/TLS connections dropping for some people.

This change makes our default keepalive interval 90 seconds
to match the previous behavior and preserve it.


Change-Id: Ibd9a45f3cbe5d9bb6d2161268696645ff781b1d6

15 months agores_pjsip: Update endpoint transport option documentation.
Richard Mudgett [Thu, 19 Jul 2018 21:17:50 +0000 (16:17 -0500)]
res_pjsip: Update endpoint transport option documentation.

Change-Id: I5394fdff6a296efc8e1695a156e616acd932ae52

15 months agopjsip_resolver.c: Use replacement function
Richard Mudgett [Thu, 19 Jul 2018 18:27:30 +0000 (13:27 -0500)]
pjsip_resolver.c: Use replacement function

* Use the replacement function ast_sip_push_task_wait_servant() instead of
the deprecated ast_sip_push_task_synchronous().

Change-Id: I145b550ba7054640c7faa3b644e63137f505c612

15 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."

15 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

15 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."

15 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."

15 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."

15 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."

15 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"

15 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

15 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

15 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."

15 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

15 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

15 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

15 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

15 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

15 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"

15 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"

15 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

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

15 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."

15 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

15 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

15 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

15 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