Richard Mudgett [Fri, 2 Nov 2012 21:01:33 +0000 (21:01 +0000)]
Things don't need to be that const.
........
Merged revisions 375658 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375659 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375661 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375662
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Fri, 2 Nov 2012 18:46:58 +0000 (18:46 +0000)]
Multiple revisions 375519-375524
........
r375519 | rmudgett | 2012-10-30 16:06:15 -0500 (Tue, 30 Oct 2012) | 11 lines
chan_misdn: Timer primitives must be handled first.
The frm->addr is a different "address space" than the stack/instance
address of other Lx primitives. The test for B channel instance address
could fail.
Patches:
patch01_timers.diff (license #6372) patch uploaded by Guenther Kelleter
JIRA ABE-2888
........
r375520 | rmudgett | 2012-10-30 16:14:58 -0500 (Tue, 30 Oct 2012) | 10 lines
chan_misdn: Free memory in error paths and other memory leaks.
The one line commented with BUG is not easily fixable because there is no
de-init function one can call.
Patches:
patch02_memory.diff (license #6372) patch uploaded by Guenther Kelleter
JIRA ABE-2888
........
r375521 | rmudgett | 2012-10-30 16:38:41 -0500 (Tue, 30 Oct 2012) | 14 lines
chan_misdn: ISDN NT L2 de-establish/establish
* An NT-PTMP cannot de/establish L2 since it doesn't know the TEIs.
* On NT-PTP L2 is started when L1 is finally active in handle_l1.
* L2 deactivation logging cleanup.
* L2 aggregate link status is unknown for NT-PTMP, show as "UNKN".
* Removed unused functions and code for L2 handling.
Patches:
patch03_L2estab.diff (license #6372) patch uploaded by Guenther Kelleter
Modified
JIRA ABE-2888
........
r375522 | rmudgett | 2012-10-30 16:56:14 -0500 (Tue, 30 Oct 2012) | 22 lines
chan_misdn: Fix broken upper_id/lower_id usage.
Sending PH prim via lower_id layer (3 or 1) simply does not work. For TE
(3) it returns an error (len=-6) which is not evaluated by handle_l1(), so
the L1 layer status ends up wrong. Instead PH must be sent via L4, only
then does it reach L1 without an error message.
And NT PH prims only reach L1 when they are sent to layer 2 id.
--> use upper_id to send PH primitives.
* Check for errors in PH_(DE)ACTIVATE | CONFIRM.
* Debug messages are improved.
* The lower_id is now not used for anything, except: Why is lower_id layer
deleted when it wasn't created? I removed this code since it looks very
wrong.
Patches:
patch04_l1activation.diff (license #6372) patch uploaded by Guenther Kelleter
JIRA ABE-2888
........
r375523 | rmudgett | 2012-10-30 17:29:15 -0500 (Tue, 30 Oct 2012) | 31 lines
chan_misdn: Fix loss of B channels if L1 is down.
If you make 2 calls out an NT PTMP port which is not connected to any
phone, the B channel associated with that call becomes unusable until
Asterisk is restarted.
The problem is the EVENT_SETUP is queued when L1 is not up in
misdn_lib_send_event(). If L1 cannot be activated the event won't be
dequeued. It gets even worse when the call is hung up. The queued
EVENT_SETUP will be overwritten by an EVENT_DISCONNECT. The reserved B
channel then will never be freed. If later someone connects a phone to
the port, L1 will eventually activate and the queued EVENT_DISCONNECT is
sent down the stack. However, it is ignored because it is the wrong call
state.
The real fix would be that activation and queueing for a new SETUP is done
by the NT stack. But since it doesn't, the workaround must be removed
because it doesn't always work.
Fix: The event is no longer queued but immediately sent to the stack. If
L1 cannot be activated, the L3 state machine that was started by the
EVENT_SETUP will do its work, i.e. a timeout will release the B channel
properly. The SETUP possibly cannot be sent the first time but is resent
by T303 in case L1 could be activated.
Patches:
patch05_bchan-loss.diff (license #6372) patch uploaded by Guenther Kelleter
Modified
JIRA ABE-2888
........
r375524 | rmudgett | 2012-10-30 18:26:05 -0500 (Tue, 30 Oct 2012) | 13 lines
chan_misdn: Remove some calls to exit().
Try proper cleanup when something goes wrong in misdn_lib_init().
Especially do not call exit()!
* Fix memory leak because stack_destroy() does not free the stack struct.
Patches:
patch06_cleanup-init.diff (license #6372) patch uploaded by Guenther Kelleter
Modified
JIRA ABE-2888
........
Merged revisions 375519-375524 from https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier
........
Merged revisions 375625 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375626 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375627 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375628
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Michael L. Young [Fri, 2 Nov 2012 17:27:24 +0000 (17:27 +0000)]
Fix Wrong Result In Debug Message For SDP Origin Processing
While looking at some debug logs, I noticed that it was being reported that the
SDP origin line was unsupported or failed. Upon looking into this on my local
machine, I found that I too was getting this debug message yet everything seemed
to be getting processed properly. What was discovered is, that, the variable to
determine what is displayed in the debug message for the SDP line that was
processed, was not being set for the origin line when the result was successful.
This patch fixes this and was tested on local machine.
........
Merged revisions 375594 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375601 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375613 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375614
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Thu, 1 Nov 2012 15:03:04 +0000 (15:03 +0000)]
chan_sip: Fix a bug causing SIP reloads to remove all entries from the registry
A regression was introduced in chan_sip by changes to sip reload introduced by
r349097. That patch moved peer purging from the beginning of the reload to
after the general configuration was finished. This patch fixes that by undoing
the repositioning of the original peer purging code and using a similar
function after performing general configuration that purges only autocreated
peers that were created when persist mode isn't enabled.
(closes issue ASTERISK-20611)
Reported by: Alisher
Review: https://reviewboard.asterisk.org/r/2171/
........
Merged revisions 375575 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375576
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Wed, 31 Oct 2012 18:01:09 +0000 (18:01 +0000)]
Fix an issue with res_http_websocket where the chan_sip WebSocket handler could not be registered.
On some systems the optional API support uses the GCC compiler attribute "weakref" to provide its
functionality. This code changes the function names and prefixes "__" to the front. The
res_http_websocket exports file did not take this into account, thereby not allowing those functions
to be global and ultimately found.
(closes issue ASTERISK-20631)
Reported by: danjenkins
........
Merged revisions 375559 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375560
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Wed, 31 Oct 2012 14:58:44 +0000 (14:58 +0000)]
Properly extract the Body information of an EWS calendar item
Unlike all other calendar modules, res_calendar_ews fails to extract the Body
information for a calendar item. This is due, in part, to a quirk in the
schema in the XML - not only does a CalendarItem contain a Body element, but
the CalendarItem exists as a descendant of a different Body element. The neon
parser was erroneously skipping all Body elements.
This patch fixes that by bypassing Body elements that are not a child of
CalendarItem, and parsing the Body element out if it is a child.
Note that the original patch by Terry Wilson only needed slight modifications
to make it properly pull the Body information out; as such, while I've linked
to the patch that I uploaded for Dmitry, I've attributed the patch to Terry.
(closes issue ASTERISK-19738)
Reported by: Dmitry Burilov
Tested by: Dmitry Burilov
patches:
calendar_ews_body_2012_10_29.diff uploaded by Terry Wilson (license 6283)
........
Merged revisions 375528 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375531 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375532 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375533
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 30 Oct 2012 19:31:02 +0000 (19:31 +0000)]
Fix ConfBridge crash if no timing module loaded.
(closes issue ASTERISK-19448)
Reported by: feyfre
Patches:
smfix.patch (license #6099) patch uploaded by feyfre
Modified for coding guidelines.
........
Merged revisions 375496 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375506 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375511
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Tue, 30 Oct 2012 19:20:33 +0000 (19:20 +0000)]
mixmonitor: Add a test event
This test event is being used to fix the mixmonitor_audiohook_inherit
test.
........
Merged revisions 375484 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375485 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375486 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375498
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Tue, 30 Oct 2012 15:10:38 +0000 (15:10 +0000)]
confbridge: Fix a bug which made conferences not record with AMI/CLI commands
When confbridge was changed to handle conference status with a state machine in
r374658. The function responsible for starting recording for a conference was
refactored with the function actually responsible for launching the recording
thread being split into a function with another name. The old function name was
still used for manually started recordings through AMI or CLI. This patch fixes
that by switching which function is used to start recording the conference.
(closes issue ASTERISK-20601)
Reported by: Vilius
Patches:
confbridge_mixmonitor.diff uploaded by Jonathan Rose (license 6182)
........
Merged revisions 375470 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375471 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375472
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 29 Oct 2012 21:38:40 +0000 (21:38 +0000)]
Prevent resetting of NATted realtime peer address on reload.
If a "sip reload" is issued for a SIP peer, then his
IP address will be cleared, thus resulting in forgetting the
public IP address. Asterisk will then attempt to route SIP
traffic to the private IP address.
The fix here is to make "sip reload" ignore realtime peers
when "host = dynamic" is spotted. Realtime peers can now only
have their IP address reset if they have gone from being not
dynamic to being dynamic.
(closes issue ASTERISK-18203)
reported by daren ferreira
(closes issue ASTERISK-20572)
reported by JoshE
Patches:
fix_nat_realtime.diff uploaded by JoshE (license #6075)
........
Merged revisions 375415 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375417 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375437 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375443
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 29 Oct 2012 21:27:09 +0000 (21:27 +0000)]
Make evaluation of channel variables consistently case-sensitive.
Due to inconsistencies in how variable names were evaluated, the
decision was made to make all evaluations case-sensitive. See the
UPGRADE.txt file or https://wiki.asterisk.org/wiki/display/AST/Case+Sensitivity
for more details.
(closes issue ASTERISK-20163)
reported by Matt Jordan
Review: https://reviewboard.asterisk.org/r/2160
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375442
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Mon, 29 Oct 2012 21:02:20 +0000 (21:02 +0000)]
Ensure that CDRs for a caller in a Queue that is not answered is NO ANSWER.
When a caller enters a queue and no queue member answers the call, the current
behaviour can be a little odd depending on the paused status of the queue
members. If any queue member is paused, but not all, the CDR disposition
will be BUSY. If all queue members are paused, then the CDR disposition is
based instead on the disposition of the call prior to entering the Queue.
This patch modifies the behaviour in the following ways:
* If no queue members are paused, the CDR disposition is whatever the
disposition was prior to going into Queue. If the call was answered this
will be ANSWERED; otherwise, it is NO ANSWER.
* If some queue members are pused, the CDR result is NO ANSWER. (This is a
change in behaviour, as the result would previously have been BUSY)
* If all queue members are paused, the CDR result is whatever the result was
prior to going into Queue. This is the same as the behaviour prior to this
patch.
* If the caller hangs up, times out, or presses '*' with the 'h' option, the
CDR disposition is again not set and is dependent on whether or not the
caller was Answered prior to entering Queue.
This patch was based on one provided by Thomas Arimont, but has been modified
to accomodate findings by the reviewers.
Review: https://reviewboard.asterisk.org/r/2064/
(closes issue AST-906)
Reported by: Thomas Arimont
(closes issue ASTERISK-17776)
Reported by: Attila Megyeri
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375416
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Mon, 29 Oct 2012 19:31:36 +0000 (19:31 +0000)]
Fix the Park 'r' option when a channel parks itself.
When a channel uses the Park appliation to park itself with the 'r'
option, the channel hears music-on-hold instead of the requested ringing.
* Added a missing check for the 'r' option when a channel parks itself.
(closes issue ASTERISK-19382)
Reported by: James Stocks
Patches by: dsessions
Review: https://reviewboard.asterisk.org/r/2148/
........
Merged revisions 375388 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375389 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375390 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375391
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Mon, 29 Oct 2012 15:56:13 +0000 (15:56 +0000)]
chan_dahdi: Fix segfault dereferencing a NULL tech_pvt.
The tech support customer was using the AMI Redirect action shortly after
a call was placed. While the channel tried to do an ast_read(), the
masquerade resulting from the channel redirect took place. The masquerade
in the middle of the ast_read() resulted in the segfault.
(closes issue AST-1025)
Reported by: Trey Blancher
Patches:
jira_ast_1025_v1.8_v2.patch (license #5621) patch uploaded by rmudgett
........
Merged revisions 375361 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375362 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375363 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375364
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Tue, 23 Oct 2012 16:22:44 +0000 (16:22 +0000)]
ast_tls_cert script: Better response for various exit conditions to openssl
(closes issue ASTERISK-20260)
Reported by: Daniel O'Connor
Patches:
ast_tls_cert-update.diff uploaded by Daniel O'Connor (license 6419)
........
Merged revisions 375325 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375326 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375327 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375328
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Mon, 22 Oct 2012 20:19:51 +0000 (20:19 +0000)]
core: Fix a memory leak in app.c from an early return
ast_app_group_match_get_count allocates memory with the regcomp
function and we previously forgot to free it when bailing out
due to a regex compilation failure against category.
(closes issue AST-1018)
Reported by: Guenther Kelleter
Patches:
regcomp_memleak.diff uploaded by Guenther Kelleter (license 6372)
........
Merged revisions 375299 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375300 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375301 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375311
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Mon, 22 Oct 2012 17:31:20 +0000 (17:31 +0000)]
GSM: Fix encoding problems with GSM
(closes issue ASTERISK-20457)
Reported by: Richard Miller
Patches:
code.patch uploaded by Richard Miller (license 5685)
........
Merged revisions 375272 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375273 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375288 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375291
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Thu, 18 Oct 2012 21:49:24 +0000 (21:49 +0000)]
app_queue: add upgrade notes for 375216
Adds UPGRADE notes describing behavioral changes to rrmemory strategy caused by
375216
(issue AST-989)
Reported by: Thomas Arimont
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375249
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Thu, 18 Oct 2012 21:47:46 +0000 (21:47 +0000)]
Blocked revisions 375247
........
pp_queue: add upgrade notes for 375216
Adds UPGRADE notes describing behavioral changes to rrmemory strategy caused by
375216
(issue AST-989)
Reported by: Thomas Arimont
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375248
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Thu, 18 Oct 2012 21:25:22 +0000 (21:25 +0000)]
app_queue: Make ordering of rrmemory/rrordered persist over add/remove members
Prior to this patch, adding, removing or reloading members to rrmemory would
cause the order to become completely jumbled. Now it behaves more or less like
rrordered other than the fact that it stores the members on a hash table rather
than a linked list. This patch also prevents removal of members and member
reloads from jumbling rrordered queues.
(issue AST-989)
Reported by: Thomas Arimont
Review: https://reviewboard.asterisk.org/r/2164/
........
Merged revisions 375216 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375217 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375219 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375240
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Michael L. Young [Thu, 18 Oct 2012 20:31:05 +0000 (20:31 +0000)]
Fix XML Document Validation Failure
Fix documentation error when validating the xml in trunk caused by r375150.
Moved the description end tag down to below the variablelist element end tag.
Found when compiling with --dev-mode-enabled.
(issue ASTERISK-20289)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375215
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Thu, 18 Oct 2012 20:13:17 +0000 (20:13 +0000)]
build_tools: Allow Asterisk to report git SHAs in version string.
Make git more attractive for managing work-in-progress. Especially
convenient when a potential patch set needs to be tested on multiple
platforms since one can use git to keep all the test environments in sync
independent of a subversion server.
Now the Asterisk version will show the exact git SHA5 that was used when
building (still appended by "M" if there are local modifications) from a
git clone of the Asterisk repository so the developer can more easily know
what is actually under test.
You will now get this:
$ asterisk -V
Asterisk GIT-1698298
Instead of this:
$ asterisk -V
Asterisk UNKNOWN__and_probably_unsupported
This has zero impact for those not using git with the exception of an
extra test in the configure script to gather git's path. This is
necessary to prevent "sudo make install" from failing since git may not be
in the path in make's shell environment.
(closes issue ASTERISK-20483)
Reported by: Shaun Ruffell
Patches:
0001-build_tools-Allow-Asterisk-to-report-git-SHAs-in-ver.patch (license #5417) patch uploaded by Shaun Ruffell
Modified
........
Merged revisions 375189 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375190 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375191 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375192
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Thu, 18 Oct 2012 14:17:40 +0000 (14:17 +0000)]
Doxygen Updates - Title update
Update and extend the configuration_file group and enable linking. Commit other cleanups from multi-version Doxygen testing. Update title that was left behind many years ago.
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375182
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Wed, 17 Oct 2012 20:34:40 +0000 (20:34 +0000)]
manager: remove curses dependent stuff from r375103
Upon further examination, this code was causing compliation problems on
CentOS at the least (possibly on any machine without curses) and also
the local value of COLS is used even with a remote console, so it is
less than ideal.
(issue ASTERISK-20396)
Reported by: Johan Wilfer
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375175
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Pedro Kiefer [Wed, 17 Oct 2012 19:02:46 +0000 (19:02 +0000)]
Adds new formats to app_alarmreceiver, ALAW calls support and enhanced protection.
Commiting this on behalf of Kaloyan Kovachev (license 5506).
AlarmReceiver now supports the following DTMF signaling types:
- ContactId
- 4x1
- 4x2
- High Speed
- Super Fast
We are also auto-detecting which signaling is being received. So support for
those protocols should work out-the-box. Correctly identify ALAW / ULAW calls.
Some enhanced protection for broken panels and malicious callers where added.
(closes issue ASTERISK-20289)
Reported by: Kaloyan Kovachev
Review: https://reviewboard.asterisk.org/r/2088/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375150
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Wed, 17 Oct 2012 19:01:27 +0000 (19:01 +0000)]
Ensure Asterisk fails TCP/TLS SIP calls when certificate checking fails
When placing a call to a TCP/TLS SIP endpoint whose certificate is not
signed by a configured CA certificate, Asterisk would issue a warning
and continue to process the call as if there was not an issue with the
certificate. Asterisk now properly fails the call if the certificate
fails verification or if the certificate does not exist when
certificate checking is enabled (the default behavior).
(closes issue ASTERISK-20559)
Reported by: kmoore
Review: https://reviewboard.asterisk.org/r/2163/
........
Merged revisions 375146 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375147 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375148 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375149
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Walter Doekes [Wed, 17 Oct 2012 14:24:52 +0000 (14:24 +0000)]
Change a few warnings to debug and the inverse.
Remove the "RTP Read too short" warning for RTP keepalives. Remove the
the warning about the application delimiter switch from pipe to comma.
(You should've done this by now.) Make cdr_odbc report more when an
insert fails. Make chan_sip warn less when the peer wants SRTP (and we
don't) or sends a zero port to disable a media type.
Review: https://reviewboard.asterisk.org/r/2167
(closes issue ASTERISK-20538)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375137
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Walter Doekes [Tue, 16 Oct 2012 21:46:09 +0000 (21:46 +0000)]
Fixes to the fd-oriented SIP TCP reads.
Don't crash on large user input. Allow SIP headers without space.
Optimize code a bit.
Review: https://reviewboard.asterisk.org/r/2162
........
Merged revisions 375111 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375112 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375113 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375114
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Walter Doekes [Tue, 16 Oct 2012 21:38:00 +0000 (21:38 +0000)]
Don't do SIP contact/route DNS if we're not using the result.
In many cases (for peers behind NAT or for TCP sockets) we do not need
to look up any hostname in the Contact (or Route) when sending an
in-dialog request. This should reduce netsock2.c: getaddrinfo errors in
certain scenarios.
Review: https://reviewboard.asterisk.org/r/2156
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375110
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jonathan Rose [Tue, 16 Oct 2012 20:45:49 +0000 (20:45 +0000)]
manager: Change display of 'manager show commands' and 'manager show command'
manager show commands now shows the full name of the command being displayed
regardless of size. The privilege column has also been removed from this
display. It will also now use the full length of the terminal if curses is
available. Manager show command will now always display the privilege of
the manager command within the CLI.
(closes ASTERISK-20396)
Reported by: Johan Wilfer
Review: https://reviewboard.asterisk.org/r/2143/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375103
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Pedro Kiefer [Tue, 16 Oct 2012 19:26:20 +0000 (19:26 +0000)]
Fixes two small regressions from ASTERISK-20157
- receive_dtmf_digits had the wrong buffer length
- app_alarmreceiver should wait 100ms before sending the second part of handshake
(closes issue ASTERISK-20484)
Reported by: Jean-Philippe Lord
Tested by: Jean-Philippe Lord, Pedro Kiefer
Patches:
ASTERISK-20484_v2.diff uploaded by Kaloyan Kovachev (license 5506)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375081
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Walter Doekes [Tue, 16 Oct 2012 19:25:11 +0000 (19:25 +0000)]
Update sip_request_call SIP dial string documentation.
This was missed when merging review r1859.
........
Merged revisions 375074 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375078 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375079 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375080
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 16 Oct 2012 14:09:39 +0000 (14:09 +0000)]
Remove a log message that was left in accidentally from call-id logging development.
........
Merged revisions 375051 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375052
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 15 Oct 2012 21:25:29 +0000 (21:25 +0000)]
Fix some potential misuses of ast_str in the code.
Passing an ast_str pointer by value that then calls
ast_str_set(), ast_str_set_va(), ast_str_append(), or
ast_str_append_va() can result in the pointer originally
passed by value being invalidated if the ast_str had
to be reallocated.
This fixes places in the code that do this. Only the
example in ccss.c could result in pointer invalidation
though since the other cases use a stack-allocated ast_str
and cannot be reallocated.
I've also updated the doxygen in strings.h to include
notes about potential misuse of the functions mentioned
previously.
Review: https://reviewboard.asterisk.org/r/2161
........
Merged revisions 375025 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375026 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375027 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375044
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Igor Goncharovskiy [Mon, 15 Oct 2012 08:26:58 +0000 (08:26 +0000)]
Fix underscreen buttons warnings apeared while transfer process
........
Merged revisions 375016 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375017
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Sun, 14 Oct 2012 21:59:22 +0000 (21:59 +0000)]
Doxygen Updates
Update and extend the configuration_file group and enable linking.
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375009
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Sun, 14 Oct 2012 21:57:42 +0000 (21:57 +0000)]
Doxygen Updates
Update and extend the configuration_file group and enable linking.
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375008
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Sun, 14 Oct 2012 21:56:13 +0000 (21:56 +0000)]
Title update
Update title that was left behind many years ago. Used revision 6596 as my guide for what it should be.
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375007
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Sun, 14 Oct 2012 21:47:40 +0000 (21:47 +0000)]
Doxygen Updates - Title update
Update and extend the configuration_file group and enable linking. Update title that was left behind many years ago.
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375006
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Sun, 14 Oct 2012 21:46:45 +0000 (21:46 +0000)]
Doxygen Updates - Title update
Update and extend the configuration_file group and enable linking. Update title that was left behind many years ago.
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375005
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Sun, 14 Oct 2012 21:45:16 +0000 (21:45 +0000)]
Doxygen Updates - Title update
Update and extend the configuration_file group and enable linking to the application. Update title that was left behind many years ago.
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375004
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Sun, 14 Oct 2012 21:44:27 +0000 (21:44 +0000)]
Doxygen Updates - Title update
Update and extend the configuration_file group and enable linking to the resource. Update title that was left behind many years ago.
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375003
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tzafrir Cohen [Sun, 14 Oct 2012 12:23:46 +0000 (12:23 +0000)]
Update config.guess and config.sub: 2012-10-10
Update config.guess and config.sub to revision
fb456b34ef4aa02b95dc6be69aaa66fa94a844fb from the savannah.gnu.org git
repo. Adds support for e.g. aarch64 (ARM 64bit).
config.guess:timestamp='2012-09-25'
config.sub:timestamp='2012-10-10'
........
Merged revisions 374977 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374991 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374995 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374996
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Sat, 13 Oct 2012 19:58:20 +0000 (19:58 +0000)]
Update CREDITS
Update Jean-Denis and add myself
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374970
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Sat, 13 Oct 2012 17:38:41 +0000 (17:38 +0000)]
Multiplatform Makefile Update
Paul Belanger pointed out that using sed in the Makefile is an issue with multiple platforms. We are cleaning up the Doxygen config as a following step so I just switched the sed inplace changes to be an echo append instead.
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374963
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Sat, 13 Oct 2012 16:38:48 +0000 (16:38 +0000)]
Doxygen Clean ups
Add app_skel.c as an example in app.c and fix some formating for the "Dial Privacy scripts" so it actually shows up in the Doxygen output.
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374956
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Sat, 13 Oct 2012 16:05:12 +0000 (16:05 +0000)]
Test for Asterisk Version info
Doxygen uses the ASTERISKVERSION as a sub header. If a SVN export is done and no .svn or .version file exists it defualts to UNKNOWN__and_probably_unsupported which is honest but not great for the online docs. During the "make progdocs" I added a test for this and just warned and ommitted the version.
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374949
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Sat, 13 Oct 2012 15:40:40 +0000 (15:40 +0000)]
Correct output directory
During testing I used an alternate output directory and mistakenly committed it. Matt Jordan noticed and I reverted. This is the correct setting for local output to match with all branches.
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374948
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Sat, 13 Oct 2012 15:14:51 +0000 (15:14 +0000)]
Add licens/copyright header
Begin update of static-http files and general clean ups. This only adds the standard header to the files.
(issue ASTERISK-20503)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374941
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Sat, 13 Oct 2012 15:06:39 +0000 (15:06 +0000)]
Add check for Doxygen
The autoconf configuration system had a test for DOT but not for Doxygen. I added the test for Doxygen and did an overhaul of the Makefile check to a much simpler process.
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374940
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Fri, 12 Oct 2012 21:58:29 +0000 (21:58 +0000)]
Avoid a segfault on invalid format names
If a format name was not found by ast_getformatbyname, a NULL pointer
would be passed into ast_format_rate and immediately dereferenced.
This ensures that a valid pointer is used since the structure is
already allocated on the stack.
(closes issue DPH-523)
Reported-by: Steve Pitts
........
Merged revisions 374932 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374933
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Fri, 12 Oct 2012 16:31:01 +0000 (16:31 +0000)]
Do not use a FILE handle when doing SIP TCP reads.
This is used to solve an issue where a poll on a file
descriptor does not necessarily correspond to the readiness
of a FILE handle to be read.
This change makes it so that for TCP connections, we do a
recv() on the file descriptor instead.
Because TCP does not guarantee that an entire message or even
just one single message will arrive during a read, a loop has
been introduced to ensure that we only attempt to handle a
single message at a time. The tcptls_session_instance structure
has also had an overflow buffer added to it so that if more
than one TCP message arrives in one go, there is a place to
throw the excess.
Huge thanks goes out to Walter Doekes for doing extensive review
on this change and finding edge cases where code could fail.
(closes issue ASTERISK-20212)
reported by Phil Ciccone
Review: https://reviewboard.asterisk.org/r/2123
........
Merged revisions 374905 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374906 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374914 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374924
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Thu, 11 Oct 2012 23:40:44 +0000 (23:40 +0000)]
Append Doxygen to Debian packages list
Add Doxygen to the Debian install list. I will check for other platforms like Red Hat
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374897
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Thu, 11 Oct 2012 22:43:52 +0000 (22:43 +0000)]
Update JQuery URL to recent version
The JQuery URL to version 1.4 will be removed within the life span of Asterisk 11. This is a compatible upgrade by using the URL for 1.8.
(issue ASTERISK-20503)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374889
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Thu, 11 Oct 2012 22:39:02 +0000 (22:39 +0000)]
Continue to group config files
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374888
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Thu, 11 Oct 2012 22:35:41 +0000 (22:35 +0000)]
CREDITS clean up
As discussed online http://lists.digium.com/pipermail/asterisk-dev/2012-October/057245.html the credits file needs some cleaning. This is 95% whitespace with a few additions found in file headers. Further additions should be added here instead of in the file being updated.
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374887
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Thu, 11 Oct 2012 21:40:02 +0000 (21:40 +0000)]
Revert Local testing Config
Revert a local testing config that I made. This was not intended to be committed.
Thank you Matt Jordan for noticing this.
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374879
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 11 Oct 2012 21:19:33 +0000 (21:19 +0000)]
Fix a bug where audio on Google Voice would not work due to ignoring candidates.
Instead of ignoring parts of the message that are not known just ignore the ones
we know may be present and that would cause a problem.
........
Merged revisions 374877 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374878
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 11 Oct 2012 16:06:28 +0000 (16:06 +0000)]
Fix an issue where outgoing calls would fail to establish audio due to ICE negotiation failures.
This change removes the requirement for ufrag and pwd in the transport stanza and also
makes us the controlling agent.
(closes issue ASTERISK-20554)
Reported by: mmichelson
........
Merged revisions 374850 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374852
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Thu, 11 Oct 2012 15:49:02 +0000 (15:49 +0000)]
Don't make chan_sip export global symbols.
During testing, it was discovered that having chan_sip
export global symbols was problematic.
The biggest problem was that load order was affected.
Trying to use realtime could be problematic since in
all likelihood the necessary realtime driver(s) would
not be loaded before chan_sip.
In addition, it was found that it was impossible to
use the Digium Phone Module for Asterisk since it
must be loaded before chan_sip since it must hook
into chan_sip's configuration parsing.
The solution is to use a virtual table in the same
manner that other modules in Asterisk do, like
app_voicemail.
(closes issue ASTERISK-20545)
Reported by: kmoore
........
Merged revisions 374842 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374849
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Thu, 11 Oct 2012 15:44:38 +0000 (15:44 +0000)]
Fix incorrect billing duration reported when batch mode is enabled
Similar to r369351, the billing duration can be skewed when batch mode is
enabled. This happened much more rarely than the duration, as it only
occured when the call was answered (thereby indicating an actual answer
time) and immediately hung up on (indicating a billsec of 0). Since
a billing time of '0' can either mean that the call immediately ended
or that the CDR was improperly answered, we have to use additional information
to know whether or not we can trust the CDR billsec value. Prior to this
patch, we looked to see if we had a valid answer time. If we did, and
billsec was zero, we used the current time to calculate what billsec value
we could from the CDR being written. If batch mode is enabled, this will
incorrectly report a billsec value being much greater than the actual
duration of the call.
Instead of relying on the presence of an answer time to know whether or not
we can re-calculate the billsec for the CDR, we now also use the presence
of the CDR's end time to know if we need to re-calculate or whether we can
trust the billsec value that we have. This prevents erroneous jumps in the
billsec value, while still making sure that in the worst case, some billing
time will be calculated.
(closes issue AST-1016)
Reported by: Thomas Arimont
Tested by: Thomas Arimont
........
Merged revisions 374843 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374844 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374845 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374846
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 11 Oct 2012 13:34:52 +0000 (13:34 +0000)]
Consider the Google Talk content stanza name (jin:content) valid.
........
Merged revisions 374833 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374834
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Wed, 10 Oct 2012 21:05:51 +0000 (21:05 +0000)]
app_queue: Made pass connected line updates from the caller to ringing queue members.
Party A calls Party B
Party B puts Party A on hold.
Party B calls a queue.
Ringing queue member D sees Party B identification.
Party B transfers Party A to the queue.
Queue member D does not get a connected line update for Party A.
Queue member D answers the call and still sees Party B information.
However, if Party A later transfers the call to Party C then queue member
D gets a connected line update for Party C.
* Made pass connected line updates from the caller to queue members while
the queue members are ringing.
(closes issue AST-1017)
Reported by: Thomas Arimont
(closes issue ABE-2886)
Reported by: Thomas Arimont
Tested by: rmudgett
........
Merged revisions 374801 from https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier
........
Merged revisions 374802 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374803 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374804 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374805
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kinsey Moore [Wed, 10 Oct 2012 13:40:40 +0000 (13:40 +0000)]
Fix segfault regression from r370681
Due to usage of ast_hook_send_action, AMI action handling code should
be able to handle a NULL mansession->session. This would cause a crash
on NULL dereference if action_originate was called from
ast_hook_send_action.
(closes issue ASTERISK-20544)
........
Merged revisions 374792 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374793
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 9 Oct 2012 22:24:10 +0000 (22:24 +0000)]
Fix execution of 'i' extension due to uninitialized variable.
The fix for ASTERISK-18243 added code that could potentially use
dst_exten[] uninitialized. As a result the 'i' exten may not be executed
when it should.
(closes issue ASTERISK-20455)
Reported by: Richard Miller
Patches:
pbx-1.8.16.0.diff (license #5685) patch uploaded by Richard Miller
Made some cosmetic modifications.
........
Merged revisions 374758 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374763 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374771 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374778
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 9 Oct 2012 21:35:53 +0000 (21:35 +0000)]
Improve logging for DTLS-SRTP failure situations.
(closes issue ASTERISK-20487)
Reported by: mjordan
........
Merged revisions 374756 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374757
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Mon, 8 Oct 2012 22:31:09 +0000 (22:31 +0000)]
dahdi.conf.sample: Add description for "buffers" setting.
This contains an edited version of the patch originally created by John
Bigelow.
(closes issue ASTERISK-14435)
Reported by: John Bigelow
Patches:
buffers.patch (license #5091) patch uploaded by John Bigelow
0001-dahdi.conf.sample-Add-description-for-buffers-settin.patch (license #5417) patch uploaded by Shaun Ruffell
Modified
........
Merged revisions 374727 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374728 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374729 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374730
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Mon, 8 Oct 2012 21:24:11 +0000 (21:24 +0000)]
Fix deletion of unopenable spool files.
If scan_service() cannot open the spool file, it logs a message saying
that it will delete the file and calls remove_from_queue() to do it.
However, remove_from_queue() fails to delete the spool file because struct
outgoing has not yet been fully initialized.
* Merged allocating a new struct outgoing and init_outgoing() into
new_outgoing(). Allocation is initialization.
* Made apply_outgoing() not initialize the spool filename in struct
outgoing.
* Made apply_outgoing() call ast_trim_blanks() and ast_skip_blanks()
rather than manually inlining them.
* Reduced indentation levels in apply_outgoing().
* Fixed a garbled comment in remove_from_queue().
* Reworked scan_service() to simplify it.
(closes issue ASTERISK-17231)
Reported by: David Chappell
Patches:
spool_open_failure.diff (license #4997) patch uploaded by David Chappell
Started with this patch.
........
Merged revisions 374686 from http://svn.asterisk.org/svn/asterisk/branches/1.8
* Fixed some memory leaks on off nominal paths in init_outgoing() when
merging into the new_outgoing() function dealing with o->capabilities.
........
Merged revisions 374695 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374708 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374717
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Mon, 8 Oct 2012 20:39:26 +0000 (20:39 +0000)]
Disable ICE support by default
Since there are a number of legacy devices out there that fail to handle ICE
candidates properly (which is a nice way of saying something much uglier),
disable it by default.
Support for ICE candidates can be enabled in rtp.conf using the icesupport
setting.
........
Merged revisions 374676 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374677
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Mon, 8 Oct 2012 18:48:34 +0000 (18:48 +0000)]
Resolve issues in ConfBridge regarding marked, waitmarked, and unmarked users
Thank's to Neil Tallim (flan)'s tireless testing, issue reporting, and patches
it became clear that app_confbridge had some complex logic in how it handled
interactions between marked, waitmarked, and unmarked users. In particular,
there were some areas in which the interactions between the users resulted
in inconsistent behavior, and app_confbridge was missing logic in how to handle
some corner cases. Some areas included:
* Poor handling of mixing unmarked and waitmarked users
* Inconsistencies in how MOH and muting was applied to various users
* Handling of various announcements for different user profile options
flan's patches seem to fix the various issues, but highlighted how hard the
code could be to maintain. In an attempt to make things easier to maintain and
to more fully enumerate the various cases that exist, this patch breaks up the
logic into a state machine-like setup.
Please note that the various state transitioned are documented on the Asterisk
wiki:
https://wiki.asterisk.org/wiki/display/AST/Confbridge+state+changes
Review: //https://reviewboard.asterisk.org/r/2072/
Note that for the following issues, mjordan uploaded the patch, although it
was written by twilson. Any contributor license discrepency is due to that.
(closes issue ASTERISK-19562)
Reported by: flan
Tested by: flan, mjordan, jrose
patches:
bugASTERISK-19562_ASTERISK-19726_ASTERISK-20181.patch uploaded by twilson (license 6283)
(closes issue ASTERISK-19726)
Reported by: flan
Tested by: flan
patches:
bugASTERISK-19562_ASTERISK-19726_ASTERISK-20181.patch uploaded by twilson (license 6283)
(closes issue ASTERISK-20181)
Reported by: Jonathan White
Tested by: Jonathan White
patches:
bugASTERISK-19562_ASTERISK-19726_ASTERISK-20181.patch uploaded by twilson (license 6283)
........
Merged revisions 374652 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374657 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374658
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Mon, 8 Oct 2012 00:45:36 +0000 (00:45 +0000)]
pjproject: Fix for Solaris builds. Do not undef s_addr.
pjproject, in order to solve build problems on Windows [1], undefines s_addr in
one of it's headers that is included in res_rtp_asterisk.c. On Solaris s_addr
is not a structure member, but defined to map to the real strucuture member,
therefore when building on Solaris it's possible to get build errors like:
[CC] res_rtp_asterisk.c -> res_rtp_asterisk.o
In file included from /export/home/admin/asterisk-11-svn/include/asterisk/stun.h:29,
from res_rtp_asterisk.c:51:
/export/home/admin/asterisk-11-svn/include/asterisk/network.h: In function `inaddrcmp':
/export/home/admin/asterisk-11-svn/include/asterisk/network.h:92: error: structure has no member named `s_addr'
/export/home/admin/asterisk-11-svn/include/asterisk/network.h:92: error: structure has no member named `s_addr'
res_rtp_asterisk.c: In function `ast_rtp_on_ice_tx_pkt':
res_rtp_asterisk.c:706: warning: dereferencing type-punned pointer will break strict-aliasing rules
res_rtp_asterisk.c:710: warning: dereferencing type-punned pointer will break strict-aliasing rules
res_rtp_asterisk.c: In function `rtp_add_candidates_to_ice':
res_rtp_asterisk.c:1085: error: structure has no member named `s_addr'
make[2]: *** [res_rtp_asterisk.o] Error 1
make[1]: *** [res] Error 2
make[1]: Leaving directory `/export/home/admin/asterisk-11-svn'
gmake: *** [_cleantest_all] Error 2
Unfortunately, in order to make this work, I also had to make sure pjproject
only used the typdef pj_in_addr and not the struct pj_in_addr so that when
building Asterisk I could "typedef struct in_addr pj_in_addr". It's possible
then that the library and users of those interfaces in Asterisk have a different
idea about the type of the argument, while on the surface it looks like they are
all 32 bit big endian values.
[1] http://trac.pjsip.org/repos/changeset/484
(issues ASTERISK-20366)
Reported by: Ben Klang
Tested by: Ben Klang, mjordan
patches:
0001-pjproject-Fix-for-Solaris-builds.-Do-not-undef-s.patch uploaded by Shaun Ruffell (license 5417)
........
Merged revisions 374642 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374643
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Sun, 7 Oct 2012 17:33:38 +0000 (17:33 +0000)]
Trivial patch to make 'best_score' defined for all architectures.
Fixes trivial build error on Solaris:
acl.c: In function `get_local_address':
acl.c:196: error: `best_score' undeclared (first use in this function)
acl.c:196: error: (Each undeclared identifier is reported only once
acl.c:196: error: for each function it appears in.)
make[2]: *** [acl.o] Error 1
(issue ASTERISK-20366)
Reported by: Ben Klang
Tested by: Ben Klang
patches:
0002-main-acl.c-Trivial.-best_score-should-be-defined-for.patch by Shaun Ruffell (license 5417)
........
Merged revisions 374632 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374633
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Sat, 6 Oct 2012 03:22:37 +0000 (03:22 +0000)]
Handle capability stanzas that fail to provide node or version information
While XEP-0115 states that the node and ver attributes are both required, some
devices fail to provide either field. Prior to this patch, failure to provide
the node or ver attribute would cause a crash in res_xmpp. While failing to
provide the node or ver attribute is technically invalid, since this
information is not utilized by Asterisk except for reporting purposes, for
interoperability reasons, we continue to process the capability stanza anyways.
(closes issue ASTERISK-20495)
Reported by: Martin W
Tested by: Martin W
patches:
20495.patch uploaded by Martin W (license #6434)
........
Merged revisions 374622 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374623
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Sat, 6 Oct 2012 01:47:00 +0000 (01:47 +0000)]
Update documentation for MessageSend application/command's From field for XMPP
When using the channel technology agnostic application/AMI command MessageSend,
the "From" field is technically optional for the SIP channel driver. However,
if being sent by the XMPP resource module (either res_xmpp or res_jabber), the
"From" field is necessary, and must correspond to a defined account. This
patch updates the documentation for this application/AMI command to reflect
this.
(closes issue ASTERISK-20405)
Reported by: Leif Madsen
........
Merged revisions 374611 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374612
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Fri, 5 Oct 2012 20:33:56 +0000 (20:33 +0000)]
Multiple revisions 374570,374581
........
r374570 | dlee | 2012-10-05 15:14:41 -0500 (Fri, 05 Oct 2012) | 22 lines
Improve AMI long line error handling
In AMI's parser, when it receives a long line (> 1024 characters), it discards
that line, but continues to process the message normally.
Typically, this is not a problem because a) who has lines that long and b)
usually a discarded line results in an invalid message. But if that line is
specifying an optional field, then the message will be processed, you get a
'Response: Success', but things don't work the way you expected them to.
This patch changes the behavior when a line-too-long parse error occurs.
* Changes the log message to avoid way-too-long (and truncated anyways) log
messages
* Adds a 'parsing' status flag to Response: Success
* Sets parsing = MESSAGE_LINE_TOO_LONG if, well, a line is too long
* Responds with an appropriate error if parsing != MESSAGE_OKAY
(closes issue AST-961)
Reported by: John Bigelow
Review: https://reviewboard.asterisk.org/r/2142/
........
r374581 | dlee | 2012-10-05 15:20:28 -0500 (Fri, 05 Oct 2012) | 1 line
I've committed too much. Reverting part of r374570.
........
Merged revisions 374570,374581 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374586 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374587 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374588
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Fri, 5 Oct 2012 18:42:14 +0000 (18:42 +0000)]
Merged revisions 374515-374535 from
https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier
................
r374515 | rmudgett | 2012-10-04 17:52:36 -0500 (Thu, 04 Oct 2012) | 10 lines
chan_misdn: Remove some deadcode
* Made setup_bc() static.
Patches:
patch1_unused-code.diff (license #6372) patch uploaded by Guenther Kelleter
Modified
JIRA ABE-2882
................
r374516 | rmudgett | 2012-10-04 18:01:01 -0500 (Thu, 04 Oct 2012) | 7 lines
chan_misdn: Remove unused bchan states
Patches:
patch2_unused-states.diff (license #6372) patch uploaded by Guenther Kelleter
JIRA ABE-2882
................
r374517 | rmudgett | 2012-10-04 18:17:51 -0500 (Thu, 04 Oct 2012) | 16 lines
chan_misdn: Remove unnecessary null pointer checks and checks for stack->nt
* cleanup_bc() is always called with valid bc (or it would've crashed
before).
* Value of stack->nt is known in advance at some places.
* Rename handle_event() to handle_event_te(), handle_frm() to
handle_frm_te().
Patches:
patch3_checks.diff (license #6372) patch uploaded by Guenther Kelleter
Modified
JIRA ABE-2882
................
r374518 | rmudgett | 2012-10-04 18:21:59 -0500 (Thu, 04 Oct 2012) | 7 lines
chan_misdn: Fix spelling in log messages
Patches:
patch4_spelling.diff (license #6372) patch uploaded by Guenther Kelleter
JIRA ABE-2882
................
r374519 | rmudgett | 2012-10-04 18:31:59 -0500 (Thu, 04 Oct 2012) | 15 lines
chan_misdn: Don't cleanup a bc twice.
In handle_frm_te() after calling misdn_lib_send_event(bc,
EVENT_RELEASE_COMPLETE) bc is emptied, cleaned and set not in use,
although misdn_lib_send_event() already did the same. This is bad. When
it's not in use we are not allowed to touch it.
* Moved log message in front of the resulting actions and fixed it to
match the case.
Patches:
patch5_bccleanup.diff (license #6372) patch uploaded by Guenther Kelleter
JIRA ABE-2882
................
r374520 | rmudgett | 2012-10-04 18:43:56 -0500 (Thu, 04 Oct 2012) | 12 lines
chan_misdn: Fix memory leaks, bc, chan not cleaned up etc., really bad stuff.
* Fix return codes of cb_events() for EVENT_SETUP to use caller's cleanup
mechanisms.
* Move cl_queue_chan() call after bearer check.
Patches:
patch6_leaks.diff (license #6372) patch uploaded by Guenther Kelleter
JIRA ABE-2882
................
r374521 | rmudgett | 2012-10-04 18:48:38 -0500 (Thu, 04 Oct 2012) | 11 lines
chan_misdn: We must initialize cause on sending a DISCONNECT.
We must initialize cause on sending a DISCONNECT, so it is later correctly
indicated to ast_channel in case the answer (RELEASE/RELEASE_COMPLETE)
does not include one.
Patches:
patch7_hangupcause.diff (license #6372) patch uploaded by Guenther Kelleter
JIRA ABE-2882
................
r374522 | rmudgett | 2012-10-04 19:03:56 -0500 (Thu, 04 Oct 2012) | 7 lines
chan_misdn: Remove unused code for upqueue
Patches:
patch8_unused-upqueue.diff (license #6372) patch uploaded by Guenther Kelleter
JIRA ABE-2882
................
r374523 | rmudgett | 2012-10-04 19:11:50 -0500 (Thu, 04 Oct 2012) | 7 lines
chan_misdn: Improve debugging (port number, messages fixed, dups removed)
Patches:
patch9_debug.diff (license #6372) patch uploaded by Guenther Kelleter
JIRA ABE-2882
................
r374533 | rmudgett | 2012-10-05 12:17:18 -0500 (Fri, 05 Oct 2012) | 8 lines
chan_misdn: Better debug: we can print_bc_info even if there's no ast leg.
Patches:
patch10_debug-bc-2.diff (license #6372) patch uploaded by Guenther Kelleter
Modified.
JIRA ABE-2882
................
r374534 | rmudgett | 2012-10-05 12:34:10 -0500 (Fri, 05 Oct 2012) | 16 lines
chan_misdn: setup_bc() is called too early for an incoming SETUP on TE.
This prevents the B channel from being setup for HDLC mode when requested
by the bearer capability and config option hdlc=yes. It violates
ETS300102 Ch.5.2.3.2: "The user, in any case, must not connect to the
channel until a CONNECT ACKNOWLEDGE message has been received."
* Call setup_bc() on receipt of CONNECT_ACKNOWLEGDE for PTMP, and on first
response to SETUP for PTP.
Patches:
abe-2881-2.diff (license #6372) patch uploaded by Guenther Kelleter
Modified.
JIRA ABE-2881
................
r374535 | rmudgett | 2012-10-05 12:41:05 -0500 (Fri, 05 Oct 2012) | 2 lines
chan_misdn: Remove some more deadcode.
................
........
Merged revisions 374536 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374537 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374538 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374539
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Alec L Davis [Thu, 4 Oct 2012 20:21:36 +0000 (20:21 +0000)]
dsp.c User Configurable DTMF_HITS_TO_BEGIN and DTMF_MISSES_TO_END
Instead of a recompile, allow values to be adjusted in dsp.conf
For binary distributions allows easy adjustment for wobbly GSM calls, and other reasons.
Defaults to DTMF_HITS_TO_BEGIN=2 and DTMF_MISSES_TO_END=3
(closes issue ASTERISK-17493)
Reported by: alecdavis
Tested by: alecdavis
alecdavis (license 585)
Review https://reviewboard.asterisk.org/r/2144/
........
Merged revisions 374479 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374481 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374485 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374493
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Alec L Davis [Thu, 4 Oct 2012 20:08:22 +0000 (20:08 +0000)]
dsp.c fix incorrect DTMF Digit_Duration.
it's always short by 'hits_to_begin*DTMF_GSIZE', or 25.5ms if hitstobegin=2
(issue ASTERISK-16003)
Tested by: alecdavis
alecdavis (license 585)
Review https://reviewboard.asterisk.org/r/2145/
........
Merged revisions 374475 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374476 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374477 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374478
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
David M. Lee [Thu, 4 Oct 2012 15:48:24 +0000 (15:48 +0000)]
Fix DBDelTree error codes for AMI, CLI and AGI
The AMI DBDelTree command will return Success/Key tree deleted successfully even
if the given key does not exist. The CLI command 'database deltree' had a
similar problem, but was saved because it actually responded with '0 database
entries removed'. AGI had a slightly different error, where it would return
success if the database was unavailable.
This came from confusion about the ast_db_deltree retval, which is -1 in the
event of a database error, or number of entries deleted (including 0 for
deleting nothing).
* Changed some poorly named res variables to num_deleted
* Specified specific errors when calling ast_db_deltree (database unavailable
vs. entry not found vs. success)
* Fixed similar bug in AGI database deltree, where 'Database unavailable'
results in successful result
(closes issue AST-967)
Reported by: John Bigelow
Review: https://reviewboard.asterisk.org/r/2138/
........
Merged revisions 374426 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374427 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374428 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374429
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 4 Oct 2012 13:49:45 +0000 (13:49 +0000)]
Add support for applying direct media ACLs between differing channel technologies.
Review: https://reviewboard.asterisk.org/r/2122/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374414
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Alec L Davis [Thu, 4 Oct 2012 04:50:16 +0000 (04:50 +0000)]
dsp.c User configuration of DTMF_NORMAL_TWIST and DTMF_REVERSE_TWIST values
Asterisk's DTMF Specifications are based on AT&T specs, which may not be compatible in other countries.
Various countries have different specifications for the maximum power level differences
between the DTMF low group and high group of frequencies.
Power level difference between frequencies for different Administrations/RPOAs
NTT = Max. 5 dB
AT&T = 4dB(reverse) to 8dB(normal)
Danish = Max. 6 dB
Australian = Max. 10 dB
Brazilian = Max. 9 dB
ETSI = Max. 6 dB from ETSI ES 201 235-3 V1.3.1 (2006-03)
Now allow 4 variables to be individually configured in dsp.conf, with reasonable min/max of 2dB to 20dB.
Default is AT&T specifications
Add's the following variables to dsp.conf
;dtmf_normal_twist=6.31
;dtmf_reverse_twist=2.51
;relax_dtmf_normal_twist=6.31
;relax_dtmf_reverse_twist=3.98
(closes issue ASTERISK-20442)
Reported by: tbsky
Tested by: tbsky,alecdavis
alecdavis (license 585)
Review https://reviewboard.asterisk.org/r/2141/
........
Merged revisions 374384 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374385 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374386 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374387
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Thu, 4 Oct 2012 02:16:43 +0000 (02:16 +0000)]
Check for presence of buddy in info/dinfo handlers
The res_jabber resource module uses the ASTOBJ library for managing its ref
counted objects. After calling ASTOBJ_CONTAINER_FIND to locate a buddy object,
the pointer to the object has to be checked to see if the buddy existed.
Prior to this patch, the buddy object was not checked for NULL; with this patch
in both aji_client_info_handler and aji_dinfo_handler the pointer is checked
before used and, if no buddy object was found, the handlers return an error
code.
This patch does not take the approach that our JID can be used to log in from
another resource. If that approach is desired, an improvement could be made to
this patch to create the buddy on the fly. This patch seeks only to prevent
Asterisk from crashing.
FYI: In Asterisk 11+, you really should be using res_xmpp. It does not have
this problem, as it moved to the astobj2 library.
Note that multiple people have proposed patches for this issue; the patch being
committed here is based on those.
(closes issue ASTERISK-19532)
Reported by: Karsten Wemheuer
Tested by: Byron Clark
patches:
fix-jabber uploaded by Karsten Wemheuer (license #5930)
xmpp_no_crash_with_ejabberd.patch uploaded by Byron Clark (license #6157)
(closes issue ASTERISK-19557)
Reported by: ulugutz
........
Merged revisions 374335 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374336 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374337 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374338
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Wed, 3 Oct 2012 17:27:53 +0000 (17:27 +0000)]
Destroy the generic_monitors container after the core_instances in ccss
For each item in core_instances disposed of in the shutdown of ccss, any
generic monitor instances referenced by the objects will be removed from
generic_monitors during their destruction. Hilarity ensues if
generic_monitors no longer exists.
Thanks to the Asterisk Test Suite's generic_ccss test for complaining loudly
when it ran into this.
........
Merged revisions 374300 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374301 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374302
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 2 Oct 2012 23:23:30 +0000 (23:23 +0000)]
Missed an astobj2.c debug tag.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374279
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Tue, 2 Oct 2012 22:39:47 +0000 (22:39 +0000)]
* Add ref debug tags to astobj2.c ref usage.
* Make container nodes not show up in the ref debug log.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374269
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Tue, 2 Oct 2012 21:26:27 +0000 (21:26 +0000)]
Ensure Shutdown AMI event is still fired during Asterisk shutdown
Richard pointed out that having the manager dispose of itself gracefully
during shutdown meant that the Shutdown event will no longer get fired.
This patch moves the AMI event just prior to running the atexit callbacks.
........
Merged revisions 374230 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374231 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374248 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374259
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Tue, 2 Oct 2012 20:45:22 +0000 (20:45 +0000)]
Modify hashtest2 to compile after r374213. Someone, somewhere, may care.
Because hashtest2 has to provide symbols for things in asterisk that items
it includes may use, when astobj2 decided to use ast_register_atexit it needed
to provide a declaration for that as well. Otherwise - no linky.
On a related note, ASTERISK-20505 was filed to convert hashtest/hashtest2 into
actual unit tests, so we don't run into this problem again.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374229
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Tue, 2 Oct 2012 17:16:20 +0000 (17:16 +0000)]
Fix findings from check-in on r374177
Richard pointed out two problems with the check-in from r374177:
* The ast_msg_shutdown function declaration doesn't match the prototype
in main/message.c.
* The ref/alloc function usage in astobj2 (in trunk) can use the ao2_t_*
variants of the functions to allow the REF_DEBUG flag to enable/disable
their debug counterparts.
........
Merged revisions 374210 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374211 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374213
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Tue, 2 Oct 2012 01:47:16 +0000 (01:47 +0000)]
Fix a variety of ref counting issues
This patch resolves a number of ref leaks that occur primarily on Asterisk
shutdown. It adds a variety of shutdown routines to core portions of
Asterisk such that they can reclaim resources allocate duringd initialization.
Review: https://reviewboard.asterisk.org/r/2137
........
Merged revisions 374177 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374178 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374196 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374197
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Mon, 1 Oct 2012 23:39:45 +0000 (23:39 +0000)]
Doxygen Cleanup
Start adding configuration file linking and pages. Add module loading doxygen block.
Breaking up commits to keep it easy to track
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374167
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Mon, 1 Oct 2012 23:24:35 +0000 (23:24 +0000)]
Doxygen Cleanup
Start adding configuration file linking and pages. Add module loading doxygen block.
Breaking up commits to keep it easy to track
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374166
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Mon, 1 Oct 2012 23:24:10 +0000 (23:24 +0000)]
Doxygen Cleanup
Start adding configuration file linking and pages. Add module loading doxygen block.
Breaking up commits to keep it easy to track
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374165
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Andrew Latham [Mon, 1 Oct 2012 23:22:50 +0000 (23:22 +0000)]
Doxygen Cleanup
Start adding configuration file linking and pages. Add module loading doxygen block.
(issue ASTERISK-20259)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374164
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Mon, 1 Oct 2012 20:36:25 +0000 (20:36 +0000)]
app_queue: Support persisting and loading of long member lists.
Greenlight in #asterisk brought up that he was receiving an error message "Could
not create persistent member string, out of space" when running app_queue in
Asterisk 10. dump_queue_members() made an assumption that 8K would be enough to
store the generated string, but with queues that have large member lists this is
not always the case. This patch removes the limitation and uses ast_str instead
of a fixed sized buffer.
The complicating factor comes from the fact that ast_db_get requires a buffer
and buffer size argument, which doesn't let us pull back more than what we pass
in, so I introduced a new ast_db_get_allocated() which returns an ast_strdup()'d
copy of the value from astdb.
As an aside, I did some testing on the maximum size of data that we can store in
the BDB library we distribute and was able to store a 10MB string and retrieve
it with no problems, so I feel this is a safe patch.
Review: https://reviewboard.asterisk.org/r/2136/
........
Merged revisions 374108 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374135 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374150 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374151
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Sean Bright [Mon, 1 Oct 2012 17:28:41 +0000 (17:28 +0000)]
Use ast_copy_string instead of strncpy to guarantee a NUL terminated string.
........
Merged revisions 374132 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374133 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374134
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Mon, 1 Oct 2012 17:05:37 +0000 (17:05 +0000)]
Change core show help output format.
The CLI "core show help" output leaves something to be desired.
1) The command is truncated to a maximum of 30 characters.
2) The output columns are mirrored from the 31st column.
Current output format:
logger mute Toggle logging output to a console
logger reload Reopens the log files
logger rotate Rotates and reopens the log files
logger set level {DEBUG|NOTICE Enables/Disables a specific logging level for this console
logger show channels List configured log channels
New format:
logger mute -- Toggle logging output to a console
logger reload -- Reopens the log files
logger rotate -- Rotates and reopens the log files
logger set level {DEBUG|NOTICE|WARNING|ERROR|VERBOSE|DTMF} {on|off} -- Enables/Disables a specific logging level for this console
logger show channels -- List configured log channels
Review: https://reviewboard.asterisk.org/r/2133/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374109
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Mark Michelson [Mon, 1 Oct 2012 16:26:23 +0000 (16:26 +0000)]
Don't destroy confbridge config when error is encountered during a reload.
Not panicking means that the old config is kept.
(closes issue ASTERISK-20458)
Reported by: Leif Madsen
Patches:
ASTERISK-20458.patch uploaded by Mark Michelson(license #5049)
Tested by Leif Madsen
........
Merged revisions 374106 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374107
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 1 Oct 2012 12:29:04 +0000 (12:29 +0000)]
Add support for retrieving engine specific settings using the speech API and from dialplan.
(closes issue ASTERISK-17136)
Reported by: kenner
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374096
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matthew Jordan [Sat, 29 Sep 2012 03:56:49 +0000 (03:56 +0000)]
Fix ref leak when adding ICE candidates to an SDP
There was a missing decrement to the reference count for the current ICE
candidate when local candidates are being added to an outbound SDP. This
patch corrects that.
........
Merged revisions 374085 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374086
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Richard Mudgett [Fri, 28 Sep 2012 22:11:19 +0000 (22:11 +0000)]
Include channel uniqueid in "AsyncAGI" and "AGIExec" events.
* Added AMI event documentation for AsyncAGI and AGIExec events.
(closes issue ASTERISK-20318)
Reported by: Dan Cropp
Patches:
res_agi_patch.txt (license #6422) patch uploaded by Dan Cropp
modified for trunk.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374075
65c4cc65-6c06-0410-ace0-
fbb531ad65f3