asterisk/asterisk.git
3 years agocdr.c: Rename the Party A CDR container.
Richard Mudgett [Fri, 6 Oct 2017 20:55:26 +0000 (15:55 -0500)]
cdr.c: Rename the Party A CDR container.

* Rename the Party A CDR container from active_cdrs_by_channel to
active_cdrs_master.

* Renamed the support functions associated with active_cdrs_master
appropriately.

ASTERISK-27335

Change-Id: I6104bb3edc3a0b7243ce502e45e8832b0cff14f7

3 years agocdr.c: Add container to key off of Party B channel names.
Richard Mudgett [Mon, 2 Oct 2017 22:42:48 +0000 (17:42 -0500)]
cdr.c: Add container to key off of Party B channel names.

The CDR performance gets worse the further it gets behind in processing
stasis messages.  One of the reasons is because of a n*m loop used when
processing Party B information.

* Added a new CDR container that is keyed to Party B so we don't need such
a large loop when processing Party B information.

NOTE: To reduce the size of the patch I deferred to another patch the
renaming of the Party A active_cdrs_by_channel container to
active_cdrs_master and renaming the container's hash and cmp functions
appropriately.

ASTERISK-27335

Change-Id: I0bf66e8868f8adaa4b5dcf9e682e34951c350249

3 years agoMerge "declare optional openssl dependencies in moduleinfo"
Jenkins2 [Mon, 16 Oct 2017 14:19:56 +0000 (09:19 -0500)]
Merge "declare optional openssl dependencies in moduleinfo"

3 years agoMerge "cdr.c: Eliminated many calls to ao2_global_obj_ref()."
Joshua Colp [Mon, 16 Oct 2017 10:45:11 +0000 (05:45 -0500)]
Merge "cdr.c: Eliminated many calls to ao2_global_obj_ref()."

3 years agoMerge "cdr.c: Defer getting ao2_global_obj_ref() until needed."
Joshua Colp [Mon, 16 Oct 2017 10:45:01 +0000 (05:45 -0500)]
Merge "cdr.c: Defer getting ao2_global_obj_ref() until needed."

3 years agoMerge "ast_bt_get_symbols: Prevent double-free."
Jenkins2 [Sun, 15 Oct 2017 19:52:57 +0000 (14:52 -0500)]
Merge "ast_bt_get_symbols: Prevent double-free."

3 years agoMerge "tcptls: NULL-check the parameter of ast_ssl_teardown before accessing it."
Joshua Colp [Sun, 15 Oct 2017 19:29:39 +0000 (14:29 -0500)]
Merge "tcptls: NULL-check the parameter of ast_ssl_teardown before accessing it."

3 years agoMerge "cdr.c: Set stringfields only if they are different."
Jenkins2 [Fri, 13 Oct 2017 22:42:49 +0000 (17:42 -0500)]
Merge "cdr.c: Set stringfields only if they are different."

3 years agoMerge "cdr.c: Fix setting dnid, callingsubaddr, and calledsubaddr"
Kevin Harwell [Fri, 13 Oct 2017 22:11:53 +0000 (17:11 -0500)]
Merge "cdr.c: Fix setting dnid, callingsubaddr, and calledsubaddr"

3 years agoast_bt_get_symbols: Prevent double-free.
Corey Farrell [Fri, 13 Oct 2017 13:51:09 +0000 (09:51 -0400)]
ast_bt_get_symbols: Prevent double-free.

It's possible for bfdobj to be created but syms not created.  If syms
was not allocated in the current loop iteration but was allocated in the
previous iteration it would crash.

ASTERISK-27340

Change-Id: I5b110c609f6dfe91339f782a99a431bca5837363

3 years agotcptls: NULL-check the parameter of ast_ssl_teardown before accessing it.
Alexander Traud [Fri, 13 Oct 2017 13:12:07 +0000 (15:12 +0200)]
tcptls: NULL-check the parameter of ast_ssl_teardown before accessing it.

This avoids a crash on stopping a chan_sip which failed to start its TLS server.

ASTERISK-27339 #close

Change-Id: I327fc70db68eaaca5b50a15c7fd687fde79263d5

3 years agocdr.c: Eliminated many calls to ao2_global_obj_ref().
Richard Mudgett [Fri, 29 Sep 2017 19:26:41 +0000 (14:26 -0500)]
cdr.c: Eliminated many calls to ao2_global_obj_ref().

The CDR performance gets worse the further it gets behind in processing
stasis messages.  One of the reasons is we were getting the global config
to determine if we needed to log a debugging message.

* Many calls to ao2_global_obj_ref() were just so we could determine if
debug mode is enabled.  Made a global flag to check instead.

* Eliminated many RAII_VAR() usages associated with the remaining
ao2_global_obj_ref() calls.

* Added missing NULL checks for the returned ao2_global_obj_ref() value.

ASTERISK-27335

Change-Id: Iceaad93172862f610cad0188956634187bfcc7cd

3 years agocdr.c: Defer getting ao2_global_obj_ref() until needed.
Richard Mudgett [Fri, 6 Oct 2017 18:45:30 +0000 (13:45 -0500)]
cdr.c: Defer getting ao2_global_obj_ref() until needed.

The CDR performance gets worse the further it gets behind in processing
stasis messages.  One of the reasons is we were getting the global config
even if we didn't need it.

* Most uses of the global config were only needed on off nominal code
paths so it makes sense to not get it until absolutely needed.

ASTERISK-27335

Change-Id: I00c63b7ec233e5bfffd5d976f05568613d3c2365

3 years agocdr.c: Set stringfields only if they are different.
Richard Mudgett [Thu, 5 Oct 2017 23:08:33 +0000 (18:08 -0500)]
cdr.c: Set stringfields only if they are different.

The CDR performance gets worse the further it gets behind in processing
stasis messages.  One of the reasons is we were repeatedly setting string
fields to potentially the same string in base_process_party_a().  Setting
a string field involves allocating room for the new string out of a memory
pool which may have to allocate even more memory.

* Check to see if the string field is already set to the desired string.

ASTERISK-27335

Change-Id: I3ccb7e23f1488417e08cafe477755033eed65a7c

3 years agocdr.c: Fix setting dnid, callingsubaddr, and calledsubaddr
Richard Mudgett [Thu, 5 Oct 2017 23:03:11 +0000 (18:03 -0500)]
cdr.c: Fix setting dnid, callingsubaddr, and calledsubaddr

The string comparisons for setting these CDR variables was inverted.  We
were repeatedly setting these CDR variables only if the channel snapshots
had the same value.

ASTERISK-27335

Change-Id: I9482073524411e7ea6c03805b16de200cb1669ea

3 years agofeatures, manager : Add CancelAtxfer AMI action
Thomas Sevestre [Fri, 25 Aug 2017 13:19:00 +0000 (13:19 +0000)]
features, manager : Add CancelAtxfer AMI action

Add action to cancel feature attended transfer with AMI interface

ASTERISK-27215 #close

Change-Id: Iab8a81362b5a1757e2608f70b014ef863200cb42

3 years agoMerge "res_pjsip_session: Prevent user=phone being added to anonimized URIs."
Jenkins2 [Thu, 12 Oct 2017 17:51:03 +0000 (12:51 -0500)]
Merge "res_pjsip_session: Prevent user=phone being added to anonimized URIs."

3 years agoMerge "sorcery: Use ao2_weakproxy to hold list of instances."
Jenkins2 [Thu, 12 Oct 2017 16:25:12 +0000 (11:25 -0500)]
Merge "sorcery: Use ao2_weakproxy to hold list of instances."

3 years agores_pjsip_session: Prevent user=phone being added to anonimized URIs.
Daniel Tryba [Fri, 6 Oct 2017 09:55:38 +0000 (11:55 +0200)]
res_pjsip_session: Prevent user=phone being added to anonimized URIs.

Move ast_sip_add_usereqphone to be called after anonymization of URIs,
to prevent the user_eq_phone adding "user=phone" to URIs containing a
username that is not a phonenumber (RFC3261 19.1.1). An extra call to
ast_sip_add_usereqphone on the saved version before anonymization is
added to add user=phone" to the PAI.

ASTERISK-27047 #close

Change-Id: Ie5644bc66341b86dc08b1f7442210de2e6acdec6

3 years agoMerge "named_locks: Use ao2_weakproxy_find."
Jenkins2 [Thu, 12 Oct 2017 15:16:45 +0000 (10:16 -0500)]
Merge "named_locks: Use ao2_weakproxy_find."

3 years agoMerge "astobj2: Add ao2_weakproxy_find function."
Jenkins2 [Thu, 12 Oct 2017 14:26:29 +0000 (09:26 -0500)]
Merge "astobj2: Add ao2_weakproxy_find function."

3 years agoMerge "astobj2: Run weakproxy callbacks outside of lock."
Jenkins2 [Thu, 12 Oct 2017 14:02:47 +0000 (09:02 -0500)]
Merge "astobj2: Run weakproxy callbacks outside of lock."

3 years agoMerge "cdr.c: Defer misc checks."
Joshua Colp [Thu, 12 Oct 2017 13:02:36 +0000 (08:02 -0500)]
Merge "cdr.c: Defer misc checks."

3 years agoMerge "res_pjsip: Prevent "user=phone" being added multiple times to header"
Jenkins2 [Thu, 12 Oct 2017 12:03:59 +0000 (07:03 -0500)]
Merge "res_pjsip: Prevent "user=phone" being added multiple times to header"

3 years agoMerge "cdr_mysql: avoid releasing a config string"
Jenkins2 [Thu, 12 Oct 2017 00:12:56 +0000 (19:12 -0500)]
Merge "cdr_mysql: avoid releasing a config string"

3 years agoMerge "chan_vpb: Fix a gcc 7 out-of-bounds complaint"
Joshua Colp [Wed, 11 Oct 2017 22:06:17 +0000 (17:06 -0500)]
Merge "chan_vpb:  Fix a gcc 7 out-of-bounds complaint"

3 years agoMerge "app_originate: Set ORIGINATE_STATUS correctly on failure"
Joshua Colp [Wed, 11 Oct 2017 21:03:21 +0000 (16:03 -0500)]
Merge "app_originate: Set ORIGINATE_STATUS correctly on failure"

3 years agores_pjsip: Prevent "user=phone" being added multiple times to header
Daniel Tryba [Fri, 6 Oct 2017 10:14:40 +0000 (12:14 +0200)]
res_pjsip: Prevent "user=phone" being added multiple times to header

ast_sip_add_usereqphone adds "user=phone" to the header every time is is
called without checking whether the param already exists. Preventing
this by searching to string representation of header for "user=phone".

ASTERISK-26988 #close

Change-Id: Ib84383b07254de357dc6a98d91fc1d2c2c3719e6

3 years agocdr.c: Defer misc checks.
Richard Mudgett [Thu, 5 Oct 2017 23:12:04 +0000 (18:12 -0500)]
cdr.c: Defer misc checks.

Try to defer some checks until needed in case there is an early exit.

Change-Id: Ibc6b34c38a4f60ad4f9b67984b7d070a07257064

3 years agoMerge "cdr.c: Eliminated simple RAII_VAR usages."
Jenkins2 [Wed, 11 Oct 2017 17:04:09 +0000 (12:04 -0500)]
Merge "cdr.c: Eliminated simple RAII_VAR usages."

3 years agoMerge "ari/bridge: Add mute, dtmf suppression controls"
Jenkins2 [Wed, 11 Oct 2017 16:34:08 +0000 (11:34 -0500)]
Merge "ari/bridge: Add mute, dtmf suppression controls"

3 years agoMerge "app_queue.c: clear moh field in init_queue"
Jenkins2 [Wed, 11 Oct 2017 16:30:46 +0000 (11:30 -0500)]
Merge "app_queue.c: clear moh field in init_queue"

3 years agoari/bridge: Add mute, dtmf suppression controls
Seán C McCord [Sat, 7 Oct 2017 01:48:48 +0000 (21:48 -0400)]
ari/bridge: Add mute, dtmf suppression controls

Add bridge_features structure to bridge creation.  Specifically, this
implements mute and DTMF suppression, but others should be able to be
easily added to the same structure.

ASTERISK-27322 #close
Reported by: Darren Sessions
Sponsored by: AVOXI

Change-Id: Id4002adfb65c9a8027ee9e1a5f477e0f01cf9d61

3 years agochan_vpb: Fix a gcc 7 out-of-bounds complaint
George Joseph [Wed, 11 Oct 2017 12:03:41 +0000 (06:03 -0600)]
chan_vpb:  Fix a gcc 7 out-of-bounds complaint

chan_vpb was trying to use sizeof(*p->play_dtmf), where
p->play_dtmf is defined as char[16], to get the length of the array
but since p->play_dtmf is an actual array, sizeof(*p->play_dtmf)
returns the size of the first array element, which is 1.  gcc7
validly complains because the context in which it's used could
cause an out-of-bounds condition.

Change-Id: If9c4bfdb6b02fa72d39e0c09bf88900663c000ba

3 years agoMerge "res_pjsip_registrar.c: Update remove_existing AOR contact handling."
Jenkins2 [Wed, 11 Oct 2017 11:49:54 +0000 (06:49 -0500)]
Merge "res_pjsip_registrar.c: Update remove_existing AOR contact handling."

3 years agoapp_queue.c: clear moh field in init_queue
Nathan Bruning [Fri, 6 Oct 2017 07:39:42 +0000 (09:39 +0200)]
app_queue.c: clear moh field in init_queue

ASTERISK-27301 #close

Change-Id: Ic31361f34e2de3b6470e68fc37205a7711082eba

3 years agosorcery: Use ao2_weakproxy to hold list of instances.
Corey Farrell [Tue, 10 Oct 2017 02:00:45 +0000 (22:00 -0400)]
sorcery: Use ao2_weakproxy to hold list of instances.

* Store weak proxy objects in instances container.
* Remove special unreference function and replace with macro that calls
ao2_cleanup.
* Add REF_DEBUG information to ast_sorcery_open.

Change-Id: I5a150a4e13cee319d46b5a4654f95a4623a978f8

3 years agonamed_locks: Use ao2_weakproxy_find.
Corey Farrell [Tue, 10 Oct 2017 02:55:44 +0000 (22:55 -0400)]
named_locks: Use ao2_weakproxy_find.

Change-Id: I0ce8a1b7101b6caac6a19f83a89f00eaba1e9d9c

3 years agoastobj2: Add ao2_weakproxy_find function.
Corey Farrell [Mon, 9 Oct 2017 22:51:05 +0000 (18:51 -0400)]
astobj2: Add ao2_weakproxy_find function.

This function finds a weak proxy in an ao2_container and returns the
real object associated with it.

Change-Id: I9da822049747275f5961b5c0a7f14e87157d65d8

3 years agoastobj2: Run weakproxy callbacks outside of lock.
Corey Farrell [Tue, 10 Oct 2017 20:09:14 +0000 (16:09 -0400)]
astobj2: Run weakproxy callbacks outside of lock.

Copy the list of weakproxy callbacks to temporary memory so they can be
run without holding the weakproxy lock.

Change-Id: Ib167622a8a0f873fd73938f7611b2a5914308047

3 years agoMerge "contrib/thirdparty/sip_to_pjsip: add additional flag mappings"
Jenkins2 [Tue, 10 Oct 2017 17:51:42 +0000 (12:51 -0500)]
Merge "contrib/thirdparty/sip_to_pjsip: add additional flag mappings"

3 years agoapp_originate: Set ORIGINATE_STATUS correctly on failure
Sean Bright [Tue, 10 Oct 2017 17:01:05 +0000 (13:01 -0400)]
app_originate: Set ORIGINATE_STATUS correctly on failure

We were ignoring the return value from ast_pbx_outgoing_exten() and
ast_pbx_outgoing_app() which could fail before setting the reason code.
This resulted in failures being reported as success.

ASTERISK-25266 #close
Reported by: Allen Ford

Change-Id: Idf16237b7e41b527d2c69c865829128686beeb3b

3 years agoMerge "res_pjsip: Add REF_DEBUG info to module references."
Jenkins2 [Tue, 10 Oct 2017 17:28:13 +0000 (12:28 -0500)]
Merge "res_pjsip: Add REF_DEBUG info to module references."

3 years agocontrib/thirdparty/sip_to_pjsip: add additional flag mappings
Torrey Searle [Tue, 3 Oct 2017 20:16:49 +0000 (22:16 +0200)]
contrib/thirdparty/sip_to_pjsip: add additional flag mappings

add mappings for udptl redundancy, rtptimeout, and debug flags

Change-Id: Ie73cf5c83c05dee01eb9624ede76c1a30225d73a

3 years agocdr.c: Eliminated simple RAII_VAR usages.
Richard Mudgett [Mon, 2 Oct 2017 21:46:19 +0000 (16:46 -0500)]
cdr.c: Eliminated simple RAII_VAR usages.

Change-Id: I150505db307249a962987e7b941bdd369bb91f35

3 years agocdr_mysql: avoid releasing a config string
Tzafrir Cohen [Tue, 10 Oct 2017 14:49:15 +0000 (17:49 +0300)]
cdr_mysql: avoid releasing a config string

Fixes a memory corruption issue after a reload of cdr_mysql.

Issue was accidentally included in 747beb1ed159f89a3b58742e4257740b3d6d6bba .

ASTERISK-27270 #close

Change-Id: I90b6a9d18710c0f9009466370bd5f4bac5d5d12e

3 years agoMerge "res_pjproject: Fix cleanup of buildopts vector."
Jenkins2 [Tue, 10 Oct 2017 13:12:25 +0000 (08:12 -0500)]
Merge "res_pjproject: Fix cleanup of buildopts vector."

3 years agoMerge "tcptls: Do not re-bind to wildcard on client creation."
Joshua Colp [Tue, 10 Oct 2017 12:53:04 +0000 (07:53 -0500)]
Merge "tcptls: Do not re-bind to wildcard on client creation."

3 years agodeclare optional openssl dependencies in moduleinfo
Tzafrir Cohen [Tue, 10 Oct 2017 12:42:46 +0000 (15:42 +0300)]
declare optional openssl dependencies in moduleinfo

Declare optional openssl dependencies in:
* res_rtp_asterisk.c
* tcptls.c

ASTERISK-27328 #close

Change-Id: I2636f1c05b8104b4fe6f36cce0ebd9a98b9c78ab

3 years agores_pjproject: Fix cleanup of buildopts vector.
Corey Farrell [Tue, 10 Oct 2017 03:51:03 +0000 (23:51 -0400)]
res_pjproject: Fix cleanup of buildopts vector.

ASTERISK-27306

Change-Id: I3bed0edf3f55b1d4adcbabb25ec14f11dc766c72

3 years agoMerge "cdr.c: Replace redundant check with an ast_assert()"
Jenkins2 [Tue, 10 Oct 2017 01:04:33 +0000 (20:04 -0500)]
Merge "cdr.c: Replace redundant check with an ast_assert()"

3 years agoMerge "cdr.h: Fix doxygen comments."
Jenkins2 [Tue, 10 Oct 2017 00:01:19 +0000 (19:01 -0500)]
Merge "cdr.h: Fix doxygen comments."

3 years agoMerge "cdr.c: Use current ao2 flag names"
Joshua Colp [Mon, 9 Oct 2017 23:08:26 +0000 (18:08 -0500)]
Merge "cdr.c: Use current ao2 flag names"

3 years agoMerge "res_pjsip: Fix issues that prevented shutdown of modules."
Jenkins2 [Mon, 9 Oct 2017 22:29:26 +0000 (17:29 -0500)]
Merge "res_pjsip: Fix issues that prevented shutdown of modules."

3 years agoMerge "cdr.c: Replace inlined code with ao2_t_replace()"
Jenkins2 [Mon, 9 Oct 2017 21:52:29 +0000 (16:52 -0500)]
Merge "cdr.c: Replace inlined code with ao2_t_replace()"

3 years agoMerge "res_pjsip_session: Fix format_cap leak."
Jenkins2 [Mon, 9 Oct 2017 21:23:01 +0000 (16:23 -0500)]
Merge "res_pjsip_session: Fix format_cap leak."

3 years agoMerge "res_config_sqlite: Don't enable SQLite CDRs when running 'make samples'"
Jenkins2 [Mon, 9 Oct 2017 21:20:55 +0000 (16:20 -0500)]
Merge "res_config_sqlite: Don't enable SQLite CDRs when running 'make samples'"

3 years agoMerge "res_pjsip: Fix leak of persistent endpoint references."
Jenkins2 [Mon, 9 Oct 2017 20:24:49 +0000 (15:24 -0500)]
Merge "res_pjsip: Fix leak of persistent endpoint references."

3 years agocdr.c: Replace redundant check with an ast_assert()
Richard Mudgett [Tue, 3 Oct 2017 21:09:58 +0000 (16:09 -0500)]
cdr.c: Replace redundant check with an ast_assert()

The only caller of cdr_object_fn_table.process_party_b() explicitly does
the check before calling.

Change-Id: Ib0c53cdf5048227842846e0df9d2c19117c45618

3 years agocdr.c: Replace inlined code with ao2_t_replace()
Richard Mudgett [Mon, 2 Oct 2017 22:41:12 +0000 (17:41 -0500)]
cdr.c: Replace inlined code with ao2_t_replace()

Change-Id: I9f424f5282ca7d833592f958d95f1b2bafb549b0

3 years agocdr.c: Use current ao2 flag names
Richard Mudgett [Fri, 29 Sep 2017 17:07:14 +0000 (12:07 -0500)]
cdr.c: Use current ao2 flag names

Change-Id: Ib59d7d2f2a4a822754628f2c48a308d6791a6e6e

3 years agocdr.h: Fix doxygen comments.
Richard Mudgett [Fri, 29 Sep 2017 17:31:18 +0000 (12:31 -0500)]
cdr.h: Fix doxygen comments.

* Also some misc formatting in cdr.c.

Change-Id: Ied89a28802a662c37c43326a1aafdce596e0df4a

3 years agores_pjsip_registrar.c: Update remove_existing AOR contact handling.
Richard Mudgett [Wed, 20 Sep 2017 23:36:15 +0000 (18:36 -0500)]
res_pjsip_registrar.c: Update remove_existing AOR contact handling.

When "rewrite_contact" is enabled, the "max_contacts" count option can
block re-registrations because the source port from the endpoint can be
random.  When the re-registration is blocked, the endpoint may give up
re-registering and require manual intervention.

* The "remove_existing" option now allows a registration to succeed by
displacing any existing contacts that now exceed the "max_contacts" count.
Any removed contacts are the next to expire.  The behaviour change is
beneficial when "rewrite_contact" is enabled and "max_contacts" is greater
than one.  The removed contact is likely the old contact created by
"rewrite_contact" that the device is refreshing.

ASTERISK-27192

Change-Id: I64c107a10b70db1697d17136051ae6bf22b5314b

3 years agoMerge "res_sdp_translator_pjmedia: Fix test unregistration."
Jenkins2 [Mon, 9 Oct 2017 17:10:34 +0000 (12:10 -0500)]
Merge "res_sdp_translator_pjmedia: Fix test unregistration."

3 years agores_config_sqlite: Don't enable SQLite CDRs when running 'make samples'
Sean Bright [Mon, 9 Oct 2017 13:15:54 +0000 (09:15 -0400)]
res_config_sqlite: Don't enable SQLite CDRs when running 'make samples'

Change-Id: I65a5190b2732b2246d67472db70dd37db64ddad4

3 years agores/res_ari.c Fix: Memory leaks in ARI when using Content-Type: application/json
hajekd [Sun, 8 Oct 2017 19:05:56 +0000 (21:05 +0200)]
res/res_ari.c Fix: Memory leaks in ARI when using Content-Type: application/json

ASTERISK-27305
Reported by: David Hajek
Tested by: David Hajek

Change-Id: Ife3e289062e6cf7d0e7d342dbf79ed96feff441e

3 years agotcptls: Do not re-bind to wildcard on client creation.
Alexander Traud [Sun, 8 Oct 2017 14:11:10 +0000 (16:11 +0200)]
tcptls: Do not re-bind to wildcard on client creation.

Since ASTERISK-26922, this issue affected only those chan_sip which were
* enabled for dual-stack (bindaddr=::), and
* enabled for TCP (tcpenable=yes) and/or TLS (tlsenable=yes), and
* tried to register and/or invite a IPv4-only service,
* via TCP and/or TLS.
Now, ast_tcptls_client_create does not re-bind to [::] anymore.

ASTERISK-27324 #close

Change-Id: I4b242837bdeb1ec7130dc82505c6180a946fd9b5

3 years agores_pjsip_session: Fix format_cap leak.
Corey Farrell [Sat, 7 Oct 2017 20:47:53 +0000 (16:47 -0400)]
res_pjsip_session: Fix format_cap leak.

ASTERISK-27306

Change-Id: I2c8d3fc148f9f53715c958314e1146f9611741f3

3 years agoMerge "vector: multiple evaluation of elem in AST_VECTOR_ADD_SORTED."
Joshua Colp [Sat, 7 Oct 2017 19:46:49 +0000 (14:46 -0500)]
Merge "vector: multiple evaluation of elem in AST_VECTOR_ADD_SORTED."

3 years agores_pjsip: Fix leak of persistent endpoint references.
Corey Farrell [Thu, 5 Oct 2017 21:26:14 +0000 (17:26 -0400)]
res_pjsip: Fix leak of persistent endpoint references.

Do not manually call sip_endpoint_apply_handler from load_all_endpoints.
This is not necessary and causes memory leaks.

Additionally reinitialize persistent->aors when we reuse a persistent
object with a new endpoint.

ASTERISK-27306

Change-Id: I59bbfc8da8a14d5f4af8c5bb1e71f8592ae823eb

3 years agoMerge "main/strings: Fix uninitialized value."
Jenkins2 [Fri, 6 Oct 2017 19:49:11 +0000 (14:49 -0500)]
Merge "main/strings: Fix uninitialized value."

3 years agoMerge "res_pjsip: Fix leak of fake_auth references."
Jenkins2 [Fri, 6 Oct 2017 19:16:56 +0000 (14:16 -0500)]
Merge "res_pjsip: Fix leak of fake_auth references."

3 years agovector: multiple evaluation of elem in AST_VECTOR_ADD_SORTED.
Corey Farrell [Thu, 5 Oct 2017 22:59:06 +0000 (18:59 -0400)]
vector: multiple evaluation of elem in AST_VECTOR_ADD_SORTED.

Use temporary variable to prevent multiple evaluations of elem argument.
This resolves a memory leak in res_pjproject startup.

ASTERISK-27317 #close

Change-Id: Ib960d7f5576f9e1a3c478ecb48995582a574e06d

3 years agores_pjsip: Fix leak of fake_auth references.
Corey Farrell [Thu, 5 Oct 2017 20:54:12 +0000 (16:54 -0400)]
res_pjsip: Fix leak of fake_auth references.

pjsip_distributor leaks references to fake_auth when the default realm
has not changed.

ASTERISK-27306

Change-Id: I3fcf103b3680ad2d1d4610dcd6738eeaebf4d202

3 years agomain/strings: Fix uninitialized value.
Corey Farrell [Fri, 6 Oct 2017 01:23:31 +0000 (21:23 -0400)]
main/strings: Fix uninitialized value.

ast_strings_match uses sscanf and checks for non-zero return to verify a
token was parsed. This is incorrect as sscanf returns EOF (-1) for errors.

ASTERISK-27318 #close

Change-Id: Ifcece92605f58116eff24c5a0a3b0ee08b3c87b1

3 years agores_sdp_translator_pjmedia: Fix test unregistration.
Corey Farrell [Fri, 6 Oct 2017 00:55:31 +0000 (20:55 -0400)]
res_sdp_translator_pjmedia: Fix test unregistration.

ASTERISK-27306

Change-Id: Ib3ed47167cb697ab7bd0a56cab589893f491651b

3 years agores_pjsip_caller_id chan_sip: Comply to RFC 3323 values for privacy
Daniel Tryba [Mon, 2 Oct 2017 12:48:41 +0000 (14:48 +0200)]
res_pjsip_caller_id chan_sip: Comply to RFC 3323 values for privacy

Currently privacy requests are only granted if the Privacy header
value is exactly "id" (defined in RFC 3325). It ignores any other
possible value (or a combination there of). This patch reverses the
logic from testing for "id" to grant privacy, to testing for "none" and
granting privacy for any other value. "none" must not be used in
combination with any other value (RFC 3323 section 4.2).

ASTERISK-27284 #close

Change-Id: If438a21f31a962da32d7a33ff33bdeb1e776fe56

3 years agoMerge "app_queue.c: Fix announcements when announce-to-first-user not enabled."
Joshua Colp [Wed, 4 Oct 2017 20:06:49 +0000 (15:06 -0500)]
Merge "app_queue.c: Fix announcements when announce-to-first-user not enabled."

3 years agores_pjsip: Add REF_DEBUG info to module references.
Corey Farrell [Wed, 4 Oct 2017 15:59:49 +0000 (11:59 -0400)]
res_pjsip: Add REF_DEBUG info to module references.

This provides better information to REF_DEBUG log for troubleshooting
when the system is unable to unload res_pjsip.so during shutdown due to
module references.

ASTERISK-27306

Change-Id: I63197ad33d1aebe60d12e0a6561718bdc54e4612

3 years agores_pjsip: Fix issues that prevented shutdown of modules.
Corey Farrell [Wed, 4 Oct 2017 15:46:44 +0000 (11:46 -0400)]
res_pjsip: Fix issues that prevented shutdown of modules.

res_pjsip and res_pjsip_session had circular references, preventing both
modules from shutting down.
* Move session supplement registration to res_pjsip.
* Use create internal functions for use by pjsip_message_filter.c.

ASTERISK-27306

Change-Id: Ifbd5c19ec848010111afeab2436f9699da06ba6b

3 years agores_calendar_icalendar: Filter out occurrences superceded by another VEVENT
krells [Thu, 28 Sep 2017 07:56:14 +0000 (09:56 +0200)]
res_calendar_icalendar: Filter out occurrences superceded by another VEVENT

When we are loading the calendars, we call libical's
icalcomponent_foreach_recurrence method for each VEVENT component that
we have in our calendar.

That method has no knowledge concerning the existence of the other
VEVENT components and will feed our callback with all ocurrences
matching the requested time span.

The occurrences generated by icalcomponent_foreach_recurrence while
expanding a recurring VEVENT's RRULE and RDATE properties can be
superceded by an other VEVENT sharing the same UID.

I use an external iterator (in libical terminology) to avoid messing
with the internal ones from the calling function, and search for
VEVENTS which could supersede the current occurrence.

The event which can invalidate this occurence needs to have:

- the same UID as our recurrent component (comp)
- a RECURRENCE-ID property, which represents the start time of this
  occurrence

If one component is found, just clean and return.

ASTERISK-27296 #close
Reported by: Benoît Dereck-Tricot

Change-Id: I8587ae3eaa765af7cb21eda3b6bf84e8a1c87af8

3 years agoMerge "heap.c: No need to calloc heap pointer array."
Jenkins2 [Wed, 4 Oct 2017 01:41:08 +0000 (20:41 -0500)]
Merge "heap.c: No need to calloc heap pointer array."

3 years agoMerge "logger: Bring back ability to turn debug on by source file"
Joshua Colp [Wed, 4 Oct 2017 00:33:32 +0000 (19:33 -0500)]
Merge "logger:  Bring back ability to  turn debug on by source file"

3 years agoapp_queue.c: Fix announcements when announce-to-first-user not enabled.
Richard Mudgett [Thu, 28 Sep 2017 22:37:15 +0000 (17:37 -0500)]
app_queue.c: Fix announcements when announce-to-first-user not enabled.

The previous patch for ASTERISK-27216 made it so you wouldn't get any
position or periodic announcements unless you had announce-to-first-user
enabled.  The announce-to-first-user feature was added by ASTERISK_21782
as a result of the patch which introduced the redundant announcements that
ASTERISK-27216 removes.

* By noting that the makeannouncement variable is used to suppresses the
first user announcement, we set its initial value to the
announce-to-first-user enable setting.

ASTERISK-27216

Change-Id: Ieaeb7dbea8ae7073086b775fbafe0625b000b10a

3 years agoheap.c: No need to calloc heap pointer array.
Richard Mudgett [Thu, 21 Sep 2017 19:43:09 +0000 (14:43 -0500)]
heap.c: No need to calloc heap pointer array.

Change-Id: I5ae2f316229f336eb90d99c7af7ed07a33097e68

3 years agoMerge "pjsip_message_filter: Fix regression causing bad contact address"
Jenkins2 [Thu, 28 Sep 2017 18:36:28 +0000 (13:36 -0500)]
Merge "pjsip_message_filter: Fix regression causing bad contact address"

3 years agoMerge "res_stasis: Add 'video_sfu' as a requested bridge type."
Joshua Colp [Thu, 28 Sep 2017 18:13:31 +0000 (13:13 -0500)]
Merge "res_stasis: Add 'video_sfu' as a requested bridge type."

3 years agoMerge "res_pjsip_session: outgoing call did not offer all configured codecs"
Joshua Colp [Thu, 28 Sep 2017 17:24:11 +0000 (12:24 -0500)]
Merge "res_pjsip_session: outgoing call did not offer all configured codecs"

3 years agologger: Bring back ability to turn debug on by source file
George Joseph [Wed, 27 Sep 2017 18:45:21 +0000 (12:45 -0600)]
logger:  Bring back ability to  turn debug on by source file

Somewhere along the way we lost the ability to debug individual
source files.  For modules, this wasn't a big deal but all the
source files in ./main are in the one "core" module so debugging
individual core capabilities was almost impossible.

* Added a test to DEBUG_ATLEAST that also checks __FILE__ instead
of just module name.  Any source file will work even if it's in
a module subdirectory.

Change-Id: Icc0af41837f3b1679dec7af21fa32cd1f7469f6e

3 years agoMerge "pjproject: Patch to correct STUN FINGERPRINT usage"
Jenkins2 [Thu, 28 Sep 2017 13:30:54 +0000 (08:30 -0500)]
Merge "pjproject: Patch to correct STUN FINGERPRINT usage"

3 years agoMerge "res_rtp_asterisk.c: Fix bridge_p2p_rtp_write() reentrancy potential."
Joshua Colp [Thu, 28 Sep 2017 12:08:33 +0000 (07:08 -0500)]
Merge "res_rtp_asterisk.c: Fix bridge_p2p_rtp_write() reentrancy potential."

3 years agoMerge "res_rtp_asterisk: Trim trailing byte off of SDES packet"
Joshua Colp [Thu, 28 Sep 2017 11:45:28 +0000 (06:45 -0500)]
Merge "res_rtp_asterisk: Trim trailing byte off of SDES packet"

3 years agores_stasis: Add 'video_sfu' as a requested bridge type.
Joshua Colp [Thu, 28 Sep 2017 10:33:00 +0000 (10:33 +0000)]
res_stasis: Add 'video_sfu' as a requested bridge type.

This change adds 'video_sfu' as a requested bridge type when
creating a bridge. By specifying this a mixing type bridge is
created that exchanges video in an SFU fashion.

Change-Id: I2ada47cf5f3fc176518b647c0b4aa39d55339606

3 years agores_pjsip_outbound_publish.c: Fix misplaced parenthesis.
Richard Mudgett [Wed, 27 Sep 2017 16:16:16 +0000 (11:16 -0500)]
res_pjsip_outbound_publish.c: Fix misplaced parenthesis.

The pjsip_publishc_init() call was referenced with a misplaced
parentheses.  As a result, outbound publication messages went out with an
expiration of 1 second.

ASTERISK-27298

Change-Id: I93622eabc8ee83e7a22e98c107f921284c605a08

3 years agopjsip_message_filter: Fix regression causing bad contact address
George Joseph [Tue, 26 Sep 2017 16:01:48 +0000 (10:01 -0600)]
pjsip_message_filter: Fix regression causing bad contact address

The "res_pjsip:  Filter out non SIP(S) requests" commit moved the
filtering of messages to pjproject's PJSIP_MOD_PRIORITY_TRANSPORT_LAYER
in order to filter out incoming bad uri schemes as early as possible.
Since the change affected outgoing messages as well and the TRANSPORT
layer is the last to be run on outgoing messages, we were overwriting
the setting of external_signaling_address (which is set earlier by
res_pjsip_nat) with an internal address.

* pjsip_message_filter now registers itself as a pjproject module
twice.  Once in the TSX layer for the outgoing messages (as it was
originally), then a second time in the TRANSPORT layer for the
incoming messages to catch the invalid uri schemes.

ASTERISK-27295
Reported by: Sean Bright

Change-Id: I2c90190c43370f8a9d1c4693a19fd65840689c8c

3 years agores_rtp_asterisk.c: Fix bridge_p2p_rtp_write() reentrancy potential.
Richard Mudgett [Thu, 14 Sep 2017 02:31:52 +0000 (21:31 -0500)]
res_rtp_asterisk.c: Fix bridge_p2p_rtp_write() reentrancy potential.

The bridge_p2p_rtp_write() has potential reentrancy problems.

* Accessing the bridged RTP members must be done with the instance1 lock
held.  The DTMF and asymmetric codec checks must be split to be done with
the correct RTP instance struct locked.  i.e., They must be done when
working on the appropriate side of the point to point bridge.

* Forcing the RTP mark bit was referencing the wrong side of the point to
point bridge.  The set mark bit is used everywhere else to set the mark
bit when sending not receiving.

The patches for ASTERISK_26745 and ASTERISK_27158 did not take into
account that not everything carried by RTP uses a codec.  The telephony
DTMF events are not exchanged with a codec.  As a result when
RFC2833/RFC4733 sent digits you would crash if "core set debug 1" is
enabled, the DTMF digits would always get passed to the core even though
the local native RTP bridge is active, and the DTMF digits would go out
using the wrong SSRC id.

* Add protection for non-format payload types like DTMF when updating the
lastrxformat and lasttxformat.  Also protect against non-format payload
types when checking for asymmetric codecs.

ASTERISK-27292

Change-Id: I6344ab7de21e26f84503c4d1fca1a41579364186

3 years agores_rtp_asterisk: Trim trailing byte off of SDES packet
Sean Bright [Tue, 26 Sep 2017 15:55:29 +0000 (11:55 -0400)]
res_rtp_asterisk: Trim trailing byte off of SDES packet

This could have been fixed by subtracting 1 from the final value of
'len' but the way the packet was being constructed was confusing so I
took the opportunity to (I think) make it more clear.

We were sending 1 extra byte at the end of the SDES RTCP packet which
caused Chrome to complain (in its debug log):

    Too little data (1 byte) remaining in buffer to parse
    RTCP header (4 bytes).

We now send the correct number of bytes.

Change-Id: I9dcf087cdaf97da0374ae0acb7d379746a71e81b

3 years agoMerge "webrtc: Allow 'webrtc' to be set on endpoints without dtls_ca_file"
Joshua Colp [Tue, 26 Sep 2017 12:37:22 +0000 (07:37 -0500)]
Merge "webrtc: Allow 'webrtc' to be set on endpoints without dtls_ca_file"

3 years agoMerge "channel.c: Fix invalid reference in conditionaled out code."
Joshua Colp [Tue, 26 Sep 2017 12:29:02 +0000 (07:29 -0500)]
Merge "channel.c: Fix invalid reference in conditionaled out code."

3 years agoMerge "app_queue: Only do announcement logic between ringing cycles"
Joshua Colp [Tue, 26 Sep 2017 11:36:47 +0000 (06:36 -0500)]
Merge "app_queue: Only do announcement logic between ringing cycles"