Commit Graph

17884 Commits

Author SHA1 Message Date
Russell Bryant
ba9c84c7a3 Merged revisions 256010 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r256010 | russell | 2010-04-02 18:30:58 -0500 (Fri, 02 Apr 2010) | 9 lines
  
  Merged revisions 256009 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r256009 | russell | 2010-04-02 18:30:15 -0500 (Fri, 02 Apr 2010) | 2 lines
    
    Remove extremely verbose debug message.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@256011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-02 23:32:51 +00:00
Tilghman Lesher
f75ce7bfec Merged revisions 255952 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r255952 | tilghman | 2010-04-02 15:19:01 -0500 (Fri, 02 Apr 2010) | 8 lines
  
  Pass the PID of the Asterisk process, not the PID of the canary.
  
  (closes issue #17065)
   Reported by: globalnetinc
   Patches: 
         astcanary.patch uploaded by makoto (license 38)
   Tested by: frawd, globalnetinc
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@255953 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-02 20:20:28 +00:00
Tilghman Lesher
b99bf76241 Merged revisions 255796 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r255796 | tilghman | 2010-04-01 13:16:37 -0500 (Thu, 01 Apr 2010) | 7 lines
  
  Fix DEBUG_THREADS build on Darwin.
  
  (closes issue #16828)
   Reported by: oej
   Patches: 
         20100331__issue16828.diff.txt uploaded by tilghman (license 14)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@255813 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-04-01 18:21:14 +00:00
Tilghman Lesher
84ad636a56 Recorded merge of revisions 255592 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r255592 | tilghman | 2010-03-31 14:13:02 -0500 (Wed, 31 Mar 2010) | 22 lines
  
  Recorded merge of revisions 255591 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r255591 | tilghman | 2010-03-31 14:09:46 -0500 (Wed, 31 Mar 2010) | 15 lines
    
    Ensure line terminators in email are consistent.
    
    Fixes an issue with certain Mail Transport Agents, where attachments are not
    interpreted correctly.
    
    (closes issue #16557)
     Reported by: jcovert
     Patches: 
           20100308__issue16557__1.4.diff.txt uploaded by tilghman (license 14)
           20100308__issue16557__1.6.0.diff.txt uploaded by tilghman (license 14)
           20100308__issue16557__trunk.diff.txt uploaded by tilghman (license 14)
     Tested by: ebroad, zktech
     
    Reviewboard: https://reviewboard.asterisk.org/r/544/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@255674 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-31 19:34:30 +00:00
Leif Madsen
a6b89675b6 Merged revisions 255504 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r255504 | lmadsen | 2010-03-31 12:48:09 -0500 (Wed, 31 Mar 2010) | 5 lines
  
  Add documentation clarifying when 't' and 'T' can be used.
  
  (closes issue #17021)
  Reported by: kovzol
  Tested by: lmadsen, kovzol, davidw, ebroad
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@255507 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-31 17:54:13 +00:00
Russell Bryant
74e4fc665b Merged revisions 255410 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r255410 | russell | 2010-03-30 15:56:26 -0500 (Tue, 30 Mar 2010) | 9 lines
  
  Merged revisions 255409 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r255409 | russell | 2010-03-30 15:56:00 -0500 (Tue, 30 Mar 2010) | 2 lines
    
    Don't kill Asterisk if the H323 listener does not start.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@255411 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-30 20:57:13 +00:00
Russell Bryant
9913649c93 Merged revisions 255323 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r255323 | russell | 2010-03-30 11:07:49 -0500 (Tue, 30 Mar 2010) | 9 lines
  
  Merged revisions 255322 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r255322 | russell | 2010-03-30 11:06:06 -0500 (Tue, 30 Mar 2010) | 2 lines
    
    Don't make Asterisk not start if pbx_dundi fails to initialize.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@255324 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-30 16:09:20 +00:00
Leif Madsen
dd1cc4a4ac Merged revisions 255021 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r255021 | lmadsen | 2010-03-26 14:07:38 -0500 (Fri, 26 Mar 2010) | 8 lines
  
  Update confusing documentation for tlsbindaddr.
  
  Update some confusing documentation for the tlsbindaddr
  option in sip.conf.sample. Point at a link instead which
  has better documentation.
  
  (closes issue #17054)
  Reported by: klaus3000
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@255054 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-26 19:24:19 +00:00
Jason Parker
1c76fa176d Merged revisions 254802 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r254802 | qwell | 2010-03-25 15:41:49 -0500 (Thu, 25 Mar 2010) | 9 lines
  
  Merged revisions 254800 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r254800 | qwell | 2010-03-25 15:41:15 -0500 (Thu, 25 Mar 2010) | 1 line
    
    Don't remove local copies of utils in uninstall.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254803 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 20:42:42 +00:00
Russell Bryant
1435ad60a9 Merged revisions 254718 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r254718 | russell | 2010-03-25 15:08:40 -0500 (Thu, 25 Mar 2010) | 2 lines
  
  chan_usbradio depends on alsa.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254719 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 20:09:09 +00:00
Jason Parker
8c55f67ce5 Fix DEBUG_THREADS issue with out-of-tree modules.
Take 2, without ABI breakage this time.

Review: https://reviewboard.asterisk.org/r/588/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254716 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 19:59:04 +00:00
Mark Michelson
9110081925 Merged revisions 254553 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r254553 | mmichelson | 2010-03-25 12:42:36 -0500 (Thu, 25 Mar 2010) | 11 lines
  
  Merged revisions 254552 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r254552 | mmichelson | 2010-03-25 12:33:35 -0500 (Thu, 25 Mar 2010) | 5 lines
    
    Add doxygen for acl.h
    
    Review: https://reviewboard.asterisk.org/r/528
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254554 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 17:45:36 +00:00
Mark Michelson
b66c44e895 Undo unnecessary commit. Sean Bright beat me to the punch on this one.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254550 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 17:26:02 +00:00
Mark Michelson
afd7a846d1 Fix potential use of uninitialized value.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254549 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 17:22:34 +00:00
Sean Bright
efdef4370d Initialize stream to avoid a compilation error.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254546 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 17:19:36 +00:00
Mark Michelson
ff80463375 Fix crashes resulting from reading non-existent RTP streams.
Specifically, when using the CHANNEL dialplan function, it was
possible to crash Asterisk by trying to get the rtpdest of a
stream type that is not in use by the channel. This commit
fixes that issue.



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254540 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 17:05:40 +00:00
Leif Madsen
f986c2b287 Make safe_asterisk work on dash/sh/bash etc.
Merged from the change to trunk via issue #13111. For some reason
the changes there were only done on trunk, and thus were available
for 1.6.1 and 1.6.2 when they were branched. Because this change is
available on both 1.6.1 and 1.6.2, it makes sense to allow it on the
1.6.0 branch as well.

(closes issue #17094)
Reported by: stuarth

Much thanks to Tilghman and Sean Bright for the help on this merge.

Merged revisions 135061 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r135061 | mvanbaak | 2008-08-01 07:17:33 -0500 (Fri, 01 Aug 2008) | 8 lines
  
  Make safe_asterisk work on dash/sh/bash etc.
  
  (closes issue #13111)
  Reported by: pabelanger
  Patches:
        2008071901_issue13111_safe_asterisk.diff uploaded by mvanbaak (license 7)
  Tested by: mvanbaak, pabelanger
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254539 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 17:02:17 +00:00
Sean Bright
c8b17088d8 Unblock r135061
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254538 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 16:57:07 +00:00
Terry Wilson
299146ba89 Merged revisions 254453 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r254453 | twilson | 2010-03-25 11:03:51 -0500 (Thu, 25 Mar 2010) | 9 lines
  
  Merged revisions 254451 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r254451 | twilson | 2010-03-25 10:57:29 -0500 (Thu, 25 Mar 2010) | 2 lines
    
    Handle new SRCCHANGE control message here too
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254466 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 16:19:13 +00:00
Mark Michelson
cc43151dcd Recorded merge of revisions 254454 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r254454 | mmichelson | 2010-03-25 11:04:48 -0500 (Thu, 25 Mar 2010) | 50 lines
  
  Recorded merge of revisions 254452 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r254452 | mmichelson | 2010-03-25 10:59:56 -0500 (Thu, 25 Mar 2010) | 44 lines
    
    Several fixes regarding RFC2833 DTMF detection.
    
    Here is a copy and paste of the details from my request on
    reviewboard that dealt with these changes:
    
    Fix 1. The first change in place is to fix Mantis issue 15811, which deals with a situation where Asterisk will incorrectly interpret out of order RFC2833 frames as duplicate DTMF digits. For instance, we would receive a sequence like:
    
    seqno 1: DTMF 1
    seqno 2: DTMF 1
    seqno 3: DTMF 1
    seqno 4: DTMF 1
    seqno 6: DTMF 1 (end)
    seqno 5: DTMF 1
    seqno 7: DTMF 1 (end)
    seqno 8: DTMF 1 (end)
    
    Prior to this patch when we received the frame with seqno 5, we would interpret this as a new DTMF 1. With this patch, we will check the seqno of the incoming digit and not process the frame if the seqno is lower than the last recorded seqno. Note that we do not record the seqno of the dropped DTMF frame for future processing. While the above situation is what was designed to be fixed, the patch is written in such a way that the following would also be fixed too:
    
    seqno  9: DTMF 1
    seqno 10: DTMF 1 (end)
    seqno 11: DTMF 1 (end)
    seqno 13: DTMF 2
    seqno 12: DTMF 1 (end)
    seqno 14: DTMF 2
    seqno 15: DTMF 2 (end)
    seqno 16: DTMF 2 (end)
    seqno 17: DTMF 2 (end)
    
    In this second situation, the beginning of the DTMF 2 arrives before the final end frame of the DTMF 1. With the patch, seqno 12 is no processed and thus we properly interpret the DTMF.
    
    Fix 2. The second change in place is to fix an issue like the following:
    
    seqno 1: DTMF 1
    seqno 2: DTMF 1
    seqno 3: DTMF 1 (end) *packet lost*
    seqno 4: DTMF 1 (end) *packet lost*
    seqno 5: DTMF 1 (end) *packet lost*
    seqno 6: DTMF 2
    
    When we receive seqno 6, we had code in place that was supposed to properly end the previously unended DTMF 1. The problem was that the code was essentially a no-op. The code would set up an end frame for the DTMF 1 but would immediately overwrite the frame with the begin for DTMF 2. I changed process_dtmf_rfc2833() so that instead of returning a single frame, it is given as an output parameter a list of frames. Each frame that needs to be returned is appended to this list.
    
    Fix 3. The final change is a minor one where an AST_CONTROL_SRCCHANGE frame could get lost. If we process a cisco DTMF or an RFC 3389 frame and no frame was returned, then we would return &ast_null_frame. The problem is that earlier in the function, we may have generated an AST_CONTROL_SRCCHANGE frame and put it in the list of frames we wish to return. This frame would be lost in such a case. The patch fixes this problem
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254455 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 16:11:02 +00:00
Leif Madsen
7b152d6dee Merged revisions 254446 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r254446 | lmadsen | 2010-03-25 10:21:26 -0500 (Thu, 25 Mar 2010) | 9 lines
  
  handle_speechset has 4 arguments.
  
  Update code to reflect that handle_speechset has 4 arguments.
  
  (closes issue #17093)
  Reported by: gpatri
  Patches: 
        res_agi.patch uploaded by gpatri (license 1014)
  Tested by: pabelanger, mmichelson
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254449 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 15:22:30 +00:00
Jeff Peeler
ebdd7fef46 Merged revisions 254277 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r254277 | jpeeler | 2010-03-24 12:15:05 -0500 (Wed, 24 Mar 2010) | 78 lines
  
  Merged revisions 254235 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r254235 | jpeeler | 2010-03-23 19:37:23 -0500 (Tue, 23 Mar 2010) | 72 lines
    
    Ensure that monitor recordings are written to the correct location (again)
    
    This is an extension to 248860. As such the dialplan test has been extended:
    
    ; non absolute path, not combined
    exten => 5040, 1, monitor(wav,tmp/jeff/monitor_test)
    exten => 5040, n, dial(sip/5001)
    ; absolute path, not combined
    exten => 5041, 1, monitor(wav,/tmp/jeff/monitor_test2)
    exten => 5041, n, dial(sip/5001)
    ; no path, not combined
    exten => 5042, 1, monitor(wav,monitor_test3)
    exten => 5042, n, dial(sip/5001)
    ; combined: changemonitor from non absolute to no path (leaves tmp/jeff)
    exten => 5043, 1, monitor(wav,tmp/jeff/monitor_test4,m)
    exten => 5043, n, changemonitor(monitor_test5)
    exten => 5043, n, dial(sip/5001)
    ; combined: changemonitor from no path to non absolute path
    exten => 5044, 1, monitor(wav,monitor_test6,m)
    exten => 5044, n, changemonitor(tmp/jeff/monitor_test7) ; this wasn't possible before
    exten => 5044, n, dial(sip/5001)
    ; non absolute path, combined
    exten => 5045, 1, monitor(wav,tmp/jeff/monitor_test8,m)
    exten => 5045, n, dial(sip/5001)
    ; absolute path, combined 
    exten => 5046, 1, monitor(wav,/tmp/jeff/monitor_test9,m)
    exten => 5046, n, dial(sip/5001)
    ; no path, combined
    exten => 5047, 1, monitor(wav,monitor_test10,m)
    exten => 5047, n, dial(sip/5001)
    ; combined: changemonitor from non absolute to absolute (leaves tmp/jeff)
    exten => 5048, 1, monitor(wav,tmp/jeff/monitor_test11,m)
    exten => 5048, n, changemonitor(/tmp/jeff/monitor_test12)
    exten => 5048, n, dial(sip/5001)
    ; combined: changemonitor from absolute to non absolute (leaves /tmp/jeff)
    exten => 5049, 1, monitor(wav,/tmp/jeff/monitor_test13,m)
    exten => 5049, n, changemonitor(tmp/jeff/monitor_test14)
    exten => 5049, n, dial(sip/5001)
    ; combined: changemonitor from no path to absolute
    exten => 5050, 1, monitor(wav,monitor_test15,m)
    exten => 5050, n, changemonitor(/tmp/jeff/monitor_test16)
    exten => 5050, n, dial(sip/5001)
    ; combined: changemonitor from absolute to no path (leaves /tmp/jeff)
    exten => 5051, 1, monitor(wav,/tmp/jeff/monitor_test17,m)
    exten => 5051, n, changemonitor(monitor_test18)
    exten => 5051, n, dial(sip/5001)
    ; not combined: changemonitor from non absolute to no path (leaves tmp/jeff)
    exten => 5052, 1, monitor(wav,tmp/jeff/monitor_test19)
    exten => 5052, n, changemonitor(monitor_test20)
    exten => 5052, n, dial(sip/5001)
    ; not combined: changemonitor from no path to non absolute
    exten => 5053, 1, monitor(wav,monitor_test21)
    exten => 5053, n, changemonitor(tmp/jeff/monitor_test22)
    exten => 5053, n, dial(sip/5001)
    ; not combined: changemonitor from non absolute to absolute (leaves tmp/jeff)
    exten => 5054, 1, monitor(wav,tmp/jeff/monitor_test23)
    exten => 5054, n, changemonitor(/tmp/jeff/monitor_test24)
    exten => 5054, n, dial(sip/5001)
    ; not combined: changemonitor from absolute to non absolute (leaves /tmp/jeff)
    exten => 5055, 1, monitor(wav,/tmp/jeff/monitor_test24)
    exten => 5055, n, changemonitor(tmp/jeff/monitor_test25)
    exten => 5055, n, dial(sip/5001)
    ; not combined: changemonitor from no path to absolute
    exten => 5056, 1, monitor(wav,monitor_test26)
    exten => 5056, n, changemonitor(/tmp/jeff/monitor_test27)
    exten => 5056, n, dial(sip/5001)
    ; not combined: changemonitor from absolute to no path (leaves /tmp/jeff)
    exten => 5057, 1, monitor(wav,/tmp/jeff/monitor_test28)
    exten => 5057, n, changemonitor(monitor_test29)
    exten => 5057, n, dial(sip/5001)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-24 17:17:14 +00:00
Jeff Peeler
0d17ae2e52 Merged revisions 254050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r254050 | jpeeler | 2010-03-23 16:17:23 -0500 (Tue, 23 Mar 2010) | 14 lines
  
  Exit native bridging early for greater timing accuracy with warnings
  
  This changes native bridging to break one millisecond early so that the more
  accurate timeval calculations done in the generic bridge can be performed using
  the bridge config. Currently the time between exiting native bridging slightly
  late can sometimes cause a large enough discrepancy for warnings to be missed.
  For the record, 1.4 does not attempt to native bridge at all when warnings are
  enabled.
  
  (closes issue #15815)
  Reported by: adomjan
  
  Review: https://reviewboard.asterisk.org/r/577/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254061 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-23 21:19:45 +00:00
Tzafrir Cohen
2ade0348ac Merged revisions 254001 via svnmerge from
http://svn.digium.com/svn/asterisk/trunk

........
  r254001 | tzafrir | 2010-03-23 21:19:52 +0200 (Tue, 23 Mar 2010) | 2 lines
  
  Change the name of the category 'TEST' to match the name of the subdir
........



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@254044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-23 20:52:21 +00:00
Matthew Nicholson
7388546134 Merged revisions 253800 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r253800 | mnicholson | 2010-03-22 14:52:52 -0500 (Mon, 22 Mar 2010) | 11 lines
  
  Merged revisions 253799 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r253799 | mnicholson | 2010-03-22 14:50:00 -0500 (Mon, 22 Mar 2010) | 4 lines
    
    Unconditionally copy the caller's account code to the called party.
    
    (related to issue #16331)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@253803 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-22 19:57:11 +00:00
Russell Bryant
abcca6dd11 Resolve 1.6.0 compilation issues on FreeBSD.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@253630 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-20 18:29:46 +00:00
Russell Bryant
d18064d8bd Merged revisions 253536-253538,253540 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r253536 | russell | 2010-03-20 06:33:30 -0500 (Sat, 20 Mar 2010) | 4 lines
  
  Use SHRT_MAX instead of MAXSHORT.
  
  These changes fix build issues I had with this module on FreeBSD.
........
  r253537 | russell | 2010-03-20 06:39:39 -0500 (Sat, 20 Mar 2010) | 2 lines
  
  Resolve a compiler warning on FreeBSD.
........
  r253538 | russell | 2010-03-20 06:43:08 -0500 (Sat, 20 Mar 2010) | 2 lines
  
  Resolve compiler warnings on FreeBSD.
........
  r253540 | russell | 2010-03-20 07:03:07 -0500 (Sat, 20 Mar 2010) | 2 lines
  
  Resolve more compiler warnings on FreeBSD.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@253626 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-20 18:14:31 +00:00
Russell Bryant
7ad504971b Resolve compiler warnings on FreeBSD.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@253625 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-20 18:11:06 +00:00
Leif Madsen
ab0a12c8b9 Slightly different fix for UserEvent docs update.
(issue #16961)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@253348 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-18 17:56:56 +00:00
Leif Madsen
bb8310d706 Merged revisions 253256 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r253256 | lmadsen | 2010-03-18 10:46:52 -0500 (Thu, 18 Mar 2010) | 9 lines
  
  Update to new Local channel documentation.
  
  Add same changes as commit to 1.4, but convert to TeX.
  
  (issue #16963)
  Reported by: kobaz
  Patches: 
        localchannel-2.txt uploaded by kobaz (license 834)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@253259 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-18 15:48:37 +00:00
Terry Wilson
5954201d07 Revert API change in release branches
This re-renames ast_rtp_update_source to ast_rtp_new_source


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@253158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-17 16:25:52 +00:00
Leif Madsen
1fdf828d5f Merged revisions 253028 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r253028 | lmadsen | 2010-03-16 19:29:06 -0500 (Tue, 16 Mar 2010) | 13 lines
  
  Merged revisions 253018 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r253018 | lmadsen | 2010-03-16 19:26:19 -0500 (Tue, 16 Mar 2010) | 6 lines
    
    Add french snipset to say.conf.
    
    Add the french snipset to say.conf.
    
    (Closes issue #15799)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@253031 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-17 00:31:01 +00:00
Tilghman Lesher
e43ae5a319 Merged revisions 252976 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r252976 | tilghman | 2010-03-16 18:49:35 -0500 (Tue, 16 Mar 2010) | 8 lines
  
  Mask out previous arguments on each nested invocation of Gosub.
  (closes issue #16758)
   Reported by: wdoekes
   Patches: 
         20100316__issue16758.diff.txt uploaded by tilghman (license 14)
   
  Review: https://reviewboard.asterisk.org/r/561/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@252979 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-16 23:54:43 +00:00
Russell Bryant
efcecc44d9 Merged revisions 252767 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r252767 | russell | 2010-03-16 14:01:04 -0500 (Tue, 16 Mar 2010) | 13 lines
  
  Merged revisions 252766 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r252766 | russell | 2010-03-16 14:00:43 -0500 (Tue, 16 Mar 2010) | 6 lines
    
    Don't treat warnings as errors for muted.
    
    muted supports OS X, but uses functions marked as deprecated in 10.6.  However,
    the functions are still supported, so just ignore the warnings for now and
    allow the build to proceed.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@252768 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-16 19:01:27 +00:00
Leif Madsen
8e80dd8daf Merged revisions 252762 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r252762 | lmadsen | 2010-03-16 13:48:22 -0500 (Tue, 16 Mar 2010) | 15 lines
  
  Merged revisions 252761 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r252761 | lmadsen | 2010-03-16 13:46:20 -0500 (Tue, 16 Mar 2010) | 7 lines
    
    Additional extensions.ael global variable fixes.
    
    Fixing up a couple more overlapping global variable namespaces shared with
    extensions.conf.sample. Also noticed a few of the lines that were commented
    out didn't have the closing semi-colon so I added that as well.
    
    (issue #17035)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@252765 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-16 18:49:41 +00:00
Sean Bright
9ccf24075e Merged revisions 252623 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r252623 | seanbright | 2010-03-15 17:55:44 -0400 (Mon, 15 Mar 2010) | 4 lines
  
  Resolve a crash in SLATrunk when the specified trunk doesn't exist.
  
  Reported by philipp64 in #asterisk-dev.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@252624 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-15 21:59:38 +00:00
Tilghman Lesher
ef410a5421 Merged revisions 252619 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r252619 | tilghman | 2010-03-15 16:51:55 -0500 (Mon, 15 Mar 2010) | 9 lines
  
  Merged revisions 252617 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r252617 | tilghman | 2010-03-15 16:43:14 -0500 (Mon, 15 Mar 2010) | 2 lines
    
    Uh, yeah.  Umask.  I'm stupid.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@252620 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-15 21:53:45 +00:00
Leif Madsen
4e99bc5739 Merged revisions 252534 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r252534 | lmadsen | 2010-03-15 15:52:32 -0500 (Mon, 15 Mar 2010) | 15 lines
  
  Merged revisions 252533 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r252533 | lmadsen | 2010-03-15 15:48:56 -0500 (Mon, 15 Mar 2010) | 7 lines
    
    Update extensions.ael file to not overlap extensions.conf.
    Updated the extensions.ael file so the global variables don't overlap
    those that we have in extensions.conf (sample files). This way unexpected
    things won't happed hopefully if both pbx_ael and res_config are loaded.
    
    (closes issue #17035)
    Reported by: pprindeville
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@252537 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-15 20:54:06 +00:00
Tilghman Lesher
5c574788af Merged revisions 252362 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r252362 | tilghman | 2010-03-14 20:37:04 -0500 (Sun, 14 Mar 2010) | 11 lines
  
  Merged revisions 252361 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r252361 | tilghman | 2010-03-14 20:33:50 -0500 (Sun, 14 Mar 2010) | 4 lines
    
    Launch Asterisk on Mac OS X with launchd.
    
    Reviewboard: https://reviewboard.asterisk.org/r/551/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@252363 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-15 01:37:44 +00:00
Sean Bright
355113c8df Merged revisions 252314 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r252314 | seanbright | 2010-03-14 13:43:46 -0400 (Sun, 14 Mar 2010) | 8 lines
  
  Fix building CDR and CEL SQLite3 modules.
  
  They added a sqlite3_log() function which was conflicting with our function
  names.
  
  (closes issue #17017)
  Reported by: alephlg
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@252315 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-14 17:45:53 +00:00
Terry Wilson
c93af115bb Remove unused field
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@252176 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-13 00:30:51 +00:00
Terry Wilson
e8413489a0 Merged revisions 252089 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r252089 | twilson | 2010-03-12 16:04:51 -0600 (Fri, 12 Mar 2010) | 20 lines
  
  Only change the RTP ssrc when we see that it has changed
  
  This change basically reverts the change reviewed in
  https://reviewboard.asterisk.org/r/374/ and instead limits the
  updating of the RTP synchronization source to only those times when we
  detect that the other side of the conversation has changed the ssrc.
  
  The problem is that SRCUPDATE control frames are sent many times where
  we don't want a new ssrc, including whenever Asterisk has to send DTMF
  in a normal bridge. This is also not the first time that this mistake
  has been made. The initial implementation of the ast_rtp_new_source
  function also changed the ssrc--and then it was removed because of
  this same issue. Then, we put it back in again to fix a different
  issue. This patch attempts to only change the ssrc when we see that
  the other side of the conversation has changed the ssrc.
  
  It also renames some functions to make their purpose more clear.
  
  Review: https://reviewboard.asterisk.org/r/540/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@252134 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-12 23:39:12 +00:00
Richard Mudgett
3c00cc96af Forward declaring dahdi_pri was already done.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@251995 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-12 19:53:54 +00:00
Tilghman Lesher
900ba0ff35 Merged revisions 251989 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r251989 | tilghman | 2010-03-12 13:43:23 -0600 (Fri, 12 Mar 2010) | 8 lines
  
  Don't override a user option with the global option.
  
  (closes issue #16849)
   Reported by: ip-rob
   Patches: 
         20100311__issue16849.diff.txt uploaded by tilghman (license 14)
   Tested by: ip-rob
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@251992 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-12 19:49:02 +00:00
Richard Mudgett
e24b97e213 Merged revisions 251987 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r251987 | rmudgett | 2010-03-12 13:40:16 -0600 (Fri, 12 Mar 2010) | 9 lines
  
  Merged revisions 251986 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r251986 | rmudgett | 2010-03-12 13:33:22 -0600 (Fri, 12 Mar 2010) | 1 line
    
    Make chan_dahdi wakeup_sub() prototype not conditional.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@251988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-12 19:42:56 +00:00
Tilghman Lesher
f175cb5e0e Merged revisions 251884 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r251884 | tilghman | 2010-03-11 15:07:07 -0600 (Thu, 11 Mar 2010) | 8 lines
  
  Because ExecIf needs to reprocess arguments, it's best if we don't remove quotes during parsing.
  
  (closes issue #16905)
   Reported by: ip-rob
   Patches: 
         20100303__issue16905.diff.txt uploaded by tilghman (license 14)
   Tested by: ip-rob
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@251885 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-11 21:08:14 +00:00
Tilghman Lesher
b5c7ee9e95 Merged revisions 251877 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r251877 | tilghman | 2010-03-11 14:25:02 -0600 (Thu, 11 Mar 2010) | 8 lines
  
  If the argument to the system application is quoted, ensure we remove the quotes before trying to execute.
  
  (closes issue #16842)
   Reported by: ip-rob
   Patches: 
         20100310__issue16842.diff.txt uploaded by tilghman (license 14)
   Tested by: ip-rob
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@251882 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-11 20:29:31 +00:00
Jeff Peeler
7bbb0e54cf Blocked revisions 251679 via svnmerge
........
  r251679 | jpeeler | 2010-03-10 14:51:23 -0600 (Wed, 10 Mar 2010) | 13 lines
  
  Fix ParkAndAnnounce not respecting parking options.
  
  The patch ensures that if a peer does not exist, parking settings are read from
  the channel. A unit test has been written to ensure proper operation for both
  standard parking and parking using masquerades.
  
  (closes issue #16592)
  Reported by: mwyres
  Patches: 
        bug_16592.diff uploaded by snuffy (license 35)
  
  Review: https://reviewboard.asterisk.org/r/539/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@251681 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-10 20:53:55 +00:00
Tilghman Lesher
9383d00d1c Merged revisions 251475 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r251475 | tilghman | 2010-03-09 14:30:03 -0600 (Tue, 09 Mar 2010) | 8 lines
  
  Build system modifications to ensure that Asterisk properly builds on Mac OS X 10.6.
  
  (closes issue #16997)
   Reported by: jquinn
   Patches: 
         20100309__issue16997__2.diff.txt uploaded by tilghman (license 14)
   Tested by: tilghman, russell
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@251487 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-09 20:32:32 +00:00
Leif Madsen
a8cf58e70c Merged revisions 251310 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r251310 | lmadsen | 2010-03-08 12:08:44 -0600 (Mon, 08 Mar 2010) | 21 lines
  
  Merged revisions 251309 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r251309 | lmadsen | 2010-03-08 12:07:44 -0600 (Mon, 08 Mar 2010) | 13 lines
    
    Fix Debian init script to not use -c.
    When using the init script as-is currently, it could cause issues on Debian
    such as high CPU usage. This fix has worked for several people so I'm
    implementing the change.
    
    
    (closes issue #16784)
    Reported by: pabelanger
    Tested by: pabelanger, mnick, davidw, mutineer612
    
    (closes issue #16887)
    Reported by: jlpedrosa
    Tested by: jlpedrosa, mutineer612
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@251313 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-08 18:10:20 +00:00