3 years agoMerge "func_odbc: Check connection status before executing queries."
zuul [Thu, 28 Apr 2016 11:53:01 +0000 (06:53 -0500)]
Merge "func_odbc: Check connection status before executing queries."

3 years agoMerge "config: Fix ast_config_text_file_save2 writability check for missing files"
Joshua Colp [Wed, 27 Apr 2016 19:55:55 +0000 (14:55 -0500)]
Merge "config:  Fix ast_config_text_file_save2 writability check for missing files"

3 years agofunc_odbc: Check connection status before executing queries.
Mark Michelson [Wed, 27 Apr 2016 18:23:37 +0000 (13:23 -0500)]
func_odbc: Check connection status before executing queries.

A recent change to func_odbc made it so that a single connection was
maintained per DSN. The problem was that the code was optimistic about
the health of the connection after initially opening it and did nothing
to re-connect in case the connection had died.

This change adds a check before executing a query to ensure that the
connection to the database is still up and running.

ASTERISK-25963 #close
Reported by Ross Beer

Change-Id: Id33c86eb04ff48ca088bb2e3086c27b3b683491d

3 years agoMerge "res_pjsip: disable multi domain to improve realtime performace"
Joshua Colp [Wed, 27 Apr 2016 17:45:11 +0000 (12:45 -0500)]
Merge "res_pjsip: disable multi domain to improve realtime performace"

3 years agoMerge "res_pjsip: Add serialized scheduler (res_pjsip/pjsip_scheduler.c)"
zuul [Wed, 27 Apr 2016 16:14:11 +0000 (11:14 -0500)]
Merge "res_pjsip:  Add serialized scheduler (res_pjsip/pjsip_scheduler.c)"

3 years agores_pjsip: disable multi domain to improve realtime performace
Alexei Gradinari [Fri, 15 Apr 2016 16:59:42 +0000 (12:59 -0400)]
res_pjsip: disable multi domain to improve realtime performace

This patch added new global pjsip option 'disable_multi_domain'.
Disabling Multi Domain can improve Realtime performance by reducing
number of database requests.

ASTERISK-25930 #close

Change-Id: I2e7160f3aae68475d52742107949a799aa2c7dc7

3 years agochan_sip: Give more time for TCP/TLS threads to stop.
Joshua Colp [Tue, 26 Apr 2016 16:13:14 +0000 (13:13 -0300)]
chan_sip: Give more time for TCP/TLS threads to stop.

The unload process currently tells each TCP/TLS to terminate but
does not wait for them to do so. This introduces a race condition
where the container holding the threads may be destroyed before
the threads are able to remove themselves from it. When they
finally do the container is invalid and can't be used causing a

A previous change existed which waited a bit to wait for any
stranglers to finish. This change extends this and waits longer.

ASTERISK-25961 #close

Change-Id: Idc6262b670ca49ede32061159e323b7b63c6f3c6

3 years agoapp_queue: Fix crash when unloading module.
Joshua Colp [Tue, 26 Apr 2016 10:48:40 +0000 (07:48 -0300)]
app_queue: Fix crash when unloading module.

When unloading the app_queue module the members in each queue are
destroyed and as part of this they are removed from the pending
members container. Unfortunately a crash would occur as the container
was destroyed before the members were removed.

This change tweaks ordering so the container destruction occurs
after the members are destroyed.


Change-Id: I48c728668c55aee3d05b751a5d450fb57e87f44b

3 years agoMerge changes from topic 'system_stress_patches'
Joshua Colp [Tue, 26 Apr 2016 09:57:36 +0000 (04:57 -0500)]
Merge changes from topic 'system_stress_patches'

* changes:
  test_message.c: Wait longer in case dialplan also processes the test message.
  Manager: Short circuit AMI message processing.
  manager.c: Eliminate most RAII_VAR usage.

3 years agoMerge "manager_channels.c: Fix allocation failure crash."
zuul [Tue, 26 Apr 2016 03:00:51 +0000 (22:00 -0500)]
Merge "manager_channels.c: Fix allocation failure crash."

3 years agoMerge "Bridge system: Fix memory leaks and double frees on impart failure."
zuul [Tue, 26 Apr 2016 02:08:16 +0000 (21:08 -0500)]
Merge "Bridge system: Fix memory leaks and double frees on impart failure."

3 years agoMerge "bridge_softmix.c: Fix crash if channel fails to join mixing tech."
zuul [Tue, 26 Apr 2016 02:08:15 +0000 (21:08 -0500)]
Merge "bridge_softmix.c: Fix crash if channel fails to join mixing tech."

3 years agoMerge "app_queue: queue members can receive multiple calls"
Joshua Colp [Tue, 26 Apr 2016 00:34:09 +0000 (19:34 -0500)]
Merge "app_queue: queue members can receive multiple calls"

3 years agoconfig: Fix ast_config_text_file_save2 writability check for missing files
George Joseph [Mon, 25 Apr 2016 03:51:16 +0000 (21:51 -0600)]
config:  Fix ast_config_text_file_save2 writability check for missing files

A patch I did back in 2014 modified ast_config_text_file_save2 to check the
writability of the main file and include files before truncating and re-writing
them.  An unintended side-effect of this was that if a file doesn't exist,
the check fails and the write is aborted.

This patch causes ast_config_text_file_save2 to check the writability of the
parent directory of missing files instead of checking the file itself.  This
allows missing files to be created again.  A unit test was also added to
test_config to test saving of config files.

The regression was discovered when app_voicemail's passwordlocation=spooldir
feature stopped working.

ASTERISK-25917 #close
Reported-by: Jonathan Rose

Change-Id: Ic4dbe58c277a47b674679e49daed5fc6de349f80

3 years agoFix case sensitive actions in AMI QueueSummary and QueueStatus
DarkS [Mon, 25 Apr 2016 13:11:31 +0000 (15:11 +0200)]
Fix case sensitive actions in AMI QueueSummary and QueueStatus

ASTERISK-25954 #close
Reported by: Javier Acosta

Change-Id: I00be83d45cc7e8385de2523012bd196aafeeb256
(cherry picked from commit c0688a6398f27296ff849848a2e416e036d794e3)

3 years agoapp_queue: queue members can receive multiple calls
Kevin Harwell [Thu, 21 Apr 2016 19:23:21 +0000 (14:23 -0500)]
app_queue: queue members can receive multiple calls

It was possible for a queue member that is a member of at least 2 or more
queues to receive mulitiple calls at the same time. This happened because
of a race between when a member was being rung and when the device state
notified the other queue(s) member object of the state change.

This patch makes it so when a queue member is being rung it gets added to
a global pool of queue members. If that same member is tried again, e.g.
from another queue, and it is found to already exist in the pending member
container then it will not ring that member.

ASTERISK-16115 #close

Change-Id: I546dd474776d158c2b6be44205353dee5bac7e48

3 years agores_agi: Prevent run_agi from eating frames it shouldn't
George Joseph [Fri, 22 Apr 2016 22:53:23 +0000 (16:53 -0600)]
res_agi:  Prevent run_agi from eating frames it shouldn't

The run_agi function is eating control frames when it shouldn't be. This is
causing issues when an AGI is run from CONNECTED_LINE_SEND_SUB in a blond

Alice calls Bob. Bob attended transfers to Charlie but hangs up before Charlie

Alice gets the COLP UPDATE indicating Charlie but Charlie never gets an UPDATE
and is left thinking he's connected to Bob.

In this case, when CONNECTED_LINE_SEND_SUB runs on Alice's channel and it calls
an AGI, the extra eaten frames prevent CONNECTED_LINE_SEND_SUB from running on
Charlie's channel.

The fix was to accumulate deferrable frames in the "forever" loop instead of
dropping them, and re-queue them just before running the actual agi command
or exiting.

ASTERISK-25951 #close

Change-Id: I0f4bbfd72fc1126c2aaba41da3233a33d0433645

3 years agoMerge "func_odbc: Use one connection per DSN."
Joshua Colp [Mon, 25 Apr 2016 10:14:17 +0000 (05:14 -0500)]
Merge "func_odbc: Use one connection per DSN."

3 years agoMerge "Remove reference to non-existent sip.conf option"
zuul [Fri, 22 Apr 2016 23:55:45 +0000 (18:55 -0500)]
Merge "Remove reference to non-existent sip.conf option"

3 years agoMerge "res_stasis: Handle re-enter stasis bridge with swap channel."
zuul [Fri, 22 Apr 2016 22:08:06 +0000 (17:08 -0500)]
Merge "res_stasis: Handle re-enter stasis bridge with swap channel."

3 years agoMerge "bridge: Hold off more than one imparting channel at a time."
zuul [Fri, 22 Apr 2016 22:08:04 +0000 (17:08 -0500)]
Merge "bridge: Hold off more than one imparting channel at a time."

3 years agotest_message.c: Wait longer in case dialplan also processes the test message.
Richard Mudgett [Fri, 22 Apr 2016 20:25:29 +0000 (15:25 -0500)]
test_message.c: Wait longer in case dialplan also processes the test message.

Bumped the wait from 1 second to 5 seconds.  The test message was hitting my
default call handler and failing the test because it took longer.

Change-Id: I3a03737f25e92983de00548fcc7bbc50dd7544ba

3 years agomanager_channels.c: Fix allocation failure crash.
Richard Mudgett [Wed, 13 Apr 2016 22:09:53 +0000 (17:09 -0500)]
manager_channels.c: Fix allocation failure crash.

An earlier allocation failure failed to create a channel snapshot for the
AMI HangupRequest/SoftHangupRequest event which resulted in a crash in
channel_hangup_request_cb().  Where the stasis message gets generated
cannot tell if the NULL snapshot returned was because of an allocation
failure or the channel was a dummy channel.

* Made channel_hangup_request_cb() check if the channel blob has a
snapshot and exit if it doesn't.

* Eliminated the RAII_VAR usage in channel_hangup_request_cb().

Change-Id: I0b6a1c4e95cbb7d80b2a7054c6eadecc169dfd24

3 years agoBridge system: Fix memory leaks and double frees on impart failure.
Richard Mudgett [Wed, 13 Apr 2016 18:50:04 +0000 (13:50 -0500)]
Bridge system: Fix memory leaks and double frees on impart failure.

You cannot reference the passed in features struct after calling
ast_bridge_impart().  Even if the call fails.

Change-Id: I902b88ba0d5d39520e670fb635078a367268ea21

3 years agobridge_softmix.c: Fix crash if channel fails to join mixing tech.
Richard Mudgett [Wed, 13 Apr 2016 18:20:23 +0000 (13:20 -0500)]
bridge_softmix.c: Fix crash if channel fails to join mixing tech.

softmix_bridge_join() failed because of an allocation failure.  To address
this, the softmix bridge technology now checks if the channel failed to
join softmix successfully.  In addition, the bridge now begins the process
of kicking the channel out of the bridge so we don't have channels
partially in the bridge for very long.

* Fix the test_channel_feature_hooks.c unit tests.  The test channel must
have a valid codec to join the simple_bridge technology.  This patch makes
joining a bridge more strict by not allowing partially joined channels to
remain in the bridge.

Change-Id: I97e2ade6a2bcd1214f24fb839fda948825b61a2b

3 years agoManager: Short circuit AMI message processing.
Richard Mudgett [Tue, 12 Apr 2016 20:29:52 +0000 (15:29 -0500)]
Manager: Short circuit AMI message processing.

Improve AMI message processing performance if there are no consumers
listening for the messages.  We now skip creating the AMI event message
text strings.

Change-Id: I7b22fc5ec4e500d00635c1a467aa8ea68a1bb2b3

3 years agomanager.c: Eliminate most RAII_VAR usage.
Richard Mudgett [Wed, 13 Apr 2016 22:54:26 +0000 (17:54 -0500)]
manager.c: Eliminate most RAII_VAR usage.

* Made ast_manager_event_blob_create() not allocate the ao2 event object
with a lock as it is not needed.

Change-Id: I8e11bfedd22c21316012e0b9dd79f5918f644b7c

3 years agofunc_odbc: Use one connection per DSN.
Mark Michelson [Fri, 22 Apr 2016 18:49:50 +0000 (13:49 -0500)]
func_odbc: Use one connection per DSN.

res_odbc was changed in Asterisk 13.8.0 to remove connection management,
opting instead to let unixodbc maintain open connections and return
those to Asterisk as requested.

This was a boon for realtime, since it meant that multiple threads could
potentially run parallel queries since they could each be using their
own database connections.

However, on the user-facing side, func_odbc, there were some inherent
behaviors being relied on that no longer hold true after the change.
One such reported behavior was that MySQL's LAST_INSERTED_ID() works
per-connection. This means that if Asterisk uses separate connections
for every database operation, whereas before it used one connection for
everything, we have broken expectations and functionality.

The fix provided in this patch is to make func_odbc use a single
database connection per DSN. This way, user-facing database usage will
have the same behavior as it did pre-13.8.0. However, realtime, which is
the real workhorse of database interaction, will continue to let
unixodbc manage connections.

ASTERISK-25938 #close
Reported by Edwin Vandamme

Change-Id: Iac961fe79154c6211569afcdfec843c0c24c46dc

3 years agoRemove reference to non-existent sip.conf option
Leif Madsen [Fri, 22 Apr 2016 18:02:53 +0000 (14:02 -0400)]
Remove reference to non-existent sip.conf option

Option was removed in commit 7f883ef495b57ae9182e47213d01d5e8009dbf3f

ASTERISK-25927 #close

Change-Id: I92f9b0196d9fc41d1d58354c07340c465ef1fcf8

3 years agoMerge "res_pjsip_callerid: Clear out display name if id->name is not valid"
Joshua Colp [Thu, 21 Apr 2016 19:02:09 +0000 (14:02 -0500)]
Merge "res_pjsip_callerid:  Clear out display name if id->name is not valid"

3 years agoMerge "lock.c: Check *lt before dereferencing it"
zuul [Thu, 21 Apr 2016 18:01:56 +0000 (13:01 -0500)]
Merge "lock.c: Check *lt before dereferencing it"

3 years agoMerge "stringfields: Update extended string fields for master only."
zuul [Thu, 21 Apr 2016 17:48:27 +0000 (12:48 -0500)]
Merge "stringfields:  Update extended string fields for master only."

3 years agolock.c: Check *lt before dereferencing it
Diederik de Groot [Thu, 21 Apr 2016 13:26:47 +0000 (15:26 +0200)]
lock.c: Check *lt before dereferencing it

*lt is NULL if t->tracking == 0

ASTERISK-25948 #close

Change-Id: I4a81af28f9c82a74aa82413d772a7dc8fa6f45ba

3 years agores_stasis: Handle re-enter stasis bridge with swap channel.
Richard Mudgett [Fri, 15 Apr 2016 19:36:59 +0000 (14:36 -0500)]
res_stasis: Handle re-enter stasis bridge with swap channel.

We lose the fact that there is a swap channel if there is one.  We
currently wind up rejoining the stasis bridge as a normal join after the
swap channel has already been kicked from the bridge.

This patch preserves the swap channel so the AMI/ARI events can note that
the channel joining the bridge is swapping with another channel.  Another
benefit to swaqpping in one operation is if there are any channels that
get lonely (MOH, bridge playback, and bridge record channels).  The lonely
channels won't leave before the joining channel has a chance to come back
in under stasis if the swap channel is the only reason the lonely channels
are staying in the bridge.

ASTERISK-25947 #close
Reported by: Richard Mudgett

Reported by: John Bigelow

Reported by: John Bigelow

Change-Id: If37ea508831d1fed6dbfac2f191c638fc0a850ee

3 years agobridge: Hold off more than one imparting channel at a time.
Richard Mudgett [Tue, 19 Apr 2016 21:58:32 +0000 (16:58 -0500)]
bridge: Hold off more than one imparting channel at a time.

An earlier patch blocked the ast_bridge_impart() call until the channel
either entered the target bridge or it failed.  Unfortuantely, if the
target bridge is stasis and the imprted channel is not a stasis channel,
stasis bounces the channel out of the bridge to come back into the bridge
as a proper stasis channel.  When the channel is bounced out, that
released the block on ast_bridge_impart() to continue.  If the impart was
a result of a transfer, then it became a race to see if the swap channel
would get hung up before the imparted channel could come back into the
stasis bridge.  If the imparted channel won then everything is fine.  If
the swap channel gets hung up first then the transfer will fail because
the swap channel is leaving the bridge.

* Allow a chain of ast_bridge_impart()'s to happen before any are
unblocked to prevent the race condition described above.  When the channel
finally joins the bridge or completely fails to join the bridge then the
ast_bridge_impart() instances are unblocked.

Reported by: Richard Mudgett

Reported by: John Bigelow

Reported by: John Bigelow

Change-Id: I8fef369171f295f580024ab4971e95c799d0dde1

3 years agoMerge "Dial: Combine frame handling functions."
zuul [Wed, 20 Apr 2016 15:53:17 +0000 (10:53 -0500)]
Merge "Dial: Combine frame handling functions."

3 years agoMerge "pjproject: Add patch for removing strip of '[]' from header params"
Joshua Colp [Wed, 20 Apr 2016 13:17:30 +0000 (08:17 -0500)]
Merge "pjproject:  Add patch for removing strip of '[]' from header params"

3 years agores_pjsip_callerid: Clear out display name if id->name is not valid
George Joseph [Tue, 19 Apr 2016 22:52:15 +0000 (16:52 -0600)]
res_pjsip_callerid:  Clear out display name if id->name is not valid

When create_new_id_hdr creates a new RPID or PAI header, it starts by cloning
the From header, then it overwrites the display name and uri from the channel's  If the wasn't valid, create_new_id_hdr was
leaving the display name from the From header in the new RPID or PAI header.
On an attended transfer where the originator had a caller id number set but not
a display name, the re-INVITE to the final transferee had the number of the
originator but the display name of the transferer.

Added a check to clear out the display name in the new header if was invalid.

ASTERISK-25942 #close

Change-Id: I60b4bf7a7ece9b7425eba74151c0b4969cd2738b

3 years agoMerge "PJSIP: Remove PJSIP parsing functions from uri length validation."
zuul [Tue, 19 Apr 2016 21:53:52 +0000 (16:53 -0500)]
Merge "PJSIP: Remove PJSIP parsing functions from uri length validation."

3 years agoapp_talkdetect: Make the module core supported.
Joshua Colp [Tue, 19 Apr 2016 18:02:18 +0000 (15:02 -0300)]
app_talkdetect: Make the module core supported.

This module is used as part of testsuite tests to confirm
stuff works. I'm accordingly marking it as core as it is
required by those tests.

Change-Id: I558e7af7679b22b8ed641d7dd37ee4ca35b11e88

3 years agoPJSIP: Remove PJSIP parsing functions from uri length validation.
Mark Michelson [Mon, 18 Apr 2016 17:12:37 +0000 (12:12 -0500)]
PJSIP: Remove PJSIP parsing functions from uri length validation.

The PJSIP parsing functions provide a nice concise way to check the
length of a hostname in a SIP URI. The problem is that in order to use
those parsing functions, it's required to use them from a thread that
has registered with PJLib.

On startup, when parsing AOR configuration, the permanent URI handler
may not be run from a PJLib-registered thread. Specifically, this could
happen when Asterisk was started in daemon mode rather than
console-mode. If PJProject were compiled with assertions enabled, then
this would cause Asterisk to crash on startup.

The solution presented here is to do our own parsing of the contact URI
in order to ensure that the hostname in the URI is not too long. The
parsing does not attempt to perform a full SIP URI parse/validation,
since the hostname in the URI is what is important.

ASTERISK-25928 #close
Reported by Joshua Colp

Change-Id: Ic3d6c20ff3502507c17244a8b7e2ca761dc7fb60

3 years agoMerge "app_queue: Frequent segfaults in function can_ring_entry()"
Joshua Colp [Tue, 19 Apr 2016 14:49:17 +0000 (09:49 -0500)]
Merge "app_queue: Frequent segfaults in function can_ring_entry()"

3 years agoMerge "stasis_bridge.c: Update stasis bridge push diagnostic messages."
Joshua Colp [Tue, 19 Apr 2016 14:42:45 +0000 (09:42 -0500)]
Merge "stasis_bridge.c: Update stasis bridge push diagnostic messages."

3 years agoMerge "res_pjsip_transport_management: Allow unload to occur."
Joshua Colp [Tue, 19 Apr 2016 14:40:59 +0000 (09:40 -0500)]
Merge "res_pjsip_transport_management: Allow unload to occur."

3 years agoMerge "bridge_channel.c: Ignore role setup failure in channel push."
Joshua Colp [Tue, 19 Apr 2016 14:37:36 +0000 (09:37 -0500)]
Merge "bridge_channel.c: Ignore role setup failure in channel push."

3 years agores_pjsip_registrar: Fix bad memory-ness with user_agent.
Mark Michelson [Mon, 18 Apr 2016 22:00:42 +0000 (17:00 -0500)]
res_pjsip_registrar: Fix bad memory-ness with user_agent.

Recent changes to the PJSIP registrar resulted in tests failing due to
missing AOR_CONTACT_ADDED test events. The reason for this was that the
user_agent string had junk values in it, resulting in being unable to
generate the event.

I'm going to be honest here, I have no idea why this was happening. Here
are the steps needed for the user_agent variable to get messed up:
* REGISTER is received
* First contact in the REGISTER results in a contact being removed
* Second contact in the REGISTER results in a contact being added
* The contact, AOR, expiration, and user agent all have to be passed as
  format parameters to the creation of a string. Any subset of those
  parameters would not be enough to cause the problem.

Looking into what was happening, the thing that struck me as odd was
that the user_agent variable was meant to be set to the value of the
User-Agent SIP header in the incoming REGISTER. However, when removing a
contact, the user_agent variable would be set (via ast_strdupa inside a
loop) to the stored contact's user_agent. This means that the
user_agent's value would be incorrect when attempting to process further
contacts in the incoming REGISTER.

The fix here is to use a different variable for the stored user agent
when removing a contact. Correcting the behavior to be correct also
means the memory usage is less weird, and the issue no longer occurs.

ASTERISK-25929 #close
Reported by Joshua Colp

Change-Id: I7cd24c86a38dec69ebcc94150614bc25f46b8c08

3 years agores_pjsip_transport_management: Allow unload to occur.
Joshua Colp [Mon, 18 Apr 2016 18:41:34 +0000 (15:41 -0300)]
res_pjsip_transport_management: Allow unload to occur.

At shutdown it is possible for modules to be unloaded that wouldn't
normally be unloaded. This allows the environment to be cleaned up.

The res_pjsip_transport_management module did not have the unload
logic in it to clean itself up causing the res_pjsip module to not
get unloaded. As a result the res_pjsip monitor thread kept going
processing traffic and timers when it shouldn't.

Change-Id: Ic8cadee131e3b2c436a81d3ae8bb5775999ae00a

3 years agobridge_channel.c: Ignore role setup failure in channel push.
Richard Mudgett [Fri, 15 Apr 2016 16:41:49 +0000 (11:41 -0500)]
bridge_channel.c: Ignore role setup failure in channel push.

We have to setup the channel roles after the bridge class push is called
because the bridge class push callback may have set roles on the incoming
channel.  Since we have already partially pushed the channel into the
bridge and reversing what we have already done could be problematic, the
only thing we can do is press on to complete pushing the channel into the

* Ignore any channel role setup errors after pushing the channel into a
bridge.  The channel may behave incorrectly in the bridge but we can no
longer abort the push at this time.

Change-Id: I08a97082b729052ee65cdca6bb730cf1289ede00

3 years agochan_sip: Don't verify table if rtupdate=no
Jaco Kroon [Sun, 17 Apr 2016 20:37:53 +0000 (22:37 +0200)]
chan_sip: Don't verify table if rtupdate=no

If rtupdate=no do not verify sipregs/peers table has updatable fields.

ASTERISK-25934 #close

Change-Id: Iaa2c53037b93daccc7e7333c40d61861847b856d

3 years agoMerge "Codecs: strip codec name while parsing allow/disallow options"
Joshua Colp [Mon, 18 Apr 2016 10:31:17 +0000 (05:31 -0500)]
Merge "Codecs: strip codec name while parsing allow/disallow options"

3 years agoapp_queue: Frequent segfaults in function can_ring_entry()
ibercom [Mon, 18 Apr 2016 09:53:14 +0000 (11:53 +0200)]
app_queue: Frequent segfaults in function can_ring_entry()

ASTERISK-25888 #close

Change-Id: I007a2f2dd99823e04fb5be3ff01f02b0a2956117

3 years agostasis_bridge.c: Update stasis bridge push diagnostic messages.
Richard Mudgett [Fri, 15 Apr 2016 21:51:58 +0000 (16:51 -0500)]
stasis_bridge.c: Update stasis bridge push diagnostic messages.

Change-Id: I195b14994c9dcccb9452491ca20a885d2a54605a

3 years agoMerge "app_voicemail/IMAP: function 'save_to_folder' creates wrong folder"
Joshua Colp [Fri, 15 Apr 2016 19:37:28 +0000 (14:37 -0500)]
Merge "app_voicemail/IMAP: function 'save_to_folder' creates wrong folder"

3 years agoDial: Combine frame handling functions.
Mark Michelson [Tue, 12 Apr 2016 19:55:42 +0000 (14:55 -0500)]
Dial: Combine frame handling functions.

There is a good amount of repetition in the two frame handling routines
in the Dial API. This commit combines the two functions into one.

This is in preparation for an upcoming commit that adds the ability to
handle frames for a channel in a bridge.

Reported by Mark Michelson

Change-Id: Iaae2f174e3058e774cb44e10659fcdfb85345c58

3 years agoCodecs: strip codec name while parsing allow/disallow options
Alexei Gradinari [Mon, 11 Apr 2016 21:20:49 +0000 (17:20 -0400)]
Codecs: strip codec name while parsing allow/disallow options

Failed registration using PJSIP/Realtime if one of the codec name
in allow/disallow option is wrong or contains space.

This patch strip codec name.


Change-Id: Ifdf02de94e5ddbce305640f6f0666084a3b9283d

3 years agotransport management: Register thread with PJProject.
Mark Michelson [Thu, 14 Apr 2016 18:49:35 +0000 (13:49 -0500)]
transport management: Register thread with PJProject.

The scheduler thread that kills idle TCP connections was not registering
with PJProject properly and causing assertions if PJProject was built in
debug mode.

This change registers the thread with PJProject the first time that the
scheduler callback executes.


Change-Id: I5f7a37e2c80726a99afe9dc2a4a69bdedf661283

3 years agores_pjsip: Add serialized scheduler (res_pjsip/pjsip_scheduler.c)
George Joseph [Thu, 17 Mar 2016 17:28:26 +0000 (11:28 -0600)]
res_pjsip:  Add serialized scheduler (res_pjsip/pjsip_scheduler.c)

There are several places that do scheduled tasks or periodic housecleaning,
each with its own implementation:

* res_pjsip_keepalive has a thread that sends keepalives.
* pjsip_distributor has a thread that cleans up expired unidentified requests.
* res_pjsip_registrar_expire has a thread that cleans up expired contacts.
* res_pjsip_pubsub uses ast_sched directly and then calls ast_sip_push_task.
* res_pjsip_sdp_rtp also uses ast_sched to send keepalives.

There are also places where we should be doing scheduled work but aren't.
A good example are the places we have sorcery observers to start registration
or qualify.  These don't work when changes are made to a backend database
without a pjsip reload.  We need to check periodically.

As a first step to solving these issues, a new ast_sip_sched facility has
been created.

ast_sip_sched wraps ast_sched but only uses ast_sched as a scheduled queue.
When a task is ready to run, ast_sip_task_pusk is called for it. This ensures
that the task is executed in a PJLIB registered thread and doesn't hold up the
ast_sched thread so it can immediately continue processing the queue.  The
serializer used by ast_sip_sched is one of your choosing or a random one from
the res_pjsip pool if you don't choose one.

Another feature is the ability to automatically clean up the task_data when the
task expires (if ever).  If it's an ao2 object, it will be dereferenced, if
it's a malloc'd object it will be freed.  This is selectable when the task is
scheduled.  Even if you choose to not auto dereference an ao2 task data object,
the scheduler itself maintains a reference to it while the task is under it's
control.  This prevents the data from disappearing out from under the task.

There are two scheduling models.

AST_SIP_SCHED_TASK_PERIODIC specifies that the invocations of the task occur at
the specific interval.  That is, every "interval" milliseconds, regardless of
how long the task takes.  If the task takes longer than the interval, it will
be scheduled at the next available multiple of interval.  For exmaple: If the
task has an interval of 60 secs and the task takes 70 secs (it better not),
the next invocation will happen at 120 seconds.

AST_SIP_SCHED_TASK_DELAY specifies that the next invocation of the task should
start "interval" milliseconds after the current invocation has finished.

Also, the same ast_sched facility for fixed or variable intervals exists.  The
task's return code in conjunction with the AST_SIP_SCHED_TASK_FIXED or
AST_SIP_SCHED_TASK_VARIABLE flags controls the next invocation start time.

One res_pjsip.h housekeeping change was made.  The pjsip header files were
added to the top.  There have been a few cases lately where I've needed
res_pjsip.h just for ast_sip calls and had compiles fail spectacularly because
I didn't add the pjsip header files to my source even though I never referenced
any pjsip calls.

Finally, a few new convenience APIs were added to astobj2 to make things a
little easier in the scheduler.  ao2_ref_and_lock() calls ao2_ref() and
ao2_lock() in one go.  ao2_unlock_and_unref() does the reverse. A few macros
were also copied from res_phoneprov because I got tired of having to duplicate
the same hash, sort and compare functions over and over again. The
AO2_STRING_FIELD_(HASH|SORT|CMP)_FN macros will insert functions suitable for
aor_container_alloc into your source.

This facility can be used immediately for the situations where we already have
a thread that wakes up periodically or do some scheduled work.  For the
registration and qualify issues, additional sorcery and schema changes would
need to be made so that we can easily detect changed objects on a periodic
basis without having to pull the entire database back to check.  I'm thinking
of a last-updated timestamp on the rows but more on this later.

Change-Id: I7af6ad2b2d896ea68e478aa1ae201d6dd016ba1c

3 years agoMerge "res_pjsip_transport_management: Kill idle TCP connections."
Joshua Colp [Thu, 14 Apr 2016 18:02:32 +0000 (13:02 -0500)]
Merge "res_pjsip_transport_management: Kill idle TCP connections."

3 years agoMerge "Rename res_pjsip_keepalive res_pjsip_transport_management"
Joshua Colp [Thu, 14 Apr 2016 18:01:00 +0000 (13:01 -0500)]
Merge "Rename res_pjsip_keepalive res_pjsip_transport_management"

3 years agoMerge "AST-2016-004: Fix crash on REGISTER with long URI."
Joshua Colp [Thu, 14 Apr 2016 17:59:31 +0000 (12:59 -0500)]
Merge "AST-2016-004: Fix crash on REGISTER with long URI."

3 years agores_pjsip_transport_management: Kill idle TCP connections.
Mark Michelson [Tue, 8 Mar 2016 18:12:16 +0000 (12:12 -0600)]
res_pjsip_transport_management: Kill idle TCP connections.

"Idle" here means that someone connects to us and does not send a SIP
request. PJProject will not automatically time out such connections, so
it's up to Asterisk to do it instead.

When we receive an incoming TCP connection, we will start a timer
(equivalent to transaction timer D) waiting to receive an incoming
request. If we do not receive a request in that timeframe, then we will
shut down the TCP connection.

ASTERISK-25796 #close
Reported by George Joseph


Change-Id: I7b0d303e5d140d0ccaf2f7af562071e3d1130ac6

3 years agoRename res_pjsip_keepalive res_pjsip_transport_management
Mark Michelson [Tue, 8 Mar 2016 16:52:19 +0000 (10:52 -0600)]
Rename res_pjsip_keepalive res_pjsip_transport_management

Reported by George Joseph


Change-Id: Id322a05f927392293570599730050bc677d99433

3 years agoAST-2016-004: Fix crash on REGISTER with long URI.
Mark Michelson [Thu, 14 Apr 2016 12:23:54 +0000 (07:23 -0500)]
AST-2016-004: Fix crash on REGISTER with long URI.

Due to some ignored return values, Asterisk could crash if processing an
incoming REGISTER whose contact URI was above a certain length.

ASTERISK-25707 #close
Reported by George Joseph



Change-Id: I3ea7cee16f29c8088794de3085ca7523c1c4833d

3 years agobridge_softmix.c: Fix crash if could not allocate the dsp.
Richard Mudgett [Tue, 12 Apr 2016 18:10:47 +0000 (13:10 -0500)]
bridge_softmix.c: Fix crash if could not allocate the dsp.

Fix off nominal crash where we could not setup the channel to process
frames for the softmix bridge technology because of allocation failure.

Change-Id: Ic307a8386e46bf551e48fcd1eb97276714d56372

3 years agostringfields: Update extended string fields for master only.
George Joseph [Wed, 13 Apr 2016 18:38:01 +0000 (12:38 -0600)]
stringfields:  Update extended string fields for master only.

In 13, the new ast_string_field_header structure had to be dynamically
allocated and assigned to a pointer in ast_string_field_mgr to preserve ABI
compatability.  In master, it can be converted to being a structure-in-place in
ast_string_field_mgr to eliminate the extra alloc and free calls.

Change-Id: Ia97c5345eec68717a15dc16fe2e6746ff2a926f4

3 years agoMerge "app_voicemail: Fix test_voicemail_notify_endl test."
Joshua Colp [Wed, 13 Apr 2016 10:21:05 +0000 (05:21 -0500)]
Merge "app_voicemail: Fix test_voicemail_notify_endl test."

3 years agopjproject: Add patch for removing strip of '[]' from header params
George Joseph [Tue, 12 Apr 2016 20:41:43 +0000 (14:41 -0600)]
pjproject:  Add patch for removing strip of '[]' from header params

From the patch submitted to Teluu on 4/12/2016
The wholesale stripping of '[]' from header parameters causes issues if
something (like a port) occurs after the final ']'.

'[2001:a::b]' will correctly parse to '2001:a::b'
'[2001:a::b]:8080' will correctly parse to '2001:a::b' but the scanner is left
with ':8080' and parsing stops with a syntax error.

I can't even find a case where stripping the '[]' is a good thing anyway.  Even
if you continued to parse and resulted in a string that looks like this...
'2001:a::b:8080', it's not valid.

This came up in Asterisk because Kamailio sends us a Contact with an alias
URI parameter that has an IPv6 address in it like this:
Contact: <sip:1171@;alias=[2001:1:2::3]~43691~6>
which should be legal but causes a syntax error because of the characters
after the final ']'.  Even if it didn't, the '[]' should still not be stripped.

I've run the Asterisk Test Suite for PJSIP (252 tests) many of which are IPv6
enabled.  No issues were caused by removing the code that strips the '[]'.

ASTERISK-25123 #close
Reported-by: Anthony Messina

Change-Id: I5cb33f4ebf07ee1f2b26d07caae715e2ec65595a

3 years agoMerge "res_pjsip_dialog_info: Add missing "direction" attribute in NOTIFY event"
Joshua Colp [Tue, 12 Apr 2016 18:29:20 +0000 (13:29 -0500)]
Merge "res_pjsip_dialog_info: Add missing "direction" attribute in NOTIFY event"

3 years agoapp_voicemail: Fix test_voicemail_notify_endl test.
Joshua Colp [Tue, 12 Apr 2016 14:10:45 +0000 (11:10 -0300)]
app_voicemail: Fix test_voicemail_notify_endl test.

The test_voicemail_notify_endl test checks the end-of-line
characters of an email message to confirm that they are consistent.
The test wrongfully assumed that reading from the email message
into a buffer will always result in more than 1 character being
read. This is incorrect. If only 1 character was read the test
would go outside of the buffer and access other memory causing
a crash.

The test now checks to ensure that 2 or more characters are read
in ensuring the test stays within the buffer.

ASTERISK-25874 #close

Change-Id: Ic2c89cea6e90f2c0bc2d8138306ebbffd4f8b710

3 years agoapp_voicemail/IMAP: function 'save_to_folder' creates wrong folder
Alexei Gradinari [Thu, 7 Apr 2016 17:02:19 +0000 (13:02 -0400)]
app_voicemail/IMAP: function 'save_to_folder' creates wrong folder

If try to move message to Cust1 (number 5)
the function 'save_to_folder' tries to create Greeting folder instead of Cust1.

This patch fixed it by setting GREETINGS_FOLDER = -1

ASTERISK-24927 #close

Change-Id: I03d1a761894bcc2d130ec9b003bbcddc28e25c51

3 years agores_pjsip: Add headers to AMI Event ContactStatusDetail
Alexei Gradinari [Thu, 7 Apr 2016 21:18:03 +0000 (17:18 -0400)]
res_pjsip: Add headers to AMI Event ContactStatusDetail

* Added Useragent and RegExpire headers to AMI Event
ContactStatusDetail with associated documentation.

ASTERISK-25903 #close

Change-Id: If3d121e943e588d016ba51d4eb9c6a421a562239

3 years agoMerge "res_pjsip_outbound_publish: Add transport for outbound PUBLISH"
zuul [Tue, 12 Apr 2016 02:26:08 +0000 (21:26 -0500)]
Merge "res_pjsip_outbound_publish: Add transport for outbound PUBLISH"

3 years agoMerge "alembic: Remove batch operations (and sqlite support)"
Joshua Colp [Tue, 12 Apr 2016 00:36:23 +0000 (19:36 -0500)]
Merge "alembic:  Remove batch operations (and sqlite support)"

3 years agoMerge "core_unreal: Fix hangupcauses not getting set on Local channels"
Joshua Colp [Mon, 11 Apr 2016 21:37:34 +0000 (16:37 -0500)]
Merge "core_unreal: Fix hangupcauses not getting set on Local channels"

3 years agoMerge "res_pjsip contact: Lock expiration/addition of contacts"
zuul [Mon, 11 Apr 2016 21:29:34 +0000 (16:29 -0500)]
Merge "res_pjsip contact:  Lock expiration/addition of contacts"

3 years agores_pjsip_outbound_publish: Add transport for outbound PUBLISH
Alexei Gradinari [Tue, 5 Apr 2016 21:56:39 +0000 (17:56 -0400)]
res_pjsip_outbound_publish: Add transport for outbound PUBLISH

The first available transport of the appropriate type is used now.
This patch adds new config option 'transport' for outbound-publish.
If transport is set then outbound PUBLISH requests will use this transport.

ASTERISK-25901 #close

Change-Id: Ib389130489b70e36795b0003fa5fd386e2680151

3 years agocore_unreal: Fix hangupcauses not getting set on Local channels
Jaco Kroon [Mon, 11 Apr 2016 19:26:57 +0000 (21:26 +0200)]
core_unreal: Fix hangupcauses not getting set on Local channels

ASTERISK-25912 #close

Change-Id: I8e72e6894feaf36c9450f2788d205d07baec23aa

3 years agoMerge "app_voicemail/IMAP: IMAP access FATAL error: Out of memory"
zuul [Mon, 11 Apr 2016 19:21:21 +0000 (14:21 -0500)]
Merge "app_voicemail/IMAP: IMAP access FATAL error: Out of memory"

3 years agores_pjsip contact: Lock expiration/addition of contacts
George Joseph [Fri, 1 Apr 2016 18:30:56 +0000 (12:30 -0600)]
res_pjsip contact:  Lock expiration/addition of contacts

Contact expiration can occur in several places:  res_pjsip_registrar,
res_pjsip_registrar_expire, and automatically when anyone calls
ast_sip_location_retrieve_aor_contact.  At the same time, res_pjsip_registrar
may also be attempting to renew or add a contact.  Since none of this was locked
it was possible for one thread to be renewing a contact and another thread to
expire it immediately because it was working off of stale data.  This was the
casue of intermittent registration/inbound/nominal/multiple_contacts test

Now, the new named lock functionality is used to lock the aor during contact
expire and add operations and res_pjsip_registrar_expire now checks the
expiration with the lock held before deleting the contact.

ASTERISK-25885 #close
Reported-by: Josh Colp

Change-Id: I83d413c46a47796f3ab052ca3b349f21cca47059

3 years agoMerge "lock: Add named lock capability"
Joshua Colp [Mon, 11 Apr 2016 17:58:44 +0000 (12:58 -0500)]
Merge "lock:  Add named lock capability"

3 years agopjproject: Add patch to fix Via IPv6 parsing
George Joseph [Sun, 10 Apr 2016 19:16:42 +0000 (13:16 -0600)]
pjproject:  Add patch to fix Via IPv6 parsing

There's a bug in pjproject's sip_parser where the ":" wasn't correctly
interpreted. This is causing IPv6 addresses in the "received" parameter of the
Via header to cause a syntax check failure.

This patch was submitted to Teluu on 4/10/2016.

ASTERISK-25910 #close
Reported-by: Anthony Messina

Change-Id: Ic7e4c4aa14ded61860401ec349f5177568c4d922

3 years agoMerge "pbx.h: Make ast_state_cb_type take more const."
Joshua Colp [Fri, 8 Apr 2016 20:47:50 +0000 (15:47 -0500)]
Merge "pbx.h: Make ast_state_cb_type take more const."

3 years agolock: Add named lock capability
George Joseph [Fri, 1 Apr 2016 01:04:29 +0000 (19:04 -0600)]
lock:  Add named lock capability

Locking some objects like sorcery objects can be tricky because the underlying
ao2 object may not be the same for all callers.  For instance, two threads that
call ast_sorcery_retrieve_by_id on the same aor name might actually get 2
different ao2 objects if the underlying wizard had to rehydrate the aor from a
database. Locking one ao2 object doesn't have any effect on the other even if
those objects had locks in the first place.

Named locks allow access control by keyspace and key strings.  Now an "aor"
named "1000" can be locked and any other thread attempting to lock "aor" "1000"
will wait regardless of whether the underlying ao2 object is the same or not.
Mutex and rwlocks are supported.

This capability will initially be used to lock an aor when multiple threads may
be attempting to prune expired contacts from it.

Change-Id: If258c0b7f92b02d07243ce70e535821a1ea7fb45

3 years agoapp_voicemail/IMAP: IMAP access FATAL error: Out of memory
Alexei Gradinari [Thu, 7 Apr 2016 16:37:43 +0000 (12:37 -0400)]
app_voicemail/IMAP: IMAP access FATAL error: Out of memory

Sometimes uw-imap function 'mail_fetchbody' returns huge len
which then pass to uw-imap function 'rfc822_base64'.
uw-imap tries to allocate huge memory and abort() on fail.

This patch check the len.
If the len more than max size (128 Mbytes) log error.
This patch also set variables len, newlen to avoid uninizialezed len.
This patch also check pointer returned by rfc822_base64.

ASTERISK-25899 #close

Change-Id: I4a0e7d655f11abef6a5224e2169df6d5c1f1caca

3 years agoMerge "pbx.c: Minor code rearangements."
Joshua Colp [Fri, 8 Apr 2016 16:59:55 +0000 (11:59 -0500)]
Merge "pbx.c: Minor code rearangements."

3 years agores_pjsip_dialog_info: Add missing "direction" attribute in NOTIFY event
Alexei Gradinari [Thu, 7 Apr 2016 21:39:19 +0000 (17:39 -0400)]
res_pjsip_dialog_info: Add missing "direction" attribute in NOTIFY event

BLF pickup isn't working on Cisco SPA and Snom phones
if the direction="recipient" attribute is missing in 'dialog' tag.

This patch adds direction="recipient" if extension state is

ASTERISK-24601 #close

Change-Id: I5b2c097ca29fd59e92ba237ca5d397cb1b0bcd8c

3 years agopbx.h: Make ast_state_cb_type take more const.
Richard Mudgett [Wed, 6 Apr 2016 22:57:20 +0000 (17:57 -0500)]
pbx.h: Make ast_state_cb_type take more const.

This eliminates some casts that I made a note saying v10 and above
would no longer need them.

Better late than never :)

Change-Id: I346cdb3032b6478ceb40eb6fe732978b54035572

3 years agopbx.c: Minor code rearangements.
Richard Mudgett [Thu, 7 Apr 2016 15:59:13 +0000 (10:59 -0500)]
pbx.c: Minor code rearangements.

* Pull out a loop invariant.

* Convert an else-if ladder to a switch statement.

Change-Id: I0a95cfa9474a4600b9865f7b444534d275b37e95

3 years agopbx: Update doxygen for extension state watchers.
Richard Mudgett [Thu, 7 Apr 2016 17:26:57 +0000 (12:26 -0500)]
pbx: Update doxygen for extension state watchers.

Change-Id: Id1403b12136de62a272c01bb355aef65fd2c2d1e

3 years agoMerge "pbx: Add support for autohints."
Joshua Colp [Thu, 7 Apr 2016 20:11:17 +0000 (15:11 -0500)]
Merge "pbx: Add support for autohints."

3 years agoalembic: Remove batch operations (and sqlite support)
George Joseph [Thu, 7 Apr 2016 16:49:43 +0000 (10:49 -0600)]
alembic:  Remove batch operations (and sqlite support)

Because SQLite doesn't support full ALTER capabilities, alembic scripts
require batch operations.  However, that capability wasn't available until
0.7.0 which some distributions haven't reached yet.  Therefore, the batch
operations introduced in commit 86d6e44cc (review 2319) have been reverted
and SQLite is unsupported again, for now anyway.

Tested the full upgrade and downgrade on MySQL/Mariadb and Postgresql.

ASTERISK-25890 #close
Reported-by: Harley Peters

Change-Id: I82eba5456736320256f6775f5b0b40133f4d1c80

3 years agores_pjsip_registrar_expire: Fix race condition at shutdown.
Joshua Colp [Thu, 7 Apr 2016 16:05:26 +0000 (13:05 -0300)]
res_pjsip_registrar_expire: Fix race condition at shutdown.

When shutting down, the PJSIP sorcery is destroyed. The registrar
expiration module queries the PJSIP sorcery to determine what
to expire. As there was no synchronization between termination
of the expiration thread and the unloading of the module it was
possible for the thread to try to access the PJSIP sorcery after
it had been destroyed.

This change ensures that the thread is shut down before allowing
the module to be considered unloaded.

Change-Id: I69fd239edbaaf160c2d37ae00d3ac06e5596fe8b

3 years agores_pjsip: Fix configuration setting of "regcontext".
Joshua Colp [Wed, 6 Apr 2016 21:28:49 +0000 (18:28 -0300)]
res_pjsip: Fix configuration setting of "regcontext".

Due to a merge problem two options were swapped causing the
regcontext setting to not get set.

Change-Id: Icb33edc668e7357bacbaec2861a6b5ac64edaff1

3 years agoframe.c: Copy the whole subclass in ast_frdup().
Jacek Konieczny [Wed, 6 Apr 2016 13:01:47 +0000 (15:01 +0200)]
frame.c: Copy the whole subclass in ast_frdup().

The problem is ast_frdup() does not copy whole frame.subclass for voice,
video and image frames, only the format is copied.  For video frames, the
subclass structure contains the .frame_ending flag used to put the RTP
marker where it needs to be.

ASTERISK-25894 #close

Change-Id: I812ca90e84ed5d4f473b997d0dd0d3c5a915fe33

3 years agoMerge "res_pjsip: Handle deferred SDP hold/unhold properly."
Joshua Colp [Wed, 6 Apr 2016 12:52:56 +0000 (07:52 -0500)]
Merge "res_pjsip: Handle deferred SDP hold/unhold properly."

3 years agoMerge "ARI: Add method to Dial a created channel."
Joshua Colp [Wed, 6 Apr 2016 10:43:47 +0000 (05:43 -0500)]
Merge "ARI: Add method to Dial a created channel."

3 years agoMerge "ARI: Add method to create a new channel."
Joshua Colp [Wed, 6 Apr 2016 10:43:36 +0000 (05:43 -0500)]
Merge "ARI: Add method to create a new channel."

3 years agoARI: Add method to Dial a created channel.
Mark Michelson [Wed, 30 Mar 2016 22:18:39 +0000 (17:18 -0500)]
ARI: Add method to Dial a created channel.

This adds a new ARI method that allows for you to dial a channel that
you previously created in ARI.

By combining this with the create method for channels, it allows for a
workflow where a channel can be created, manipulated, and then dialed.
The channel is under control of the ARI application during all stages of
the Dial and can even be manipulated based on channel state changes
observed within an ARI application.

The overarching goal for this is to eventually be able to add a dialed
channel to a Stasis bridge earlier than the "Up" state. However, at the
moment more work is needed in the Dial and Bridge APIs in order to
facilitate that.

ASTERISK-25889 #close

Change-Id: Ic6c399c791e66c4aa52454222fe4f8b02483a205

3 years agoARI: Add method to create a new channel.
Mark Michelson [Wed, 30 Mar 2016 22:01:28 +0000 (17:01 -0500)]
ARI: Add method to create a new channel.

This adds a new ARI method to the channels resource that allows for the
creation of a new channel. The channel is created and then placed into
the specified Stasis application.

This is different from the existing originate method that creates a
channel, dials it, and then places the answered channel into the
dialplan or a Stasis application. This method does not attempt to call
the channel at all. Dialing is left as a later step after channel
creation. This allows for pre-dialing channel manipulation if desired.


Change-Id: I3c96a0aba914b08e39f6256371a5bd4c92cbded8

3 years agoMerge "Dial: Add function to append already-created channel."
Joshua Colp [Tue, 5 Apr 2016 23:12:37 +0000 (18:12 -0500)]
Merge "Dial: Add function to append already-created channel."