Kevin P. Fleming [Thu, 4 Jan 2007 21:06:35 +0000 (21:06 +0000)]
Merged revisions 49523 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49523 | kpfleming | 2007-01-04 15:06:02 -0600 (Thu, 04 Jan 2007) | 2 lines
if we're going to decrement the frame count when we free a frame, we should inrement it when we create one :-)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49524
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
TransNexus OSP Development [Thu, 4 Jan 2007 20:27:39 +0000 (20:27 +0000)]
1. Update osp guide.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49507
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
TransNexus OSP Development [Thu, 4 Jan 2007 19:46:07 +0000 (19:46 +0000)]
1. Update osp module configuration file.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49491
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Thu, 4 Jan 2007 18:32:23 +0000 (18:32 +0000)]
Merged revisions 49465 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49465 | kpfleming | 2007-01-04 12:31:55 -0600 (Thu, 04 Jan 2007) | 2 lines
only do IAX2 frame caching for voice and video frames
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49466
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matt O'Gorman [Thu, 4 Jan 2007 18:28:50 +0000 (18:28 +0000)]
Merged revisions 49459 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.4
................
r49459 | mogorman | 2007-01-04 12:11:19 -0600 (Thu, 04 Jan 2007) | 10 lines
Merged revisions 49447 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.2
........
r49447 | mogorman | 2007-01-04 11:45:16 -0600 (Thu, 04 Jan 2007) | 2 lines
converted a lot of 256 to PATH_MAX and some white space fixes.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49464
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Thu, 4 Jan 2007 18:19:55 +0000 (18:19 +0000)]
Merged revisions 49457,49460-49461 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49457 | kpfleming | 2007-01-04 12:05:47 -0600 (Thu, 04 Jan 2007) | 2 lines
make building of codec_gsm against the system GSM library actually work
........
r49460 | kpfleming | 2007-01-04 12:16:40 -0600 (Thu, 04 Jan 2007) | 2 lines
don't define this type either if LOW_MEMORY is enabled
........
r49461 | kpfleming | 2007-01-04 12:17:01 -0600 (Thu, 04 Jan 2007) | 2 lines
don't do frame header caching in the core if LOW_MEMORY is defined
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49463
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matt O'Gorman [Thu, 4 Jan 2007 18:17:24 +0000 (18:17 +0000)]
Merged revisions 49458 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.4
........
r49458 | kpfleming | 2007-01-04 12:06:51 -0600 (Thu, 04 Jan 2007) | 2 lines
don't do frame caching in LOW_MEMORY mode
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49462
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matt O'Gorman [Thu, 4 Jan 2007 16:52:38 +0000 (16:52 +0000)]
Merged revisions 49413 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.4
................
r49413 | mogorman | 2007-01-04 10:50:56 -0600 (Thu, 04 Jan 2007) | 11 lines
Merged revisions 49412 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.2
........
r49412 | mogorman | 2007-01-04 10:48:43 -0600 (Thu, 04 Jan 2007) | 3 lines
good catch russell sorry i missed that.
fix magic number with proper sizeof
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49414
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Thu, 4 Jan 2007 04:35:44 +0000 (04:35 +0000)]
This bug was fixed in the trunk by the recent work to consolidate the various
string handling into a single API, so this revision is blocked here.
Blocked revisions 49388 via svnmerge
........
r49388 | russell | 2007-01-03 23:33:00 -0500 (Wed, 03 Jan 2007) | 6 lines
Fix the REALTIME() dialplan function. ast_build_string() advances the string
pointer to the position to begin the next write into the buffer. So, this
pointer can not be used to copy the contents of the string later. The
beginning of the buffer must be saved. Interestingly enough, this code could
not have ever worked. (Pointed out by Sebb on IRC, thanks!)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49389
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Matt O'Gorman [Wed, 3 Jan 2007 23:41:19 +0000 (23:41 +0000)]
Merged revisions 49355 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.4
................
r49355 | mogorman | 2007-01-03 17:32:03 -0600 (Wed, 03 Jan 2007) | 14 lines
Merged revisions 49354 via svnmerge from
https://svn.digium.com/svn/asterisk/branches/1.2
........
r49354 | mogorman | 2007-01-03 17:22:47 -0600 (Wed, 03 Jan 2007) | 6 lines
When using ODBC_STORAGE VoicemailMain doesn't create the
subdirectories for a mailbox such as the INBOX directory.
this patch solves that problem, was written by anthony
be-125
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49356
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Christian Richter [Wed, 3 Jan 2007 11:15:02 +0000 (11:15 +0000)]
Merged revisions 49313 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r49313 | crichter | 2007-01-03 10:06:50 +0100 (Mi, 03 Jan 2007) | 41 lines
Merged revisions 48319,48321,48467,48552,48576,49135,49303 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48319 | crichter | 2006-12-06 15:35:25 +0100 (Mi, 06 Dez 2006) | 1 line
changed a few debugs to higher debug levels
........
r48321 | crichter | 2006-12-06 16:48:45 +0100 (Mi, 06 Dez 2006) | 1 line
added the export and import of the MISDN_ADDRESS_COMPLETE Variable to inidcate wether the extension is already completely dialed or if there might come additional digits by information elements. also added some docs for that.
........
r48467 | crichter | 2006-12-14 14:03:49 +0100 (Do, 14 Dez 2006) | 1 line
removed FIXUP state. added check for channel allocation conflict when we create a setup while the other site creates a setup on the same channel, besides the check we resolve this conflict.
........
r48552 | crichter | 2006-12-18 11:19:39 +0100 (Mo, 18 Dez 2006) | 1 line
when our PTP Partner sends us a SETUP with a preselected channel we just accept it, even when we're NT. added some checks for segfaults.
........
r48576 | crichter | 2006-12-19 14:08:51 +0100 (Di, 19 Dez 2006) | 1 line
when we reject a channel, because it's in use already, we shouldn't process the setup anymore. made the channel allocation a bit easier and more understandable, removed a few unused lines
........
r49135 | crichter | 2007-01-02 11:07:22 +0100 (Di, 02 Jan 2007) | 1 line
added check for channel ranges in the set/empty channel functions. set pmp_l1_check default to no. added misdn restart pid cli command. added cleaning of channel when we send a RELEASE_COMPLETE.
........
r49303 | crichter | 2007-01-03 09:24:00 +0100 (Mi, 03 Jan 2007) | 9 lines
* Added check for bridging in misdn_call to avoid setting echocancellation
when 2 mISDN channels are involved and when bridging is set. That lead
to a kernel panic before under different situations, because we switched
about 2 times between hardware bridging and echocancelation
* readded MISDN_URATE variable which got lost before, this should make app_v110
work again
* fixed typo
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49321
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Christian Richter [Wed, 3 Jan 2007 11:03:57 +0000 (11:03 +0000)]
Merged revisions 47989 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r47989 | crichter | 2006-11-24 16:46:13 +0100 (Fr, 24 Nov 2006) | 9 lines
Merged revisions 47968 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r47968 | crichter | 2006-11-23 17:10:23 +0100 (Do, 23 Nov 2006) | 1 line
fixed a litle bug regarding HOLD/RETRIEVE. beatufied some logs, changed some loglevels. changed the default value of block_on_alarm
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49320
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Wed, 3 Jan 2007 03:28:12 +0000 (03:28 +0000)]
Merged revisions 49282 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49282 | kpfleming | 2007-01-02 21:21:25 -0600 (Tue, 02 Jan 2007) | 2 lines
various Makefile improvements to get chan_vpb (and any other C++ modules) to build properly
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49283
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Wed, 3 Jan 2007 01:21:41 +0000 (01:21 +0000)]
Merged revisions 49259 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49259 | file | 2007-01-02 20:19:53 -0500 (Tue, 02 Jan 2007) | 2 lines
Check pvt structure presence before passing to send_command. This gets rid of the irritating message about a packet without pvt structure. This happens because the scheduled item is getting cancelled at almost the exact moment it is getting executed.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49260
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Tue, 2 Jan 2007 22:43:36 +0000 (22:43 +0000)]
Merged revisions 49237 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49237 | murf | 2007-01-02 15:30:53 -0700 (Tue, 02 Jan 2007) | 1 line
This is a slight modification to Josh's edits for #8579; both files edited were the produced by flex; so the source files need to be changed instead, and the generated files regenerated.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49238
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 2 Jan 2007 20:02:37 +0000 (20:02 +0000)]
Removing propably accidentally added debug messages sent to verbose channel
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49215
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 2 Jan 2007 20:01:34 +0000 (20:01 +0000)]
Merged revisions 49212 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49212 | oej | 2007-01-02 20:58:45 +0100 (Tue, 02 Jan 2007) | 2 lines
Small cleanup of add_t38sdp - it's always enabled at that point in the code
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49214
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Tue, 2 Jan 2007 17:33:53 +0000 (17:33 +0000)]
Blocked revisions 49189 via svnmerge
........
r49189 | qwell | 2007-01-02 11:33:02 -0600 (Tue, 02 Jan 2007) | 2 lines
Allow fractions of a second in the Wait() application, like it says it allows.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49190
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Tue, 2 Jan 2007 17:04:08 +0000 (17:04 +0000)]
Tweak description text to match new functionality (Issue 7959)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49187
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Tue, 2 Jan 2007 14:01:20 +0000 (14:01 +0000)]
Merged revisions 49165 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49165 | kpfleming | 2007-01-02 07:59:44 -0600 (Tue, 02 Jan 2007) | 2 lines
remove comment that is unrelated to this function
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49166
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Tue, 2 Jan 2007 13:50:51 +0000 (13:50 +0000)]
Update sample config
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49152
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Mon, 1 Jan 2007 23:43:43 +0000 (23:43 +0000)]
Merged revisions 49102 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49102 | kpfleming | 2007-01-01 17:34:35 -0600 (Mon, 01 Jan 2007) | 2 lines
check specifically for VLDTMF and transcoding support in the system's Zaptel installation, and make only the modules that need those features dependent on them (this will allow building the other Zaptel-using parts of Asterisk against older versions of Zaptel or those on other platforms that haven't caught up yet to the Linux version)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49103
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Mon, 1 Jan 2007 22:59:01 +0000 (22:59 +0000)]
GNU make already knows what the current directory is, there is no need to use 'pwd'
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49101
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Mon, 1 Jan 2007 22:49:56 +0000 (22:49 +0000)]
Merged revisions 49098-49099 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49098 | kpfleming | 2007-01-01 16:08:24 -0600 (Mon, 01 Jan 2007) | 2 lines
revert this change until a better solution can be found... 'env -i' was not being used properly, but even when changed to do so, this process fails during cross-compilation because the menuselect build still sees 'CC' as set to the cross-compiler
........
r49099 | kpfleming | 2007-01-01 16:48:03 -0600 (Mon, 01 Jan 2007) | 2 lines
use a simpler (and portable) method to ensure that menuselect is built as a host binary
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49100
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 1 Jan 2007 20:16:33 +0000 (20:16 +0000)]
Block cleanup of release branch
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49097
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 1 Jan 2007 20:08:47 +0000 (20:08 +0000)]
Doxygen documentationification
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49095
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 1 Jan 2007 19:52:22 +0000 (19:52 +0000)]
Fix manager too.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49094
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 1 Jan 2007 19:48:31 +0000 (19:48 +0000)]
- Add error handling to ast_parse_allow_disallow
- Use this in chan_sip configuration parsing
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49093
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Mon, 1 Jan 2007 19:20:46 +0000 (19:20 +0000)]
- Implement error handling in ast_append_ha
- Use this in chan_sip
- Document ha functions in acl.c
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49092
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Sun, 31 Dec 2006 19:15:23 +0000 (19:15 +0000)]
count is no longer used in the iaxq structure really so let's just make this a statically declared linked list.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49089
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Sun, 31 Dec 2006 09:38:27 +0000 (09:38 +0000)]
Update CHANGES, make section about SIP. This might be a good way to handle
other parts of this file too, as it grows.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49082
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Sun, 31 Dec 2006 09:34:11 +0000 (09:34 +0000)]
Added some docs
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49081
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Sun, 31 Dec 2006 09:31:23 +0000 (09:31 +0000)]
Add version number to useragent string - Issue #8700, blanchet - THANKS!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49080
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Sun, 31 Dec 2006 05:20:18 +0000 (05:20 +0000)]
Add power and right/left shift functions (Issue 7959)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49076
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Sun, 31 Dec 2006 04:54:20 +0000 (04:54 +0000)]
1. Rename 'maxmessage' to 'maxsecs' to differentiate from 'maxmsg'.
2. Rename 'minmessage' to 'minsecs' for parity.
3. Make 'maxsecs' a per-user option, in addition to global.
(Issue # 8624)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49075
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Sat, 30 Dec 2006 18:32:31 +0000 (18:32 +0000)]
Merged revisions 49073 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49073 | file | 2006-12-30 13:31:17 -0500 (Sat, 30 Dec 2006) | 2 lines
IAX has been deprecated for quite some time so we had better use IAX2 when creating the dial string for users. (issue #8697 reported by ssokol)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49074
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Sat, 30 Dec 2006 18:27:13 +0000 (18:27 +0000)]
Clarify why we are reading in a frame in the Packet2Packet bridge.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49072
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Sat, 30 Dec 2006 18:22:54 +0000 (18:22 +0000)]
Blocked revisions 49070 via svnmerge
........
r49070 | file | 2006-12-30 13:19:57 -0500 (Sat, 30 Dec 2006) | 2 lines
Use asprintf to build the channel names instead of custom function. I believe the custom function is doing some things that are not portable across all implementations. (issue #8570 reported by hterag & issue #8692 reported by nicolasg)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49071
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Sat, 30 Dec 2006 13:27:38 +0000 (13:27 +0000)]
now that the 'languageprefix' option defaults to 'on', and all channels have a default language of 'en', let's install the English sound files into /var/lib/asterisk/sounds/en, just like the other languages
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49069
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Sat, 30 Dec 2006 13:26:43 +0000 (13:26 +0000)]
small formatting fix
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49068
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Sat, 30 Dec 2006 05:49:17 +0000 (05:49 +0000)]
Merged revisions 49066 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49066 | file | 2006-12-30 00:46:57 -0500 (Sat, 30 Dec 2006) | 2 lines
If the Packet2Packet bridge is being broken because of a masquerade then attempt to read a frame in so the masquerade actually happens. Otherwise weirdness will occur. (issue #8696 reported by kjotte)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49067
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Sat, 30 Dec 2006 03:42:20 +0000 (03:42 +0000)]
Initialize obj pointers to NULL. Gets rid of two compiler warnings.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49065
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Sat, 30 Dec 2006 03:40:42 +0000 (03:40 +0000)]
Merged revisions 49063 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49063 | file | 2006-12-29 22:37:22 -0500 (Fri, 29 Dec 2006) | 2 lines
Initialize the packet queue in load_module instead of just declaring the list with the default value. (issue #8695 reported by ssokol)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49064
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Sat, 30 Dec 2006 00:51:07 +0000 (00:51 +0000)]
Merged revisions 49061 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49061 | murf | 2006-12-29 17:40:37 -0700 (Fri, 29 Dec 2006) | 1 line
A fix for 8661, where the CUT func needed to have comma args converted to vertical bars. I hope this change does little harm.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49062
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 29 Dec 2006 13:25:07 +0000 (13:25 +0000)]
Convert various comments to doxygen format.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49056
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Fri, 29 Dec 2006 11:02:28 +0000 (11:02 +0000)]
Removing extra output
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49054
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Fri, 29 Dec 2006 06:26:53 +0000 (06:26 +0000)]
Fix a spelling mistake in a comment.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49053
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Fri, 29 Dec 2006 00:33:33 +0000 (00:33 +0000)]
Merged revisions 49046 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r49046 | kpfleming | 2006-12-28 18:32:59 -0600 (Thu, 28 Dec 2006) | 10 lines
Merged revisions 49045 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r49045 | kpfleming | 2006-12-28 18:32:32 -0600 (Thu, 28 Dec 2006) | 2 lines
location of the bug posting guidelines has changed
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49047
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Thu, 28 Dec 2006 21:28:48 +0000 (21:28 +0000)]
Blocked revisions 49035 via svnmerge
........
r49035 | qwell | 2006-12-28 15:26:04 -0600 (Thu, 28 Dec 2006) | 4 lines
Fix some deprecated commands.
Issue 8682, patch by me
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49036
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Thu, 28 Dec 2006 20:42:28 +0000 (20:42 +0000)]
Blocked revisions 49032 via svnmerge
........
r49032 | qwell | 2006-12-28 14:40:23 -0600 (Thu, 28 Dec 2006) | 2 lines
saw this in passing... fix a small typo
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49033
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Tilghman Lesher [Thu, 28 Dec 2006 20:13:00 +0000 (20:13 +0000)]
Integrate functionality tested on svncommunity users back into trunk
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49030
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Thu, 28 Dec 2006 20:10:24 +0000 (20:10 +0000)]
Merged revisions 49028 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49028 | kpfleming | 2006-12-28 14:08:59 -0600 (Thu, 28 Dec 2006) | 2 lines
new versions of sounds
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49029
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 28 Dec 2006 20:05:00 +0000 (20:05 +0000)]
Convert uri_redirects list to read/write locks.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49027
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 28 Dec 2006 20:02:41 +0000 (20:02 +0000)]
Merged revisions 49024 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49024 | qwell | 2006-12-28 14:52:46 -0500 (Thu, 28 Dec 2006) | 2 lines
make the uris_lock a rwlock instead of a mutex lock - needs to be forward ported to trunk
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49026
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Thu, 28 Dec 2006 19:53:48 +0000 (19:53 +0000)]
Blocked revisions 49024 via svnmerge
........
r49024 | qwell | 2006-12-28 13:52:46 -0600 (Thu, 28 Dec 2006) | 2 lines
make the uris_lock a rwlock instead of a mutex lock - needs to be forward ported to trunk
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49025
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Thu, 28 Dec 2006 19:45:44 +0000 (19:45 +0000)]
Blocked revisions 49022 via svnmerge
........
r49022 | file | 2006-12-28 14:43:15 -0500 (Thu, 28 Dec 2006) | 2 lines
Backport support for read/write locks.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49023
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Steve Murphy [Thu, 28 Dec 2006 17:56:21 +0000 (17:56 +0000)]
Jason is having problems with the inclusion of <err.h>; it appears to be unnecessary for sucessful builds, so I either removed or commented out the inclusions from all the AEL related code. New outputs from bison/flex are included, etc.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49019
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Wed, 27 Dec 2006 22:30:28 +0000 (22:30 +0000)]
Merged revisions 49009 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49009 | file | 2006-12-27 17:28:46 -0500 (Wed, 27 Dec 2006) | 2 lines
ast_copy_string is not available when LOW_MEMORY is used and things are being built in the utils directory, so we need to resort to the old method of strncpy. (issue #8579 reported by mottano)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49010
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Wed, 27 Dec 2006 22:14:33 +0000 (22:14 +0000)]
Merged revisions 49006 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r49006 | kpfleming | 2006-12-27 16:06:56 -0600 (Wed, 27 Dec 2006) | 2 lines
since these variables all have static duration, none of them need initializers (they default to zero anyway)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49008
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Wed, 27 Dec 2006 22:10:31 +0000 (22:10 +0000)]
add file to ignore list
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49007
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 27 Dec 2006 21:27:57 +0000 (21:27 +0000)]
Only include include files once (imported from 1.4)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49004
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Wed, 27 Dec 2006 21:21:21 +0000 (21:21 +0000)]
apparently we need an explicit message to warn people
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49001
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Wed, 27 Dec 2006 21:18:27 +0000 (21:18 +0000)]
make the 'languageprefix' option default to on, and deprecate turning it off
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49000
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Wed, 27 Dec 2006 21:09:35 +0000 (21:09 +0000)]
Merged revisions 48998 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48998 | kpfleming | 2006-12-27 15:08:30 -0600 (Wed, 27 Dec 2006) | 3 lines
move extern declaration for this option to a header file where it belongs
provide an initial value for 'languageprefix' option, instead of relying on randomness to provide a useful value
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48999
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 27 Dec 2006 20:30:03 +0000 (20:30 +0000)]
Only set "rfc2833compensate" option once
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48996
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 27 Dec 2006 20:26:30 +0000 (20:26 +0000)]
Only handle T38 options once
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48994
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 27 Dec 2006 19:57:06 +0000 (19:57 +0000)]
-Remove "localmask" setting (deprecated in earlier version)
- Remove "musiconhold" and "musicclass" settings (also deprecated earlier)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48992
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Wed, 27 Dec 2006 18:34:24 +0000 (18:34 +0000)]
Merged revisions 48988 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48988 | kpfleming | 2006-12-27 12:33:22 -0600 (Wed, 27 Dec 2006) | 2 lines
make the option actually match the documentation
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48990
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Kevin P. Fleming [Wed, 27 Dec 2006 18:33:44 +0000 (18:33 +0000)]
Merged revisions 48987 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48987 | kpfleming | 2006-12-27 12:29:13 -0600 (Wed, 27 Dec 2006) | 2 lines
allow 'show memory' and 'show memory summary' to distinguish memory allocations that were done for caching purposes, so they don't look like memory leaks
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48989
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 27 Dec 2006 18:02:10 +0000 (18:02 +0000)]
Be politically correct
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48986
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 27 Dec 2006 16:58:03 +0000 (16:58 +0000)]
From coding guidelines:
Comments should explain what the code does, not when something was changed
or who changed it. If you have done a larger contribution, make sure
that you are added to the CREDITS file.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48984
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 27 Dec 2006 16:56:11 +0000 (16:56 +0000)]
Add support for buggy Cisco MWI firmware > 8.0.3 (issue 8575 - flewid)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48983
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 27 Dec 2006 16:35:41 +0000 (16:35 +0000)]
Cleanup of handle_common_options
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48981
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 27 Dec 2006 16:26:02 +0000 (16:26 +0000)]
Reset invitestate when sending new invite
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48979
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Olle Johansson [Wed, 27 Dec 2006 16:01:07 +0000 (16:01 +0000)]
Issue #8600 - bogus SDP Content Length in T.38 re-invite
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48976
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 26 Dec 2006 05:23:25 +0000 (05:23 +0000)]
Merged revisions 48966 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48966 | file | 2006-12-26 00:20:08 -0500 (Tue, 26 Dec 2006) | 2 lines
Get rid of a needless memory allocation and only create a conference structure in find_conf_realtime if data was read from realtime. (issue #8669 reported by robl)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48967
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Tue, 26 Dec 2006 04:34:07 +0000 (04:34 +0000)]
Merged revisions 48964 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48964 | file | 2006-12-25 23:31:58 -0500 (Mon, 25 Dec 2006) | 2 lines
Add an API call that initializes an RTP structure. We need this because chan_sip is cheeky and uses a temporary RTP structure for codec purposes, and the API calls that are used rely on the lock. (Pointed out on asterisk-dev by Andy Wang)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48965
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Mon, 25 Dec 2006 17:06:58 +0000 (17:06 +0000)]
Merged revisions 48960 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48960 | file | 2006-12-25 12:04:48 -0500 (Mon, 25 Dec 2006) | 2 lines
Clean up autoconf file (gets rid of warnings seen when rebuilding configure) and rebuild configure.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48961
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 25 Dec 2006 06:42:15 +0000 (06:42 +0000)]
provide INT16_MIN and INT16_MAX for platforms where they are not defined.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48959
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Mon, 25 Dec 2006 06:38:09 +0000 (06:38 +0000)]
rename the structs struct tone_zone_sound and struct tone_zone
defined in indications.h to ind_tone_zone_sound and ind_tone_zone,
to avoid conflicts with the structs with the same names
defined in tonezone.h
Hope i haven't missed any instance.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48958
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 25 Dec 2006 05:22:40 +0000 (05:22 +0000)]
Merged revisions 48956 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48956 | russell | 2006-12-25 00:21:20 -0500 (Mon, 25 Dec 2006) | 14 lines
Merged revisions 48955 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48955 | russell | 2006-12-25 00:19:48 -0500 (Mon, 25 Dec 2006) | 6 lines
Fix an error introduced by copying and pasting the handling of the >= operator
for the MATH function. If a single equal sign was used as an operator, the
function would treat it is as if it were the >= operator. Now, it properly
handles it as an invalid operator.
(issue #8665, patch by tempest1)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48957
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 25 Dec 2006 02:31:04 +0000 (02:31 +0000)]
Simplify the if statements used to check to see if the argument was "num"
or "number". It is not possible to ever reach the second part of this
conditional statement.
Thanks to my brother, Brett, for pointing this out. :)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48951
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Mon, 25 Dec 2006 02:06:47 +0000 (02:06 +0000)]
Resolve some compiler warnings
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48950
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sun, 24 Dec 2006 21:21:21 +0000 (21:21 +0000)]
Merged revisions 48948 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48948 | russell | 2006-12-24 16:19:37 -0500 (Sun, 24 Dec 2006) | 3 lines
Fix a typo in an error message that indicated that the MGCP channel type could
not be registered, instead of the correct type, OSS.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48949
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sun, 24 Dec 2006 21:01:02 +0000 (21:01 +0000)]
Use spaces as a separator for the redirect option to improve readability
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48947
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sun, 24 Dec 2006 07:27:29 +0000 (07:27 +0000)]
Merged revisions 48944 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48944 | russell | 2006-12-24 02:25:38 -0500 (Sun, 24 Dec 2006) | 11 lines
Merged revisions 48943 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48943 | russell | 2006-12-24 02:23:07 -0500 (Sun, 24 Dec 2006) | 3 lines
Check for the proper return value on an error in a call to mmap().
This was reported by Andy Wang on the asterisk-dev list. Thanks!
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48945
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sun, 24 Dec 2006 06:51:37 +0000 (06:51 +0000)]
Merged revisions 48940 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r48940 | russell | 2006-12-24 01:49:31 -0500 (Sun, 24 Dec 2006) | 11 lines
Merged revisions 48939 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r48939 | russell | 2006-12-24 01:47:29 -0500 (Sun, 24 Dec 2006) | 3 lines
Remove a couple of misplaced dots in log messages. This was reported by
Andrea Spadaccini on the asterisk-dev mailing list.
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48941
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sun, 24 Dec 2006 03:29:42 +0000 (03:29 +0000)]
Simplify the definition of http_uri_redirect such that only one allocation is
done for exactly how much memory is needed. This was suggested by Luigi on
the asterisk-dev mailing list. Thanks!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48933
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sat, 23 Dec 2006 20:26:34 +0000 (20:26 +0000)]
Blocked revisions 48931 via svnmerge
........
r48931 | russell | 2006-12-23 15:22:52 -0500 (Sat, 23 Dec 2006) | 2 lines
Implement locking for the list of URI handlers to make it thread-safe.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48932
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sat, 23 Dec 2006 20:13:14 +0000 (20:13 +0000)]
- Convert the list of URI handlers to use the linked list macros. While doing
this, implementing locking of this list to make it thread-safe.
- Add a "redirect" option to http.conf that allows redirecting one URI to
another. I was inspired to do this while playing with the Asterisk GUI. I
got tired of typing this URL to get to the GUI:
http://localhost:8088/asterisk/static/config/cfgadvanced.html
So, now I have the following line in http.conf:
redirect=/=/asterisk/static/config/cfgadvanced.html
Now, I can type the following into my browser and go to the GUI:
http://localhost:8088
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48930
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sat, 23 Dec 2006 20:08:16 +0000 (20:08 +0000)]
Remove a debug message. If this is still needed for debugging something,
it should be made a LOG_DEBUG message.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48929
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Joshua Colp [Sat, 23 Dec 2006 19:55:38 +0000 (19:55 +0000)]
We should probably declare the lock... and not just the constructor/deconstructor.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48928
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Russell Bryant [Sat, 23 Dec 2006 19:51:56 +0000 (19:51 +0000)]
Use the correct function to destroy an rwlock in the destructor for an ast_rwlock_t
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48927
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Fri, 22 Dec 2006 22:34:31 +0000 (22:34 +0000)]
Merged revisions 48906 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48906 | qwell | 2006-12-22 16:33:46 -0600 (Fri, 22 Dec 2006) | 2 lines
Minor fixes for Solaris.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48907
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Fri, 22 Dec 2006 21:40:56 +0000 (21:40 +0000)]
Merged revisions 48888 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48888 | qwell | 2006-12-22 15:40:20 -0600 (Fri, 22 Dec 2006) | 2 lines
Note to self: Run make before committing...
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48889
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Jason Parker [Fri, 22 Dec 2006 20:43:38 +0000 (20:43 +0000)]
Merged revisions 48870 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r48870 | qwell | 2006-12-22 14:43:05 -0600 (Fri, 22 Dec 2006) | 2 lines
Fix for issue 7774 - patch by alamantia
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48871
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Fri, 22 Dec 2006 10:35:20 +0000 (10:35 +0000)]
improve readability of a few macros.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48857
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Thu, 21 Dec 2006 23:33:44 +0000 (23:33 +0000)]
make sms_hexdump() thread safe;
restructure and reduce indentation on some blocks.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48844
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Thu, 21 Dec 2006 22:15:03 +0000 (22:15 +0000)]
make isodate thread-safe
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48832
65c4cc65-6c06-0410-ace0-
fbb531ad65f3
Luigi Rizzo [Thu, 21 Dec 2006 22:03:54 +0000 (22:03 +0000)]
- use the standard option parsing routines;
- document existing but undocumented parameters to send a message
(untested but unchanged;
- ad a new option p(N) to set the initial message delay to N ms
so this can be adapted from the dialplan to various countries;
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48825
65c4cc65-6c06-0410-ace0-
fbb531ad65f3