Commit Graph

29615 Commits

Author SHA1 Message Date
Tzafrir Cohen
ce71acf9ca cdr_mysql: avoid releasing a config string
Fixes a memory corruption issue after a reload of cdr_mysql.

Issue was accidentally included in 747beb1ed1 .

ASTERISK-27270 #close

Change-Id: I90b6a9d18710c0f9009466370bd5f4bac5d5d12e
2017-10-11 17:30:50 -05:00
Jenkins2
e1009588a5 Merge "chan_vpb: Fix a gcc 7 out-of-bounds complaint" into 14 2017-10-11 16:32:47 -05:00
Jenkins2
304403fe11 Merge "app_originate: Set ORIGINATE_STATUS correctly on failure" into 14 2017-10-11 15:14:18 -05:00
Jenkins2
165fdf2a66 Merge "cdr.c: Eliminated simple RAII_VAR usages." into 14 2017-10-11 11:04:16 -05:00
George Joseph
5bdad97458 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
2017-10-11 07:10:16 -05:00
Jenkins2
f3f3dcbf9e Merge "res_pjsip_registrar.c: Update remove_existing AOR contact handling." into 14 2017-10-11 06:44:15 -05:00
Sean Bright
1541e2c70a 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
2017-10-10 12:07:32 -05:00
Torrey Searle
5470c0d9a2 contrib/thirdparty/sip_to_pjsip: add additional flag mappings
add mappings for udptl redundancy, rtptimeout, and debug flags

Change-Id: Ie73cf5c83c05dee01eb9624ede76c1a30225d73a
2017-10-10 10:49:52 -05:00
Richard Mudgett
dde9694bdc cdr.c: Eliminated simple RAII_VAR usages.
Change-Id: I150505db307249a962987e7b941bdd369bb91f35
2017-10-10 09:59:09 -05:00
Joshua Colp
b67e4a390e Merge "res_pjproject: Fix cleanup of buildopts vector." into 14 2017-10-10 09:46:49 -05:00
Jenkins2
33a53bb100 Merge "tcptls: Do not re-bind to wildcard on client creation." into 14 2017-10-10 08:07:20 -05:00
Corey Farrell
5675fb9927 res_pjproject: Fix cleanup of buildopts vector.
ASTERISK-27306

Change-Id: I3bed0edf3f55b1d4adcbabb25ec14f11dc766c72
2017-10-09 23:17:35 -05:00
Joshua Colp
9bb9b2f53f Merge "cdr.h: Fix doxygen comments." into 14 2017-10-09 19:52:06 -05:00
Jenkins2
d5b2f4c346 Merge "cdr.c: Replace redundant check with an ast_assert()" into 14 2017-10-09 19:51:35 -05:00
Joshua Colp
3f4cca8f46 Merge "cdr.c: Use current ao2 flag names" into 14 2017-10-09 18:35:27 -05:00
Jenkins2
1c3345ac3f Merge "res_pjsip: Fix issues that prevented shutdown of modules." into 14 2017-10-09 17:51:12 -05:00
Jenkins2
521c73955b Merge "cdr.c: Replace inlined code with ao2_t_replace()" into 14 2017-10-09 17:21:04 -05:00
Joshua Colp
596cf586e0 Merge "res_config_sqlite: Don't enable SQLite CDRs when running 'make samples'" into 14 2017-10-09 16:02:18 -05:00
Jenkins2
3ee963585a Merge "res_pjsip: Fix leak of persistent endpoint references." into 14 2017-10-09 15:37:31 -05:00
Richard Mudgett
d1b63e2323 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
2017-10-09 13:34:10 -05:00
Richard Mudgett
e43959cda7 cdr.c: Replace inlined code with ao2_t_replace()
Change-Id: I9f424f5282ca7d833592f958d95f1b2bafb549b0
2017-10-09 13:29:56 -05:00
Richard Mudgett
3c6b20bd34 cdr.c: Use current ao2 flag names
Change-Id: Ib59d7d2f2a4a822754628f2c48a308d6791a6e6e
2017-10-09 13:27:36 -05:00
Richard Mudgett
f9f9a5412f cdr.h: Fix doxygen comments.
* Also some misc formatting in cdr.c.

Change-Id: Ied89a28802a662c37c43326a1aafdce596e0df4a
2017-10-09 13:25:15 -05:00
Richard Mudgett
b145619594 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
2017-10-09 12:53:11 -05:00
Corey Farrell
cf474bf57a 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
2017-10-09 12:29:24 -04:00
Sean Bright
4bdc3540fe res_config_sqlite: Don't enable SQLite CDRs when running 'make samples'
Change-Id: I65a5190b2732b2246d67472db70dd37db64ddad4
2017-10-09 08:16:29 -05:00
hajekd
5b4fc0699a 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
2017-10-09 08:05:09 -05:00
Alexander Traud
20fd595890 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
2017-10-08 09:23:13 -05:00
Corey Farrell
cacf938d38 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
2017-10-06 15:54:02 -05:00
Jenkins2
09932a13ef Merge "vector: multiple evaluation of elem in AST_VECTOR_ADD_SORTED." into 14 2017-10-06 15:20:29 -05:00
Jenkins2
b4ed8c4e4f Merge "res_pjsip: Fix leak of fake_auth references." into 14 2017-10-06 13:56:02 -05:00
Corey Farrell
e71f6d4dfa 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
2017-10-06 13:38:57 -05:00
Jenkins2
acb53a2295 Merge "main/strings: Fix uninitialized value." into 14 2017-10-06 13:24:40 -05:00
Corey Farrell
3e2cb5a9e9 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
2017-10-06 09:24:43 -05:00
Corey Farrell
3421b1de27 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
2017-10-05 20:28:19 -05:00
Daniel Tryba
e8ed162941 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
2017-10-05 14:39:53 +02:00
Joshua Colp
0991cb0a8f Merge "app_queue.c: Fix announcements when announce-to-first-user not enabled." into 14 2017-10-04 14:52:26 -05:00
krells
44d443d87e 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
2017-10-04 10:02:37 -05:00
Jenkins2
752d55f719 Merge "heap.c: No need to calloc heap pointer array." into 14 2017-10-03 20:37:39 -05:00
Jenkins2
4fdc39bcfb Merge "logger: Bring back ability to turn debug on by source file" into 14 2017-10-03 10:01:49 -05:00
Richard Mudgett
699b6a70d5 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
2017-09-28 18:47:58 -05:00
Richard Mudgett
37935c79f6 heap.c: No need to calloc heap pointer array.
Change-Id: I5ae2f316229f336eb90d99c7af7ed07a33097e68
2017-09-28 15:49:21 -05:00
Jenkins2
88ba803110 Merge "pjsip_message_filter: Fix regression causing bad contact address" into 14 2017-09-28 13:25:51 -05:00
George Joseph
00fc98d330 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
2017-09-28 12:18:41 -05:00
Joshua Colp
821927b077 Merge "pjproject: Patch to correct STUN FINGERPRINT usage" into 14 2017-09-28 08:07:27 -05:00
Jenkins2
77558d80f3 Merge "res_rtp_asterisk.c: Fix bridge_p2p_rtp_write() reentrancy potential." into 14 2017-09-28 06:47:26 -05:00
Richard Mudgett
de99052acb 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
2017-09-27 11:16:16 -05:00
George Joseph
3c5c31f14c 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
2017-09-26 11:46:46 -05:00
Richard Mudgett
738da78786 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
2017-09-26 11:18:49 -05:00
Jenkins2
9bd204f64a Merge "channel.c: Fix invalid reference in conditionaled out code." into 14 2017-09-26 06:47:22 -05:00