Commit Graph

18364 Commits

Author SHA1 Message Date
Jason Parker
2b180a5260 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.1@254717 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 20:03:59 +00:00
Mark Michelson
2e687724e4 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.1@254555 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 17:46:37 +00:00
Sean Bright
a7a034fc32 Initialize stream to avoid a compilation error.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@254547 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 17:21:06 +00:00
Mark Michelson
02d901a488 Fix potential crashes from trying to reference non-existent RTP streams.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@254541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 17:10:59 +00:00
Terry Wilson
fcc1d67a4c 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.1@254486 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 16:23:32 +00:00
Mark Michelson
68d352e05f 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.1@254456 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 16:15:14 +00:00
Leif Madsen
f9d57ab5a5 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.1@254448 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-25 15:22:09 +00:00
Jeff Peeler
42e2b70c64 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.1@254283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-24 17:18:14 +00:00
Tzafrir Cohen
9ae716e431 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.1@254130 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-23 21:37:47 +00:00
Jeff Peeler
bf1c230337 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.1@254065 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-23 21:20:22 +00:00
Matthew Nicholson
05dfa94a20 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.1@253802 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-22 19:56:36 +00:00
Tilghman Lesher
5d2cd787e7 Merged revisions 253758 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r253758 | tilghman | 2010-03-22 14:05:27 -0500 (Mon, 22 Mar 2010) | 2 lines
  
  Update query should be an UPDATE, not a SELECT.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@253759 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-22 19:06:27 +00:00
Tilghman Lesher
6bbe055811 Merged revisions 253755 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r253755 | tilghman | 2010-03-22 13:58:48 -0500 (Mon, 22 Mar 2010) | 4 lines
  
  Return the list for later manipulation.  This fixes an issue with the update procedure.
  
  Debugging with mmichelson.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@253756 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-22 19:01:16 +00:00
Tilghman Lesher
dbdb786ef4 Merged revisions 253712 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r253712 | tilghman | 2010-03-22 11:59:35 -0500 (Mon, 22 Mar 2010) | 2 lines
  
  Accomodate equal signs in DSNs and add documentation, based upon mmichelson's feedback.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@253713 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-22 17:01:21 +00:00
Russell Bryant
b950725950 Merged revisions 253540 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  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.1@253624 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-20 17:55:02 +00:00
Russell Bryant
66f578b71c Merged revisions 253538 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r253538 | russell | 2010-03-20 06:43:08 -0500 (Sat, 20 Mar 2010) | 2 lines
  
  Resolve compiler warnings on FreeBSD.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@253623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-20 17:50:53 +00:00
Russell Bryant
48d701ef63 Merged revisions 253537 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r253537 | russell | 2010-03-20 06:39:39 -0500 (Sat, 20 Mar 2010) | 2 lines
  
  Resolve a compiler warning on FreeBSD.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@253622 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-20 17:49:22 +00:00
Russell Bryant
0a335915fe Merged revisions 253536 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.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@253621 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-20 17:46:28 +00:00
Alec L Davis
eb4bd98c71 Merged revisions 253490 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r253490 | alecdavis | 2010-03-19 20:37:00 +1300 (Fri, 19 Mar 2010) | 19 lines
  
  prevent segfault if bad magic number is encountered.
  
  internal_ao2_ref uses INTERNAL_OBJ which mzy report 'bad magic number', but
  internal_ao2_ref continues on, causing segfault.
  
  Although AO2_MAGIC number is checked by INTERNAL_OBJ before internal_ao2_ref is
  called, A02_MAGIC is being destroyed (or a wrong pointer) by the time
  internal_ao2_ref uses INTERNAL_OBJ.
  
  internal_ao2_ref now returns -1 if INTERNAL_OBJ encouters a bad magic number.
  
  (issue #17037)
  Reported by: alecdavis
  Patches:
        bug17037.diff.txt uploaded by alecdavis (license 585)
  Tested by: alecdavis
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@253491 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-19 07:59:34 +00:00
Leif Madsen
2dd2ece1b9 Slightly different fix for UserEvent docs update.
(issue #16961)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@253347 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-18 17:56:18 +00:00
Leif Madsen
6b638d28bb 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.1@253258 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-18 15:48:13 +00:00
Terry Wilson
00ad4da09f 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.1@253158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-17 16:25:52 +00:00
Leif Madsen
5e188c61da 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.1@253030 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-17 00:30:42 +00:00
Tilghman Lesher
583a3b00d2 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.1@252977 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-16 23:53:50 +00:00
Russell Bryant
333a6e16ab 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.1@252769 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-16 19:01:50 +00:00
Leif Madsen
a9eaa67660 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.1@252764 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-16 18:49:24 +00:00
Sean Bright
47f304f231 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.1@252625 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-15 21:59:40 +00:00
Tilghman Lesher
8e23af4589 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.1@252621 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-15 21:54:44 +00:00
Leif Madsen
47fa7c3768 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.1@252536 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-15 20:53:41 +00:00
Tilghman Lesher
a303d62269 Merged revisions 252442 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r252442 | tilghman | 2010-03-14 23:25:35 -0500 (Sun, 14 Mar 2010) | 7 lines
  
  THIS IS NOT PYTHON.  Indentation doesn't matter, only braces do.
  
  (closes issue #17025)
   Reported by: smurfix
   Patches: 
         sip.patch uploaded by smurfix (license 547)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@252443 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-15 05:03:52 +00:00
Tilghman Lesher
192cc1e995 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.1@252364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-15 01:38:27 +00:00
Sean Bright
22d6cc5ad3 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.1@252316 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-14 17:47:11 +00:00
Terry Wilson
6cd58e9b1c Remove unusued field
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@252177 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-13 00:31:25 +00:00
Terry Wilson
77bd4bac6a 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.1@252135 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-13 00:00:16 +00:00
Richard Mudgett
61569124c4 Forward declaring dahdi_pri was already done.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@251996 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-12 19:54:42 +00:00
Tilghman Lesher
fceae4b161 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.1@251993 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-12 19:50:31 +00:00
Richard Mudgett
bafb8f1ce2 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.1@251990 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-12 19:44:11 +00:00
Tilghman Lesher
de5715e74a 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.1@251886 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-11 21:08:23 +00:00
Tilghman Lesher
f2dfa64228 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.1@251878 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-11 20:27:28 +00:00
Tilghman Lesher
f6c104ca79 Verify whether the created buffer was actually large enough to hold the expanded value.
For certain types of queries, where the size of the substituted query was much
larger than the template, it was possible for the substitution buffer to be too
small.  This is only an issue in 1.6.1, as previously we used a static buffer
anyway, and we have a substitution routine in 1.6.2 forward that automatically
sizes itself appropriately to handle larger expansions.

(closes issue #17006)
 Reported by: viniciusfontes
 Patches: 
       20100311__issue17006.diff.txt uploaded by tilghman (license 14)
 Tested by: tilghman


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@251875 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-11 19:21:19 +00:00
Alec L Davis
27b549627a Add supporting code for app-directory pause option.
Since 1.6.1 CLI help reports that option p(n) 'initial pause' is available.
Supporting code was never implemented.

(closes issue #16751)
Reported by: alecdavis
Patches: 
      based on directory_pause.trunk.diff.txt uploaded by alecdavis (license 585)
Tested by: alecdavis

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



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@251819 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-11 07:37:48 +00:00
Jeff Peeler
e611ddefe6 Merged revisions 251679 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  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.1@251684 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-10 20:59:01 +00:00
Tilghman Lesher
b30672ece0 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.1@251495 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-09 20:39:10 +00:00
Leif Madsen
bb9767861b 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.1@251312 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-08 18:09:56 +00:00
Tilghman Lesher
ca041ad6cf Merged revisions 250913 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r250913 | tilghman | 2010-03-04 22:37:36 -0600 (Thu, 04 Mar 2010) | 7 lines
  
  Missing quote in ODBC query.
  
  (closes issue #16953)
   Reported by: elguero
   Patches: 
         app_voicemail-odbc-syntax-fix.diff uploaded by elguero (license 37)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@250914 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-05 04:42:16 +00:00
Jeff Peeler
e9358fd3d3 Merged revisions 250787 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r250787 | jpeeler | 2010-03-04 19:05:46 -0600 (Thu, 04 Mar 2010) | 16 lines
  
  Merged revisions 250786 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r250786 | jpeeler | 2010-03-04 19:02:58 -0600 (Thu, 04 Mar 2010) | 9 lines
    
    Fix not being able to specify a URL in MOH class directory.
    
    Don't attempt to chdir on a URL!
    
    (closes issue #16875)
    Reported by: raarts
    Patches: 
          moh-http.patch uploaded by raarts (license 937)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@250789 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-05 01:08:36 +00:00
Mark Michelson
96bbd14004 Recorded merge of revisions 250730 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r250730 | mmichelson | 2010-03-04 14:12:26 -0600 (Thu, 04 Mar 2010) | 3 lines
  
  Adjust XML for func_channel to indicate that rtpdest can take a "text" argument.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@250732 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-04 20:14:19 +00:00
Leif Madsen
7c859a9ed1 Merged revisions 250609 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r250609 | lmadsen | 2010-03-03 16:22:55 -0500 (Wed, 03 Mar 2010) | 11 lines
  
  Update existing Local channel documentation.
  
  A complete re-write of the Local channel documentation has been performed, with
  the existing information from localchannel.txt and localchannel.tex merged in.
  
  (closes issue #16637)
  Reported by: kobaz
  Patches: 
        localchannel.tex uploaded by lmadsen (license 10)
        localchannel.txt uploaded by lmadsen (license 10)
  Tested by: lmadsen, jsmith, mmichelson
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@250611 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-03 21:25:09 +00:00
Jeff Peeler
b5dbe2e99a Merged revisions 250481 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r250481 | jpeeler | 2010-03-03 13:06:06 -0600 (Wed, 03 Mar 2010) | 22 lines
  
  Merged revisions 250480 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r250480 | jpeeler | 2010-03-03 13:04:11 -0600 (Wed, 03 Mar 2010) | 15 lines
    
    Make sure to clear red alarm after polarity reversal.
    
    From the issue:
    The automatic overnight line tests (or manual ones) used on UK (BT) lines causes
    a red alarm on a dahdi / TDM400P connected channel. This is because the line
    uses voltage tests (battery loss) and polarity reversal. The polarity reversal
    causes chan_dahdi to initiate v23 CallerID processing but during this the event
    DAHDI_EVENT_NOALARM is ignored so that the alarm is never cleared.
    
    (closes issue #14163)
    Reported by: jedi98
    Patches: 
          chan_dahdi-1.4-inalarm.diff uploaded by jedi98 (license 653)
    Tested by: mattbrown, Chainsaw, mikeeccleston
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@250483 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-03 19:09:21 +00:00
David Vossel
07ff0f5769 Merged revisions 250395 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r250395 | dvossel | 2010-03-03 12:03:19 -0600 (Wed, 03 Mar 2010) | 22 lines
  
  Merged revisions 250394 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r250394 | dvossel | 2010-03-03 12:02:27 -0600 (Wed, 03 Mar 2010) | 16 lines
    
    fixes problem with duplicate TXREQ packets
    
    When Asterisk receives an IAX2 TXREQ packet, try_transfer()
    will call store_by_transfercallno() to link the chan_iax2_pvt
    struct into iax_transfercallno_pvts. If a duplicate TXREQ
    packet is received for the same call, the pvt struct will be
    linked into iax_transfercallno_pvts multiple times.  This patch
    fixes this.  Thanks rain for debugging this and providing a patch!
    
    (closes issue #16904)
    Reported by: rain
    Patches:
          iax2-double-txreq-fix.diff uploaded by rain (license 327)
    Tested by: rain, dvossel
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@250397 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-03-03 18:05:24 +00:00