Matt Jordan [Mon, 4 May 2015 12:45:04 +0000 (07:45 -0500)]
Merge "main/presencestate.c: Add trailing slash to test category."
Matt Jordan [Mon, 4 May 2015 09:04:04 +0000 (04:04 -0500)]
Merge "Remove unneeded uses of optional_api providers."
Matt Jordan [Mon, 4 May 2015 09:03:06 +0000 (04:03 -0500)]
Merge "Update configure.ac/Makefile for clang"
Corey Farrell [Sun, 3 May 2015 18:36:01 +0000 (14:36 -0400)]
main/presencestate.c: Add trailing slash to test category.
ASTERISK-25053
Reported by: Corey Farrell
Change-Id: I8c0375dd0818747b2d2e1ceaea87bfbeb2daf8d4
Joshua Colp [Sun, 3 May 2015 16:37:36 +0000 (11:37 -0500)]
Merge "cdr/cdr_csv.c: Add a new option to enable columns added in Asterisk 1.8"
Matt Jordan [Sun, 3 May 2015 15:54:12 +0000 (10:54 -0500)]
Merge "term: send proper reset sequence when black background is forced"
Diederik de Groot [Mon, 20 Apr 2015 18:03:56 +0000 (20:03 +0200)]
Update configure.ac/Makefile for clang
Created autoconf/ast_check_raii.m4: contains AST_CHECK_RAII which
checks compiler requirements for RAII:
gcc: -fnested-functions support
clang: -fblocks (and if required -lBlocksRuntime)
The original check was implemented in configure.ac and now has it's
own file. This function also sets C_COMPILER_FAMILY to either gcc or
clang for use by makefile
Created autoconf/ast_check_strsep_array_bounds.m4 (contains
AST_CHECK_STRSEP_ARRAY_BOUNDS):
which checks if clang is able to handle the optimized strsep & strcmp
functions (linux). If not, the standard libc implementation should be
used instead. Clang + the optimized macro's work with:
strsep(char *, char []), but not with strsepo(char *, char *).
Instead of replacing all the occurences throughout the source code,
not using the optimized macro version seemed easier
See 'define __strcmp_gc(s1, s2, l2) in bits/string2.h':
llvm-comment: Normally, this array-bounds warning are suppressed for
macros, so that unused paths like the one that accesses __s1[3] are
not warned about. But if you preprocess manually, and feed the
result to another instance of clang, it will warn about all the
possible forks of this particular if statement. Instead of switching
of this optimization, another solution would be to run the preproces-
sing step with -frewrite-includes, which should preserve enough
information so that clang should still be able to suppress the diag-
nostic at the compile step later on.
See also "https://llvm.org/bugs/show_bug.cgi?id=20144"
See also "https://llvm.org/bugs/show_bug.cgi?id=11536"
Makefile.rules: If C_COMPILER_FAMILY=clang then add two warning
suppressions:
-Wno-unused-value
-Wno-parentheses-equality
In an earlier review (reviewboard: 4550 and 4554), they were deemed a
nuisace and less than benefitial.
configure.ac:
Added AST_CHECK_RAII() see earlier
Added AST_CHECK_STRSEP_ARRAY_BOUNDS() see earlier
Removed moved content
ASTERISK-24917
Change-Id: I12ea29d3bda2254ad3908e279b7effbbac6a97cb
Rodrigo Ramírez Norambuena [Tue, 28 Apr 2015 09:49:18 +0000 (05:49 -0400)]
cdr/cdr_csv.c: Add a new option to enable columns added in Asterisk 1.8
This patch adds a new option to cdr.conf, 'newcdrcolumns', that will handle CDR
columns added in Asterisk 1.8. The columns are:
* peeraccount
* linkedid
* sequence
When enabled, the columns in the database entry will be populated with the data
from the CDR.
ASTERISK-24976 #close
Change-Id: I51a57063f4ae5e194a9d933a8df45dc8a4534f0b
Matt Jordan [Sun, 3 May 2015 14:19:16 +0000 (09:19 -0500)]
Merge "res_pjsip_dlg_options: Fix MODULEINFO section."
Corey Farrell [Sat, 2 May 2015 23:58:40 +0000 (19:58 -0400)]
Remove unneeded uses of optional_api providers.
A few cases exist where headers of optional_api provders are included but
not needed. This causes unneeded calls to ast_optional_api_use.
* Don't include optional_api.h from sip_api.h.
* Move 'struct ast_channel_monitor' to channel.h.
* Don't include monitor.h from chan_sip.c, channel.c or features.c.
The move of struct ast_channel_monitor is needed since channel.c depends on
it. This has no effect on users of monitor.h since channel.h is included
from monitor.h.
ASTERISK-25051 #close
Reported by: Corey Farrell
Change-Id: I53ea65a9fc9693c89f8bcfd6120649bfcfbc3478
Matt Jordan [Sat, 2 May 2015 15:19:14 +0000 (10:19 -0500)]
Merge "include/asterisk/channel.h: Fix typo"
Matt Jordan [Sat, 2 May 2015 15:17:31 +0000 (10:17 -0500)]
Merge "Astobj2: Fix initialization order of refdebug and AO2_DEBUG."
Corey Farrell [Sat, 2 May 2015 07:15:15 +0000 (03:15 -0400)]
res_pjsip_dlg_options: Fix MODULEINFO section.
Removed the extra space before "MODULEINFO" in res_pjsip_dlg_options.
This extra space prevented any of the dependencies from being seen by
menuselect, so building with default options would fail if PJSIP was
not installed.
This also makes the tool that extracts information for menuselect
tolerant of multiple spaces in the future.
ASTERISK-25033 #close
Reported by: Peter Whisker
Change-Id: Iccd54846f70c4a7a50cb5bf70b7bb5cb4bab3698
D Tucny [Sat, 2 May 2015 00:50:22 +0000 (20:50 -0400)]
term: send proper reset sequence when black background is forced
When using the force black background command-line option or configuration
option an invalid reset sequence is sent following a coloured output item
in the CLI, the result is that the colour is not 'turned off' and continues
until the next non-default coloured text output.
A reset sequence is already defined in term.c, but the ast_term_reset
function doesn't use it, instead building it's own invalid sequence and
returning that.
This patch changes that behaviour, removing the building of a reset sequence
and instead using the pre-built constant 'enddata' which is a suitable reset
sequence for this purpose.
ASTERISK-24896 #close
Reported by: Dan Tucny
Change-Id: I56323899123ae3264900389cae1f5b252aa3bf43
Corey Farrell [Fri, 1 May 2015 18:22:03 +0000 (14:22 -0400)]
Astobj2: Fix initialization order of refdebug and AO2_DEBUG.
This ensures that refdebug is initialized before AO2_DEBUG if
both are enabled, since AO2_DEBUG allocates a container.
This change also makes AO2_DEBUG initialization critical, a
failure will abort Asterisk startup. This is needed since
the failure would be caused by reg_containers allocation
failure, and that would result in a segmentation fault by
ao2_container_register later in startup.
ASTERISK-25048 #close
Reported by: Corey Farrell
Change-Id: I9a243ea3fc5653b48b931ba6d61971cb2e530244
Matt Jordan [Wed, 29 Apr 2015 19:49:23 +0000 (14:49 -0500)]
main/pbx: Improve performance of dialplan reloads with a large number of hints
The PBX core maintains two hash tables for hints: a container of the
actual hints (hints), along with a container of devices that are watching that
hint (hintdevices). When a dialplan reload occurs, each hint in the hints
container is destroyed; this requires a lookup in the container of devices to
find the device => hint mapping object. In the current code, this performs an
ao2_callback, iterating over each of the device to hint objects in the
hintdevices container. For a large number of hints, this is extremely
expensive: dialplan reloads with 20000 hints could take several minutes
in just this phase.
This patch improves the performance of this step in the dialplan reloads
by caching which devices are watching a hint on the hint object itself.
Since we don't want to create a circular reference, we just cache the
name of the device. This allows us to perform a smarter ao2_callback on
the hintdevices container during hint removal, hashing on the name of the
device and returning an iterator to the matching names. The overall
performance improvement is rather large, taking this step down to a number of
seconds as opposed to minutes.
In addition, this patch also registers the hint containers in the PBX
core with the astobj2 library. This allows for reasonable debugging to
hash collisions in those containers.
ASTERISK-25040 #close
Reported by: Matt Jordan
Change-Id: Iedfc97a69d21070c50fca42275d7b3e714e59360
Matt Jordan [Fri, 1 May 2015 11:55:23 +0000 (06:55 -0500)]
Merge "Prevent potential crash on blond transfer."
Corey Farrell [Thu, 30 Apr 2015 20:54:24 +0000 (16:54 -0400)]
Sample Configs: Fix syntax error in pjsip.conf
The sample pjsip.conf has a few comment lines that are missing the
semicolons at the start of the comment, causing the config to fail
load.
Change-Id: I776a38c916a7df7ee3e072fd0b21dbf4cc457352
Joshua Colp [Thu, 30 Apr 2015 20:21:38 +0000 (15:21 -0500)]
Merge "Build System: Fix issue with addons moduleinfo."
Mark Michelson [Thu, 30 Apr 2015 20:20:43 +0000 (15:20 -0500)]
Prevent potential crash on blond transfer.
Scenario:
Alice calls Bob. Bob performs a blond transfer to Carol. Carol rejects
the incoming call (or some other immediate circumstance causes Carol not
to answer the call)
What occurs in this case is that when the bridge between Alice and Bob
breaks, Alice is told to masquerade into Bob's channel that had placed
the call to Carol. The actual masquerade goes down without a hitch.
However, a channel fixup callback that attempts to publish dial events
over Stasis has a crash. The reason for this crash is that the datastore
on Bob's channel that placed the outbound call to Carol only had a bare
pointer to Carol's channel. Since Carol rejected the incoming call,
Carol's channel has been hung up and freed, meaning accessing her
channel results in a crash.
The fix here is simple. The dial fixup code has been altered to hold
references to the involved channels and to drop those references when
freeing data.
ASTERISK-25025 #close
Reported by Chet Stevens
Change-Id: I54eedda207b8ec7a69263353b43abe5746aea197
Corey Farrell [Thu, 30 Apr 2015 19:40:48 +0000 (15:40 -0400)]
Build System: Fix issue with addons moduleinfo.
The build system now scans additional sources when generating
moduleinfo for menuselect. Unfortunately the extra sources
for format_mp3 only exist if downloaded.
Use the Makefile macro 'wildcard' to allow moduleinfo generator
to ignore sources that do not exist.
Change-Id: I596604713b7345ce994f32197f8f6bfd9bcf4170
Joshua Colp [Thu, 30 Apr 2015 18:42:15 +0000 (15:42 -0300)]
res_ari_device_states: Fix dependency on res_stasis_device_state.
The res_ari_device_states module depends on res_stasis_device_state,
not res_stasis_device_states.
Change-Id: I26e02ad37f9e36bcc859867e2fad1b90452ec3de
Mark Michelson [Thu, 30 Apr 2015 16:11:19 +0000 (11:11 -0500)]
Merge "chan_dahdi: Add the chan_dahdi.conf force_restart_unavailable_chans option."
Richard Mudgett [Wed, 29 Apr 2015 19:29:10 +0000 (14:29 -0500)]
chan_dahdi: Add the chan_dahdi.conf force_restart_unavailable_chans option.
Some telco switches occasionally ignore ISDN RESTART requests. The fix
for ASTERISK-19608 added an escape clause for B channels in the restarting
state if the telco ignores a RESTART request. If the telco fails to
acknowledge the RESTART then Asterisk will assume the telco acknowledged
the RESTART on the second call attempt requesting the B channel by the
telco. The escape clause is good for dealing with RESTART requests in
general but it does cause the next call for the restarting B channel to be
rejected if the telco insists the call must go on that B channel.
chan_dahdi doesn't really need to issue a RESTART request in response to
receiving a cause 44 (Requested channel not available) code. Sending the
RESTART in such a situation is not required (nor prohibited) by the
standards. I think chan_dahdi does this for historical reasons to deal
with buggy peers to get channels unstuck in a similar fashion as the
chan_dahdi.conf resetinterval option.
* Add the chan_dahdi.conf force_restart_unavailable_chans compatability
option that when disabled will prevent chan_dahdi from trying to RESTART
the channel in response to a cause 44 code.
ASTERISK-25034 #close
Reported by: Richard Mudgett
Change-Id: Ib8b17a438799920f4a2038826ff99a1884042f65
Joshua Colp [Thu, 30 Apr 2015 11:04:34 +0000 (08:04 -0300)]
res_pjsip_outbound_registration: Fix double unref on error return.
When the PJSIP pjsip_regc_send function is invoked and an error
status returned the caller currently decrements the reference count
of the client state that it just incremented, assuming the
registration callback would not have been invoked. In practice
this is not correct. If the failure happens after the transaction
has been set up the callback will still be invoked. This will
cause the reference count to be incorrectly decremented twice, once
by the registration callback and second by the caller of
pjsip_regc_send.
This change makes it so that whether the callback is invoked or
not is known by the caller of pjsip_regc_send. Depending on
this it can know whether it is responsible for decrementing the
reference count of the client state or not.
ASTERISK-25037 #close
Reported by: Joshua Colp
Change-Id: I749dc12f3a22115c49c5d7d95ff42a5fa45319de
Rodrigo Ramírez Norambuena [Thu, 30 Apr 2015 07:07:06 +0000 (03:07 -0400)]
include/asterisk/channel.h: Fix typo
Change-Id: Ie584b85e16a94c255e60d0b1732ef9686464fef3
Matt Jordan [Wed, 29 Apr 2015 21:44:09 +0000 (16:44 -0500)]
Merge "ARI: Fix missing dependencies."
Matt Jordan [Wed, 29 Apr 2015 21:42:17 +0000 (16:42 -0500)]
Merge "res_fax: allow 2400 transmission rate according to v.27ter standard"
Matt Jordan [Wed, 29 Apr 2015 21:15:43 +0000 (16:15 -0500)]
main/rtp_engine: Fix DTLS double-free introduced by
0b6410c4f8
The patch in
0b6410c4f8 did correctly fix a memory leak of the DTLS
structures in the RTP engine. However, when a 'core reload' is issued, a
double free of the memory pointed to by the char *'s in the DTLS
configuration struct can occur, as ast_rtp_dtls_cfg_free does not set
the pointers to NULL when they are freed.
This patch sets those pointers to NULL, preventing a second call to
ast_rtp_dtls_cfg_free from corrupting memory.
ASTERISK-25022
Change-Id: I820471e6070a37e3c26f760118c86770e12f6115
Mark Michelson [Wed, 29 Apr 2015 21:11:27 +0000 (16:11 -0500)]
Merge "cdr/cdr_csv.c: Add missing space after comma."
Kevin Harwell [Wed, 29 Apr 2015 18:05:10 +0000 (13:05 -0500)]
res_fax: allow 2400 transmission rate according to v.27ter standard
A previous set of patches (see: ASTERISK-22790 & ASTERISK-23231) made it so
a v.27 modem was not allowed to have a minimum transmission rate of 2400 bits
per second. This reverts all or some of those patches since according to the
v.27ter standard a rate of 2400 bits per second is also supported.
One of the original patches also added 9600 bits per second support for v.27.
This patch also removes that since v.27ter only supports 2400/4800 bits per
second.
Also, since Asterisk specifically supports v.27ter the enum was renamed to
better reflect this.
ASTERISK-24955 #close
Reported by: Matt Jordan
Change-Id: I4b9dfb6bf7eff08463ab47ee1a74224f27cae733
Matt Jordan [Wed, 29 Apr 2015 18:37:20 +0000 (13:37 -0500)]
Merge "Astobj2: Add ao2_weakproxy_ref_object function."
Joshua Colp [Wed, 29 Apr 2015 18:09:20 +0000 (13:09 -0500)]
Merge "res_pjsip_outbound_registration: Don't fail on delayed processing."
Corey Farrell [Wed, 29 Apr 2015 04:35:22 +0000 (00:35 -0400)]
Astobj2: Add ao2_weakproxy_ref_object function.
This function allows code to run ao2_ref against the real
object associated with a weakproxy. It is useful when
all of the following conditions are true:
* You have a pointer to weakproxy.
* You do not have or need a pointer to the real object.
* You need to ensure the real object exists and is not
destroyed during a process.
In this case it's wasteful to store a pointer to the real
object just for the sake of releasing it later.
Change-Id: I38a319b83314de75be74207a8771aab269bcca46
Mark Michelson [Wed, 29 Apr 2015 17:28:24 +0000 (12:28 -0500)]
Merge "Git Conversion: Switch Non-C files to ASTERISK_REGISTER_FILE."
Mark Michelson [Mon, 27 Apr 2015 21:13:22 +0000 (16:13 -0500)]
res_pjsip_outbound_registration: Don't fail on delayed processing.
Odd behaviors have been observed during outbound registrations. The most
common problem witnessed has been one where a request with
authentication credentials cannot be created after receiving a 401
response. Other behaviors include apparently processing an incorrect SIP
response.
Inspecting the code led to an apparent issue with regards to how we
handle transactions in outbound registration code. When a response to a
REGISTER arrives, we save a pointer to the transaction and then push a
task onto the registration serializer. Between the time that we save the
pointer and push the task, it's possible for the transaction to be
destroyed due to a timeout. It's also possible for the address to be
reused by the transaction layer for a new transaction.
To allow for authentication of a REGISTER request to be authenticated
after the transaction has timed out, we now hold a reference to the
original REGISTER request instead of the transaction. The function for
creating a request with authentication has been altered to take the
original request instead of the transaction where the original request
was sent.
ASTERISK-25020
Reported by Mark Michelson
Change-Id: I756c19ab05ada5d0503175db9676acf87c686d0a
Joshua Colp [Wed, 29 Apr 2015 15:46:21 +0000 (12:46 -0300)]
res_sorcery_config: Fix build issue due to syntax error.
Change-Id: Ic8322f04e37842848ad72cf2871bd0378f67c4ac
Matt Jordan [Wed, 29 Apr 2015 15:13:03 +0000 (10:13 -0500)]
Merge "chan_pjsip: Creating Channel Causes Asterisk to Crash When Duplicate AOR Sections Exist in pjsip.conf"
Matt Jordan [Wed, 29 Apr 2015 14:49:43 +0000 (09:49 -0500)]
Merge topic 'ASTERISK-25027'
* changes:
res_pjsip: Remove incorrect MODULEINFO from presence_xml.c.
Git Migration: Create doc/rest-api when needed.
Matt Jordan [Wed, 29 Apr 2015 14:47:58 +0000 (09:47 -0500)]
Merge "Build System: Prevent unneeded changes to asterisk/buildopts.h."
Corey Farrell [Wed, 29 Apr 2015 11:46:44 +0000 (07:46 -0400)]
ARI: Fix missing dependencies.
ARI modules that are generated by 'make ari-stubs' are all dependent on
res_ari_model. Additionally some of the same modules depend on one or more
res_stasis_* modules.
ASTERISK-25027 #close
Reported by: Corey Farrell
Change-Id: I8e07fe7e81fedacb87232f2b6f8b5f47927b4153
Corey Farrell [Wed, 29 Apr 2015 11:26:13 +0000 (07:26 -0400)]
res_pjsip: Remove incorrect MODULEINFO from presence_xml.c.
Remove incorrect MODULEINFO block and unneeded header includes
from presence_xml.c.
ASTERISK-25027
Reported by: Corey Farrell
Change-Id: I977c609ab9d1fe05373027c4138900f6985990eb
Corey Farrell [Wed, 29 Apr 2015 11:17:00 +0000 (07:17 -0400)]
Git Migration: Create doc/rest-api when needed.
Create the directory './doc/rest-api' at the start of 'make ari-stubs'
to prevent an error when documentation is generated. The directory is
also added to git ignores.
ASTERISK-25027
Reported by: Corey Farrell
Change-Id: Iaccc7f0138501c23aa78feaca2f3cce9e68cbc1b
Joshua Colp [Wed, 29 Apr 2015 10:31:05 +0000 (05:31 -0500)]
Merge "chan_iax2: Ensure that IAX flags are 64 bits."
Corey Farrell [Wed, 29 Apr 2015 08:03:00 +0000 (04:03 -0400)]
Build System: Prevent unneeded changes to asterisk/buildopts.h.
* Add AST_DEVMODE to BUILDOPTS
* Use BUILDOPTS to generate AST_BUILDOPT_SUM.
* Remove loop that defined AST_MODULE_*
These changes ensure that only ABI effecting options are considered for
AST_BUILDOPT_SUM. This also reduces unneeded full system rebuilds caused
by enabling or disabling one module that another is dependent on.
ASTERISK-25028 #close
Reported by: Corey Farrell
Change-Id: I2c516d93df9f6aaa09ae079a8168c887a6ff93a2
Corey Farrell [Wed, 29 Apr 2015 05:02:10 +0000 (01:02 -0400)]
Git Conversion: Switch Non-C files to ASTERISK_REGISTER_FILE.
This switches files used to generate other sources to use the new
ASTERISK_REGISTER_FILE macro.
ASTERISK-25026 #close
Reported by: Corey Farrell
Change-Id: Ieb2537b83421cad07c8955e5f90c405ccf079740
Joshua Colp [Wed, 29 Apr 2015 00:18:29 +0000 (19:18 -0500)]
Merge "res_pjsip_outbound_registration: Add debugging messages."
Mark Michelson [Tue, 28 Apr 2015 21:38:11 +0000 (16:38 -0500)]
Merge "CHANGES: Add missing spaces."
Yousf Ateya [Tue, 28 Apr 2015 18:28:50 +0000 (20:28 +0200)]
chan_iax2: Ensure that IAX flags are 64 bits.
Flags are 64 bits. Without LLU suffix the value of 1<<31 is negative.
Although it doesn't have an effect on the current implementation, it will
be problem if more flags are added.
Change-Id: Ic290c81cfbbbf062872392d99d3322932cc49487
Ashley Sanders [Tue, 28 Apr 2015 05:29:42 +0000 (00:29 -0500)]
chan_pjsip: Creating Channel Causes Asterisk to Crash When Duplicate AOR
Sections Exist in pjsip.conf
This patch modifies the current loading strategy of the pjsip configuration. If
duplicate sections (e.g. sections containing the same [id/type]) are defined in
[pjsip.conf], the loader will consider the configuration for the given type as
invalid when the duplicate section is encountered. The entire configuration
(including what was previously loaded) for the duplicate [id/type] sections
will be rejected and destroyed, an error message is logged and the load
processing for the given stops.
ASTERISK-24996
Reported By: Ashley Sanders
Change-Id: I35090ca4cd40f1f34881dfe701a329145c347aef
Richard Mudgett [Tue, 28 Apr 2015 16:50:07 +0000 (11:50 -0500)]
chan_vpb: Fix compile error due to use of ASTERISK_FILE_VERSION.
Change-Id: I51179e2a83937423676da522b766f1126de4059e
Mark Michelson [Mon, 27 Apr 2015 19:44:16 +0000 (14:44 -0500)]
res_pjsip_outbound_registration: Add debugging messages.
When problems occur regarding outbound registrations, it currently
is difficult to debug. Most off-nominal paths had warning messages,
but sometimes we want to know what's going on before hitting the
off-nominal path. This patch adds lots of debugging output that
should give a clearer picture of what is happening with regards
to outbound registrations.
ASTERISK-25020
Reported by Mark Michelson
Change-Id: I577bde7860be0a6c872b5bcb4d5047340bf45d45
Joshua Colp [Tue, 28 Apr 2015 12:15:47 +0000 (07:15 -0500)]
Merge "Example script for scan-build (the llvm static analyzer)"
Steve Davies [Tue, 28 Apr 2015 10:38:30 +0000 (11:38 +0100)]
res_rtp_asterisk: Resolve 2 discrete memory leaks in DTLS
ao2 ref leak in res_rtp_asterisk.c when a DTLS policy is created.
The resources are linked into a table, but the original alloc refs
are never released. ast_strdup leak in rtp_engine.c. If
ast_rtp_dtls_cfg_copy() is called twice on the same destination struct,
a pointer to an alloc'd string is overwritten before the string is free'd.
ASTERISK-25022
Reported by: one47
Change-Id: I62a8ceb8679709f6c3769136dc6aa9a68202ff9b
Joshua Colp [Tue, 28 Apr 2015 11:55:30 +0000 (06:55 -0500)]
Merge "cdr/cdr_odbc.c: Added to record new columns add on CDR 1.8 Asterisk Version"
Matt Jordan [Tue, 28 Apr 2015 11:42:30 +0000 (06:42 -0500)]
Merge "Astobj2: Allow reference debugging to be enabled/disabled by config."
Rodrigo Ramírez Norambuena [Tue, 28 Apr 2015 09:28:37 +0000 (05:28 -0400)]
cdr/cdr_csv.c: Add missing space after comma.
Change-Id: I3866a20019b1a3a2f10fe36640053929330b0fcb
Rodrigo Ramírez Norambuena [Tue, 28 Apr 2015 03:01:25 +0000 (23:01 -0400)]
CHANGES: Add missing spaces.
Change-Id: I534ea0f22759e3633585dfa9b145b4a284efe67f
Corey Farrell [Fri, 17 Apr 2015 07:16:59 +0000 (03:16 -0400)]
Astobj2: Allow reference debugging to be enabled/disabled by config.
* The REF_DEBUG compiler flag no longer has any effect on code that uses
Astobj2. It is used to determine if reference debugging is enabled by
default. Reference debugging can be enabled or disabled in asterisk.conf.
* Caller information is provided in logger errors for ao2 bad magic numbers.
* Optimizes AO2 by merging internal functions with the public counterpart.
This was possible now that we no longer require a dual ABI.
ASTERISK-24974 #close
Reported by: Corey Farrell
Change-Id: Icf3552721fe999365ba8a8cf00a965aa6b897cc1
George Joseph [Mon, 27 Apr 2015 17:11:40 +0000 (11:11 -0600)]
res_pjsip: Fix SEGV on pending-qualify contacts
Permanent contacts that hadn't been qualified yet were missing
their contact_status entries causing SEGVs when running CLI
commands.
This patch makes sure that contact_statuses are created for
both dynamic and permanent contacts when they are created.
It also adds checks in the CLI code to make sure there's a
contact_status, just in case.
ASTERISK-25018 #close
Reported-by: Ivan Poddubny
Tested-by: Ivan Poddubny
Tested-by: George Joseph
Change-Id: I3cc13e5cedcafb24c400368b515b02d7fb81e029
Rodrigo Ramírez Norambuena [Wed, 15 Apr 2015 23:55:33 +0000 (20:55 -0300)]
cdr/cdr_odbc.c: Added to record new columns add on CDR 1.8 Asterisk Version
Add new column to INSERT new columns added in cdr 1.8 version. The columns are:
* peeraccount
* linkedid
* sequence
This feature is configurable in cdr_odbc.conf using a new configuration
option, 'newcdrcolumns'.
ASTERISK-24976 #close
Change-Id: Ibe0c7540a88305c6012786f438a0813ad8b19127
Matt Jordan [Sun, 26 Apr 2015 22:21:15 +0000 (17:21 -0500)]
channels/chan_skinny: Fix compilation error introduced in
f8e21a1adf
A typo in commit
f8e21a1adf resulted in a compilation error in
chan_skinny. This patch fixes the typo.
ASTERISK-24917
Change-Id: Id7f4ad1fe948eb2408622e80c27936ce4516c33c
Matt Jordan [Sun, 26 Apr 2015 20:53:58 +0000 (15:53 -0500)]
Merge "Clang: Fix some more tautological-compare warnings."
Matt Jordan [Fri, 24 Apr 2015 18:07:13 +0000 (13:07 -0500)]
Merge "app_confbridge: Default the template option to a compatible default profile."
Matt Jordan [Fri, 24 Apr 2015 17:24:02 +0000 (12:24 -0500)]
Merge "res_pjsip_outbound_authenticator: Increase CSeq on authed requests."
Kevin Harwell [Thu, 23 Apr 2015 22:29:51 +0000 (17:29 -0500)]
app_confbridge: Default the template option to a compatible default profile.
Confbridge dynamic profiles did not have a default profile unless you
explicitly used Set(CONFBRIDGE(bridge,template)=default_bridge). If a
template was not set prior to the bridge being created then some
options were left with no default values set. This patch makes it so
the default templates are set to the default bridge and user profiles.
ASTERISK-24749 #close
Reported by: philippebolduc
Change-Id: I1bd6e94b38701ac2112d842db68de63d46f60e0a
Joshua Colp [Fri, 24 Apr 2015 16:36:17 +0000 (11:36 -0500)]
Merge "CHANGES remove tab space"
Joshua Colp [Fri, 24 Apr 2015 15:33:12 +0000 (10:33 -0500)]
Merge "CREDITS: Update credits for Olle Johansson"
Olle E. Johansson [Thu, 23 Apr 2015 12:31:42 +0000 (14:31 +0200)]
CREDITS: Update credits for Olle Johansson
Change-Id: I8f3d0a6c3f1075a1f7d8308593394611a96749de
Mark Michelson [Fri, 24 Apr 2015 14:17:25 +0000 (09:17 -0500)]
res_pjsip_outbound_authenticator: Increase CSeq on authed requests.
The way PJSIP generates an authenticated request is to use a previous
request as a template. This means that the authenticated request will
have the same Call-ID, From header (including tag), and CSeq as the
original request. PJSIP generates a new branch on the Via header to
indicate that this is a new transaction, though.
There are some SIP implementations, though, that do not notice the
change in the branch and therefore will match the authed request to the
original request's transaction. Since the CSeq is the same, the server
will repeat the response it sent to the original request.
This patch aids interoperability by increasing the CSeq of the authed
request by one.
ASTERISK-24845 #close
Reported by: Carl Fortin
Tested by: Carl Fortin
Change-Id: I39c4ca52e688a9f83bcc1878371334becdc5be01
Diederik de Groot [Wed, 22 Apr 2015 09:17:56 +0000 (11:17 +0200)]
Clang: Fix some more tautological-compare warnings.
clang can warn about a so called tautological-compare, when it finds
comparisons which are logically always true, and are therefor deemed
unnecessary.
Exanple:
unsigned int x = 4;
if (x > 0) // x is always going to be bigger than 0
Enum Case:
Each enumeration is its own type. Enums are an integer type but they
do not have to be *signed*. C leaves it up to the compiler as an
implementation option what to consider the integer type of a particu-
lar enumeration is. Gcc treats an enum without negative values as
an int while clang treats this enum as an unsigned int.
rmudgett & mmichelson: cast the enum to (unsigned int) in assert.
The cast does have an effect. For gcc, which seems to treat all enums
as int, the cast to unsigned int will eliminate the possibility of
negative values being allowed. For clang, which seems to treat enums
without any negative members as unsigned int, the cast will have no
effect. If for some reason in the future a negative value is ever
added to the enum the assert will still catch the negative value.
ASTERISK-24917
Change-Id: Ief23ef68916192b9b72dabe702b543ecfeca0b62
Diederik de Groot [Mon, 20 Apr 2015 18:06:20 +0000 (20:06 +0200)]
Example script for scan-build (the llvm static analyzer)
- Added Pre-amble (Options / Flags / Usage Example / GNU License)
- Extended Configurability
- Made Executable
ASTERISK-24917
Change-Id: I70405fe54e4be7dbfbcb62e291690069b88617a8
Matt Jordan [Fri, 24 Apr 2015 14:24:54 +0000 (09:24 -0500)]
Merge "res_pjsip_t38: Don't crash on authenticated reinvite after originated T.38 FAX."
Mark Michelson [Thu, 23 Apr 2015 22:23:50 +0000 (17:23 -0500)]
Merge "Clang: change previous tautological-compare fixes."
Mark Michelson [Thu, 23 Apr 2015 17:54:30 +0000 (12:54 -0500)]
res_pjsip_t38: Don't crash on authenticated reinvite after originated T.38 FAX.
When Asterisk originates a channel to an application, the channel is
hung up once the application finishes executing. When the application
in question is SendFax, the Asterisk PJSIP code will attempt to reinvite
the T.38 session to audio after the FAX completes. The hangup of the
channel happens in the midst of this reinvite transaction. In most
circumstances, this works out okay because the BYE is delayed until the
reinvite transaction can complete.
However, if the reinvite that Asterisk sends receives a 401/407
response, then Asterisk's attempt to re-send the reinvite with
authentication will fail. This is because the session supplement in
res_pjsip_t38 makes the assumption that the channel on the session will
always be non-NULL. Since the channel has been hung up, though, the
channel is now NULL. Attempting to operate on the channel causes a
crash.
This patch fixes the issue by ensuring that the channel on the session
is not NULL before attempting to mess with the T.38 framehook.
This patch also contains some corrections for comments that were
incorrect and really confused me when I first started looking at the
code.
ASTERISK-25004 #close
Reported by Mark Michelson
Change-Id: Ic5a1230668369dda4bb13524098aed9306ab45a0
George Joseph [Thu, 23 Apr 2015 14:16:45 +0000 (08:16 -0600)]
res_pjsip: Validate that contact uris start with sip: or sips:
Currently we use pjsip_parse_hdr to validate contact uris but it
appears that it allows uris without a scheme if there's a port
supplied. I.E myexample.com will fail but myexample.com:5060 will
pass even though it has no scheme. This causes SEGVs later on
whenever the uri is used.
To prevent this, permanent_contact_validate has been updated to check
that the scheme is either 'sip' or 'sips'.
2 uses of possibly-null endpoint have also been fixed in
create_out_of_dialog_request.
ASTERISK-24999
Change-Id: Ifc17d16a4923e1045d37fe51e43bbe29fa556ca2
Reported-by: Brad Latus
Diederik de Groot [Thu, 23 Apr 2015 13:00:42 +0000 (15:00 +0200)]
Clang: change previous tautological-compare fixes.
clang can warn about a so called tautological-compare, when it finds
comparisons which are logically always true, and are therefor deemed
unnecessary.
Exanple:
unsigned int x = 4;
if (x > 0) // x is always going to be bigger than 0
Enum Case:
Each enumeration is its own type. Enums are an integer type but they
do not have to be *signed*. C leaves it up to the compiler as an
implementation option what to consider the integer type of a particu-
lar enumeration is. Gcc treats an enum without negative values as
an int while clang treats this enum as an unsigned int.
rmudgett & mmichelson: cast the enum to (unsigned int) in assert.
The cast does have an effect. For gcc, which seems to treat all enums
as int, the cast to unsigned int will eliminate the possibility of
negative values being allowed. For clang, which seems to treat enums
without any negative members as unsigned int, the cast will have no
effect. If for some reason in the future a negative value is ever
added to the enum the assert will still catch the negative value.
ASTERISK-24917
Change-Id: I0557ae0154a0b7de68883848a609309cdf0aee6a
Matt Jordan [Thu, 23 Apr 2015 11:50:52 +0000 (06:50 -0500)]
Merge "Astobj2: Ensure all calls to __adjust_lock pass a valid object."
Matt Jordan [Thu, 23 Apr 2015 11:31:16 +0000 (06:31 -0500)]
Merge "New AMI Command Output Format"
George Joseph [Wed, 22 Apr 2015 21:22:10 +0000 (15:22 -0600)]
res_corosync: Add check for config file before calling corosync apis
On some systems, res_corosync isn't compatible with the installed version of
corosync so corosync_cfg_initialize fails, load_module returns LOAD_FAILURE,
and Asterisk terminates. The work around has been to remember to add
res_corosync as a noload in modules.conf. A better solution though is to have
res_corosync check for its config file before attempting to call corosync apis
and return LOAD_DECLINE if there's no config file. This lets Asterisk loading
continue.
If you have a res_corosync.conf file and res_corosync fails, you get the same
behavior as today and the fatal error tells you something is wrong with the
install.
ASTERISK-24998
Change-Id: Iaf94a9431a4922ec4ec994003f02135acfdd3889
Corey Farrell [Wed, 22 Apr 2015 20:17:53 +0000 (16:17 -0400)]
Astobj2: Ensure all calls to __adjust_lock pass a valid object.
__adjust_lock doesn't check for invalid objects, and doesn't have an
appropriate return value for invalid objects. Most callers of
__adjust_lock pass objects that have already been confirmed valid,
this change adds checks before the remaining calls.
ASTERISK-24997 #close
Reported by: Corey Farrell
Change-Id: I669100f87937cc3f867cec56a27ae9c01292908f
George Joseph [Wed, 22 Apr 2015 21:32:53 +0000 (15:32 -0600)]
.gitignore: Add .gcno and .gcda
Products of --enable-coverage
Change-Id: Ie20882d64b60692e2c941ea8872ab82a86ce77a3
Matt Jordan [Wed, 22 Apr 2015 19:26:02 +0000 (14:26 -0500)]
Merge "dns: Make query sets hold on to queries for their lifetime."
Matt Jordan [Wed, 22 Apr 2015 19:25:47 +0000 (14:25 -0500)]
Merge "Fix/Update clang-RAII macro implementation"
Mark Michelson [Wed, 22 Apr 2015 19:07:58 +0000 (14:07 -0500)]
Merge "res_pjsip_mwi: Send unsolicited MWI NOTIFY on startup and when endpoint registers."
Joshua Colp [Wed, 22 Apr 2015 16:28:09 +0000 (13:28 -0300)]
dns: Make query sets hold on to queries for their lifetime.
The query set documentation states that upon completion queries can be
retrieved for the lifetime of the query set. This is a reasonable
expectation but does not currently occur. This was originally done
to resolve a circular reference between queries and query sets, but
in practice the query can be kept.
This change makes it so a query does not have a reference to the
query set until it begins resolving. It also makes it so that the
reference is given up upon the query being completed. This allows
the queries to remain for the lifetime of the query set. As the
query set on the query is only useful to the query set functionality
and only for the lifetime that the query is resolving this is safe
to do.
ASTERISK-24994 #close
Reported by: Joshua Colp
Change-Id: I54e09c0cb45475896654e7835394524e816d1aa0
Matt Jordan [Wed, 22 Apr 2015 11:27:38 +0000 (06:27 -0500)]
Merge "cdr/cdr_adaptive_odbc.c: Refactor concatenate columns name."
Diederik de Groot [Mon, 20 Apr 2015 18:01:35 +0000 (20:01 +0200)]
Fix/Update clang-RAII macro implementation
- When you need to refer to 'variable XXX' outside a block, it needs
to be declared as '__block XXX', otherwise it will not be available with-
in the block, making updating that variable hard to do, and ast_free
lead to issues.
- Removed the #error message
because it creates complications when compiling external projects
against asterisk For example when using a different compiler than the
one used to compile asterisk. The warning/error should be generated
during the configure process not the compilation process
ASTERISK-24917
Change-Id: I12091228090e90831bf2b498293858f46ea7a8c2
Joshua Colp [Wed, 22 Apr 2015 10:46:00 +0000 (05:46 -0500)]
Merge "Check for ao2_alloc failure in __ast_channel_internal_alloc."
Joshua Colp [Tue, 14 Apr 2015 19:04:46 +0000 (16:04 -0300)]
res_pjsip_mwi: Send unsolicited MWI NOTIFY on startup and when endpoint registers.
Currently the res_pjsip_mwi module only sends an unsolicited MWI NOTIFY upon
a mailbox state change (such as a new message being left, or one being deleted).
In practice this is not sufficient to keep clients aware of the current MWI status.
This change makes the module send unsolicited MWI NOTIFY on startup so that
clients are guaranteed to have the most up to date MWI information. It also makes
clients receive an unsolicited MWI NOTIFY upon registration so if they are unaware
of the current MWI status they receive it.
ASTERISK-24982 #close
Reported by: Joshua Colp
Change-Id: I043f20230227e91218f18a82c7d5bb2aa62b1d58
Joshua Colp [Wed, 22 Apr 2015 10:29:18 +0000 (05:29 -0500)]
Merge "res_pjsip_pubsub: Set the endpoint on SUBSCRIBE dialogs."
Rodrigo Ramírez Norambuena [Tue, 21 Apr 2015 22:45:43 +0000 (19:45 -0300)]
CHANGES remove tab space
Change-Id: I6b43e43474bf6fb77b8227eadb036036f8e90521
Corey Farrell [Tue, 21 Apr 2015 20:17:33 +0000 (16:17 -0400)]
Check for ao2_alloc failure in __ast_channel_internal_alloc.
Fix a crash that could occur in __ast_channel_internal_alloc if
ao2_alloc fails.
ASTERISK-24991 #close
Change-Id: I4ca89189eb22f907408cb87d0a1645cfe1314a90
Mark Michelson [Mon, 20 Apr 2015 19:30:47 +0000 (14:30 -0500)]
res_pjsip_pubsub: Set the endpoint on SUBSCRIBE dialogs.
When SUBSCRIBE dialogs were established, we never associated
the endpoint that created the subscription with the dialog
we end up creating. In most cases, this ended up not causing
any problems.
The actual bug that was observed was that when a device that
was behind NAT established a subscription with Asterisk, Asterisk
would end up sending in-dialog NOTIFY requests to the device's
private IP addres instead of the public address of the NAT router.
When Asterisk receives the initial SUBSCRIBE from the device,
res_pjsip_nat rewrites the contact to the public address on which the
SUBSCRIBE was received. This allows for the dialog to have its target
address set to the proper public address. Asterisk then would send a 200
OK response to the SUBSCRIBE, then a NOTIFY with the initial
subscription state. The device would then send a 200 OK response to
Asterisk's NOTIFY.
Here's where things went wrong. When the 200 OK arrived, res_pjsip_nat
did not rewrite the address in the Contact header. Then, when the PJSIP
dialog layer processed the 200 OK, PJSIP would perform a comparison
between the IP address in the Contact header and its saved target
address for the dialog. Since they differed, PJSIP would update the
target dialog address to be the address in the Contact header. From this
point, if Asterisk needed to send a NOTIFY to the device, the result was
that the NOTIFY would be sent to the private address that the device
placed in the Contact header.
The reason why res_pjsip_nat did not rewrite the address when it
received the 200 OK response was that it could not associate the
incoming response with a configured endpoint. This is because on a
response, the only way to associate the response to an endpoint is by
finding the dialog that the response is associated with and then finding
the endpoint that is associated with that dialog. We do not perform
endpoint lookups on responses. res_pjsip_pubsub skipped the step of
associating the endpoint with the dialog we created, so res_pjsip_nat
could not find the associated endpoint and therefore couldn't rewrite
the contact.
This commit message is like 50x longer than the actual fix.
ASTERISK 24981 #close
Reported by Mark Michelson
Change-Id: I2b963c58c063bae293e038406f7d044a8a5377cd
Gareth Palmer [Fri, 17 Apr 2015 03:34:59 +0000 (15:34 +1200)]
New AMI Command Output Format
This change modifies how the the output from a CLI command is sent
to a client over AMI.
Output from the CLI command is now sent as a series of zero-or-more
Output: headers.
Additionally, commands that fail to execute (eg: no such command,
invalid syntax etc.) now cause an Error response instead of Success.
If the command executed successfully, but the manager unable to
provide the output the reason will be included in the Message:
header. Otherwise it will contain 'Command output follows'.
Depends on a new version of starpy (> 1.0.2) that supports the new
output format.
See pull-request https://github.com/asterisk/starpy/pull/34
ASTERISK-24730
Change-Id: I6718d95490f0a6b3f171c1a5cdad9207f9a44888
Richard Mudgett [Mon, 20 Apr 2015 23:00:34 +0000 (18:00 -0500)]
chan_dahdi/sig_pri: Make post AMI HangupRequest events on PRI channels.
The chan_dahdi channel driver is a very old driver. The ability for it to
support ISDN was added well after the initial analog support. Setting the
softhangup flags is a carry over from the original analog code. The
driver was not updated to call ast_queue_hangup() which will post the AMI
HangupRequest event.
* Changed sig_pri.c to call ast_queue_hangup() instead of setting the
softhangup flag when the remote party initiates a hangup.
ASTERISK-24895 #close
Reported by: Andrew Zherdin
Change-Id: I5fe2e48556507785fd8ab8e1c960683fd5d20325
Joshua Colp [Mon, 20 Apr 2015 22:24:04 +0000 (17:24 -0500)]
Merge "pjsip_options: Fix non-qualified contacts showing as unavailable"
Rodrigo Ramírez Norambuena [Mon, 20 Apr 2015 18:40:12 +0000 (15:40 -0300)]
cdr/cdr_adaptive_odbc.c: Refactor concatenate columns name.
The concatenate for columns name to INSERT INTO is always the same. It is
possible to do it on one line.
ASTERISK-24980
Change-Id: Ib8bb53c42535378581d4ef729cc5ebbb22b067ac
George Joseph [Mon, 20 Apr 2015 14:53:00 +0000 (08:53 -0600)]
pjsip_options: Fix format specifier for int64_t rtt.
Contact status rtt is an int64_t and needs the PRId64 macro to
properly create the format specifier on 32-bit systems.
Change-Id: I4b8ab958fc1e9a179556a9b4ffa49673ba9fdec7
Matt Jordan [Mon, 20 Apr 2015 11:30:03 +0000 (06:30 -0500)]
Merge "main/pbx: Don't attempt to destroy a previously destroyed exten/priority tuple"