asterisk/asterisk.git
11 years agoMerged revisions 140670 via svnmerge from
Steve Murphy [Tue, 2 Sep 2008 22:50:59 +0000 (22:50 +0000)]
Merged revisions 140670 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140670 | murf | 2008-09-02 16:15:57 -0600 (Tue, 02 Sep 2008) | 14 lines

(closes issue #13409)
Reported by: tomaso
Patches:
      asterisk-1.6.0-rc2-cdrmemleak.patch uploaded by tomaso (license 564)

I basically spent the day, verifying that this patch
solves the problem, and doesn't hurt in non-problem
cases. Why valgrind did not plainly reveal this leak
absolutely mystifies and stuns me.

Many, many thanks to tomaso for finding and providing the fix.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140691 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140605 via svnmerge from
Sean Bright [Tue, 2 Sep 2008 18:15:54 +0000 (18:15 +0000)]
Merged revisions 140605 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140605 | seanbright | 2008-09-02 14:14:57 -0400 (Tue, 02 Sep 2008) | 8 lines

Make sure to use the correct length of the mohinterpret and mohsuggest
buffers when copying configuration values.

(closes issue #13336)
Reported by: decryptus_proformatique
Patches:
      chan_iax2_mohinterpret_mohsuggest_general_settings.patch uploaded by decryptus (license 555)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140606 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoUpdate instructions for getting libresample
Russell Bryant [Tue, 2 Sep 2008 15:11:53 +0000 (15:11 +0000)]
Update instructions for getting libresample

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140566 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoI'm not sure how these files got to trunk (probably my fault), but they
Russell Bryant [Tue, 2 Sep 2008 15:09:20 +0000 (15:09 +0000)]
I'm not sure how these files got to trunk (probably my fault), but they
should not be here

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140563 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoWhen a call is rejected because of call-limit, the channel driver is behaving
Sean Bright [Tue, 2 Sep 2008 14:41:41 +0000 (14:41 +0000)]
When a call is rejected because of call-limit, the channel driver is behaving
as expected, so we shouldn't report it as an error.  Change to LOG_NOTICE
instead.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140559 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoAdded the option s to the Park application which will silence the announcement of...
Jeff Peeler [Fri, 29 Aug 2008 17:53:32 +0000 (17:53 +0000)]
Added the option s to the Park application which will silence the announcement of the parking space number. Also, fixes the bug of just clearing the flags instead of actually parsing the arguments to Park.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140491 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140488 via svnmerge from
Mark Michelson [Fri, 29 Aug 2008 17:47:17 +0000 (17:47 +0000)]
Merged revisions 140488 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140488 | mmichelson | 2008-08-29 12:34:17 -0500 (Fri, 29 Aug 2008) | 22 lines

After working on the ao2_containers branch, I noticed
something a bit strange. In all cases where we provide
a callback function to ao2_container_alloc, the callback
function would only return 0 or CMP_MATCH. After inspecting
the ao2_callback() code carefully, I found that if you're
only looking for one specific item, then you should return
CMP_MATCH | CMP_STOP. Otherwise, astobj2 will continue
traversing the current bucket until the end searching for
more matches.

In cases like chan_iax2 where in 1.4, all the peers are
shoved into a single bucket, this makes for potentially
terrible performance since the entire bucket will be
traversed even if the peer is one of the first ones come
across in the bucket.

All the changes I have made were for cases where the
callback function defined was passed to ao2_container_alloc
so that calls to ao2_find could find a unique instance
of whatever object was being stored in the container.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140489 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoAllow for video files to be opened as well as
Mark Michelson [Fri, 29 Aug 2008 16:24:37 +0000 (16:24 +0000)]
Allow for video files to be opened as well as
audio files.

(closes issue #13372)
Reported by: epicac
Patches:
      13372.patch uploaded by putnopvut (license 60)
Tested by: epicac

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140433 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140421 via svnmerge from
Mark Michelson [Fri, 29 Aug 2008 16:06:09 +0000 (16:06 +0000)]
Merged revisions 140421 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140421 | mmichelson | 2008-08-29 11:01:07 -0500 (Fri, 29 Aug 2008) | 12 lines

Add context checking when retrieving a vm_state.
This was causing a problem for people who had identically
named mailboxes in separate voicemail contexts.
This commit affects IMAP storage only.

(closes issue #13194)
Reported by: moliveras
Patches:
      13194.patch uploaded by putnopvut (license 60)
Tested by: putnopvut, moliveras

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140422 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140417 via svnmerge from
Mark Michelson [Fri, 29 Aug 2008 15:32:02 +0000 (15:32 +0000)]
Merged revisions 140417 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140417 | mmichelson | 2008-08-29 10:26:52 -0500 (Fri, 29 Aug 2008) | 10 lines

Fix SIP's parsing so that if a port is specified
in a string to Dial(), it is not ignored.

(closes issue #13355)
Reported by: acunningham
Patches:
      13355v2.patch uploaded by putnopvut (license 60)
Tested by: acunningham

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140418 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoOops
Tilghman Lesher [Wed, 27 Aug 2008 23:23:56 +0000 (23:23 +0000)]
Oops

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140355 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140299 via svnmerge from
Mark Michelson [Wed, 27 Aug 2008 20:11:22 +0000 (20:11 +0000)]
Merged revisions 140299 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140299 | mmichelson | 2008-08-27 14:49:20 -0500 (Wed, 27 Aug 2008) | 11 lines

Fix tag checking in get_sip_pvt_byid_locked when
in pedantic mode. The problem was that the wrong
tags would be compared depending on the direction
of the call.

(closes issue #13353)
Reported by: flefoll
Patches:
      chan_sip.c.br14.139015.patch-refer-pedantic uploaded by flefoll (license 244)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140301 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMove the mwi send thread functionality back into the do_monitor thread so that it...
Doug Bailey [Tue, 26 Aug 2008 21:59:31 +0000 (21:59 +0000)]
Move the mwi send thread functionality back into the do_monitor thread so that it is easier to manage CID spill resources when do_monitor needs to be killed.
(closes issue #13213)
Reported by: bbryant

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140246 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140056 via svnmerge from
Jeff Peeler [Tue, 26 Aug 2008 18:48:55 +0000 (18:48 +0000)]
Merged revisions 140056 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140056 | jpeeler | 2008-08-26 10:57:02 -0500 (Tue, 26 Aug 2008) | 9 lines

(closes issue #12071)
Reported by: tzafrir
Patches:
      dahdi_close.diff uploaded by tzafrir (license 46)
Tested by: tzafrir, jpeeler

This patch fixes closing open file descriptors in the case of an error.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140205 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoOpenBSD compat fix (reminded by mvanbaak on #asterisk-dev)
Tilghman Lesher [Tue, 26 Aug 2008 18:46:07 +0000 (18:46 +0000)]
OpenBSD compat fix (reminded by mvanbaak on #asterisk-dev)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140201 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoFix building menuselect-tree with PRINT_DIR set. We _must_ use the --quiet
Russell Bryant [Tue, 26 Aug 2008 18:11:49 +0000 (18:11 +0000)]
Fix building menuselect-tree with PRINT_DIR set.  We _must_ use the --quiet
flag here, or else some arbitrary text will end up in the resulting
menuselect-tree file and things will explode.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140169 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoStandardize the option names for consistency (but continue to work with the
Tilghman Lesher [Tue, 26 Aug 2008 18:05:58 +0000 (18:05 +0000)]
Standardize the option names for consistency (but continue to work with the
existing names for backwards compatibility).
(closes issue #13370)
 Reported by: jsturtevant

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140167 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 140115 via svnmerge
Jeff Peeler [Tue, 26 Aug 2008 16:51:48 +0000 (16:51 +0000)]
Blocked revisions 140115 via svnmerge

........
r140115 | jpeeler | 2008-08-26 11:49:57 -0500 (Tue, 26 Aug 2008) | 1 line

add HAVE_PRI if define around dahdi_close_pri_fd
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140116 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140060 via svnmerge from
Russell Bryant [Tue, 26 Aug 2008 16:10:06 +0000 (16:10 +0000)]
Merged revisions 140060 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140060 | russell | 2008-08-26 11:07:58 -0500 (Tue, 26 Aug 2008) | 6 lines

Fix some bogus scheduler usage in chan_sip.  This code used the return value
of a completely unrelated function to determine whether the scheduler should
be run or not.  This would have caused the scheduler to not run in cases where
it should have.  Also, leave a note about another scheduler issue that needs
to be addressed at some point.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140061 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years ago(closes issue #13366)
Steve Murphy [Tue, 26 Aug 2008 15:57:49 +0000 (15:57 +0000)]
(closes issue #13366)
Reported by: erousseau

This was a reasonable enhancement request, which was
easy to implement. Since it's an enhancement, it
could only be applied to trunk.

Basically, for accounting where "initiated" seconds
are billed for, if the microseconds field on the end
time is greater than the microseconds field for the
answer time, add one second to the billsec field.

The implementation was requested by erousseau, and
I've implemented it as requested. I've updated the
CHANGES, the cdr.conf.sample, and the .h files
accordingly, to accept and set a flag for the
corresponding new option. cdr.c adds in the extra
second based on the usec fields if the option is
set. Tested, seems to be working fine.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140057 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 140051 via svnmerge from
Russell Bryant [Tue, 26 Aug 2008 15:29:25 +0000 (15:29 +0000)]
Merged revisions 140051 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r140051 | russell | 2008-08-26 10:27:23 -0500 (Tue, 26 Aug 2008) | 15 lines

Fix a race condition with the IAX scheduler thread.  A lock and condition are
used here to allow newly scheduled tasks to wake up the scheduler just in case
the new task needs to run sooner than the current wakeup time when the thread
is sleeping.  However, there was a race condition such that a newly scheduled
task would not properly wake up the scheduler or affect the wake up period.
The order of execution would have been:

  1) Scheduler thread determines wake up time of N ms.
  2) Another thread schedules a task and signals the condition, with an
     execution time of < N ms.
  3) Scheduler thread locks and goes to sleep for N ms.

By moving the sleep time determination to inside the critical section, this
possibility is avoided.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140053 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 140050 via svnmerge
Terry Wilson [Tue, 26 Aug 2008 15:27:46 +0000 (15:27 +0000)]
Blocked revisions 140050 via svnmerge

........
r140050 | twilson | 2008-08-26 10:22:58 -0500 (Tue, 26 Aug 2008) | 4 lines

sounds/Makefile installs sounds using the "new" language directory structure, but languageprefix needs to be set = yes for sounds in subdirectories (digits/1, etc.) to play as the correct language.

Fix the generation of asterisk.conf to include languageprefix=yes

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@140052 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoOptional light colored background, for those who use black on white terminals.
Tilghman Lesher [Mon, 25 Aug 2008 23:13:32 +0000 (23:13 +0000)]
Optional light colored background, for those who use black on white terminals.
(closes issue #13306)
 Reported by: Corydon76
 Patches:
       20080814__bug13306__3.diff.txt uploaded by Corydon76 (license 14)
 Tested by: Corydon76, pkempgen

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139981 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139927 via svnmerge from
Jeff Peeler [Mon, 25 Aug 2008 21:48:51 +0000 (21:48 +0000)]
Merged revisions 139927 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139927 | jpeeler | 2008-08-25 16:47:33 -0500 (Mon, 25 Aug 2008) | 3 lines

Fix a typo I made. Lesson learned, apply the patch if one exists.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139928 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139909 via svnmerge from
Sean Bright [Mon, 25 Aug 2008 21:32:10 +0000 (21:32 +0000)]
Merged revisions 139909 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139909 | seanbright | 2008-08-25 17:31:03 -0400 (Mon, 25 Aug 2008) | 9 lines

Some versions of awk (nawk, for example) don't like empty regular expressions
so be slightly more verbose.

(closes issue #13374)
Reported by: dougm
Patches:
      13374.diff uploaded by seanbright (license 71)
Tested by: dougm

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139915 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139869 via svnmerge from
Terry Wilson [Mon, 25 Aug 2008 20:59:58 +0000 (20:59 +0000)]
Merged revisions 139869 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139869 | twilson | 2008-08-25 15:46:10 -0500 (Mon, 25 Aug 2008) | 2 lines

Make SIPADDHEADER() propagate indefinitely

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139870 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoAdd output of variables to AgentRingNoAnswer manager
Mark Michelson [Mon, 25 Aug 2008 17:24:02 +0000 (17:24 +0000)]
Add output of variables to AgentRingNoAnswer manager
event if eventwhencalled is set to "vars" in
queues.conf. Yay for consistency.

(closes issue #13369)
Reported by: srt
Patches:
      13369_agentringnoanswer_variables.diff uploaded by srt (license 378)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139832 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoRealtime capabilities for the Find-Me-Follow-Me application.
Tilghman Lesher [Mon, 25 Aug 2008 16:02:56 +0000 (16:02 +0000)]
Realtime capabilities for the Find-Me-Follow-Me application.
(closes issue #13295)
 Reported by: Corydon76
 Patches:
       20080813__followme_realtime_enabled.diff.txt uploaded by Corydon76 (license 14)
 Tested by: dferrer

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139775 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 139769 via svnmerge
Mark Michelson [Mon, 25 Aug 2008 15:55:10 +0000 (15:55 +0000)]
Blocked revisions 139769 via svnmerge

........
r139769 | mmichelson | 2008-08-25 10:52:59 -0500 (Mon, 25 Aug 2008) | 12 lines

Fix the logic in config_text_file_save so that if an
UpdateConfig manager action is issued and the
file specified in DstFileName does not yet exist,
an error is not returned.

(closes issue #13341)
Reported by: vadim
Patches:
      13341.patch uploaded by putnopvut (license 60)
  (with small modification from seanbright)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139771 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139764 via svnmerge from
Steve Murphy [Mon, 25 Aug 2008 15:54:18 +0000 (15:54 +0000)]
Merged revisions 139764 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139764 | murf | 2008-08-25 09:33:14 -0600 (Mon, 25 Aug 2008) | 9 lines

This patch reverts the changes made via 139347, and 139635, as users
are seeing adverse difference.

I will un-close 13251.

Back to the drawing board/ concept/ beginning/ whatever!

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139770 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMemory leak
Tilghman Lesher [Sun, 24 Aug 2008 16:26:48 +0000 (16:26 +0000)]
Memory leak

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139707 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoEliminate open coding of ast_str
Tilghman Lesher [Sun, 24 Aug 2008 16:23:15 +0000 (16:23 +0000)]
Eliminate open coding of ast_str

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139704 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139635 via svnmerge from
Steve Murphy [Fri, 22 Aug 2008 22:32:35 +0000 (22:32 +0000)]
Merged revisions 139635 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139635 | murf | 2008-08-22 16:24:02 -0600 (Fri, 22 Aug 2008) | 6 lines

I found some problems with the code I committed earlier, when
I merged them into trunk, so I'm coming back to clean up.
And, in the process, I found an error in the code I added
to trunk and 1.6.x, that I'll fix using this patch also.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139662 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139347 via svnmerge from
Steve Murphy [Fri, 22 Aug 2008 22:03:13 +0000 (22:03 +0000)]
Merged revisions 139347 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139347 | murf | 2008-08-21 17:03:50 -0600 (Thu, 21 Aug 2008) | 47 lines

(closes issue #13251)
Reported by: sergee
Tested by: murf

THis is a bold move for a static release fix, but I wouldn't have
made it if I didn't feel confident (at least a *bit* confident)
that it wouldn't mess everyone up.

The reasoning goes something like this:

1. We simply cannot do anything with CDR's at the current point
(in pbx.c, after the __ast_pbx_run loop). It's way too late to
have any affect on the CDRs. The CDR is already posted and gone,
and the remnants have been cleared.

2. I was very much afraid that moving the running of the 'h'
extension down into the bridge code (where it would be now
practical to do it), would result in a lot more calls to the
'h' exten, so I implemented it as another exten under another
name, but found, to my pleasant surprise, that there was a
1:1 correspondence to the running of the 'h' exten in the
pbx_run loop, and the new spot at the end of the bridge.
So, I ifdef'd out the current 'h' loop, and moved it into
the bridge code. The only difference I can see is the stuff
about the AST_PBX_KEEPALIVE, and hopefully, if this
is still an important decision point, I can replicate it
if there are complaints. To be perfectly honest,
the KEEPALIVE situation is not totally clear to me,
and how it relates to a post-bridge situation is less
clear. I suspect the users will point out everything
in total clarity if this steps on anyone's toes!

3. I temporarily swap the bridge_cdr into the channel
before running the 'h' exten, which makes it possible
for users to edit the cdr before it goes out the door.
And, of course, with the endbeforehexten config var set,
the users can also get at the billsec/duration vals.
After the h exten finishes, the cdr is swapped back
and processing continues as normal.

Please, all who deal with CDR's, please test this version
of Asterisk, and file bug reports as appropriate!

........

I also made a little fix to the app_dial's 'e' option,
that is related to my updates.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139627 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139621 via svnmerge from
Jeff Peeler [Fri, 22 Aug 2008 21:57:32 +0000 (21:57 +0000)]
Merged revisions 139621 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139621 | jpeeler | 2008-08-22 16:36:13 -0500 (Fri, 22 Aug 2008) | 5 lines

(closes issue #13359)
Reported by: Laureano
Patches:
      originate_channel_check.patch uploaded by Laureano (license 265)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139624 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoremove extra comma typo
Jeff Peeler [Fri, 22 Aug 2008 21:52:20 +0000 (21:52 +0000)]
remove extra comma typo

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139622 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoThe -1 return value from incomplete or improper
Mark Michelson [Fri, 22 Aug 2008 20:20:58 +0000 (20:20 +0000)]
The -1 return value from incomplete or improper
headers for the SipNotify manager command was
causing the current manager session to become
disconnected. Change the return value to 0 for
these cases.

Also change a test for a NULL pointer to be
ast_strlen_zero instead.

(closes issue #13351)
Reported by: Laureano
Patches:
      sipnotify_action_fix.patch uploaded by Laureano (license 265)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139563 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoAdd missing unique id to ParkedCallGiveUp and ParkedCallTimeOut
Mark Michelson [Fri, 22 Aug 2008 20:02:35 +0000 (20:02 +0000)]
Add missing unique id to ParkedCallGiveUp and ParkedCallTimeOut
manager events

(closes issue #13358)
Reported by: srt
Patches:
      13358_parking_events.diff uploaded by srt (license 378)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139558 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139553 via svnmerge from
Mark Michelson [Fri, 22 Aug 2008 19:45:41 +0000 (19:45 +0000)]
Merged revisions 139553 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139553 | mmichelson | 2008-08-22 14:45:19 -0500 (Fri, 22 Aug 2008) | 8 lines

Fix compilation when DEBUG_THREAD_LOCALS is selected

(closes issue #13298)
Reported by: snuffy
Patches:
      bug13298_20080822.diff uploaded by snuffy (license 35)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139554 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 139521 via svnmerge
Mark Michelson [Fri, 22 Aug 2008 19:24:26 +0000 (19:24 +0000)]
Blocked revisions 139521 via svnmerge

........
r139521 | mmichelson | 2008-08-22 14:23:02 -0500 (Fri, 22 Aug 2008) | 8 lines

Remove show_frame_stats_deprecated since it is not
used anywhere and causes build errors if building under
dev-mode with TRACE_FRAMES selected in menuselect.

(closes issue #13362)
Reported by: snuffy

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139525 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139466 via svnmerge from
Mark Michelson [Fri, 22 Aug 2008 17:25:12 +0000 (17:25 +0000)]
Merged revisions 139466 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139466 | mmichelson | 2008-08-22 12:24:47 -0500 (Fri, 22 Aug 2008) | 3 lines

Fix the build. Thanks, mvanbaak!

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139469 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139456 via svnmerge from
Mark Michelson [Fri, 22 Aug 2008 16:58:21 +0000 (16:58 +0000)]
Merged revisions 139456 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139456 | mmichelson | 2008-08-22 11:57:38 -0500 (Fri, 22 Aug 2008) | 7 lines

Prevent a deadlock in chan_iax2 resulting from
incorrect locking order between iax2_pvt and
ast_channel structures.

AST-13

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139457 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139387 via svnmerge from
Jeff Peeler [Thu, 21 Aug 2008 23:41:50 +0000 (23:41 +0000)]
Merged revisions 139387 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139387 | jpeeler | 2008-08-21 18:39:31 -0500 (Thu, 21 Aug 2008) | 3 lines

Fixes loop that could possibly never exit in the event of a channel never being able to be opened or specify after a restart.
(closes issue #11017)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139391 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agooops
Dwayne M. Hubbard [Thu, 21 Aug 2008 23:00:31 +0000 (23:00 +0000)]
oops

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139346 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoinitiate T38 negotiation in FaxSend; use channel variables; other stuff too
Dwayne M. Hubbard [Thu, 21 Aug 2008 22:54:18 +0000 (22:54 +0000)]
initiate T38 negotiation in FaxSend; use channel variables; other stuff too

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139345 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoFix two memory leaks in chan_gtalk, thanks Eliel!
Philippe Sultan [Thu, 21 Aug 2008 09:55:31 +0000 (09:55 +0000)]
Fix two memory leaks in chan_gtalk, thanks Eliel!
(closes issue #13310)
Reported by: eliel
Patches:
      chan_gtalk.c.patch uploaded by eliel (license 64)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139281 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139213 via svnmerge from
Russell Bryant [Wed, 20 Aug 2008 22:16:36 +0000 (22:16 +0000)]
Merged revisions 139213 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139213 | russell | 2008-08-20 17:14:35 -0500 (Wed, 20 Aug 2008) | 11 lines

Fix a crash in the ChanSpy application.  The issue here is that if you call
ChanSpy and specify a spy group, and sit in the application long enough looping
through the channel list, you will eventually run out of stack space and the
application with exit with a seg fault.  The backtrace was always inside of
a harmless snprintf() call, so it was tricky to track down.  However, it turned
out that the call to snprintf() was just the biggest stack consumer in this
code path, so it would always be the first one to hit the boundary.

(closes issue #13338)
Reported by: ruddy

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139215 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoFix output of sipshowpeer manager response.
Jason Parker [Wed, 20 Aug 2008 22:06:40 +0000 (22:06 +0000)]
Fix output of sipshowpeer manager response.

(closes issue #13346)
Reported by: srt
Patches:
      13346_malformed_sip_show_peer_response.diff uploaded by srt (license 378)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139210 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoRemove extraneous debugging messages.
Shaun Ruffell [Wed, 20 Aug 2008 20:03:28 +0000 (20:03 +0000)]
Remove extraneous debugging messages.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139154 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoFix bug where the samples were not accurate when in G723 mode, which would
Shaun Ruffell [Wed, 20 Aug 2008 19:57:22 +0000 (19:57 +0000)]
Fix bug where the samples were not accurate when in G723 mode, which would
cause the timestamp field of the RTP header to be invalid.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139153 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 139145 via svnmerge
Kevin P. Fleming [Wed, 20 Aug 2008 19:36:27 +0000 (19:36 +0000)]
Blocked revisions 139145 via svnmerge

........
r139145 | kpfleming | 2008-08-20 14:35:59 -0500 (Wed, 20 Aug 2008) | 8 lines

Backport support for Zaptel/DAHDI channel-level alarms from trunk/1.6, because not doing so just makes it difficult for people with channels that are in alarm when Asterisk starts up to get them going once the alarm is cleared

(closes issue #12160)
Reported by: tzafrir
Patches:
      asterisk-chanalarms_14.patch uploaded by tzafrir (license 46)
Tested by: tzafrir

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139146 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139074 via svnmerge from
Steve Murphy [Wed, 20 Aug 2008 17:25:07 +0000 (17:25 +0000)]
Merged revisions 139074 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139074 | murf | 2008-08-20 11:14:55 -0600 (Wed, 20 Aug 2008) | 12 lines

(closes issue #13263)
Reported by: brainy
Tested by: murf

The specialized reset routine is tromping on the
flags field of the CDR. I made a change to not
reset the DISABLED bit. This should get rid of this
problem.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139083 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agofix unholding phones after hangup on older cisco phones.
Michiel van Baak [Wed, 20 Aug 2008 16:16:53 +0000 (16:16 +0000)]
fix unholding phones after hangup on older cisco phones.

Patch by wedhorn.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139020 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 139015 via svnmerge from
Mark Michelson [Wed, 20 Aug 2008 15:38:47 +0000 (15:38 +0000)]
Merged revisions 139015 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139015 | mmichelson | 2008-08-20 10:37:56 -0500 (Wed, 20 Aug 2008) | 6 lines

sip_read should properly handle a NULL return from sip_rtp_read.

(closes issue #13257)
Reported by: travishein

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@139016 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 138949 via svnmerge
Jeff Peeler [Tue, 19 Aug 2008 23:23:02 +0000 (23:23 +0000)]
Blocked revisions 138949 via svnmerge

........
r138949 | jpeeler | 2008-08-19 18:22:39 -0500 (Tue, 19 Aug 2008) | 1 line

add DAHDI_POLICY_WHEN_FULL compatability define for Zaptel
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138951 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 138942 via svnmerge from
Mark Michelson [Tue, 19 Aug 2008 23:19:40 +0000 (23:19 +0000)]
Merged revisions 138942 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138942 | mmichelson | 2008-08-19 18:17:17 -0500 (Tue, 19 Aug 2008) | 11 lines

Reset agent_pvt variables back to the values in agents.conf
(from what the corresponding channel variables were set to)
when the agent logs out.

(closes issue #13098)
Reported by: davidw
Patches:
      20080731__issue13098_agent_ackcall_not_reset.diff uploaded by bbryant (license 36)
Tested by: davidw

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138943 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 138938 via svnmerge
Jeff Peeler [Tue, 19 Aug 2008 22:56:42 +0000 (22:56 +0000)]
Blocked revisions 138938 via svnmerge

........
r138938 | jpeeler | 2008-08-19 17:56:07 -0500 (Tue, 19 Aug 2008) | 7 lines

Add configuration option to chan_dahdi.conf to allow buffering policy and number of buffers to be configured per channel. Syntax:

buffers=<num of buffers>,<policy>

Where the number of buffers is some non-negative integer and the policy is either "full", "half", or "immediate".

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138939 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 138886 via svnmerge from
Mark Michelson [Tue, 19 Aug 2008 18:52:04 +0000 (18:52 +0000)]
Merged revisions 138886 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138886 | mmichelson | 2008-08-19 13:50:53 -0500 (Tue, 19 Aug 2008) | 23 lines

Add a lock and unlock prior to the destruction of the chanspy_ds
lock to ensure that no other threads still have it locked. While
this should not happen under normal circumstances, it appears that
if the spyer and spyee hang up at nearly the same time, the following
may occur.

1. ast_channel_free is called on the spyee's channel.
2. The chanspy datastore is removed from the spyee's channel in
   ast_channel_free.
3. In the spyer's thread, the spyer attempts to remove and destroy the datastore
   from the spyee channel, but the datastore has already been removed in step 2,
   so the spyer continues in the code.
4. The spyee's thread continues and calls the datastore's destroy callback,
   chanspy_ds_destroy. This involves locking the chanspy_ds.
5. Now the spyer attempts to destroy the chanspy_ds lock. The problem is that in step 4,
   the spyee has locked this lock, meaning that the spyer is attempting to destroy a lock
   which is currently locked by another thread.

The backtrace provided in issue #12969 supports the idea that this is possible
(and has even occurred). This commit does not close the issue, but should help
in preventing one type of crash associated with the use of app_chanspy.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138887 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agochan_skinny now respects callwaiting=no
Michiel van Baak [Tue, 19 Aug 2008 16:56:50 +0000 (16:56 +0000)]
chan_skinny now respects callwaiting=no

(closes issue #12691)
Reported by: sbisker
Patches:
      callwaitingv1.diff uploaded by wedhorn (license 30)
Tested by: wedhorn on old skinny phones, mvanbaak on 7960 and 7905 with latest firmware

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138851 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoOops. put a decl in a generated file. My bad, but fixed now.
Steve Murphy [Tue, 19 Aug 2008 16:31:24 +0000 (16:31 +0000)]
Oops. put a decl in a generated file. My bad, but fixed now.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138845 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoThese changes are in regards to bug 13249, where users are being surprised by the...
Steve Murphy [Tue, 19 Aug 2008 15:59:12 +0000 (15:59 +0000)]
These changes are in regards to bug 13249, where users are being surprised by the changes made
to the Set app in trunk/1.6.x, as they come from the 1.4 world. They are only bitten if
they write their AEL dialplan in the 1.4 world, and then carry it over to a trunk/1.6.x
installation where a "make samples" was executed, or where they hand-edited the
asterisk.conf file and added the [compat] category with app_set = 1.6 (or higher).

(this commit does not totally solve 13249, at least not yet)

The change involves issueing a single warning while the AEL file is loading, if:
 1. app_set is present in the config file, and set to 1.6 or higher.
 2. there are double quotes in an assignment statement (eg x = "hi there";)
 3. the warning was not already issued.

The standalone app, aelparse, does not (yet) issue this warning. I'd have to
have it read in the asterisk.conf file, and that's a bit of hassle. I'll add
it if users request it, tho.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138815 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMention JID rather than SreenName in help messages
Philippe Sultan [Tue, 19 Aug 2008 15:58:39 +0000 (15:58 +0000)]
Mention JID rather than SreenName in help messages

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138814 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoLet it compile now, too (woops)
Sean Bright [Tue, 19 Aug 2008 00:10:56 +0000 (00:10 +0000)]
Let it compile now, too (woops)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138780 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoAnd remove code we don't need anymore.
Sean Bright [Tue, 19 Aug 2008 00:09:38 +0000 (00:09 +0000)]
And remove code we don't need anymore.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138779 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoWhile we're at it, make this machine parseable too.
Sean Bright [Tue, 19 Aug 2008 00:08:27 +0000 (00:08 +0000)]
While we're at it, make this machine parseable too.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138778 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoChange event header to RegistrationTime to be more consistent (and avoid
Sean Bright [Mon, 18 Aug 2008 23:42:36 +0000 (23:42 +0000)]
Change event header to RegistrationTime to be more consistent (and avoid
breaking existing frameworks).  Pointed out by Laureano on #asterisk-dev.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138775 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agochannels/chan_misdn.c
Richard Mudgett [Mon, 18 Aug 2008 21:07:28 +0000 (21:07 +0000)]
channels/chan_misdn.c
*  Made bearer2str() use allowed_bearers_array[]
*  Made use the causes.h defines instead of hardcoded numbers.
*  Made use Asterisk presentation indicator values if either of the
mISDN presentation or screen options are negative.
*  Updated the misdn_set_opt application option descriptions.
*  Renamed the awkward Caller ID presentation misdn_set_opt
application option value not_screened to restricted.
Deprecated the not_screened option value.

channels/misdn/isdn_lib.c
*  Made use the causes.h defines instead of hardcoded numbers.
*  Fixed some spelling errors and typos.
*  Added all defined facility code strings to fac2str().

channels/misdn/isdn_lib.h
*  Added doxygen comments to struct misdn_bchannel.

channels/misdn/isdn_lib_intern.h
*  Added doxygen comments to struct misdn_stack.

channels/misdn_config.c
configs/misdn.conf.sample
*  Updated the mISDN presentation and screen parameter descriptions.

doc/tex/misdn.tex
*  Updated the misdn_set_opt application option descriptions.
*  Fixed some spelling errors and typos.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138738 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoChange the queue timeout priority logic into less ugly
Mark Michelson [Mon, 18 Aug 2008 20:23:11 +0000 (20:23 +0000)]
Change the queue timeout priority logic into less ugly
and confusing code pieces. Clarify the logic within
queues.conf.sample.

(closes issue #12690)
Reported by: atis
Patches:
      queue_timeoutpriority.patch uploaded by atis (license 242)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138694 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 138685 via svnmerge from
Mark Michelson [Mon, 18 Aug 2008 20:04:10 +0000 (20:04 +0000)]
Merged revisions 138685 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138685 | mmichelson | 2008-08-18 15:01:14 -0500 (Mon, 18 Aug 2008) | 10 lines

Change the inequalities used in app_queue with regards
to timeouts from being strict to non-strict for more
accuracy.

(closes issue #13239)
Reported by: atis
Patches:
      app_queue_timeouts_v2.patch uploaded by atis (license 242)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138687 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoRemove option that isn't valid here.
Jason Parker [Mon, 18 Aug 2008 15:54:07 +0000 (15:54 +0000)]
Remove option that isn't valid here.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138631 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 138569 via svnmerge
Sean Bright [Mon, 18 Aug 2008 11:58:49 +0000 (11:58 +0000)]
Blocked revisions 138569 via svnmerge

........
r138569 | seanbright | 2008-08-18 07:57:24 -0400 (Mon, 18 Aug 2008) | 1 line

You know what's awesome?  Code that compiles... ;)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138570 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoadd missing define for SS7 in dahdi_restart
Jeff Peeler [Mon, 18 Aug 2008 02:13:04 +0000 (02:13 +0000)]
add missing define for SS7 in dahdi_restart

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138518 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 138516 via svnmerge
Jeff Peeler [Mon, 18 Aug 2008 02:06:54 +0000 (02:06 +0000)]
Blocked revisions 138516 via svnmerge

........
r138516 | jpeeler | 2008-08-17 21:05:29 -0500 (Sun, 17 Aug 2008) | 1 line

fix compilation warnings
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138517 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMove Uniqueid to the end of the event for those that rely on the position
Sean Bright [Sun, 17 Aug 2008 14:12:11 +0000 (14:12 +0000)]
Move Uniqueid to the end of the event for those that rely on the position
of the name/value pairs, pointed out by snuffy-home on #asterisk-commits.

For those of you who rely on the position of name/value pairs in manager
events... stop... that is why associative arrays were invented.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138482 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoAdd Uniqueid header to ParkedCall manager event.
Sean Bright [Sun, 17 Aug 2008 13:51:08 +0000 (13:51 +0000)]
Add Uniqueid header to ParkedCall manager event.

(closes issue #13323)
Reported by: srt
Patches:
      13323_unique_id_for_parkedcalls_event.diff uploaded by srt (license 378)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138479 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoAdd missing colons to RTCPReceived and RTCPSent manager events.
Sean Bright [Sun, 17 Aug 2008 13:40:36 +0000 (13:40 +0000)]
Add missing colons to RTCPReceived and RTCPSent manager events.

(closes issue #13319)
Reported by: srt
Patches:
      13319_rtcp_manager_event_headers.diff uploaded by srt (license 378)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138476 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoFix the output of the JitterBufStats manager event.
Sean Bright [Sun, 17 Aug 2008 13:31:54 +0000 (13:31 +0000)]
Fix the output of the JitterBufStats manager event.

(closes issue #13324)
Reported by: srt
Patches:
      13324_missing_nl_in_jitterbufstats_event_2.diff uploaded by srt (license 378)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138473 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoSince it's introduction in revision 3497, cdr_tds has *never* read
Sean Bright [Sat, 16 Aug 2008 16:40:43 +0000 (16:40 +0000)]
Since it's introduction in revision 3497, cdr_tds has *never* read
the port configuration option from cdr_tds.conf.  So go ahead and
remove it from the sample config.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138442 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoFix compilation warnings (found with dev-mode)
Tilghman Lesher [Sat, 16 Aug 2008 13:07:08 +0000 (13:07 +0000)]
Fix compilation warnings (found with dev-mode)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138412 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoAlso make sure hinting won't crash on reload.
Tilghman Lesher [Sat, 16 Aug 2008 12:52:06 +0000 (12:52 +0000)]
Also make sure hinting won't crash on reload.
(Closes issue #13312)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138409 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 138360 via svnmerge from
Jeff Peeler [Sat, 16 Aug 2008 01:13:26 +0000 (01:13 +0000)]
Merged revisions 138360 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138360 | jpeeler | 2008-08-15 20:12:18 -0500 (Fri, 15 Aug 2008) | 1 line

fixes use count to properly decrement if an active dahdi channel is destroyed allowing module to be unloaded
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138361 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 138119,138151,138238 via svnmerge from
Jeff Peeler [Fri, 15 Aug 2008 23:46:09 +0000 (23:46 +0000)]
Merged revisions 138119,138151,138238 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138119 | jpeeler | 2008-08-15 14:21:51 -0500 (Fri, 15 Aug 2008) | 4 lines

Fixes the dahdi restart functionality. Dahdi restart allows one to restart all DAHDI channels, even if they are currently in use. This is different from unloading and then loading the module since unloading requires the use count to be zero. Reloading the module is different in that the signalling is not changed from what it was originally configured. Also, this fixes not closing all the file descriptors for D-channels upon module unload (which would prevent loading the module afterwards).

(closes issue #11017)

........
r138151 | jpeeler | 2008-08-15 14:41:29 -0500 (Fri, 15 Aug 2008) | 1 line

declared static mutexes using AST_MUTEX_DEFINE_STATIC macro
........
r138238 | jpeeler | 2008-08-15 16:28:26 -0500 (Fri, 15 Aug 2008) | 1 line

initialize condition variable ss_thread_complete using ast_cond_init
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138311 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 138309 via svnmerge
Jeff Peeler [Fri, 15 Aug 2008 23:42:28 +0000 (23:42 +0000)]
Blocked revisions 138309 via svnmerge

........
r138309 | jpeeler | 2008-08-15 18:41:54 -0500 (Fri, 15 Aug 2008) | 1 line

add forgotten locks around ss_thread_count in ss_thread for dahdi restart
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138310 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 138258 via svnmerge from
Tilghman Lesher [Fri, 15 Aug 2008 22:54:57 +0000 (22:54 +0000)]
Merged revisions 138258 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138258 | tilghman | 2008-08-15 17:33:42 -0500 (Fri, 15 Aug 2008) | 8 lines

More fixes for realtime peers.
(closes issue #12921)
 Reported by: Nuitari
 Patches:
       20080804__bug12921.diff.txt uploaded by Corydon76 (license 14)
       20080815__bug12921.diff.txt uploaded by Corydon76 (license 14)
 Tested by: Corydon76

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138260 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoRemove deprecated syntax from sample config file
Tilghman Lesher [Fri, 15 Aug 2008 20:35:24 +0000 (20:35 +0000)]
Remove deprecated syntax from sample config file
(closes issue #13314)
 Reported by: kue

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138206 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agorename all zfd instances in chan_dahdi to dfd to match 1.4 (left over from DAHDI...
Jeff Peeler [Fri, 15 Aug 2008 20:12:19 +0000 (20:12 +0000)]
rename all zfd instances in chan_dahdi to dfd to match 1.4 (left over from DAHDI transition)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138155 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoChange free to ast_free_ptr, too
Tilghman Lesher [Fri, 15 Aug 2008 19:36:11 +0000 (19:36 +0000)]
Change free to ast_free_ptr, too

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138148 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoe->data can be NULL, so use the safe version of ast_strdup()
Tilghman Lesher [Fri, 15 Aug 2008 19:22:48 +0000 (19:22 +0000)]
e->data can be NULL, so use the safe version of ast_strdup()
(closes issue #13312)
 Reported by: pj

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138124 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoregseconds is actually stored as the epoch time, not registration length
Tilghman Lesher [Fri, 15 Aug 2008 18:02:15 +0000 (18:02 +0000)]
regseconds is actually stored as the epoch time, not registration length

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138086 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 138027 via svnmerge from
Russell Bryant [Fri, 15 Aug 2008 15:09:46 +0000 (15:09 +0000)]
Merged revisions 138027 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138027 | russell | 2008-08-15 10:07:16 -0500 (Fri, 15 Aug 2008) | 9 lines

Ensure that when a hangup occurs in autoservice, that a hangup frame gets
properly deferred to be read from the channel owner when it gets taken out
of autoservice.

(closes issue #12874)
Reported by: dimas
Patches:
      v1-12874.patch uploaded by dimas (license 88)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138028 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 138023 via svnmerge from
Tilghman Lesher [Fri, 15 Aug 2008 15:03:32 +0000 (15:03 +0000)]
Merged revisions 138023 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r138023 | tilghman | 2008-08-15 09:51:12 -0500 (Fri, 15 Aug 2008) | 8 lines

Additional check for more string specifiers than arguments.
(closes issue #13299)
 Reported by: adomjan
 Patches:
       20080813__bug13299.diff.txt uploaded by Corydon76 (license 14)
       func_strings.c-sprintf.patch uploaded by adomjan (license 487)
 Tested by: adomjan

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@138024 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoFix a bashism that causes an error when trying to build the pdf on ubuntu
Russell Bryant [Thu, 14 Aug 2008 22:43:15 +0000 (22:43 +0000)]
Fix a bashism that causes an error when trying to build the pdf on ubuntu

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137987 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoFix memory leak in cdr_sqlite3_custom.
Sean Bright [Thu, 14 Aug 2008 18:47:28 +0000 (18:47 +0000)]
Fix memory leak in cdr_sqlite3_custom.

(closes issue #13304)
Reported by: eliel
Patches:
      sqlite.patch uploaded by eliel (license 64)
      (Slightly modified by me)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137933 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoPrepare for adding 1.6.2 changes
Russell Bryant [Thu, 14 Aug 2008 18:12:16 +0000 (18:12 +0000)]
Prepare for adding 1.6.2 changes

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137901 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoBlocked revisions 137850 via svnmerge
Tilghman Lesher [Thu, 14 Aug 2008 17:01:00 +0000 (17:01 +0000)]
Blocked revisions 137850 via svnmerge

........
r137850 | tilghman | 2008-08-14 11:55:20 -0500 (Thu, 14 Aug 2008) | 2 lines

Oops, wrong direction

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137851 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 137847 via svnmerge from
Tilghman Lesher [Thu, 14 Aug 2008 16:52:43 +0000 (16:52 +0000)]
Merged revisions 137847 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r137847 | tilghman | 2008-08-14 11:47:30 -0500 (Thu, 14 Aug 2008) | 9 lines

When creating the secondary subchannel name, it is necessary to compare to
the existing channel name without the "Zap/" or "DAHDI/" prefix, since our
test string is also without that prefix.
(closes issue #13027)
 Reported by: dferrer
 Patches:
       chan_zap-1.4.21.1_fix2.patch uploaded by dferrer (license 525)
       (Slightly modified by me, to compensate for both names)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137848 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMake sure we set the socket port, so we don't try to use <ip address>:0.
Jason Parker [Thu, 14 Aug 2008 15:32:16 +0000 (15:32 +0000)]
Make sure we set the socket port, so we don't try to use <ip address>:0.

(closes issue #13255)
Reported by: falves11
Patches:
      13255-socketport.diff uploaded by qwell (license 4)
Tested by: falves11

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137812 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoIf we detect that we are no longer connected, try to reconnect a few times
Sean Bright [Thu, 14 Aug 2008 15:03:03 +0000 (15:03 +0000)]
If we detect that we are no longer connected, try to reconnect a few times
before giving up.  This relies on the timeout settings in the freetds.conf
file and, unfortunately, on a recent version of FreeTDS (0.82 or newer).

I either need to change the current execs to be non-blocking (which I do
not want to do) or we have to force people to run with the latest and
greatest of FreeTDS.  I'm on the fence...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137780 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 137731 via svnmerge from
Russell Bryant [Thu, 14 Aug 2008 14:15:50 +0000 (14:15 +0000)]
Merged revisions 137731 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r137731 | russell | 2008-08-14 09:05:23 -0500 (Thu, 14 Aug 2008) | 4 lines

Comments in this config file were aligned only if your tab size was set to 8.
So, convert tabs to spaces so that things should be aligned regardless of what
tab size you use in your editor.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137732 65c4cc65-6c06-0410-ace0-fbb531ad65f3

11 years agoMerged revisions 137679 via svnmerge from
Kevin P. Fleming [Thu, 14 Aug 2008 02:03:47 +0000 (02:03 +0000)]
Merged revisions 137679 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r137679 | kpfleming | 2008-08-13 21:03:04 -0500 (Wed, 13 Aug 2008) | 1 line

forgot one module name that changed
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137680 65c4cc65-6c06-0410-ace0-fbb531ad65f3