Commit Graph

28965 Commits

Author SHA1 Message Date
Sean Bright
1966265562 res_xmpp: Try to provide useful errors messages from OpenSSL
If any errors occur during the TLS connection setup, we currently dump a
fairly generic error message. So instead we try to pull in something
useful from OpenSSL to report instead.

ASTERISK-24712
Reported by: Matthias Urlichs

Change-Id: I288500991a9681f447d92913b11fedaf426087f4
2017-03-25 12:01:28 -04:00
Sean Bright
03b99ae3d2 res_xmpp: Correctly check return value of SSL_connect
SSL_connect returns non-zero for both success and some error conditions
so simply negating is inadequate.

Change-Id: Ifbf882896e598703b6c615407fa456d3199f95b1
2017-03-25 12:01:28 -04:00
zuul
39fff2ebf9 Merge "res_pjsip_sdp_rtp: Set hangup cause for RTP timeouts" into 13 2017-03-24 19:21:51 -05:00
Joshua Colp
ddbff36c12 Merge "res_xmpp: Correct implementation of JABBER_STATUS & JabberStatus" into 13 2017-03-24 17:45:52 -05:00
zuul
30f5409eef Merge "cdr: Allow setting of user field from 'h' extension" into 13 2017-03-24 17:45:02 -05:00
zuul
1fccedf0fd Merge "pjproject_bundled: raise timeout value used when downloading" into 13 2017-03-24 15:42:42 -05:00
zuul
2f2811c2dc Merge "res_xmpp: Don't crash when trying to send a message without a connection" into 13 2017-03-24 12:04:38 -05:00
zuul
b7b171c06f Merge "res_xmpp: Include client name in connection related error messages" into 13 2017-03-24 12:01:22 -05:00
Sean Bright
d9d2beba1c 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
2017-03-24 12:29:10 -04:00
zuul
68d523a1af Merge "audiohook.c: Lost RTP packets lead to out-of-sync MixMonitor." into 13 2017-03-24 06:59:30 -05:00
Kevin Harwell
552cf009c0 Update for 13.15.0-rc1 13.15.0-rc1 2017-03-23 15:33:40 -05:00
Kevin Harwell
f1b34e6eb4 AMI: Updated version
Updated the AMI version for the following reason (see CHANGES for more details):

The 'PJSIPShowEndpoint' command's response event of 'IdentifyDetail' now
contains a new optional parameter, 'MatchHeader'.

Change-Id: I9aeac4decc89f9b464b3f026e97c7ef1acc79242
2017-03-23 14:24:42 -05:00
Kevin Harwell
e6aeeabddf pjproject_bundled: raise timeout value used when downloading
After configuring Asterisk with '--with-pjproject-bundled' the configure/build
process attempts to download pjproject from its download site. Currently, a
timeout of 10 seconds is used that will stop the download process if pjproject
has not been fully downloaded in that time. For some systems this was not enough
time and the process was timing out too early.

This patch raises the download timeout value to '60'. Also, this patch fixes
another bug where the DOWNLOAD_TIMEOUT variable was not being properly exported
due to a naming error. DOWNLOAD_MAX_TIMEOUT is now properly renamed to
DOWNLOAD_TIMEOUT.

ASTERISK-26814 #close

Change-Id: Ia56e4e8a3d39db76bc8a1852b2cf07ec10b39842
2017-03-23 13:14:59 -05:00
Sean Bright
0939a19cff res_xmpp: Correct implementation of JABBER_STATUS & JabberStatus
The documentation for JABBER_STATUS (and the deprecated JabberStatus
app) indicate that a return value of 7 indicates that the specified
buddy was not in the roster. It also indicates that you can specify a
"bare" JID (one without a resource). Unfortunately the actual behavior
does not match the documented behavior.

Assuming that our roster includes the buddy online and available
"valid@example.org/Valid" and does *not* include the buddy
"invalid@example.org", the JABBER_STATUS() function returns the
following before this patch:

+------------------------------+------------+--------------------------+
| Buddy                        | Status     | Result                   |
+------------------------------+------------+--------------------------+
| valid@example.org            |  Online    |  7 (Not in roster)       |
| valid@example.org/Valid      |  Online    |  1 (Online)              |
| valid@example.org/Invalid    |  N/A       |  7 (Not in roster)       |
| invalid@example.org          |  N/A       |  Error logged, no return |
| invalid@example.org/Valid    |  N/A       |  Error logged, no return |
+------------------------------+------------+--------------------------+

And after this patch:

+------------------------------+------------+--------------------------+
| Buddy                        | Status     | Result                   |
+------------------------------+------------+--------------------------+
| valid@example.org            |  Online    |  1 (Online)              |
| valid@example.org/Valid      |  Online    |  1 (Online)              |
| valid@example.org/Invalid    |  N/A       |  6 (Offline)             |
| invalid@example.org          |  N/A       |  7 (Not in roster)       |
| invalid@example.org/Valid    |  N/A       |  7 (Not in roster)       |
+------------------------------+------------+--------------------------+

This brings the behavior in line with the documentation.

ASTERISK-23510 #close
Reported by: Anthony Critelli

Change-Id: I9c3241035363ef4a6bdc21fabfd8ffcd9ec657bf
2017-03-23 11:44:48 -04:00
Sean Bright
a487f6fb97 res_xmpp: Don't crash when trying to send a message without a connection
If we never establish a connection to our Jabber server, iksemel never sets up
its internal transport pointer, so attempting to send a message dereferences a
NULL pointer and causes a crash.

ASTERISK-21855 #close
Reported by: Jeremy Kister

Change-Id: I204a568894e4a53ab929783ecc594a000f04d79c
2017-03-23 10:54:20 -04:00
Sean Bright
90fb1fca41 res_xmpp: Include client name in connection related error messages
ASTERISK-25622 #close
Reported by: Sean Darcy

Change-Id: I8472cb7bfb58d411a3cfbd482da98cae2d94d1e9
2017-03-23 10:54:20 -04:00
zuul
4fcb8d807e Merge "CHANNEL(callid): Give dialplan access to the callid." into 13 2017-03-22 17:26:04 -05:00
zuul
b79e67ba47 Merge "res_pjsip_session: Enable RFC3578 overlap dialing support." into 13 2017-03-22 15:48:53 -05:00
zuul
5f75cc8279 Merge "res_pjsip_messaging: Check URI type before dereferencing" into 13 2017-03-22 12:36:51 -05:00
zuul
d7c52125e9 Merge "Revert "app_queue: Handle the caller being redirected out of a queue bridge"" into 13 2017-03-22 11:04:06 -05:00
Joshua Colp
f762dfaf2a Merge "app_queue: Member stuck as pending after forwarding previous call from queue" into 13 2017-03-22 08:33:26 -05:00
Sebastian Gutierrez
e196190f11 cdr: Allow setting of user field from 'h' extension
The CDR code previously did not allow the user field to be set
from the 'h' extension in the dialplan. This change removes that
limitation and allows it to be set.

ASTERISK-26818

Change-Id: I0fed8a79b5e408bac4e30542b8f33a61c5ed9aa6
2017-03-22 07:32:29 -06:00
zuul
14a9a6fc09 Merge "pjsip: prevent memory corruption on creation of xml bodies" into 13 2017-03-22 07:06:16 -05:00
Richard Begg
398e5ec16c res_pjsip_session: Enable RFC3578 overlap dialing support.
Support for RFC3578 overlap dialling (i.e. 484 Response to partially matched
destinations) as currently provided by chan_sip is missing from res_pjsip.
This patch adds a new endpoint attribute (allow_overlap) [defaults to yes]
which when set to yes enables 484 responses to partial destination
matches rather than the current 404.

ASTERISK-26864

Change-Id: Iea444da3ee7c7d4f1fde1d01d138a3d7b0fe40f6
2017-03-22 11:25:07 +00:00
zuul
d7ba743329 Merge "autochan/mixmonitor/chanspy: Fix unsafe channel locking and references." into 13 2017-03-21 19:47:25 -05:00
zuul
72ae513f15 Merge "res_hep: Capture actual transport type in use" into 13 2017-03-21 19:47:20 -05:00
Sean Bright
218f618095 res_hep: Capture actual transport type in use
Rather than hard-coding UDP, allow consumers of the HEP API to specify
which protocol is in use. Update the PJSIP provider to pass in the
current protocol type.

ASTERISK-26850 #close

Change-Id: I54bbb0a001cfe4c6a87ad4b6f2014af233349978
2017-03-21 15:40:08 -04:00
Sean Bright
1c8b81a2a4 Revert "app_queue: Handle the caller being redirected out of a queue bridge"
This reverts commit 163e9e53dc.

Change-Id: Ief28479c77a298879dfe2c56be7ee92dc465da4b
2017-03-21 10:59:06 -04:00
Sean Bright
b3cc20799b res_pjsip_messaging: Check URI type before dereferencing
We aren't validating that the URI we just parsed is a SIP/SIPS one before
trying to access the user, host, and port members of a possibly uninitialized
structure.

Also update the MessageSend documentation to indicate what 'from' formats are
accepted.

ASTERISK-26484 #close
Reported by: Vinod Dharashive

Change-Id: I476b5cc5f18a7713d0ee945374f2a1c164857d30
2017-03-21 10:44:30 -04:00
Joshua Elson
91c97b5da5 pjsip: prevent memory corruption on creation of xml bodies
ASTERISK-26776 #close

Change-Id: I884b6f4e8233a355d0be687ec78d41bc0e4d3fd2
2017-03-21 08:26:04 -06:00
Sean Bright
7f34c11b6a bridge_softmix: Ignore non-voice frames from translator
Some codecs - codec_speex specifically - take voice frames and return
other types of frames, like CNG. If we subsequently treat those as
voice frames, we'll run into trouble when destroying the frame because
of the requirement that each voice frame have an associated format.

ASTERISK-26880 #close
Reported by: Kirsty Tyerman

Change-Id: I43f8450c48fb276ad8b99db8512be82949c1ca7c
2017-03-20 17:27:24 -04:00
zuul
fdea369852 Merge "res/res_pjsip_session: Only check localnet if it is defined" into 13 2017-03-20 14:38:35 -05:00
Aaron An
d5b480afca audiohook.c: Lost RTP packets lead to out-of-sync MixMonitor.
Fixed a bug in function "ast_audiohook_write_frame" that checked the
variable other_factory_samples and only flushed the factories, so they
would be in sync, when other_factory_samples > 0. When there is not any
rtp incoming the variable other_factory_samples will be 0, and although
the result of "our_factory_ms - other_factory_ms" may be very large,
this led to the record file not syncing.

ASTERISK-26875 #close
Reported-by: Aaron An
Tested-by: Aaron An

Change-Id: Ia4d890fb8fc1636a7188502bab35f555685aea22
2017-03-20 13:02:27 -06:00
Joshua Colp
9613391868 Merge "thread safety: Don't use getprotobyname()" into 13 2017-03-20 11:51:38 -05:00
Sean Bright
38cebc73a3 thread safety: Don't use getprotobyname()
POSIX does not require getprotobyname() to be thread safe and some
implementations use static memory which causes issues when multiple
threads are used.

Further, our usage of it today is just to ultimately get IPPROTO_TCP
for calls to setsockopt(). So instead we just use IPPROTO_TCP directly.

Change-Id: I2e14e58674808f7ce99b2f5e900d0f90d0d8da48
2017-03-20 08:51:47 -04:00
Sean Bright
265455bc2d res_rtp_asterisk: Pass correct data length to ast_rtcp_interpret
We are currently passing in the capacity of the read buffer instead of the
number of bytes that we actually read off the wire.

Change-Id: I60465049727d955c7f9a5e529e6f2aaff04cda36
2017-03-19 14:27:29 -04:00
Joshua Colp
baeabb82ea Merge "app_queue: Fix locking behavior in stasis message handlers" into 13 2017-03-18 05:38:32 -05:00
Joshua Colp
1b828e50fe Merge "chan_sip: Add rtcp-mux support" into 13 2017-03-18 05:37:49 -05:00
Joshua Colp
130af0ab80 Merge "res_rtp_asterisk: Fix crash when RTCP is not present when DTLS is stopped." into 13 2017-03-18 05:37:04 -05:00
Joshua Colp
a2d29a7545 Merge "res_pjsip_asterisk.c: Fix compile error if libsrtp is not installed." into 13 2017-03-18 05:36:15 -05:00
Joshua Colp
e76947bd88 Merge "app_confbridge: Fix ConfbridgeTalking AMI event description." into 13 2017-03-17 16:08:31 -05:00
Joshua Colp
6da1b60918 Merge "res_pjsip_sdp_rtp.c: Fix cut-n-paste error" into 13 2017-03-17 13:08:22 -05:00
Robert Mordec
76afb9e18a app_queue: Member stuck as pending after forwarding previous call from queue
Queue member will get stuck in pending_members if queue calls a device
that is different from the one observed for state changes.

This patch removes members from pending_members as a result of channel stasis
events such as blind or attended transfers and hangup.

ASTERISK-26862 #close

Change-Id: I8bf6df487b9bb35726c08049ff25cdad5e357727
2017-03-17 09:58:17 -06:00
Richard Mudgett
60b372a883 CHANNEL(callid): Give dialplan access to the callid.
* Added CHANNEL(callid) to retrieve the call identifier log tag associated
with the channel.  Dialplan now has access to the call log search key
associated with the channel so it can be saved in case there is a problem
with the call.

ASTERISK-26878

Change-Id: I2c97ebd928b6f3c5bc80c5729e4d3c07f453049f
2017-03-17 10:50:17 -05:00
Sean Bright
9a57b24e17 app_queue: Fix locking behavior in stasis message handlers
The queue_stasis_data structure contains various mutable fields that require
appropriate locking. Specifically, the 'dying,' 'member_uniqueid,' and
'caller_uniqueid' fields need to be locked when read from or written to.

Change-Id: I246b7dbff8447acc957a1299f6ad0ebd0fd39088
2017-03-17 10:20:30 -04:00
Joshua Colp
161fe61a0f Merge "res_pjsip_sdp_rtp: RTP instance does not use same IP as explicit transport" into 13 2017-03-17 08:58:42 -05:00
Sean Bright
8721d0bf1b chan_sip: Add rtcp-mux support
ASTERISK-26846 #close

Change-Id: I541a1602ff55ab73684e9f8002edb9e0e745d639
2017-03-17 09:35:21 -04:00
Richard Mudgett
792171ea9e app_confbridge: Fix ConfbridgeTalking AMI event description.
Thanks to Chris Howard for pointing this out on the wiki.

Change-Id: I18e56de09a70e736b5d04719d45ef29cf0636705
2017-03-16 16:50:17 -05:00
Richard Mudgett
047fb7f11e res_pjsip_asterisk.c: Fix compile error if libsrtp is not installed.
struct ast_rtcp does not define the dtls member if SRTP is not enabled.

ASTERISK-26732

Change-Id: Id15ea212e04490e012f2cf4a56818b4dd948875e
2017-03-16 16:37:42 -05:00
Richard Mudgett
a75f02c089 res_pjsip_sdp_rtp.c: Fix cut-n-paste error
We were inadvertenly referencing the cos_video option to determine if we
should set the tos_audio and cos_audio value on the RTP instance.

Change-Id: Ia7964f486801d39dc6f5dae570baff079e1595b0
2017-03-16 15:46:00 -05:00