2 years agoMerge "rtp_engine/res_rtp_asterisk: Fix RTP struct reentrancy crashes."
George Joseph [Fri, 21 Apr 2017 20:46:21 +0000 (15:46 -0500)]
Merge "rtp_engine/res_rtp_asterisk: Fix RTP struct reentrancy crashes."

2 years agoMerge "build: Update config.guess and config.sub"
George Joseph [Thu, 20 Apr 2017 18:34:45 +0000 (13:34 -0500)]
Merge "build: Update config.guess and config.sub"

2 years agoMerge "res_stun_monitor: Don't fail to load if DNS resolution fails"
George Joseph [Thu, 20 Apr 2017 12:19:46 +0000 (07:19 -0500)]
Merge "res_stun_monitor: Don't fail to load if DNS resolution fails"

2 years agoMerge "make ari-stubs so doc periodic jobs can run"
George Joseph [Thu, 20 Apr 2017 12:17:28 +0000 (07:17 -0500)]
Merge "make ari-stubs so doc periodic jobs can run"

2 years agortp_engine/res_rtp_asterisk: Fix RTP struct reentrancy crashes.
Richard Mudgett [Wed, 22 Mar 2017 21:05:49 +0000 (16:05 -0500)]
rtp_engine/res_rtp_asterisk: Fix RTP struct reentrancy crashes.

The struct ast_rtp_instance has historically been indirectly protected
from reentrancy issues by the channel lock because early channel drivers
held the lock for really long times.  Holding the channel lock for such a
long time has caused many deadlock problems in the past.  Along comes
chan_pjsip/res_pjsip which doesn't necessarily hold the channel lock
because sometimes there may not be an associated channel created yet or
the channel pointer isn't available.

In the case of ASTERISK-26835 a pjsip serializer thread was processing a
message's SDP body while another thread was reading a RTP packet from the
socket.  Both threads wound up changing the rtp->rtcp->local_addr_str
string and interfering with each other.  The classic reentrancy problem
resulted in a crash.

In the case of ASTERISK-26853 a pjsip serializer thread was processing a
message's SDP body while another thread was reading a RTP packet from the
socket.  Both threads wound up processing ICE candidates in PJPROJECT and
interfering with each other.  The classic reentrancy problem resulted in a

* rtp_engine.c: Make the ast_rtp_instance_xxx() calls lock the RTP
instance struct.

* rtp_engine.c: Make ICE and DTLS wrapper functions to lock the RTP
instance struct for the API call.

* res_rtp_asterisk.c: Lock the RTP instance to prevent a reentrancy
problem with rtp->rtcp->local_addr_str in the scheduler thread running

* res_rtp_asterisk.c: Avoid deadlock when local RTP bridging in
bridge_p2p_rtp_write() because there are two RTP instance structs

* res_rtp_asterisk.c: Avoid deadlock when trying to stop scheduler
callbacks.  We cannot hold the instance lock when trying to stop a
scheduler callback.

* res_rtp_asterisk.c: Remove the lock in struct dtls_details and use the
struct ast_rtp_instance ao2 object lock instead.  The lock was used to
synchronize two threads to prevent a race condition between starting and
stopping a timeout timer.  The race condition is no longer present between
dtls_perform_handshake() and __rtp_recvfrom() because the instance lock
prevents these functions from overlapping each other with regards to the
timeout timer.

* res_rtp_asterisk.c: Remove the lock in struct ast_rtp and use the struct
ast_rtp_instance ao2 object lock instead.  The lock was used to
synchronize two threads using a condition signal to know when TURN
negotiations complete.

* res_rtp_asterisk.c: Avoid deadlock when trying to stop the TURN
ioqueue_worker_thread().  We cannot hold the instance lock when trying to
create or shut down the worker thread without a risk of deadlock.

This patch exposed a race condition between a PJSIP serializer thread
setting up an ICE session in ice_create() and another thread reading RTP

* res_rtp_asterisk.c:ice_create(): Set the new rtp->ice pointer after we
have re-locked the RTP instance to prevent the other thread from trying to
process ICE packets on an incomplete ICE session setup.

A similar race condition is between a PJSIP serializer thread resetting up
an ICE session in ice_create() and the timer_worker_thread() processing
the completion of the previous ICE session.

* res_rtp_asterisk.c:ast_rtp_on_ice_complete(): Protect against an
uninitialized/null remote_address after calling

* res_rtp_asterisk.c: Eliminate the chance of ice_reset_session()
destroying and setting the rtp->ice pointer to NULL while other threads
are using it by adding an ao2 wrapper around the PJPROJECT ice pointer.
Now when we have to unlock the RTP instance object to call a PJPROJECT ICE
function we will hold a ref to the wrapper.  Also added some rtp->ice NULL
checks after we relock the RTP instance and have to do something with the
ICE structure.

ASTERISK-26835 #close
ASTERISK-26853 #close

Change-Id: I780b39ec935dcefcce880d50c1a7261744f1d1b4

2 years agobuild: Update config.guess and config.sub
Sean Bright [Wed, 19 Apr 2017 13:39:00 +0000 (09:39 -0400)]
build: Update config.guess and config.sub

Change-Id: Id078a1df07a771808775e1053cdfe1d99c8fb172

2 years agoMerge "format_wav: Read 16khz wav samples properly"
Joshua Colp [Wed, 19 Apr 2017 13:38:59 +0000 (08:38 -0500)]
Merge "format_wav: Read 16khz wav samples properly"

2 years agoMerge "format_ogg_vorbis: Clear ogg/vorbis data structures on close"
Joshua Colp [Wed, 19 Apr 2017 13:38:16 +0000 (08:38 -0500)]
Merge "format_ogg_vorbis: Clear ogg/vorbis data structures on close"

2 years agoMerge "Revert "bridging: Ensure successful T.38 negotation""
Joshua Colp [Wed, 19 Apr 2017 13:37:17 +0000 (08:37 -0500)]
Merge "Revert "bridging:  Ensure successful T.38 negotation""

2 years agoformat_wav: Read 16khz wav samples properly
Sean Bright [Fri, 14 Apr 2017 18:52:59 +0000 (14:52 -0400)]
format_wav: Read 16khz wav samples properly

When opening a PCM wave file for reading, we aren't tracking the
frequency of the opened file, so we treat 16khz files as 8khz and do
half reads.

This patch also cleans up some of the data types and an unnecessarily
complex `if` expression.

ASTERISK-26613 #close
Reported by: Vitaly K

Change-Id: I05f8b263058dc573ea8ffe0c62e7964506e11815

2 years agomake ari-stubs so doc periodic jobs can run
George Joseph [Mon, 17 Apr 2017 00:59:54 +0000 (18:59 -0600)]
make ari-stubs so doc periodic jobs can run

The periodic doc job does a make ari-stubs and checks that
there are no changes before generating the docs.  Since I changed
the mustache template (and the generated code directly) recently
and forgot to regenerate the stubs, the doc job thinks they're out
of date.

Change-Id: I94b97035311eccf52b0101b8590223265a7881d4

2 years agoformat_ogg_vorbis: Clear ogg/vorbis data structures on close
Sean Bright [Fri, 14 Apr 2017 17:51:31 +0000 (13:51 -0400)]
format_ogg_vorbis: Clear ogg/vorbis data structures on close

On filestream close, we need to clear out the ogg & vorbis data
structures to prevent a memory leak.

ASTERISK-26169 #close
Reported by: Ivan Myalkin

Change-Id: Iee94c5a5d5bdafbf8b181c5c064d15d90ace8274

2 years agoRevert "bridging: Ensure successful T.38 negotation"
Richard Mudgett [Fri, 14 Apr 2017 22:32:22 +0000 (17:32 -0500)]
Revert "bridging:  Ensure successful T.38 negotation"

This reverts commit 7819f95791fe0ca0e0cdc417e2687a5900444053.

Change-Id: Ib91a7e6c9856f5f41329e42f40ba2394fee861a4

2 years agores_stun_monitor: Don't fail to load if DNS resolution fails
Sean Bright [Fri, 14 Apr 2017 21:50:56 +0000 (17:50 -0400)]
res_stun_monitor: Don't fail to load if DNS resolution fails

res_stun_monitor will fail to load if DNS resolution of the STUN server
fails. Instead, we continue without the STUN server being resolved and
we will re-attempt the resolution on the STUN refresh interval.

ASTERISK-21856 #close
Reported by: Jeremy Kister

Change-Id: I6334c54a1cc798f8a836b4b47948e0bb4ef59254

2 years agoformat_pcm: Track actual header size of .au files
Sean Bright [Fri, 14 Apr 2017 19:36:57 +0000 (15:36 -0400)]
format_pcm: Track actual header size of .au files

Sun's Au file format has a minimum data offset 24 bytes, but this
offset is encoded in each .au file. Instead of assuming the minimum,
read the actual value and store it for later use.

ASTERISK-20984 #close
Reported by: Roman S.
asterisk- (license #6474) patch
uploaded by Roman S.

Change-Id: I524022fb19ff2fd5af2cc2d669d27a780ab2057c

2 years agomodules: change module LOAD_FAILUREs to LOAD_DECLINES (master)
George Joseph [Wed, 12 Apr 2017 12:50:49 +0000 (06:50 -0600)]
modules:  change module LOAD_FAILUREs to LOAD_DECLINES (master)

Change-Id: Iac40ecb20e10513d67bf0eaf61807f306067b258

2 years agoMerge "modules: change module LOAD_FAILUREs to LOAD_DECLINES (14)"
Joshua Colp [Thu, 13 Apr 2017 12:06:51 +0000 (07:06 -0500)]
Merge "modules:  change module LOAD_FAILUREs to LOAD_DECLINES (14)"

2 years agoMerge "modules: change module LOAD_FAILUREs to LOAD_DECLINES"
zuul [Thu, 13 Apr 2017 12:03:42 +0000 (07:03 -0500)]
Merge "modules:  change module LOAD_FAILUREs to LOAD_DECLINES"

2 years agoMerge "strings.h: Avoid overflows in the string hash functions"
Joshua Colp [Thu, 13 Apr 2017 00:46:06 +0000 (19:46 -0500)]
Merge "strings.h:  Avoid overflows in the string hash functions"

2 years agomodules: change module LOAD_FAILUREs to LOAD_DECLINES (14)
George Joseph [Wed, 12 Apr 2017 12:47:59 +0000 (06:47 -0600)]
modules:  change module LOAD_FAILUREs to LOAD_DECLINES (14)

Change-Id: If99e3b4fc2d7e86fc3e61182aa6c835b407ed49e

2 years agomodules: change module LOAD_FAILUREs to LOAD_DECLINES
George Joseph [Tue, 11 Apr 2017 16:07:39 +0000 (10:07 -0600)]
modules:  change module LOAD_FAILUREs to LOAD_DECLINES

In all non-pbx modules, AST_MODULE_LOAD_FAILURE has been changed
to AST_MODULE_LOAD_DECLINE.  This prevents asterisk from exiting
if a module can't be loaded.  If the user wishes to retain the
FAILURE behavior for a specific module, they can use the "require"
or "preload-require" keyword in modules.conf.

A new API was added to logger: ast_is_logger_initialized().  This
allows asterisk.c/check_init() to print to the error log once the
logger subsystem is ready instead of just to stdout.  If something
does fail before the logger is initialized, we now print to stderr
instead of stdout.

Change-Id: I5f4b50623d9b5a6cb7c5624a8c5c1274c13b2b25

2 years agoMerge "bridging: Ensure successful T.38 negotation"
zuul [Wed, 12 Apr 2017 16:22:19 +0000 (11:22 -0500)]
Merge "bridging:  Ensure successful T.38 negotation"

2 years agoMerge "res_rtp_asterisk.c: Add stun_blacklist option"
zuul [Wed, 12 Apr 2017 14:55:42 +0000 (09:55 -0500)]
Merge "res_rtp_asterisk.c: Add stun_blacklist option"

2 years agobridging: Ensure successful T.38 negotation
Torrey Searle [Wed, 5 Apr 2017 11:41:29 +0000 (13:41 +0200)]
bridging:  Ensure successful T.38 negotation

When a T.38 happens immediatly after call establishment, the control
frame can be lost because the other leg is not yet in the bridge.

This patch detects this case an makes sure T.38 negotation happens
when the 2nd leg is being made compatible with the negotating
first leg

ASTERISK-26923 #close

Change-Id: If334125ee61ed63550d242fc9efe7987e37e1d94

2 years agoMerge "stun.c: Fix ast_stun_request() erratic timeout."
Joshua Colp [Wed, 12 Apr 2017 09:54:33 +0000 (04:54 -0500)]
Merge "stun.c: Fix ast_stun_request() erratic timeout."

2 years agoMerge "sorcery.c: Speed up ast_sorcery_retrieve_by_id()"
zuul [Wed, 12 Apr 2017 01:12:55 +0000 (20:12 -0500)]
Merge "sorcery.c: Speed up ast_sorcery_retrieve_by_id()"

2 years agoMerge "res_pjsip: Fix pointer use after unref."
zuul [Wed, 12 Apr 2017 01:12:53 +0000 (20:12 -0500)]
Merge "res_pjsip: Fix pointer use after unref."

2 years agoMerge "res_pjsip_sdp_rtp.c: Don't use deprecated transport struct member."
zuul [Wed, 12 Apr 2017 01:12:50 +0000 (20:12 -0500)]
Merge "res_pjsip_sdp_rtp.c: Don't use deprecated transport struct member."

2 years agostrings.h: Avoid overflows in the string hash functions
Torrey Searle [Fri, 7 Apr 2017 13:58:23 +0000 (15:58 +0200)]
strings.h:  Avoid overflows in the string hash functions

On 2's compliment machines abs(INT_MIN) behavior is undefined and
results in a negative value still being returnd.  This results in
negative hash codes that can result in crashes.

ASTERISK-26528 #close

Change-Id: Idff550145ca2133792a61a2e212b4a3e82c6517b

2 years agores_rtp_asterisk.c: Add stun_blacklist option
Richard Mudgett [Fri, 7 Apr 2017 21:14:16 +0000 (16:14 -0500)]
res_rtp_asterisk.c: Add stun_blacklist option

Added the stun_blacklist option to rtp.conf.  Some multihomed servers have
IP interfaces that cannot reach the STUN server specified by stunaddr.
Blacklist those interface subnets from trying to send a STUN packet to
find the external IP address.  Attempting to send the STUN packet
needlessly delays processing incoming and outgoing SIP INVITEs because we
will wait for a response that can never come until we give up on the
response.  Multiple subnets may be listed.

ASTERISK-26890 #close

Change-Id: I3ff4f729e787f00c3e6e670fe6435acce38be342

2 years agostun.c: Fix ast_stun_request() erratic timeout.
Richard Mudgett [Thu, 6 Apr 2017 22:31:14 +0000 (17:31 -0500)]
stun.c: Fix ast_stun_request() erratic timeout.

If ast_stun_request() receives packets other than a STUN response then we
could conceivably never exit if we continue to receive packets with less
than three seconds between them.

* Fix poll timeout to keep track of the time when we sent the STUN
request.  We will now send a STUN request every three seconds regardless
of how many other packets we receive while waiting for a response until we
have completed three STUN request transmission cycles.

Change-Id: Ib606cb08585e06eb50877f67b8d3bd385a85c266

2 years agosorcery.c: Speed up ast_sorcery_retrieve_by_id()
Richard Mudgett [Thu, 6 Apr 2017 23:30:11 +0000 (18:30 -0500)]
sorcery.c: Speed up ast_sorcery_retrieve_by_id()

Return early if ast_sorcery_retrieve_by_id() is not passed an id to find.
Also eliminated the RAII_VAR() usage in the function.

Change-Id: I871dbe162a301b5ced8b4393cec27180c7c6b218

2 years agores_pjsip: Fix pointer use after unref.
Richard Mudgett [Mon, 10 Apr 2017 16:30:35 +0000 (11:30 -0500)]
res_pjsip: Fix pointer use after unref.

Change-Id: I4b6e1b0070563eeaee223cb58326f1b962ed5bc1

2 years agores_pjsip_sdp_rtp.c: Don't use deprecated transport struct member.
Richard Mudgett [Thu, 6 Apr 2017 23:18:16 +0000 (18:18 -0500)]
res_pjsip_sdp_rtp.c: Don't use deprecated transport struct member.

* create_rtp(): Eliminate use of deprecated transport struct member.  That
member and several others in the transport structure were deprecated
because of an infinite loop created when using realtime configuration.
See 2451d4e4550336197ee2e482750cc53f30afa352


Change-Id: I0533aa13c9ce3c6cc394e0fd2b5bf1cd1b2ef3bc

2 years agotcptls.c: Cleanup TCP/TLS listener thread on abnormal exit.
Richard Mudgett [Mon, 10 Apr 2017 22:45:35 +0000 (17:45 -0500)]
tcptls.c: Cleanup TCP/TLS listener thread on abnormal exit.

Temporarily running out of file descriptors should not terminate the
listener thread.  Otherwise, when there becomes more file descriptors
available, nothing is listening.

* Added EMFILE exception to abnormal thread exit.

* Added an abnormal TCP/TLS listener exit error message.

* Closed the TCP/TLS listener socket on abnormal exit so Asterisk does not
appear dead if something tries to connect to the socket.

ASTERISK-26903 #close

Change-Id: I10f2f784065136277f271159f0925927194581b5

2 years agosamples: Undo removal of include from canonicalize-app-names commit.
Walter Doekes [Sat, 8 Apr 2017 08:05:03 +0000 (10:05 +0200)]
samples: Undo removal of include from canonicalize-app-names commit.

This include was accidentally removed in changeset
Ia79aea64de89531362e993e34230c2044a70aa93. My bad.

Change-Id: I1d716c7f9590b4e97909fb8bca1f2ed9bd0e4082

2 years agoMerge "pjproject_bundled: Crash on pj_ssl_get_info() while ioqueue_on_read_complete()."
Joshua Colp [Fri, 7 Apr 2017 22:33:12 +0000 (17:33 -0500)]
Merge "pjproject_bundled: Crash on pj_ssl_get_info() while ioqueue_on_read_complete()."

2 years agoMerge "pjsip: Add Alembic for PUBLISH support."
zuul [Fri, 7 Apr 2017 20:26:00 +0000 (15:26 -0500)]
Merge "pjsip: Add Alembic for PUBLISH support."

2 years agoMerge "samples: Canonicalize app names in extensions.conf.sample."
Joshua Colp [Fri, 7 Apr 2017 19:49:11 +0000 (14:49 -0500)]
Merge "samples: Canonicalize app names in extensions.conf.sample."

2 years agoMerge "core: Improve/simplify handling of required headers."
Joshua Colp [Fri, 7 Apr 2017 19:48:36 +0000 (14:48 -0500)]
Merge "core: Improve/simplify handling of required headers."

2 years agopjsip: Add Alembic for PUBLISH support.
Joshua Colp [Fri, 7 Apr 2017 13:35:33 +0000 (13:35 +0000)]
pjsip: Add Alembic for PUBLISH support.

This change adds database tables for the PUBLISH support so it
can be configured using realtime. A minor fix to the
res_pjsip_publish_asterisk module was done so that it read the
sorcery configuration from the correct section. Finally the
sample configuration files have been updated.


Change-Id: I81991ae5c75af98d247f7eacd1c0b0a763675952

2 years agopjproject_bundled: Crash on pj_ssl_get_info() while ioqueue_on_read_complete().
Alexander Traud [Fri, 7 Apr 2017 13:06:11 +0000 (15:06 +0200)]
pjproject_bundled: Crash on pj_ssl_get_info() while ioqueue_on_read_complete().

When the Asterisk channel driver res_pjsip offers SIP-over-TLS, sometimes, not
reproducible, Asterisk crashed in pj_ssl_sock_get_info() because a NULL pointer
was read. This change avoids this crash.

ASTERISK-26927 #close

Change-Id: I24a6011b44d1426d159742ff4421cf806a52938b

2 years agosamples: Canonicalize app names in extensions.conf.sample.
Walter Doekes [Wed, 5 Apr 2017 14:10:42 +0000 (16:10 +0200)]
samples: Canonicalize app names in extensions.conf.sample.

This takes care of warnings by ossobv/asterisklint.

Change-Id: Ia79aea64de89531362e993e34230c2044a70aa93

2 years agoMerge "pjproject_bundled: Add 3 upstream patches"
Joshua Colp [Thu, 6 Apr 2017 17:23:47 +0000 (12:23 -0500)]
Merge "pjproject_bundled: Add 3 upstream patches"

2 years agoMerge "chan_sip: Session Timers required but refused wrongly."
Joshua Colp [Thu, 6 Apr 2017 16:39:41 +0000 (11:39 -0500)]
Merge "chan_sip: Session Timers required but refused wrongly."

2 years agoMerge "app_queue: Log reason for PAUSEALL/UNPAUSEALL"
zuul [Thu, 6 Apr 2017 15:19:33 +0000 (10:19 -0500)]
Merge "app_queue: Log reason for PAUSEALL/UNPAUSEALL"

2 years agoMerge "sample_config: Add samples for pubsub to pjsip.conf.sample"
Joshua Colp [Thu, 6 Apr 2017 13:29:39 +0000 (08:29 -0500)]
Merge "sample_config:  Add samples for pubsub to pjsip.conf.sample"

2 years agoMerge "Unused realtime MOH classes not purged on 'moh reload'"
zuul [Thu, 6 Apr 2017 00:14:28 +0000 (19:14 -0500)]
Merge "Unused realtime MOH classes not purged on 'moh reload'"

2 years agoMerge "res_pjsip_session: Allow BYE to be sent on disconnected session."
zuul [Thu, 6 Apr 2017 00:04:25 +0000 (19:04 -0500)]
Merge "res_pjsip_session: Allow BYE to be sent on disconnected session."

2 years agopjproject_bundled: Add 3 upstream patches
George Joseph [Tue, 4 Apr 2017 21:20:22 +0000 (15:20 -0600)]
pjproject_bundled: Add 3 upstream patches


Also removed the progress bar from wget download to stdout.

ASTERISK-26905 #close
Reported-by: Ross Beer

Change-Id: I268fb3cf71a3bb24283ff0d24bd8b03239d81256

2 years agoapp_queue: Log reason for PAUSEALL/UNPAUSEALL
Troy Bowman [Tue, 4 Apr 2017 16:44:34 +0000 (10:44 -0600)]
app_queue: Log reason for PAUSEALL/UNPAUSEALL

We needed the reason for our reporting when agents pause/unpause all of
their queues at once.  This is a small, simple patch that adds a reason
for PAUSEALL and UNPAUSEALL.  I have been using it in production for years.

ASTERISK-26920 #close

Change-Id: Ifb3f0d1a0abd5194253d9794023546e1395baf3d

2 years agosample_config: Add samples for pubsub to pjsip.conf.sample
George Joseph [Wed, 5 Apr 2017 19:50:40 +0000 (13:50 -0600)]
sample_config:  Add samples for pubsub to pjsip.conf.sample

 * outbound-publish
 * resource_list
 * inbound-publication
 * asterisk-publication

Change-Id: I65043a896c35483f30a92d30b5b118359af7ba5a

2 years agores_pjsip_sdp_rtp.c: Don't alter global addr variable.
Richard Mudgett [Mon, 3 Apr 2017 20:38:06 +0000 (15:38 -0500)]
res_pjsip_sdp_rtp.c: Don't alter global addr variable.

* create_rtp(): Fix unexpected alteration of global address_rtp if a
transport is bound to an address.

* create_rtp(): Fix use of uninitialized memory if the endpoint RTP media
address is invalid or the transport has an invalid address.


Change-Id: Icde42e65164a88913cb5c2601b285eebcff397b7

2 years agoCDR: Protect from data overflow in ast_cdr_setuserfield.
Corey Farrell [Mon, 27 Mar 2017 14:03:49 +0000 (10:03 -0400)]
CDR: Protect from data overflow in ast_cdr_setuserfield.

ast_cdr_setuserfield wrote to a fixed length field using strcpy. This could
result in a buffer overrun when called from chan_sip or func_cdr. This patch
adds a maximum bytes written to the field by using ast_copy_string instead.

ASTERISK-26897 #close
  0001-CDR-Protect-from-data-overflow-in-ast_cdr_setuserfie.patch submitted
    by Corey Farrell (license #5909)

Change-Id: Ib23ca77e9b9e2803a450e1206af45df2d2fdf65c

2 years agoUnused realtime MOH classes not purged on 'moh reload'
Daniel Journo [Sun, 26 Mar 2017 00:01:06 +0000 (00:01 +0000)]
Unused realtime MOH classes not purged on 'moh reload'

Purge Realtime MOH classes on 'moh reload' even when musiconhold.conf
hasn't changed.

ASTERISK-25974 #close

Change-Id: I42c78ea76528473a656f204595956c9eedcf3246

2 years agocore: Improve/simplify handling of required headers.
Corey Farrell [Fri, 31 Mar 2017 17:09:38 +0000 (13:09 -0400)]
core: Improve/simplify handling of required headers.

* Report failures if configure finds a required header is missing.
* Deduplicate includes between asterisk.h, astmm.h and compat.h.
* Unconditionally include headers in compat.h if required elsewhere.

Change-Id: Ie67d0185ca71fbfb81c9bdfaebe46a49e3c56dc5

2 years agores_pjsip: Fix transport ref leak.
Richard Mudgett [Mon, 3 Apr 2017 18:56:43 +0000 (13:56 -0500)]
res_pjsip: Fix transport ref leak.

We were leaking a transport ref in multihomed_on_rx_message() which
resulted in the FRACK about excessive ref counts.

ASTERISK-26916 #close

Change-Id: I7a96658a9614a060565bb9ad51cb1c9c11ee145f

2 years agoMerge "sdp: Add support for setting connection address and clean up state."
Mark Michelson [Mon, 3 Apr 2017 14:32:08 +0000 (09:32 -0500)]
Merge "sdp: Add support for setting connection address and clean up state."

2 years agochan_sip: Session Timers required but refused wrongly.
Alexander Traud [Mon, 3 Apr 2017 07:30:43 +0000 (09:30 +0200)]
chan_sip: Session Timers required but refused wrongly.

SIP user-agents indicate which protocol extensions are allowed in headers
like Supported and Required. Such protocol extensions are Session Timers
(RFC 4028) for example. Session Timers are supported since Mantis-10665.
Since ASTERISK-21721, not only the first but multiple Supported/Required
headers in a message are parsed. In that change, an existing variable was
re-used within a newly added do-loop. Currently, at the end of that loop,
that variable is an empty string always. Previously, that variable was used
within log output. However, the log output was not changed.

ASTERISK-26915 #close

Change-Id: I09315f31b4d78fb214bb2a9fb6c0f5e143eae990

2 years agoMerge "Forward declare 'struct ast_json' in asterisk.h"
zuul [Sat, 1 Apr 2017 13:46:14 +0000 (08:46 -0500)]
Merge "Forward declare 'struct ast_json' in asterisk.h"

2 years agores_pjsip_session: Allow BYE to be sent on disconnected session.
Joshua Colp [Fri, 31 Mar 2017 21:31:24 +0000 (21:31 +0000)]
res_pjsip_session: Allow BYE to be sent on disconnected session.

It is perfectly acceptable for a BYE to be sent on a disconnected
session. This occurs when we respond to a challenge to the BYE
for authentication credentials.


Change-Id: I6ef0ddece812fea6665a1dd2549ef44fb9d90045

2 years Fix compiler error.
Richard Mudgett [Fri, 31 Mar 2017 18:14:05 +0000 (13:14 -0500)] Fix compiler error.

Added missing channel technology read/write stream callback

Change-Id: I829043a327d987e0d964485dd3d27964bebbd623

2 years agoMerge "cdr_pgsql: Fix buffer overflow calling libpq"
zuul [Fri, 31 Mar 2017 14:01:23 +0000 (09:01 -0500)]
Merge "cdr_pgsql: Fix buffer overflow calling libpq"

2 years agoMerge "build: Fix deb build issues with fakeroot"
George Joseph [Fri, 31 Mar 2017 13:20:29 +0000 (08:20 -0500)]
Merge "build: Fix deb build issues with fakeroot"

2 years agoForward declare 'struct ast_json' in asterisk.h
Corey Farrell [Thu, 30 Mar 2017 23:28:18 +0000 (19:28 -0400)]
Forward declare 'struct ast_json' in asterisk.h

The ast_json structure is used in many Asterisk headers and is often the
only part of json.h used.  This adds a forward declaration to asterisk.h
and removes the include of json.h from many headers.  The declaration
has been left in endpoints.h and stasis.h to avoid problems with source
files that use ast_json functions without directly including json.h.

ari.h continues to include json.h as it uses enum

Change-Id: Id766aabce6bed56626d27e8d29f559b5e687b769

2 years agoMerge "CEL: Remove header declarations of non-existant functions."
zuul [Thu, 30 Mar 2017 23:29:09 +0000 (18:29 -0500)]
Merge "CEL: Remove header declarations of non-existant functions."

2 years agocdr_pgsql: Fix buffer overflow calling libpq
Sean Bright [Thu, 30 Mar 2017 13:11:46 +0000 (09:11 -0400)]
cdr_pgsql: Fix buffer overflow calling libpq

Implement the same buffer size checking done in cel_pgsql.

ASTERISK-26896 #close
Reported by: twisted

Change-Id: Iaacfa1f1de7cb1e9414d121850d2d8c2888f3f48

2 years agobuild: Fix deb build issues with fakeroot
Walter Doekes [Tue, 28 Mar 2017 18:01:16 +0000 (20:01 +0200)]
build: Fix deb build issues with fakeroot

If DESTDIR is set, don't call ldconfig. Assume that DESTDIR is used to
create a binary archive. The ldconfig call should be delegated to the
archive postinst script. This fixes the case where fakeroot wraps 'make
install' causing $EUID to be 0 even though it doesn't have permission to
call ldconfig.

The previous logic in to detect and correct libdir
has been removed as it was not completely accurate.  CentOS 64-bit
users should again specifiy --libdir=/usr/lib64 when configuring
to prevent install to /usr/lib.

Updated Makefile:check-old-libdir to check for orphans in
lib64 when installing to lib as well as orphans in lib when installing
to lib64.

Updated Makefile and main/Makefile uninstall targets to remove the
orphans using the new logic.


Change-Id: I51739d4a03e60bff38be719b8d2ead0007afdd51

2 years agoMerge "res_pjsip_config_wizard: Add 2 new parameters to help with proxy config"
zuul [Thu, 30 Mar 2017 22:02:38 +0000 (17:02 -0500)]
Merge "res_pjsip_config_wizard: Add 2 new parameters to help with proxy config"

2 years agosdp: Add support for setting connection address and clean up state.
Joshua Colp [Mon, 27 Mar 2017 20:32:45 +0000 (20:32 +0000)]
sdp: Add support for setting connection address and clean up state.

This change cleans up state management for media streams by moving
RTP instances into their own session structure and adding additional
details that are not relevant to the core (such as connection address).
These can live either in the local capabilities or joint capabilities.

The ability to set explicit connection address information for
the purposes of direct media and NAT has also been added at the
global and stream specific level.


Change-Id: If7e5307239a9534420732de11c451a2705b6b681

2 years agoastobj2: Prevent potential deadlocks with ao2_global_obj_release
Sean Bright [Wed, 29 Mar 2017 15:11:51 +0000 (11:11 -0400)]
astobj2: Prevent potential deadlocks with ao2_global_obj_release

The ao2_global_obj_release() function holds an exclusive lock on the
global object while it is being dereferenced. Any destructors that
run during this time that call ao2_global_obj_ref() will deadlock
because a read lock is required.

Instead, we make the global object inaccessible inside of the write
lock and only dereference it once we have released the lock. This
allows the affected destructors to fail gracefully.

While this doesn't completely solve the referenced issue (the error
message about not being able to create an IQ continues to be shown)
it does solve the backtrace spew that accompanied it.

ASTERISK-21009 #close
Reported by: Marcello Ceschia

Change-Id: Idf40ae136b5070dba22cb576ea8414fbc9939385

2 years agoCEL: Remove header declarations of non-existant functions.
Corey Farrell [Thu, 30 Mar 2017 15:18:38 +0000 (11:18 -0400)]
CEL: Remove header declarations of non-existant functions.

ast_cel_alloc and ast_cel_destroy do not exist in code, remove them from
the headers.

Change-Id: I99ce848e2e109e7d61771559f559b9e57973e45c

2 years agoMerge "cel_pgsql.c: Fix buffer overflow calling libpq"
Joshua Colp [Thu, 30 Mar 2017 10:12:11 +0000 (05:12 -0500)]
Merge "cel_pgsql.c: Fix buffer overflow calling libpq"

2 years agoMerge "srtp: Allow zero as tag value for a sRTP Crypto Suite."
Joshua Colp [Wed, 29 Mar 2017 22:49:55 +0000 (17:49 -0500)]
Merge "srtp: Allow zero as tag value for a sRTP Crypto Suite."

2 years agoMerge "Add DTLS sanity check."
zuul [Wed, 29 Mar 2017 21:11:12 +0000 (16:11 -0500)]
Merge "Add DTLS sanity check."

2 years agoMerge "core: Remove embedded module support"
George Joseph [Wed, 29 Mar 2017 19:40:36 +0000 (14:40 -0500)]
Merge "core: Remove embedded module support"

2 years agoMerge "channel: Remove old epoll support and fixed max number of file descriptors."
zuul [Wed, 29 Mar 2017 17:45:47 +0000 (12:45 -0500)]
Merge "channel: Remove old epoll support and fixed max number of file descriptors."

2 years agoMerge "alembic: Turn off execute bit on non-executable python scripts"
George Joseph [Wed, 29 Mar 2017 16:32:38 +0000 (11:32 -0500)]
Merge "alembic: Turn off execute bit on non-executable python scripts"

2 years agoMerge "res_musiconhold: Don't chdir() when scanning MoH files"
zuul [Wed, 29 Mar 2017 15:11:01 +0000 (10:11 -0500)]
Merge "res_musiconhold: Don't chdir() when scanning MoH files"

2 years agocel_pgsql.c: Fix buffer overflow calling libpq
Josh Roberson [Mon, 27 Mar 2017 16:49:08 +0000 (11:49 -0500)]
cel_pgsql.c: Fix buffer overflow calling libpq

PQEscapeStringConn() expects the buffer passed in to be an
adequitely sized buffer to write out the escaped SQL value string
into.  It is possible, for large values (such as large values to
Dial with a lot of devices) to have more than our 512+1 byte
allocation and thus cause libpq to create a buffer overrun.

glibc will nicely ABRT asterisk for you, citing a stack smash.

Let's only allocate it to be as large as needed:
If we have a value, then (strlen(value) * 2) + 1 (as recommended
by libpq), and if we have none, just one byte to hold our null
will do.

ASTERISK-26896 #close

Change-Id: If611c734292618ed68dde17816d09dd16667dea2

2 years agosrtp: Allow zero as tag value for a sRTP Crypto Suite.
Alexander Traud [Wed, 29 Mar 2017 13:04:05 +0000 (15:04 +0200)]
srtp: Allow zero as tag value for a sRTP Crypto Suite.

ASTERISK-25490 #close

Change-Id: I1c5fc0942c33c96d62b24203aad0f1e1a1a0131f

2 years agoMerge "res_xmpp: Fix ref counting issue"
Joshua Colp [Wed, 29 Mar 2017 11:57:48 +0000 (06:57 -0500)]
Merge "res_xmpp: Fix ref counting issue"

2 years agores_pjsip_config_wizard: Add 2 new parameters to help with proxy config
George Joseph [Tue, 28 Mar 2017 18:10:32 +0000 (12:10 -0600)]
res_pjsip_config_wizard: Add 2 new parameters to help with proxy config

Two new parameters have been added to the pjsip config wizard.

 * Setting 'sends_line_with_registrations' to true will cause the wizard
   to skip the creation of an identify object to match incoming request
   to the endpoint and instead add the line and endpoint parameters to
   the outbound registration object.

 * Setting 'outbound_proxy' is a shortcut for adding individual
   endpoint/outbound_proxy, aor/outbound_proxy and
   registration/outbound_proxy parameters.

Change-Id: I678e5f80765734c056620528a6d40d82736ceeb0
(cherry picked from commit a827892ff77cd37912b528d9c45b446be091bbc0)
(cherry picked from commit 27344675be1941d30508c6e6bd684acdd0791e1a)

2 years agoMerge "res_xmpp: Use incremental backoff when a read error occurs"
Joshua Colp [Tue, 28 Mar 2017 21:46:52 +0000 (16:46 -0500)]
Merge "res_xmpp: Use incremental backoff when a read error occurs"

2 years agoalembic: Turn off execute bit on non-executable python scripts
Sean Bright [Tue, 28 Mar 2017 14:29:25 +0000 (10:29 -0400)]
alembic: Turn off execute bit on non-executable python scripts

Change-Id: I744c986da4a38aeff8c00837eb89de7841fbc86c

2 years agoAdd DTLS sanity check.
Richard Mudgett [Mon, 27 Mar 2017 17:37:39 +0000 (12:37 -0500)]
Add DTLS sanity check.

Change-Id: Ib32612cf6c7ce9213a11b9cba82f630f8cd3564b

2 years agochannel: Remove old epoll support and fixed max number of file descriptors.
Joshua Colp [Wed, 8 Mar 2017 13:24:46 +0000 (13:24 +0000)]
channel: Remove old epoll support and fixed max number of file descriptors.

This change removes the old epoll support which has not been used or
maintained in quite some time.

The fixed number of file descriptors on a channel has also been removed.
File descriptors are now contained in a growable vector. This can be
used like before by specifying a specific position to store a file
descriptor at or using a new API call, ast_channel_fd_add, which adds
a file descriptor to the channel and returns its position.

Tests have been added which cover the growing behavior of the vector
and the new API call.


Change-Id: I1a754b506c009b83dfdeeb08c2d2815db30ef928

2 years agores_musiconhold: Document the 'format' option
Sean Bright [Mon, 27 Mar 2017 14:35:15 +0000 (10:35 -0400)]
res_musiconhold: Document the 'format' option

ASTERISK-26086 #close
Reported by: Jens B├╝rger

Change-Id: I6aab666c0bf01fd0c64d7a5bcb22fa7f5d41335e

2 years agocore: Remove embedded module support
Sean Bright [Fri, 24 Mar 2017 12:43:05 +0000 (08:43 -0400)]
core: Remove embedded module support

This has not worked for some time and is no longer actively maintained.

Change-Id: I5110b0db69c152761b58fa025cb0a53b0e544d99

2 years agores_musiconhold: Don't chdir() when scanning MoH files
Sean Bright [Mon, 27 Mar 2017 13:58:17 +0000 (09:58 -0400)]
res_musiconhold: Don't chdir() when scanning MoH files

There doesn't appear to be any reason that we are chdir'ing in
moh_scan_files, and in the event of an Asterisk crash, the core files
may not get written because we have changed into a read-only directory.

ASTERISK-23996 #close
Reported by: Walter Doekes

Change-Id: Iac806dce01b3335963fbd62d4b4da9a65c614354

2 years agoMerge "res_pjsip_sdp_rtp: Set hangup cause for RTP timeouts"
Joshua Colp [Sat, 25 Mar 2017 10:20:03 +0000 (05:20 -0500)]
Merge "res_pjsip_sdp_rtp: Set hangup cause for RTP timeouts"

2 years agoMerge "cdr: Allow setting of user field from 'h' extension"
Joshua Colp [Fri, 24 Mar 2017 23:02:12 +0000 (18:02 -0500)]
Merge "cdr: Allow setting of user field from 'h' extension"

2 years agoMerge "rtp_engine: allocate RTP dynamic payloads per session"
zuul [Fri, 24 Mar 2017 21:22:55 +0000 (16:22 -0500)]
Merge "rtp_engine: allocate RTP dynamic payloads per session"

2 years agores_xmpp: Use incremental backoff when a read error occurs
Sean Bright [Thu, 23 Mar 2017 14:48:40 +0000 (10:48 -0400)]
res_xmpp: Use incremental backoff when a read error occurs

If a read error occurs, we immediately attempt a reconnect without any
delay. Instead, let's sleep and backoff up to 60 seconds before we try

ASTERISK-24712 #close
Reported by: Matthias Urlichs

Change-Id: I6fe10ef4734837727437beab715e336777f13f48

2 years agoMerge "pjproject_bundled: raise timeout value used when downloading"
zuul [Fri, 24 Mar 2017 20:42:48 +0000 (15:42 -0500)]
Merge "pjproject_bundled: raise timeout value used when downloading"

2 years agoMerge "res_xmpp: Correct implementation of JABBER_STATUS & JabberStatus"
zuul [Fri, 24 Mar 2017 17:25:07 +0000 (12:25 -0500)]
Merge "res_xmpp: Correct implementation of JABBER_STATUS & JabberStatus"

2 years agoMerge "res_xmpp: Include client name in connection related error messages"
zuul [Fri, 24 Mar 2017 16:55:38 +0000 (11:55 -0500)]
Merge "res_xmpp: Include client name in connection related error messages"

2 years agores_pjsip_sdp_rtp: Set hangup cause for RTP timeouts
Sean Bright [Fri, 24 Mar 2017 16:29:10 +0000 (12:29 -0400)]
res_pjsip_sdp_rtp: Set hangup cause for RTP timeouts

chan_sip sets the hangup cause code to AST_CAUSE_REQUESTED_CHAN_UNAVAIL
(44) when a channel is hung up due to an RTP timeout. So do the same
when it happens with PJSIP for parity.

Change-Id: I3546ebbde6460c22a27c9da1bf321711b5961ab8

2 years agoMerge "res_xmpp: Don't crash when trying to send a message without a connection"
Joshua Colp [Fri, 24 Mar 2017 15:46:34 +0000 (10:46 -0500)]
Merge "res_xmpp: Don't crash when trying to send a message without a connection"

2 years agoMerge "res_xmpp: Correctly check return value of SSL_connect"
zuul [Fri, 24 Mar 2017 14:13:06 +0000 (09:13 -0500)]
Merge "res_xmpp: Correctly check return value of SSL_connect"