Commit Graph

20783 Commits

Author SHA1 Message Date
Matthew Nicholson
e529607617 Merged revisions 289179 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r289179 | mnicholson | 2010-09-29 10:04:56 -0500 (Wed, 29 Sep 2010) | 22 lines
  
  Merged revisions 289178 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r289178 | mnicholson | 2010-09-29 10:04:11 -0500 (Wed, 29 Sep 2010) | 15 lines
    
    Merged revisions 289177 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r289177 | mnicholson | 2010-09-29 10:03:27 -0500 (Wed, 29 Sep 2010) | 8 lines
      
      Set the caller id on CDRs when it is set on the parent channel.
      
      (closes issue #17569)
      Reported by: tbelder
      Patches:
            17569.diff uploaded by tbelder (license 618)
      Tested by: tbelder
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289180 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-29 15:07:57 +00:00
Brett Bryant
8e22acde1b Merged revisions 289099 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r289099 | bbryant | 2010-09-28 14:18:02 -0400 (Tue, 28 Sep 2010) | 28 lines
  
  Merged revisions 289095 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r289095 | bbryant | 2010-09-28 14:14:19 -0400 (Tue, 28 Sep 2010) | 21 lines
    
    Merged revisions 289094 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r289094 | bbryant | 2010-09-28 14:10:19 -0400 (Tue, 28 Sep 2010) | 14 lines
      
      Fixes an issue with the Newchannel AMI event during the Masquerading process.
      
      Fixes an issue with the Newchannel AMI event during the Masquerading process,
      where no Newchannel AMI event was generated for the psuedo channel used during
      the masquerading process.
      
      (closes issue #17987)
      Reported by: RadicAlish
      Patches: 
            newchannel.patch.txt uploaded by RadicAlish (license 1122)
            Tested by: RadicAlish
      
            Review: https://reviewboard.asterisk.org/r/937/
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289131 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-28 18:24:11 +00:00
Tilghman Lesher
7157b48150 Merged revisions 289104 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r289104 | tilghman | 2010-09-28 13:18:43 -0500 (Tue, 28 Sep 2010) | 4 lines
  
  Solaris compatibility fixes
  
  Review: https://reviewboard.asterisk.org/r/942/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289112 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-28 18:20:20 +00:00
Richard Mudgett
01eda62762 Merged revisions 289057 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r289057 | rmudgett | 2010-09-27 20:04:37 -0500 (Mon, 27 Sep 2010) | 5 lines
  
  Avoid deadlock processing incoming AOC-E messages.
  
  Deadlock avoidance for the owner channel was not done when processing
  incoming AOC-E messages.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289058 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-28 01:10:25 +00:00
Richard Mudgett
8bbe682e45 Merged revisions 289054-289055 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r289054 | rmudgett | 2010-09-27 19:32:18 -0500 (Mon, 27 Sep 2010) | 1 line
  
  Break up long ast_manager_event_multichan() event lines.
........
  r289055 | rmudgett | 2010-09-27 19:35:25 -0500 (Mon, 27 Sep 2010) | 1 line
  
  Revert stuff not ready for commit in -r289054.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289056 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-28 00:36:27 +00:00
David Vossel
c60da4ec9d For an INVITE transaction, treat all 2XX responses the same as a 200.
ABE-2305


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-27 22:03:54 +00:00
Olle Johansson
9860ca7d16 Formatting fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288993 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-27 19:45:56 +00:00
Olle Johansson
6cb355abbe Formating changes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288992 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-27 19:30:18 +00:00
Tilghman Lesher
475cd60ab2 Merged revisions 288961 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r288961 | tilghman | 2010-09-27 13:37:41 -0500 (Mon, 27 Sep 2010) | 5 lines
  
  Still build SIP, even if res_crypto cannot be built (use, not depend).
  
  (closes issue #18062)
   Reported by: a user on the mailing list
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288962 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-27 18:39:05 +00:00
Russell Bryant
fd58e5036f Merged revisions 288927 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r288927 | russell | 2010-09-27 08:03:43 -0500 (Mon, 27 Sep 2010) | 2 lines
  
  Fix some documentation typos and spelling errors.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288928 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-27 13:04:23 +00:00
Russell Bryant
a095791d7d Merged revisions 288925 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r288925 | russell | 2010-09-27 07:42:10 -0500 (Mon, 27 Sep 2010) | 2 lines
  
  Fix a documentation spelling error.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288926 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-27 12:42:30 +00:00
Alexandr Anikin
9810094c26 small correction for verbose print h.323 packets
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288893 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-25 07:58:23 +00:00
David Vossel
9b8cdd8a9f Merged revisions 288852 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r288852 | dvossel | 2010-09-24 12:58:57 -0500 (Fri, 24 Sep 2010) | 5 lines
  
  Append Retry-After header on 500 error response to Re-INVITE according to RFC3261 section 14.2.
  
  ABE-2301
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288853 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-24 17:59:47 +00:00
David Vossel
344bd58d56 Merged revisions 288821 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r288821 | dvossel | 2010-09-24 12:05:12 -0500 (Fri, 24 Sep 2010) | 4 lines
  
  Inspect Require header on BYE transaction according to RFC3261 section 8.2.2.3.
  
  ABE-2293
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288822 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-24 17:06:02 +00:00
Terry Wilson
4e473de5e2 Merged revisions 288748 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288748 | twilson | 2010-09-24 09:02:27 -0700 (Fri, 24 Sep 2010) | 19 lines
  
  Merged revisions 288747 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r288747 | twilson | 2010-09-24 08:37:39 -0700 (Fri, 24 Sep 2010) | 12 lines
    
    Merged revisions 288746 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r288746 | twilson | 2010-09-24 08:26:09 -0700 (Fri, 24 Sep 2010) | 5 lines
      
      Don't fail a masquerade if it is already being hung up
      
      This avoids noise on some Local channel situations where we don't use /n.
      Thanks to Alec Davis for the suggestion.
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288749 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-24 16:11:19 +00:00
Tilghman Lesher
794ff358a3 Merged revisions 288713 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288713 | tilghman | 2010-09-24 08:54:17 -0500 (Fri, 24 Sep 2010) | 12 lines
  
  Merged revisions 288712 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r288712 | tilghman | 2010-09-24 08:53:30 -0500 (Fri, 24 Sep 2010) | 5 lines
    
    Solaris won't printf a NULL.
    
    (closes issue #18041)
     Reported by: asgaroth
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288714 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-24 13:55:11 +00:00
Tilghman Lesher
296a898edb Merged revisions 288640 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r288640 | tilghman | 2010-09-23 22:42:37 -0500 (Thu, 23 Sep 2010) | 2 lines
  
  Export timersub for platforms which do not have it
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288641 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-24 03:43:14 +00:00
Tilghman Lesher
f8180257e0 Merged revisions 288638 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288638 | tilghman | 2010-09-23 22:39:29 -0500 (Thu, 23 Sep 2010) | 16 lines
  
  Merged revisions 288637 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r288637 | tilghman | 2010-09-23 22:36:01 -0500 (Thu, 23 Sep 2010) | 9 lines
    
    Merged revisions 288636 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r288636 | tilghman | 2010-09-23 22:20:24 -0500 (Thu, 23 Sep 2010) | 2 lines
      
      Solaris compatibility fixes
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288639 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-24 03:41:02 +00:00
Tilghman Lesher
cfe811bb35 Merged revisions 288606 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r288606 | tilghman | 2010-09-23 13:44:44 -0500 (Thu, 23 Sep 2010) | 2 lines
  
  Add note about the checkhangup option of ${CHANNEL()}
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288607 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-23 18:45:41 +00:00
Terry Wilson
9c1c787c36 Merged revisions 288572 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r288572 | twilson | 2010-09-23 13:05:16 -0500 (Thu, 23 Sep 2010) | 2 lines
  
  Make AMI honor enabled=no
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-23 18:08:23 +00:00
Terry Wilson
5ad9625cbf Merged revisions 288507 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288507 | twilson | 2010-09-22 16:18:27 -0700 (Wed, 22 Sep 2010) | 22 lines
  
  Merged revisions 288500 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r288500 | twilson | 2010-09-22 16:10:09 -0700 (Wed, 22 Sep 2010) | 15 lines
    
    Merged revisions 288499 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r288499 | twilson | 2010-09-22 16:00:30 -0700 (Wed, 22 Sep 2010) | 8 lines
      
      Don't let a Local channel get bridged to itself
      
      If a local channel gets bridged to itself, it becomes orphaned with no devices
      left to actually tell it to hang up. This patch modifies local_fixup() to detect
      this case and deny it.
      
      Review: https://reviewboard.asterisk.org/r/934
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288519 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-22 23:20:27 +00:00
David Vossel
a2a1ec5336 Merged revisions 288418 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288418 | dvossel | 2010-09-22 12:49:56 -0500 (Wed, 22 Sep 2010) | 18 lines
  
  Merged revisions 288417 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r288417 | dvossel | 2010-09-22 12:49:05 -0500 (Wed, 22 Sep 2010) | 11 lines
    
    Merged revisions 288416 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r288416 | dvossel | 2010-09-22 12:48:15 -0500 (Wed, 22 Sep 2010) | 5 lines
      
      RFC3261 section 12.2 explicitly says out of order requests are responded with a 500 Server Internal Error response.
      
      ABE-2458
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288419 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-22 17:50:32 +00:00
David Vossel
e6382a2dcb Merged revisions 288345 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288345 | dvossel | 2010-09-22 11:59:14 -0500 (Wed, 22 Sep 2010) | 16 lines
  
  Merged revisions 288344 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r288344 | dvossel | 2010-09-22 11:53:28 -0500 (Wed, 22 Sep 2010) | 9 lines
    
    Merged revisions 288343 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r288343 | dvossel | 2010-09-22 11:49:56 -0500 (Wed, 22 Sep 2010) | 2 lines
      
      During check_pendings, if the dialog is terminated with a CANCEL, change the invitestate to INV_CANCEL like in sip_hangup.
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288346 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-22 17:13:05 +00:00
Russell Bryant
cbabf4c6f7 Merged revisions 288341 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288341 | russell | 2010-09-22 11:45:18 -0500 (Wed, 22 Sep 2010) | 25 lines
  
  Merged revisions 288340 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r288340 | russell | 2010-09-22 11:44:13 -0500 (Wed, 22 Sep 2010) | 18 lines
    
    Merged revisions 288339 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r288339 | russell | 2010-09-22 11:39:16 -0500 (Wed, 22 Sep 2010) | 11 lines
      
      Fix a 100% CPU consumption problem when setting console=yes in asterisk.conf.
      
      The handling of -c and console=yes should be the same, but they were not.
      When you specify -c, it sets both a flag for console module and for asterisk
      not to fork() off into the background.  The handling of console=yes only set
      console mode, so you would end up with a background process() trying to run
      the Asterisk console and freaking out since it didn't have anything to read
      input from.
      
      Thanks to beagles for reporting and helping debug the problem!
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288342 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-22 16:46:20 +00:00
Tilghman Lesher
d5b09e2a36 Merged revisions 288268 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288268 | tilghman | 2010-09-22 10:14:02 -0500 (Wed, 22 Sep 2010) | 30 lines
  
  Merged revisions 288267 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r288267 | tilghman | 2010-09-22 10:11:09 -0500 (Wed, 22 Sep 2010) | 23 lines
    
    Merged revisions 288265-288266 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r288265 | tilghman | 2010-09-22 09:48:04 -0500 (Wed, 22 Sep 2010) | 9 lines
      
      Allow the encoding to be set, in case local charset does not agree with database.
      
      (closes issue #16940)
       Reported by: jamicque
       Patches: 
             20100827__issue16940.diff.txt uploaded by tilghman (license 14)
             20100921__issue16940__1.6.2.diff.txt uploaded by tilghman (license 14)
       Tested by: jamicque
    ........
      r288266 | tilghman | 2010-09-22 10:04:52 -0500 (Wed, 22 Sep 2010) | 5 lines
      
      Document addition of encoding parameter.
      
      (issue #16940)
      Reported by: jamicque
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288278 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-22 15:18:49 +00:00
Richard Mudgett
c5f5c24103 Merged revisions 288194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288194 | rmudgett | 2010-09-21 19:06:21 -0500 (Tue, 21 Sep 2010) | 40 lines
  
  Merged revisions 288193 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r288193 | rmudgett | 2010-09-21 19:03:37 -0500 (Tue, 21 Sep 2010) | 33 lines
    
    Merged revisions 288192 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r288192 | rmudgett | 2010-09-21 18:55:58 -0500 (Tue, 21 Sep 2010) | 26 lines
      
      In chan_iax2.c:schedule_delivery() calls ast_bridged_channel() on an unlocked channel.
      
      Near the beginning of schedule_delivery(), ast_bridged_channel() is called
      on iaxs[fr->callno]->owner.  However, the channel is not locked, which can
      result in ast_bridged_channel() crashing should owner->tech change to a
      technology that doesn't implement bridged_channel.
      
      I also fixed the other calls to ast_bridged_channel() in chan_iax2.c since
      the owner lock was not held there either.
      
      Converted the existing channel deadlock avoidance to use
      iax2_lock_owner().  Using the new function simplified some awkward code.
      
      In the process of fixing the locking on ast_bridged_channel(), I also
      found a memory leak in socket_process() for v1.6.2 and v1.8.  The local
      struct variable ies.vars is not freed on early/abnormal function exits.
      
      (closes issue #17919)
      Reported by: rain
      Patches:
            issue17919_v1.4.patch uploaded by rmudgett (license 664)
            issue17919_w_leak_v1.6.2.patch uploaded by rmudgett (license 664)
            issue17919_w_leak_v1.8.patch uploaded by rmudgett (license 664)
      
      Review: https://reviewboard.asterisk.org/r/926/
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288195 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-22 00:08:49 +00:00
Tilghman Lesher
949e81e6e5 Merged revisions 288159 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288159 | tilghman | 2010-09-21 17:57:22 -0500 (Tue, 21 Sep 2010) | 29 lines
  
  Merged revisions 288113 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r288113 | tilghman | 2010-09-21 16:59:46 -0500 (Tue, 21 Sep 2010) | 22 lines
    
    Merged revisions 288112 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r288112 | tilghman | 2010-09-21 16:58:13 -0500 (Tue, 21 Sep 2010) | 15 lines
      
      Try both the encoded and unencoded subscription URI for a match in hints.
      
      When a phone sends an encoded URI for a subscription, the URI is not matched
      with the actual hint that is in decoded format.  For example, if we have an
      extension with a hint that is named: "#5601" or "*5601", the subscription will
      work fine if the phone subscribes with an already decoded URI, but when it's
      decoded like "%255601" or "%2A5601", Asterisk is unable to match it with the
      correct hint.
      
      (closes issue #17785)
       Reported by: ramonpeek
       Patches: 
             20100831__issue17785.diff.txt uploaded by tilghman (license 14)
       Tested by: ramonpeek
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288160 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 22:58:10 +00:00
Paul Belanger
b287e93101 Merged revisions 288157 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288157 | pabelanger | 2010-09-21 18:26:15 -0400 (Tue, 21 Sep 2010) | 15 lines
  
  Merged revisions 288147 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r288147 | pabelanger | 2010-09-21 18:22:43 -0400 (Tue, 21 Sep 2010) | 9 lines
    
    Setup timer before set_config().
    
    (closes issue #18019)
    Reported by: Netview
    Patches: 
          issue_0018019.patch uploaded by pabelanger (license 224)
    Tested by: Netview
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 22:28:21 +00:00
Richard Mudgett
e100d8f649 Merged revisions 288082 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r288082 | rmudgett | 2010-09-21 16:03:28 -0500 (Tue, 21 Sep 2010) | 1 line
  
  Add note in party manipulation chapter on interception macros.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288083 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 21:04:04 +00:00
Richard Mudgett
851141c131 Merged revisions 288079-288080 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r288079 | rmudgett | 2010-09-21 15:29:51 -0500 (Tue, 21 Sep 2010) | 2 lines
  
  Protect channel access in CONNECTED_LINE and REDIRECTING interception macro launch code.
........
  r288080 | rmudgett | 2010-09-21 15:29:59 -0500 (Tue, 21 Sep 2010) | 8 lines
  
  Simplify locking code for REDIRECTING interception macro when forwarding a call.
  
  Simplified the locking code by using a local copy of the redirecting party
  information in app_dial.c:do_forward() and app_queue.c:wait_for_answer()
  for launching the REDIRECTING interception macro when a call is forwarded.
  
  Reduced the lock time of the 'o->chan' and 'in' channels.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 20:33:20 +00:00
Stefan Schmidt
ee5af946e2 Instead of iterate through all dialogs, add two separte container for needdestroy and rtptimeout
adding two dialog container, one for dialogs which need destroy, another for rtptimeout checks. 
both container will be checked on every loop of do_monitor instead of iterate through all dialogs.

(closes issue #17912)
Reported by: schmidts
Tested by: schmidts

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



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288063 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 20:27:04 +00:00
Brett Bryant
949c16de77 Merged revisions 288007 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288007 | bbryant | 2010-09-21 15:48:53 -0400 (Tue, 21 Sep 2010) | 21 lines
  
  Merged revisions 288006 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r288006 | bbryant | 2010-09-21 15:46:20 -0400 (Tue, 21 Sep 2010) | 14 lines
    
    Merged revisions 288005 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r288005 | bbryant | 2010-09-21 15:43:46 -0400 (Tue, 21 Sep 2010) | 8 lines
      
      Add a check to fix a rare segmentation fault you'd get if ast_frdup couldn't allocate
      memory on the first frame being queued in ast_queue_frame.
      
      (closes issue #17882)
      Reported by: seanbright
      Tested by: seanbright
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288008 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 19:50:46 +00:00
Tilghman Lesher
a24ffd93e9 Merged revisions 287935 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r287935 | tilghman | 2010-09-21 14:08:36 -0500 (Tue, 21 Sep 2010) | 16 lines
  
  Merged revisions 287934 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r287934 | tilghman | 2010-09-21 14:07:53 -0500 (Tue, 21 Sep 2010) | 9 lines
    
    Merged revisions 287933 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r287933 | tilghman | 2010-09-21 14:07:07 -0500 (Tue, 21 Sep 2010) | 2 lines
      
      Less than zero is an error, not any non-zero value.
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287936 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 19:09:15 +00:00
Terry Wilson
6aa4e2b35e Merged revisions 287931 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287931 | twilson | 2010-09-21 14:02:40 -0500 (Tue, 21 Sep 2010) | 2 lines
  
  Revert change in favor of a more targeted fix
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287932 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 19:04:57 +00:00
David Vossel
08aeb74d7a Merged revisions 287929 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287929 | dvossel | 2010-09-21 13:32:12 -0500 (Tue, 21 Sep 2010) | 4 lines
  
  Send a "415 Unsupported Media Type" after failure to process sdp due to unknown Content-Encoding header.
  
  ABE-2258
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287930 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 18:33:18 +00:00
Richard Mudgett
e86c254b79 Merged revisions 287897 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287897 | rmudgett | 2010-09-21 10:53:19 -0500 (Tue, 21 Sep 2010) | 1 line
  
  Cut-n-paste error in builtin_blindtransfer().
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287898 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 15:54:12 +00:00
Russell Bryant
4a356afb7d Merged revisions 287895 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287895 | russell | 2010-09-21 10:43:33 -0500 (Tue, 21 Sep 2010) | 10 lines
  
  Don't use ast_strdupa() from within the arguments to a function.
  
  (closes issue #17902)
  Reported by: afried
  Patches:
        issue_17902.rev1.txt uploaded by russell (license 2)
  Tested by: russell
  
  Review: https://reviewboard.asterisk.org/r/927/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287896 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 15:45:46 +00:00
Tilghman Lesher
9b4cfb0d28 Merged revisions 287893 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287893 | tilghman | 2010-09-21 10:24:47 -0500 (Tue, 21 Sep 2010) | 9 lines
  
  Anonymous callerid needs a "sip:" uri prefix.
  
  (closes issue #17981)
   Reported by: avalentin
   Patches: 
         sip-anonymous-aastra.patch uploaded by avalentin (license 1107)
         (plus an additional fix by me)
   Tested by: avalentin
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287894 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 15:27:10 +00:00
Russell Bryant
c0ddaa38d1 Merged revisions 287863 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287863 | russell | 2010-09-21 08:41:41 -0500 (Tue, 21 Sep 2010) | 2 lines
  
  Fix a regression in verbose logger processing.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 13:45:30 +00:00
Terry Wilson
690561643d Merged revisions 287833 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287833 | twilson | 2010-09-20 23:37:44 -0500 (Mon, 20 Sep 2010) | 3 lines
  
  Don't generate connected line buffer twice for comparison
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 04:39:30 +00:00
Terry Wilson
03a833f2e8 Merged revisions 287757 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287757 | twilson | 2010-09-20 18:51:38 -0500 (Mon, 20 Sep 2010) | 7 lines
  
  Avoid infinite loop with certain local channel connected line updates
  
  Compare connected line data before sending a connected line indication to avoid
  possible loops.
  
  Review: https://reviewboard.asterisk.org/r/932/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287764 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 00:11:59 +00:00
Brett Bryant
e8de16e970 Merged revisions 287760 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r287760 | bbryant | 2010-09-20 20:00:23 -0400 (Mon, 20 Sep 2010) | 30 lines
  
  Merged revisions 287759 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r287759 | bbryant | 2010-09-20 19:58:26 -0400 (Mon, 20 Sep 2010) | 23 lines
    
    Merged revisions 287758 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r287758 | bbryant | 2010-09-20 19:57:08 -0400 (Mon, 20 Sep 2010) | 16 lines
      
      Fix misvalidation of meetme pins in conjunction with the 'a' MeetMe flag.
      
      When using the 'a' MeetMe flag and having a user and admin pin setup for your
      conference, using the user pin would gain you admin priviledges. Also, when no
      user pin was set, an admin pin was, the 'a' MeetMe flag wasn't used, and the
      user tried to enter a conference then they were still prompted for a pin and
      forced to hit #.
      
      (closes issue #17908)
      Reported by: kuj
      Patches:
            pins_2.patch uploaded by kuj (license 1111)
            Tested by: kuj
      
            Review: [full review board URL with trailing slash]
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287763 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 00:04:54 +00:00
Terry Wilson
61e968d380 Add alecdavis' commit to merged props
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287762 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 00:01:33 +00:00
Terry Wilson
61151e983c Add merge properties back.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287761 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-21 00:00:41 +00:00
Alec L Davis
c65de13046 Merged revisions 287685 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r287685 | alecdavis | 2010-09-21 11:16:45 +1200 (Tue, 21 Sep 2010) | 18 lines
  
  ast_channel_masquerade: Avoid recursive masquerades.
  
  Check all 4 combinations of (original/clonechan) * (masq/masqr).
  
  Initially original->masq and clonechan->masqr were only checked.
  
  It's possible with multiple masq's planned - and not yet executed, that
   the 'original' chan could already have another masq'd into it - thus original->masqr
  would be set, that masqr would lost.
  Likewise for the clonechan->masq.
  
  (closes issue #16057;#17363)
  Reported by: amorsen;davidw,alecdavis
  Patches: 
        based on bug16057.diff4.txt uploaded by alecdavis (license 585)
  Tested by: ramonpeek, davidw, alecdavis
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287756 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-20 23:42:56 +00:00
Richard Mudgett
f92fd39b5c Merged revisions 287683 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287683 | rmudgett | 2010-09-20 18:14:42 -0500 (Mon, 20 Sep 2010) | 9 lines
  
  The inalarm flag was not set in sig_analog struct if the port is initially in alarm.
  
  Fixed initial inalarm value for sig_analog ports.
  
  Along with -r261007, this gets the inalarm flag in sync with chan_dahdi
  for sig_analog ports.
  
  (closes issue #16983)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287693 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-20 23:18:41 +00:00
Alec L Davis
672e1c323f Merged revisions 287661 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287661 | alecdavis | 2010-09-21 10:21:50 +1200 (Tue, 21 Sep 2010) | 14 lines
  
  ast_do_masquerade. Keep channels ao2_container locked while unlink and linking channels.
  
  Previously, Masquerade would unlock 'original' and 'clonechan' and allow another masq thread to run.
  End result would be corrupted memory, and the frequent report 'Bad Magic Number'.
  
  (closes issue #17801,#17710)
  Reported by: notthematrix
  Patches: 
        Based on bug17801.diff1.txt uploaded by alecdavis (license 585)
  Tested by: alecdavis
  
  Review: https://reviewboard.asterisk.org/r/928
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-20 22:24:51 +00:00
David Vossel
2f3dee2379 Merged revisions 287647 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287647 | dvossel | 2010-09-20 17:09:16 -0500 (Mon, 20 Sep 2010) | 21 lines
  
  Addition of the FrameHook API (AKA AwesomeHooks)
  
  So far all our tools for viewing and manipulating media streams
  within Asterisk have been entirely focused on audio.  That made
  sense then, but is not scalable now.  The FrameHook API lets us
  tap into and manipulate _ANY_ type of media or signaling passed
  on a channel present today or in the future.  This tool is a step
  in the direction of expanding Asterisk's boundaries and will help
  generate some rather interesting applications in the future.
  
  In addition to the FrameHook API, a simple dialplan function
  exercising the api has been included as well.  This function
  is called FRAME_TRACE().  FRAME_TRACE() allows for the internal
  ast_frames read and written to a channel to be output.  Filters
  can be placed on this function to debug only certain types of frames.
  This function could be thought of as an internal way of doing
  ast_frame packet captures.
  
  Review: https://reviewboard.asterisk.org/r/925/
........



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287648 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-20 22:16:37 +00:00
David Vossel
e2d002a144 Merged revisions 287645 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r287645 | dvossel | 2010-09-20 16:34:15 -0500 (Mon, 20 Sep 2010) | 9 lines
  
  Fixes issue with registrations not working properly with pedantic=yes.
  
  (closes issue #18017)
  Reported by: schmidts
  Patches:
        issues_18017_v1.diff uploaded by dvossel (license 671)
  Tested by: schmidts
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287646 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-20 21:35:46 +00:00
Jason Parker
27fbd5e156 Merged revisions 287643 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r287643 | qwell | 2010-09-20 16:29:46 -0500 (Mon, 20 Sep 2010) | 15 lines
  
  Merged revisions 287642 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r287642 | qwell | 2010-09-20 16:28:32 -0500 (Mon, 20 Sep 2010) | 8 lines
    
    Don't crash when parking a non-bridged call.
    
    (closes issue #17680)
    Reported by: jmhunter
    Patches: 
          chan_skinny-park-v1.txt uploaded by DEA (license 3)
    Tested by: jmhunter, DEA
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287644 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-20 21:30:12 +00:00