6 months agocodec_resample: Ensure OUTSIDE_SPEEX is defined when necessary
Sean Bright [Sun, 8 Sep 2019 15:38:57 +0000 (11:38 -0400)]
codec_resample: Ensure OUTSIDE_SPEEX is defined when necessary


Change-Id: If0d58598ce14aad3c786a1c0127b5f7b200b737d

6 months agoMerge "AST-2019-005 - translate: Don't assume all frames will have a src."
George Joseph [Thu, 5 Sep 2019 12:52:33 +0000 (07:52 -0500)]
Merge "AST-2019-005 - translate: Don't assume all frames will have a src."

6 months agoAST-2019-005 - translate: Don't assume all frames will have a src.
Joshua Colp [Mon, 26 Aug 2019 12:53:27 +0000 (09:53 -0300)]
AST-2019-005 - translate: Don't assume all frames will have a src.

This change removes the assumption that a frame will always have
a src set on it. This assumption is incorrect.

Given a scenario where an RTP packet is received with no payload
the resulting audio frame will have no samples. If this frame goes
through a signed linear translation path an interpolated frame can
be created (if generic packet loss concealment is enabled) that has
minimal data on it, including no src. If this frame is given to a
translation path a crash will occur due to the lack of src.


Change-Id: I024d10dd98207eb8a6b35b59880bcdf1090538f8

6 months agoAST-2019-004 - res_pjsip_t38.c: Add NULL checks before using session media
Kevin Harwell [Tue, 20 Aug 2019 20:05:45 +0000 (15:05 -0500)]
AST-2019-004 - res_pjsip_t38.c: Add NULL checks before using session media

After receiving a 200 OK with a declined stream in response to a T.38
initiated re-invite Asterisk would crash when attempting to dereference
a NULL session media object.

This patch checks to make sure the session media object is not NULL before
attempting to use it.

  ast-2019-004.patch submitted by Alexei Gradinari (license 5691)

Change-Id: I168f45f4da29cfe739acf87e597baa2aae7aa572

7 months agoMerge "chan_unistim: Fix code, causing all incoming DTMF sent back to asterisk"
George Joseph [Tue, 3 Sep 2019 10:32:21 +0000 (05:32 -0500)]
Merge "chan_unistim: Fix code, causing all incoming DTMF sent back to asterisk"

7 months agoMerge "res_pjsip_mwi: add better handling of solicited vs unsolicited subscriptions"
Friendly Automation [Fri, 30 Aug 2019 14:56:36 +0000 (09:56 -0500)]
Merge "res_pjsip_mwi: add better handling of solicited vs unsolicited subscriptions"

7 months agoMerge "codec_resample: Upgrade speex_resample to fix up-sampling bug"
George Joseph [Fri, 30 Aug 2019 12:47:32 +0000 (07:47 -0500)]
Merge "codec_resample: Upgrade speex_resample to fix up-sampling bug"

7 months agores_pjsip_mwi: add better handling of solicited vs unsolicited subscriptions
Kevin Harwell [Fri, 23 Aug 2019 22:03:07 +0000 (17:03 -0500)]
res_pjsip_mwi: add better handling of solicited vs unsolicited subscriptions

res_pjsip_mwi allows both solicited and unsolicited MWI subscription types.
While both can be set in the configuration for a given endpoint/aor, only
one is allowed. Precedence is given to unsolicited. Meaning if an endpoint/aor
is configured to allow both types then the solicited subscription is rejected
when it comes in. However, there is a configuration option to override that


When set to "yes" then when a solicited subscription comes in instead of
rejecting it Asterisk is suppose to replace the unsolicited one if it exists.
Prior to this patch there was a bug in Asterisk that allowed the solicted one
to be added, but did not remove the unsolicited. As a matter of fact a new
unsolicited subscription got added everytime a SIP register was received.
Over time this eventually could "flood" a phone with SIP notifies.

This patch fixes that behavior to now make it work as expected. If configured
to do so a solicited subscription now properly replaces the unsolicited one.
As well when an unsubscribe is received the unsolicited subscription is
restored. Logic was also put in to handle reloads, and any configuration changes
that might result from that. For instance, if a solicited subscription had
previously replaced an unsolicited one, but after reload it was configured to
not allow that then the solicited one needs to be shutdown, and the unsolicited
one added.


Change-Id: Iec2ec12d9431097e97ed5f37119963aee41af7b1

7 months agochan_unistim: Fix code, causing all incoming DTMF sent back to asterisk
Igor Goncharovsky [Tue, 27 Aug 2019 05:49:46 +0000 (11:49 +0600)]
chan_unistim: Fix code, causing all incoming DTMF sent back to asterisk

Current implementation of ast_channel_tech send_digit_begin hook uses
same function for tone playback as key press handler. This cause every
incoming dtmf send back to asterisk. In case of two unistim phones
connected to each other, it'll cause indefinite DTMF loop. Fix add
separate function for dtmf tone phone play.

Change-Id: I5795db468df552f0c89c7576b6b3858b26c4eab4

7 months agochan_unistim: Fix RTP port byte order for big-endian arch
Igor Goncharovsky [Fri, 16 Aug 2019 11:01:21 +0000 (15:01 +0400)]
chan_unistim: Fix RTP port byte order for big-endian arch

This patch fixes one-way oudio that users expirienced on
big-endian architechtires. RTP port number bytes was stored
in improper order and phone sent RTP to wrong RTP port.

Reported-by: Andrey Ionov
Change-Id: I9a9ca7f26e31a67bbbceff12923baa10dfb8a3be

7 months agocodec_resample: Upgrade speex_resample to fix up-sampling bug
Sean Bright [Fri, 23 Aug 2019 20:14:36 +0000 (16:14 -0400)]
codec_resample: Upgrade speex_resample to fix up-sampling bug

ASTERISK-28511 #close

Change-Id: Idd07bf341e89ac999c7f5701d9b72b8a9cb11e82

7 months agoMerge "Fix misname 'res_external_mwi' to 'res_mwi_external' in comments."
Joshua Colp [Fri, 23 Aug 2019 12:57:58 +0000 (07:57 -0500)]
Merge "Fix misname 'res_external_mwi' to 'res_mwi_external' in comments."

7 months agoMerge "pjproject: Configurable setting for cnonce to include hyphens or not"
Friendly Automation [Fri, 23 Aug 2019 00:57:08 +0000 (19:57 -0500)]
Merge "pjproject: Configurable setting for cnonce to include hyphens or not"

7 months agoFix misname 'res_external_mwi' to 'res_mwi_external' in comments.
Alexei Gradinari [Thu, 22 Aug 2019 18:19:51 +0000 (14:19 -0400)]
Fix misname 'res_external_mwi' to 'res_mwi_external' in comments.

Change-Id: Ic784be8500e5cb75dcb34bae9f03cfd93b6b34fb

7 months agochan_rtp: Accept hostname as well as ip address as destination
George Joseph [Wed, 21 Aug 2019 18:29:57 +0000 (12:29 -0600)]
chan_rtp:  Accept hostname as well as ip address as destination

The UnicastRTP channel driver provided by chan_rtp now accepts
"<hostname>:<port>" as an alternative to "<ip_address>:<port>"
in the destination. The first AAAA (preferred) or A record resolved
will be used as the destination. The lookup is synchronous so beware
of possible dialplan delays if you specify a hostname.

Change-Id: Ie6f95b983a8792bf0dacc64c7953a41032dba677

7 months agodns_core: Create new API ast_dns_resolve_ipv6_and_ipv4
George Joseph [Wed, 21 Aug 2019 17:03:26 +0000 (11:03 -0600)]
dns_core:  Create new API ast_dns_resolve_ipv6_and_ipv4

The new function takes in a pointer to an ast_sockaddr structure,
a hostname and an optional port and then dispatches parallel
"AAAA" and "A" record queries.  If an "AAAA" record is returned,
it's parsed into the ast_sockaddr structure along with the port
if it was supplied.  If no "AAAA" record was returned, the
first "A" record returned (if any) is parsed instead.

This is a synchronous call.  If you need asynchronous lookups,
use ast_dns_query_set_resolve_async and roll your own.

Change-Id: I194b0b0e73da94b35cc35263a868ffac3a8d0a95

7 months agoMerge "res_pjsip: Channel variable SIPFROMDOMAIN"
George Joseph [Wed, 21 Aug 2019 23:41:20 +0000 (18:41 -0500)]
Merge "res_pjsip: Channel variable SIPFROMDOMAIN"

7 months agopjproject: Configurable setting for cnonce to include hyphens or not
Dan Cropp [Wed, 21 Aug 2019 15:58:00 +0000 (10:58 -0500)]
pjproject: Configurable setting for cnonce to include hyphens or not

NEC SIP Station interface with authenticated registration only supports cnonce
up to 32 characters.  In Linux, PJSIP would generate 36 character cnonce
which included hyphens.  Teluu developed this patch adding a compile time
setting to default to not include the hyphens.  They felt it best to still
generate the UUID and strip the hyphens.
They have indicated it will be part of PJSIP 2.10.

Reported-by: Dan Cropp

Change-Id: Ibdfcf845d4f8c0a14df09fd983b11f2d72c5f470

7 months agoMerge "res_ari.c: Prefer exact handler match over wildcard"
Friendly Automation [Wed, 21 Aug 2019 12:52:19 +0000 (07:52 -0500)]
Merge "res_ari.c:  Prefer exact handler match over wildcard"

7 months agores_ari.c: Prefer exact handler match over wildcard
George Joseph [Tue, 20 Aug 2019 18:04:56 +0000 (12:04 -0600)]
res_ari.c:  Prefer exact handler match over wildcard

Given the following request path and 2 handler paths...
Request: /channels/externalMedia
Handler: /channels/{channelId}      "wildcard"
Handler: /channels/externalmedia    "non-wildcard"

...if /channels/externalMedia was registered as a handler after
/channels/{channelId} as shown above, the request would automatically
match the wildcard handler and attempt to parse "externalMedia" into
the channelId variable which isn't what was intended.  It'd work
if the non-wildard entry was defined in rest-api/api-docs/channels.json
before the wildcard entry but that makes the json files
order-dependent which isn't a good thing.

To combat this issue, the search loop saves any wildcard match but
continues looking for exact matches at the same level.  If it finds
one, it's used.  If it hasn't found an exact match at the end of
the current level, the wildcard is used.  Regardless, after
searching the current level, the wildcard is cleared so it won't
accidentally match for a different object or a higher level.

BTW, it's currently not possible for more than 1 wildcard entry
to be defined for a level.  For instance, there couldn't be:
Handler: /channels/{channelId}
Handler: /channels/{channelName}
We wouldn't know which one to match.

Change-Id: I574aa3cbe4249c92c30f74b9b40e750e9002f925

7 months agoaudiohook.c: Substitute silence for unavailable audio frames
Sean Bright [Fri, 9 Aug 2019 20:53:03 +0000 (16:53 -0400)]
audiohook.c: Substitute silence for unavailable audio frames

There are 4 scenarios to consider when capturing audio from a channel
with an audiohook:

 1. There is no rx and no tx audio, so return nothing.
 2. There is rx but no tx audio, so return rx.
 3. There is tx but no rx audio, so return tx.
 4. There is rx and tx audio, so mix them and return.

The file passed as the primary argument to MixMonitor will be written to
in scenarios 2, 3, and 4. However, if you pass the r() and t() options
to MixMonitor, a frame will only be written to the r() file if there was
rx audio and a frame will only be written to the t() file if there was
tx audio.

If you subsequently take the r() and t() files and try to mix them, the
sides of the conversation will 'drift' and be non-representative of the
user experience.

This patch adds a new 'S' option to MixMonitor that injects a frame of
silence on either the r() side or the t() side of the channel so that
when later mixed, there is no such drift.

Change-Id: Ibf5ed73a811087727bd561a89a59f4447b4ee20e

7 months agores_pjsip: Channel variable SIPFROMDOMAIN
Stas Kobzar [Tue, 30 Jul 2019 17:08:27 +0000 (13:08 -0400)]
res_pjsip: Channel variable SIPFROMDOMAIN

In chan_sip, there was variable SIPFROMDOMAIN that allows to set
From header URI domain per channel. This patch introduces res_pjsip
variable SIPFROMDOMAIN for backward compatibility with chan_sip.


Change-Id: I715133e43172ce2a1e82093538dc39f9e99e5f2e

7 months agoapp_voicemail/IMAP: check mailstream not NULL in leave_voicemail
Alexei Gradinari [Wed, 14 Aug 2019 19:52:01 +0000 (15:52 -0400)]
app_voicemail/IMAP: check mailstream not NULL in leave_voicemail

The function leave_voicemail checks if expungeonhangup is set,
but does not check if IMAP stream is closed,
so it could call imap function with NULL stream.
This leads to segfault.

ASTERISK-28505 #close

Change-Id: Ib66c57c1f1ba97774e447b36349198e2626a8d7c

7 months agomenuselect: Fix curses build on Gentoo Linux
Sean Bright [Fri, 9 Aug 2019 10:51:28 +0000 (06:51 -0400)]
menuselect: Fix curses build on Gentoo Linux

Because keypad() is exported by libtinfo, it needs to be explicitly
added to the linker options.

ASTERISK-28487 #close

Change-Id: I6c2ad5b95f422c263d078b5c0e84c111807dffc6

7 months agoMerge "srtp: Fix possible race condition, and add NULL checks"
Friendly Automation [Fri, 9 Aug 2019 12:46:42 +0000 (07:46 -0500)]
Merge "srtp: Fix possible race condition, and add NULL checks"

7 months agoMerge "cdr / cel: Use event time at event creation instead of processing."
George Joseph [Thu, 8 Aug 2019 18:26:29 +0000 (13:26 -0500)]
Merge "cdr / cel: Use event time at event creation instead of processing."

7 months agoCI: Escape backslashes in printenv/sort/tr
George Joseph [Thu, 8 Aug 2019 17:10:11 +0000 (11:10 -0600)]
CI: Escape backslashes in printenv/sort/tr

Change-Id: I52be64c8f6af2bbe15148a856d1f10cb113e1e94
(cherry picked from commit c6558e09af3ac15b31377de735cc96d8df0275a7)

7 months agosrtp: Fix possible race condition, and add NULL checks
Kevin Harwell [Wed, 7 Aug 2019 22:54:34 +0000 (17:54 -0500)]
srtp: Fix possible race condition, and add NULL checks

Somehow it's possible for the srtp session object to be NULL even though the
Asterisk srtp object itself is valid. When this happened it would cause a
crash down in the srtp code when attempting to protect or unprotect data.

After looking at the code there is at least one spot that makes this situation
possible. If Asterisk fails to unprotect the data, and after several retries
it still can't then the srtp->session gets freed, and set to NULL while still
leaving the Asterisk srtp object around. However, according to the original
issue reporter this does not appear to be their situation since they found
no errors logged stating the above happened (which Asterisk does for that

An issue was found however, where a possible race condition could occur between
the pjsip incoming negotiation, and the receiving of RTP packets. Both places
could attempt to create/setup srtp for the same rtp instance at the same time.
This potentially could be the cause of the problem as well.

Given the above this patch adds locking around srtp setup for a given rtp, or
rtcp instance. NULL checks for the session have also been added within the
protect and unprotect functions as a precaution. These checks should at least
stop Asterisk from crashing if it gets in this situation again.

This patch also fixes one other issue noticed during investigation. When doing
a replace the old object was freed before creating the replacement. If the new
replacement object failed to create then the rtp/rtcp instance would now point
to freed srtp data which could potentially cause a crash as well when the next
attempt to reference it was made. This is now fixed so the old srtp object is
kept upon replacement failure.

Lastly, more logging has been added to help diagnose future issues.


Change-Id: I240e11cbb1e9ea8083d59d50db069891228fe5cc

7 months agoCI: Add "throttle" label and "skip_gate" capability
George Joseph [Thu, 8 Aug 2019 12:12:18 +0000 (06:12 -0600)]
CI:  Add "throttle" label and "skip_gate" capability

To make throttling by label fully active, the "throttle" option
has to be specified with a specific label.

You can now specify "skip_gate" in the Gerrit comments when you
do a +2 code review to tell Jenkins not to actually run the
gate.  You'd do this if you plan to manually merge the change.

Also updated the "printenv" debug output to better sort multi-line

Change-Id: I4c0b1085acec4805f2ca207eebac50aad81f27e2

7 months agoMerge "app_voicemail: Remove extra menuselect build options"
George Joseph [Thu, 8 Aug 2019 12:25:29 +0000 (07:25 -0500)]
Merge "app_voicemail: Remove extra menuselect build options"

7 months agoMerge "CI: Make node labels job-specific"
Friendly Automation [Wed, 7 Aug 2019 16:19:37 +0000 (11:19 -0500)]
Merge "CI:  Make node labels job-specific"

7 months agocdr / cel: Use event time at event creation instead of processing.
Joshua Colp [Mon, 5 Aug 2019 12:23:53 +0000 (09:23 -0300)]
cdr / cel: Use event time at event creation instead of processing.

When updating times on CDR or CEL records using the time at which
it is done can result in times being incorrect if the system is
heavily loaded and stasis message processing is delayed.

This change instead makes it so CDR and CEL use the time at which
the stasis messages that drive the systems are created. This allows
them to be backed up while still producing correct records.


Change-Id: I6829227e67aefa318efe5e183a94d4a1b4e8500a

7 months agoMerge "various modules: json integer overflow"
George Joseph [Tue, 6 Aug 2019 16:06:55 +0000 (11:06 -0500)]
Merge "various modules: json integer overflow"

7 months agoCI: Make node labels job-specific
George Joseph [Tue, 6 Aug 2019 15:40:54 +0000 (09:40 -0600)]
CI:  Make node labels job-specific

Originally, the eligible nodes for a job were labelled only by
"swdev-docker".  So basically any node could run any job.  We had
found that allowing a node to run more than 1 gate at a time was
problematic so we limited the nodes to processing 1 job at a time.
With the creation of the Asterisk 17 branches however, we now have
so many active branches that getting checks and gates through in
a timely manner is problematic when a node can run only 1 job
at a time.

Now the nodes are also labelled by the job type they can run.
For instance: "asterisk-check", "asterisk-gate", etc.  With the
"Throttle Concurrent Builds" plugin, we can now allow a node to
run more than 1 job BUT throttle by job type.  For instance:
  Allow 2 jobs but only 1 asterisk-gate at a time.
Now a node can run 2 checks or 1 check and 1 gate or 1 gate but
not 2 gates at a time.

Change-Id: I2032bf6afbcec5c341d9b852214c0c812d3d6db5

7 months agoMerge "res_musiconhold: Use a vector instead of custom array allocation"
Friendly Automation [Tue, 6 Aug 2019 15:27:16 +0000 (10:27 -0500)]
Merge "res_musiconhold: Use a vector instead of custom array allocation"

7 months agoMerge "main/udptl.c: correctly handle udptl sequence wrap around"
George Joseph [Tue, 6 Aug 2019 14:48:01 +0000 (09:48 -0500)]
Merge "main/udptl.c: correctly handle udptl sequence wrap around"

7 months agoapp_voicemail: Remove extra menuselect build options
Sean Bright [Tue, 6 Aug 2019 13:20:02 +0000 (09:20 -0400)]
app_voicemail: Remove extra menuselect build options

You now select voicemail backends like normal dialplan applications, so
there is no longer a need for their own menuselect category.

Reported by snuff-work in #asterisk-dev

Change-Id: Idfa4c9c8349726074318a9e6b68d24c374521005

8 months agovarious modules: json integer overflow
Kevin Harwell [Thu, 1 Aug 2019 21:22:01 +0000 (16:22 -0500)]
various modules: json integer overflow

There were still a few places in the code that could overflow when "packing"
a json object with a value outside the base type integer's range. For instance:

unsigned int value = INT_MAX + 1
ast_json_pack("{s: i}", value);

would result in a negative number being "packed". In those situations this patch
alters those values to a ast_json_int_t, which widens the value up to a long or
long long.


Change-Id: Ied530780d83e6f1772adba0e28d8938ef30c49a1

8 months agores_musiconhold: Use a vector instead of custom array allocation
Sean Bright [Mon, 29 Jul 2019 15:15:22 +0000 (11:15 -0400)]
res_musiconhold: Use a vector instead of custom array allocation

Change-Id: Ic476a56608b1820ca93dcf68d10cd76fc0b94141

8 months agores_pjsip: Fix multiple of the same contact in "pjsip show contacts".
Joshua Colp [Thu, 1 Aug 2019 10:07:45 +0000 (10:07 +0000)]
res_pjsip: Fix multiple of the same contact in "pjsip show contacts".

The code for gathering contacts could result in the same contact
being retrieved and added to the list multiple times. The container
which stores the contacts to display will now only allow a contact
to be added to it once instead of multiple times.


Change-Id: I805185cfcec03340f57d2b9e6cc43c49401812df

8 months agoMerge "res_musiconhold: Use ast_pipe_nonblock() wrapper"
Friendly Automation [Wed, 31 Jul 2019 13:09:29 +0000 (08:09 -0500)]
Merge "res_musiconhold: Use ast_pipe_nonblock() wrapper"

8 months agoMerge "manager: Send fewer packets"
Friendly Automation [Wed, 31 Jul 2019 12:29:00 +0000 (07:29 -0500)]
Merge "manager: Send fewer packets"

8 months agomain/udptl.c: correctly handle udptl sequence wrap around
Torrey Searle [Wed, 17 Jul 2019 12:35:50 +0000 (14:35 +0200)]
main/udptl.c: correctly handle udptl sequence wrap around

incorrect handling of UDPTL squence number wrap arounds causes
loss of packets every time the wrap around occurs

ASTERISK-28483 #close

Change-Id: I33caeb2bf13c574a1ebb81714b58907091d64234

8 months agoMerge "loader.c: Fix possible SEGV when a module fails to register"
Friendly Automation [Tue, 30 Jul 2019 12:53:23 +0000 (07:53 -0500)]
Merge "loader.c:  Fix possible SEGV when a module fails to register"

8 months agomanager: Send fewer packets
Sean Bright [Wed, 24 Jul 2019 20:12:49 +0000 (16:12 -0400)]
manager: Send fewer packets

The functions that build manager message headers do so in a way that
results in a single messages being split across multiple packets. While
this doesn't matter to the remote end, it makes network captures noisier
and harder to follow, and also means additional system calls.

With this patch, we build up more of the message content into the TLS
buffer before flushing to the network. This change is completely
internal to the manager code and does not affect any of the existing
API's consumers.

Change-Id: I50128b0769060ca5272dbbb5e60242d131eaddf9

8 months agoUpdate CHANGES and UPGRADE.txt for 17.0.0
Asterisk Development Team [Mon, 29 Jul 2019 16:38:30 +0000 (11:38 -0500)]
Update CHANGES and UPGRADE.txt for 17.0.0

8 months agoUpdate master for Asterisk 18
George Joseph [Fri, 26 Jul 2019 18:03:09 +0000 (12:03 -0600)]
Update master for Asterisk 18

Change-Id: I8b8ed97001446fab0c14d7c89391ee572fb29dd6

8 months agores_musiconhold: Use ast_pipe_nonblock() wrapper
Sean Bright [Mon, 29 Jul 2019 15:04:00 +0000 (11:04 -0400)]
res_musiconhold: Use ast_pipe_nonblock() wrapper

Change-Id: Ib0a4b41e5ececbe633079e2d8c2b66c031d2d1f2

8 months agoloader.c: Fix possible SEGV when a module fails to register
George Joseph [Mon, 29 Jul 2019 13:31:56 +0000 (07:31 -0600)]
loader.c:  Fix possible SEGV when a module fails to register

When a module fails to register itself (usually a coding error
in the module), dlerror() can return NULL.  We weren't checking
for that in load_dlopen() before trying to strdup the error message
so a SEGV was thrown.  dlerror() is now surrounded with an S_OR
so we don't SEGV.

Change-Id: Ie0fb9316f08a321434f3f85aecf3c7d2ede8b956

8 months agoMerge "contrib/scripts: Make Python 2.7+/3.3+ compatible"
George Joseph [Fri, 26 Jul 2019 17:03:04 +0000 (12:03 -0500)]
Merge "contrib/scripts: Make Python 2.7+/3.3+ compatible"

8 months agoMerge "CI: Don't enable non-core modules in Certified branches"
George Joseph [Fri, 26 Jul 2019 14:47:18 +0000 (09:47 -0500)]
Merge "CI:  Don't enable non-core modules in Certified branches"

8 months agoCI: Don't enable non-core modules in Certified branches
George Joseph [Wed, 24 Jul 2019 20:15:27 +0000 (14:15 -0600)]
CI:  Don't enable non-core modules in Certified branches

We don't support non-core modules for Certified releases but we
were enabling them for CI builds which was causing lots of test
failures.  Now we don't.

Change-Id: I0b3254c08a2479f3d39151690350cce5ce5ad766

8 months agores_config_sqlite3: Only join threads that we started
Sean Bright [Tue, 23 Jul 2019 17:58:31 +0000 (13:58 -0400)]
res_config_sqlite3: Only join threads that we started

ASTERISK-28477 #close
Reported by: Dennis

ASTERISK-28478 #close
Reported by: Dennis

Change-Id: I77347ad46a86dc5b35ed68270cee56acefb4f475

8 months agoMerge "openr2(6/6): Set hangup cause"
Friendly Automation [Wed, 24 Jul 2019 00:32:57 +0000 (19:32 -0500)]
Merge "openr2(6/6): Set hangup cause"

8 months agoMerge "openr2(5/6): added cli command -- mfcr2 destroy link <index>"
George Joseph [Tue, 23 Jul 2019 23:43:00 +0000 (18:43 -0500)]
Merge "openr2(5/6): added cli command -- mfcr2 destroy link <index>"

8 months agoMerge "openr2(4/6): added new cli command -- mfcr2 show links"
George Joseph [Tue, 23 Jul 2019 22:28:59 +0000 (17:28 -0500)]
Merge "openr2(4/6): added new cli command -- mfcr2 show links"

8 months agoMerge "openr2(3/6): Convert r2links to standard Asterisk AST_LIST*"
Friendly Automation [Tue, 23 Jul 2019 20:26:30 +0000 (15:26 -0500)]
Merge "openr2(3/6): Convert r2links to standard Asterisk AST_LIST*"

8 months agoMerge "openr2(2/6): Stop polling channels when DAHDI returns -ENODEV (e.g: plug-out)"
George Joseph [Tue, 23 Jul 2019 19:26:00 +0000 (14:26 -0500)]
Merge "openr2(2/6): Stop polling channels when DAHDI returns -ENODEV (e.g: plug-out)"

8 months agoMerge "openr2(1/6): bugfix in configuration saving"
George Joseph [Tue, 23 Jul 2019 18:02:42 +0000 (13:02 -0500)]
Merge "openr2(1/6): bugfix in configuration saving"

8 months agoMerge "chan_pjsip: Transmit REFER waits for the REFER result setting TRANSFERSTATUS"
George Joseph [Tue, 23 Jul 2019 14:18:42 +0000 (09:18 -0500)]
Merge "chan_pjsip:  Transmit REFER waits for the REFER result setting TRANSFERSTATUS"

8 months agoopenr2(6/6): Set hangup cause
Leonid Fainshtein [Sun, 12 May 2019 18:29:40 +0000 (21:29 +0300)]
openr2(6/6): Set hangup cause

Change-Id: I94dc38920e6e77cc73062648f62fdd613d0d1452
Signed-off-by: Oron Peled <>

8 months agoopenr2(5/6): added cli command -- mfcr2 destroy link <index>
Tzafrir Cohen [Mon, 22 Apr 2019 19:14:32 +0000 (22:14 +0300)]
openr2(5/6): added cli command -- mfcr2 destroy link <index>

Change-Id: I452d6a853bcd8c6e194455b19e5e017713e9c0fe
Signed-off-by: Oron Peled <>

8 months agoopenr2(4/6): added new cli command -- mfcr2 show links
Tzafrir Cohen [Mon, 22 Apr 2019 15:27:23 +0000 (18:27 +0300)]
openr2(4/6): added new cli command -- mfcr2 show links

* This command show the MFC/R2 links

Change-Id: I213822e1b7ef9c05bd89a2ba62df8e0856ce9f84
Signed-off-by: Oron Peled <>

8 months agoopenr2(3/6): Convert r2links to standard Asterisk AST_LIST*
Tzafrir Cohen [Mon, 22 Apr 2019 12:27:52 +0000 (15:27 +0300)]
openr2(3/6): Convert r2links to standard Asterisk AST_LIST*

Change-Id: Ibcb2401515a58782a1488c0b9efbed201c3f3a17
Signed-off-by: Oron Peled <>

8 months agoopenr2(2/6): Stop polling channels when DAHDI returns -ENODEV (e.g: plug-out)
Tzafrir Cohen [Mon, 22 Apr 2019 12:33:16 +0000 (15:33 +0300)]
openr2(2/6): Stop polling channels when DAHDI returns -ENODEV (e.g: plug-out)

Otherwise, OpenR2 threads go crazy and consume almost all CPU resources

Change-Id: I10a41f617613fe7399c5bdced5c64a2751173f28
Signed-off-by: Oron Peled <>

8 months agoopenr2(1/6): bugfix in configuration saving
Tzafrir Cohen [Mon, 22 Apr 2019 15:02:23 +0000 (18:02 +0300)]
openr2(1/6): bugfix in configuration saving

  - The memcpy() call copied part of "dahdi_conf" and not "dahdi_conf.mfcr2"
  - As a result, the memcmp() in dahdi_r2_get_link() always fails
  - This cause dahdi_r2_get_link() to create new link for every channel
    (instead of a new link for every ~30 channels)
  - With the fix, far less links are generated -- so we use far less threads

Change-Id: I7259dd6272f5e46e8a6c7f5bf3e8c2ec01b8c132
Signed-off-by: Oron Peled <>

8 months agocontrib/scripts: Make Python 2.7+/3.3+ compatible
Walter Doekes [Mon, 22 Jul 2019 15:43:48 +0000 (17:43 +0200)]
contrib/scripts: Make Python 2.7+/3.3+ compatible

Change-Id: Ica182a891743017ff3cda16de3d95335fffd9a91

8 months agoCI: Add cleanWs to cleanup steps in jenkinsfiles
George Joseph [Fri, 19 Jul 2019 16:20:38 +0000 (10:20 -0600)]
CI: Add cleanWs to cleanup steps in jenkinsfiles

We're at the point where there are enough Jenkins jobs for
Asterisk branches than even cleaned checkouts of Asterisk
will add up to more disk space than is available on the
in-memory workspace mount.  Since we archive all relevent
artifacts anyway, there's no need to keep the workspace
around after the job finishes, whether it succeeds or fails.

Change-Id: I1cd3b73ebb045a987df0f62526d152a510210c39

8 months agoMerge "CI: Add install-headers to the install make targets"
George Joseph [Fri, 19 Jul 2019 16:04:50 +0000 (11:04 -0500)]
Merge "CI:  Add install-headers to the install make targets"

8 months agoMerge " Update year"
George Joseph [Fri, 19 Jul 2019 14:48:27 +0000 (09:48 -0500)]
Merge " Update year"

8 months agoMerge "sched: Don't allow ast_sched_del to deadlock ast_sched_runq from same thread"
George Joseph [Fri, 19 Jul 2019 13:46:21 +0000 (08:46 -0500)]
Merge "sched: Don't allow ast_sched_del to deadlock ast_sched_runq from same thread"

8 months agoCI: Add install-headers to the install make targets
George Joseph [Fri, 19 Jul 2019 13:38:39 +0000 (07:38 -0600)]
CI:  Add install-headers to the install make targets

The testsuite actually needs the headers installed to run
it's self_test.

Change-Id: Ice41d331131b876ad4a9c056085fe6aac34b32b2

8 months agoMerge "Build: Separate header install/uninstall"
George Joseph [Fri, 19 Jul 2019 12:54:28 +0000 (07:54 -0500)]
Merge "Build: Separate header install/uninstall"

8 months agoMerge "manager: Log AMI actions"
Joshua Colp [Fri, 19 Jul 2019 12:42:07 +0000 (07:42 -0500)]
Merge "manager: Log AMI actions"

8 months agosched: Don't allow ast_sched_del to deadlock ast_sched_runq from same thread
Walter Doekes [Wed, 17 Jul 2019 13:06:12 +0000 (15:06 +0200)]
sched: Don't allow ast_sched_del to deadlock ast_sched_runq from same thread

When fixing ASTERISK~24212, a change was done so a scheduled callback could not
be removed while it was running. The caller of ast_sched_del would have to wait.

However, when the caller of ast_sched_del is the callback itself (however wrong
this might be), this new check would cause a deadlock: it would wait forever
for itself.

This changeset introduces an additional check: if ast_sched_del is called
by the callback itself, it is immediately rejected (along with an ERROR log and
a backtrace). Additionally, the AST_SCHED_DEL_UNREF macro is adjusted so the
after-ast_sched_del-refcall function is only run if ast_sched_del returned

This should fix the following spurious race condition found in chan_sip:
- thread 1: schedule sip_poke_peer_now (using AST_SCHED_REPLACE)
- thread 2: run sip_poke_peer_now
- thread 2: blank out sched-ID (too soon!)
- thread 1: set sched-ID (too late!)
- thread 2: try to delete the currently running sched-ID

After this fix, an ERROR would be logged, but no deadlocks (in do_monitor) nor
excess calls to sip_unref_peer(peer) (causing double frees of rtp_instances and
other madness) should occur.

(Thanks Richard Mudgett for reviewing/improving this "scary" change.)

Note that this change does not fix the observed race condition: unlocked
access to peer->pokeexpire (and potentially other scheduled items in chan_sip),
causing AST_SCHED_DEL_UNREF to look at a changing id. But it will make the
deadlock go away. And in the observed case, it will not have adverse affects
(like memory leaks) because the scheduled item is removed through a different


Change-Id: Ic26777fa0732725e6ca7010df17af77a012aa856

8 months agoBuild: Separate header install/uninstall
George Joseph [Tue, 16 Jul 2019 12:55:49 +0000 (06:55 -0600)]
Build: Separate header install/uninstall

Asterisk headers are no longer installed and uninstalled
automatically when performing a "make install" or a
"make uninstall".  To install/uninstall the headers, use
"make install-headers" and "make uninstall-headers".
The headers also continue to be uninstalled when performing a
"make uninstall-all".

Also corrects an issue where /usr/include/asterisk.h was never
being removed at all.

Change-Id: Ia7399f3a0203a4825fc4a9f43b9034dae9a2b643

8 months agomanager: Log AMI actions
Kevin Harwell [Tue, 9 Jul 2019 19:42:51 +0000 (14:42 -0500)]
manager: Log AMI actions

When manager debugging is turned on, this patch makes it so incoming AMI actions
are now also logged.

Change-Id: I8047524510e7ac97d99482b2448f8e368f29cd47

8 months agores_rtp_asterisk: Move where DTLS MTU variable is defined.
Joshua Colp [Sun, 14 Jul 2019 18:26:41 +0000 (15:26 -0300)]
res_rtp_asterisk: Move where DTLS MTU variable is defined.

The DTLS MTU variable is not dependent on pjproject and should
not exist in its block.

Change-Id: I7e97d64dc192f2ac81bfe2b72b8229d321c7d026

8 months agoMerge "app_voicemail: Remove dependency on the stasis cache"
Kevin Harwell [Fri, 12 Jul 2019 14:21:15 +0000 (09:21 -0500)]
Merge "app_voicemail: Remove dependency on the stasis cache"

8 months agoMerge "MWI: Update modules that subscribe to MWI to use new API calls"
Kevin Harwell [Fri, 12 Jul 2019 14:19:18 +0000 (09:19 -0500)]
Merge "MWI: Update modules that subscribe to MWI to use new API calls"

8 months agoMerge "mwi: Update the MWI core to use stasis_state API"
Kevin Harwell [Fri, 12 Jul 2019 14:18:15 +0000 (09:18 -0500)]
Merge "mwi: Update the MWI core to use stasis_state API"

8 months agoMerge "stasis_state: Make unsubscribes NULL tolerant"
Kevin Harwell [Fri, 12 Jul 2019 14:17:55 +0000 (09:17 -0500)]
Merge "stasis_state: Make unsubscribes NULL tolerant"

8 months agoMerge "chan_sip: Handle invalid SDP answer to T.38 re-invite"
Friendly Automation [Thu, 11 Jul 2019 21:35:03 +0000 (16:35 -0500)]
Merge "chan_sip: Handle invalid SDP answer to T.38 re-invite"

8 months agores_pjsip_messaging: Check for body in in-dialog message
George Joseph [Wed, 12 Jun 2019 18:03:04 +0000 (12:03 -0600)]
res_pjsip_messaging:  Check for body in in-dialog message

We now check that a body exists and it has a length > 0 before
attempting to process it.

Reported-by: Gil Richard

Change-Id: Ic469544b22ab848734636588d4c93426cc6f4b1f

8 months agochan_sip: Handle invalid SDP answer to T.38 re-invite
Francesco Castellano [Fri, 28 Jun 2019 16:15:31 +0000 (18:15 +0200)]
chan_sip: Handle invalid SDP answer to T.38 re-invite

The chan_sip module performs a T.38 re-invite using a single media
stream of udptl, and expects the SDP answer to be the same.

If an SDP answer is received instead that contains an additional
media stream with no joint codec a crash will occur as the code
assumes that at least one joint codec will exist in this

This change removes this assumption.


Change-Id: I8b02845b53344c6babe867a3f0a5231045c7ac87

8 months agoapp_voicemail: Remove dependency on the stasis cache
Kevin Harwell [Wed, 12 Jun 2019 18:49:30 +0000 (13:49 -0500)]
app_voicemail: Remove dependency on the stasis cache

app_voicemail utilized the stasis cache when polling mailboxes for MWI. This
caused a memory leak (items were not being appropriately removed from the
cache), and subsequent slowdown in system processing. This patch removes the
stasis cache dependency, thus alleviating the memory leak. It does this by
utilizing the new MWI API that better manages state lifetime.


Change-Id: Ie89fedaca81ea1fd03d150d9d3a1ef3d53740e46

8 months agoMWI: Update modules that subscribe to MWI to use new API calls
Kevin Harwell [Wed, 12 Jun 2019 18:11:42 +0000 (13:11 -0500)]
MWI: Update modules that subscribe to MWI to use new API calls

The MWI core recently got some new API calls that make tracking MWI state
lifetime more reliable. This patch updates those modules that subscribe to
specific MWI topics to use the new API. Specifically, these modules now
subscribe to both MWI topics and MWI state.


Change-Id: I32bef880b647246823dbccdf44a98d384fcabfbd

8 months agomwi: Update the MWI core to use stasis_state API
Kevin Harwell [Tue, 11 Jun 2019 19:12:12 +0000 (14:12 -0500)]
mwi: Update the MWI core to use stasis_state API

** Note **

This patch is meant to be the minimum needed in order for the MWI core to use
the now underlying stasis_state module. As such it does not completely remove
its reliance on the stasis_cache. Doing so has allowed current consumers to
not have to change, and update those code paths for this patch. When time
allows, subsequent patches can/will be made to those consumers to take advantage
of some of the new MWI API included here. Thus, eventually and ultimately
removing MWI dependency on the stasis_cache.

** End Note **

This patch makes it so the MWI core now takes advantage of the new stasis_state
API. Consumers of MWI should no longer need to depend upon stasis topic pooling,
and the stasis cache directly. Similar functionality and implementation details
have now been pushed into the stasis_state module. However, all MWI state should
be accessed via the MWI API itself.

As such a few new methods, and constructs have been added to the MWI core that
facilitate consumer publishing, subscribing, and iterating over MWI state data.

* ast_mwi_subscriber *

Created via ast_mwi_add_subscriber, a subscriber subscribes to a given mailbox
in order to receive updates about the given mailbox. Adding a subscriber will
create the underlying topic, and associated state data if those do not already
exist for it. The topic, and last known state data is guaranteed to exist for
the lifetime of the subscriber.

* ast_mwi_publisher *

Before publishing to a particular topic a publisher should be created. This can
be achieved by using ast_mwi_add_publisher. Publishing to a mailbox should then
be done using one of the MWI publish functions. This ensures the message is
published to the appropriate topic, and the last known state is maintained.

* ast_mwi_observer *

Add an observer in order to watch for particular MWI module related events. For
instance if a submodule needs to know when a subscription is added to any
mailbox an observer can be added to watch for that.

* other *

Urgent message count is now part of the published MWI state object. Also state
can be iterated over using defined callbacks.


Change-Id: I93f935f9090cd5ddff6d4bc80ff90703c05cf776

8 months agostasis_state: Make unsubscribes NULL tolerant
Kevin Harwell [Mon, 8 Jul 2019 23:10:07 +0000 (18:10 -0500)]
stasis_state: Make unsubscribes NULL tolerant

Regular stasis unsubscribes can handle NULL subscription objects. This patch
makes it so stasis state unsubscribes handles NULL's as well.


Change-Id: Ic3648e8df043a85b77cff085e9ff10356028e479

9 months Update year
Rodrigo Ramírez Norambuena [Fri, 5 Jul 2019 00:46:36 +0000 (20:46 -0400)] Update year

Change-Id: I746fb94d112c7d797e206bca0fd1e13fcd26bae3

9 months agoMerge "stasis_state: Add new stasis_state module"
Friendly Automation [Tue, 2 Jul 2019 14:30:35 +0000 (09:30 -0500)]
Merge "stasis_state: Add new stasis_state module"

9 months agoMerge "chan_dahdi.c: crash in chan_dahdi"
Joshua Colp [Tue, 2 Jul 2019 13:25:41 +0000 (08:25 -0500)]
Merge "chan_dahdi.c: crash in chan_dahdi"

9 months agochan_dahdi.c: crash in chan_dahdi
Chris-Savinovich [Mon, 1 Jul 2019 21:57:25 +0000 (16:57 -0500)]
chan_dahdi.c: crash in chan_dahdi

Fixes a crash in chan_dahdi occurring on 32-bit systems. A previous
patch introduced a variable of type unassigned long long which is 64-bits.
Casting it as 'ast_json_int_t' along with JSON type 'I' makes it work
with 32-bit systems.


Change-Id: I9cef6b5f2d826fc5c93f2f6a1c997c4e3e6c93fe

9 months agores_pjsip_sdp_rtp: Remove unused variable
Kevin Harwell [Mon, 1 Jul 2019 15:49:56 +0000 (10:49 -0500)]
res_pjsip_sdp_rtp: Remove unused variable

The variable 'endpoint_caps' in function 'set_caps' is not used, so remove.


Change-Id: Ia8766d05a0738aecb29dd018302c2dafca5cab34

9 months agoMerge "app_voicemail.c: Build all three variants for app_voicemail at the same time"
George Joseph [Mon, 1 Jul 2019 15:20:43 +0000 (10:20 -0500)]
Merge "app_voicemail.c: Build all three variants for app_voicemail at the same time"

9 months agoMerge "tcptls.c: Add peer hostname and port to some error messages"
George Joseph [Mon, 1 Jul 2019 15:20:11 +0000 (10:20 -0500)]
Merge "tcptls.c:  Add peer hostname and port to some error messages"

9 months agoMerge "pjproject_bundled: Add peer information to most SSL/TLS errors"
Friendly Automation [Mon, 1 Jul 2019 15:05:26 +0000 (10:05 -0500)]
Merge "pjproject_bundled:  Add peer information to most SSL/TLS errors"

9 months agostasis_state: Add new stasis_state module
Kevin Harwell [Tue, 11 Jun 2019 17:30:27 +0000 (12:30 -0500)]
stasis_state: Add new stasis_state module

This new module describes an API that can be thought of as a combination of
stasis topic pools, and caching. Except, hopefully done in a more efficient
and less memory "leaky" manner.

The API defines methods, and data structures for managing, and tracking
published message state through stasis. By adding a subscriber or publisher,
consumers can more easily track the lifetime of the contained state. For
instance, when no more publishers and/or subscribers have need of the topic,
and associated state its data is removed from the managed container.

* stasis_state_manager *

The manager stores and well, manages state data. Each state is an association
of a unique stasis topic, and the last known published stasis message on that
topic. There is only ever one managed state object per topic. For each topic
all messages are forwarded to an "all" topic also maintained by the manager.

* stasis_state_subscriber *

Topic and state can be created, or referenced within the manager by adding a
stasis_state_subscriber. When adding a subscriber if no state currently exists
new managed state is immediately created. If managed state already exists then
a new subscriber is created referencing that state. The managed state is
guaranteed to live throughout the subscriber's lifetime. State is only removed
from the manager when no other entities require it.

* stasis_state_publisher *

Topic and state can be created, or referenced within the manager by also adding
a stasis_state_publisher. When adding a publisher if no state currently exists
new managed state is created. If managed state already exists then a new
publisher is created referencing that state. The managed state is guaranteed to
live throughout the publisher's lifetime. State is only removed from the
manager when no other entities require it.

* stasis_state_observer *

Some modules may wish to watch for, and react to managed state events. By
registering a state observer, and implementing handlers for the desired
callbacks those modules can do so.

* other *

Callbacks also exist that allow consumers to iterate over all, or some of the
managed state.


Change-Id: I7a4a06685a96e511da9f5bd23f9601642d7bd8e5

9 months agoapp_voicemail.c: Build all three variants for app_voicemail at the same time
Chris-Savinovich [Thu, 27 Jun 2019 18:50:57 +0000 (13:50 -0500)]
app_voicemail.c: Build all three variants for app_voicemail at the same time

Changes made to apps/Makefile to optionally build all three app_voicemail
variations at the same time: 1) file (default), 2) odbc, and 3) imap.
This functionality was requested by users. modules.conf.sample warns the
user to make sure only one voicemail is loaded at a time.

Change-Id: Iba3cd8ffb4b7e8b1c64a11dd383e1eafcd3ed0e7

9 months agoMerge "pjproject: Update to 2.9 release"
Kevin Harwell [Thu, 27 Jun 2019 21:52:59 +0000 (16:52 -0500)]
Merge "pjproject: Update to 2.9 release"