Commit Graph

17490 Commits

Author SHA1 Message Date
Tilghman Lesher
22e1118a93 Merged revisions 220906 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r220906 | tilghman | 2009-09-29 14:57:37 -0500 (Tue, 29 Sep 2009) | 16 lines
  
  Merged revisions 220873 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r220873 | tilghman | 2009-09-29 12:59:26 -0500 (Tue, 29 Sep 2009) | 9 lines
    
    Reduce CPU usage related to building a peer merely for devicestates.
    This fixes a 100% CPU problem in the SIP driver, found by profiling
    the driver while the problem was occurring.
    (closes issue #14309)
     Reported by: pkempgen
     Patches: 
           20090924__issue14309.diff.txt uploaded by tilghman (license 14)
     Tested by: pkempgen, vrban
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@220976 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-29 20:45:13 +00:00
Matthew Nicholson
dfcc688a9c Avoid a deadlock in chanspy, just in case the spyee is masqueraded and chanspy_ds_chan_fixup() is called with the channel locked.
(closes issue #15965)
Reported by: atis
Patches:
      chanspy-deadlock-fix1.diff uploaded by mnicholson (license 96)
Tested by: atis


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@220940 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-29 20:25:43 +00:00
Jeff Peeler
71b9410fbf Merged revisions 220833 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r220833 | jpeeler | 2009-09-29 11:58:29 -0500 (Tue, 29 Sep 2009) | 12 lines
  
  Make deletion of temporary greetings work properly with IMAP_STORAGE
  
  When imapgreetings was set to yes, the message was being deleted but wasn't
  actually being expunged. When imapgreetings was set to no, the file based
  message was not being deleted at all. All good now!
  
  (closes issue #14949)
  Reported by: noahisaac
  Patches:
        vm_tempgreeting_removal.patch uploaded by noahisaac (license 748), 
        modified by me
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@220834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-29 17:04:46 +00:00
Sean Bright
ed7d9d31bb Merged revisions 220721 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r220721 | seanbright | 2009-09-28 15:11:20 -0400 (Mon, 28 Sep 2009) | 10 lines
  
  Merged revisions 220717 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r220717 | seanbright | 2009-09-28 15:09:25 -0400 (Mon, 28 Sep 2009) | 3 lines
    
    When selecting DONT_OPTIMIZE in menuselect, explicitly pass -O0 to the compiler
    so we override any default optimization levels for a particular install.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@220723 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-28 19:13:53 +00:00
Jeff Peeler
645c49b098 Blocked revisions 220718 via svnmerge
........
  r220718 | jpeeler | 2009-09-28 14:10:10 -0500 (Mon, 28 Sep 2009) | 10 lines
  
  Fix building of registration entry in build_peer when using callbackextension
  
  Check for remotesecret option was unintentionally always true, which therefore
  caused the secret option to never be used. Thanks to dvossel for pointing out
  the exact fix.
  
  (closes issue #15943)
  Reported by: tpsast
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@220719 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-28 19:10:54 +00:00
Michiel van Baak
8d0154790d Blocked revisions 220629 via svnmerge
........
  r220629 | mvanbaak | 2009-09-27 22:40:16 +0200 (Sun, 27 Sep 2009) | 3 lines
  
  add name argument for the CALLERID dialplan function to the xml documentation.
  Pointed out to me on IRC by snuff-home. Thanks
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@220630 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-27 20:41:52 +00:00
Tilghman Lesher
83e0d61776 Merged revisions 220586 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r220586 | tilghman | 2009-09-26 10:10:28 -0500 (Sat, 26 Sep 2009) | 2 lines
  
  Allow AES to compile, when OpenSSL is not present.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@220587 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-26 15:11:23 +00:00
David Vossel
ee8f1f20a1 Merged revisions 220365 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r220365 | dvossel | 2009-09-24 15:37:20 -0500 (Thu, 24 Sep 2009) | 8 lines
  
  fixes tcptls_session memory leak caused by ref count error
  
  (closes issue #15939)
  Reported by: dvossel
  
  Review: https://reviewboard.asterisk.org/r/375/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@220372 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-24 20:42:35 +00:00
Tilghman Lesher
670aa3b5f0 Merged revisions 220289 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r220289 | tilghman | 2009-09-24 14:41:02 -0500 (Thu, 24 Sep 2009) | 13 lines
  
  Merged revisions 220288 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r220288 | tilghman | 2009-09-24 14:39:41 -0500 (Thu, 24 Sep 2009) | 6 lines
    
    Implicitly sending a progress signal breaks some applications.
    Call Progress() in your dialplan if you explicitly want progress to be sent.
    (Reverts change 216430, closes issue #15957)
    Reported by: Pavel Troller on the Asterisk-Dev mailing list
    http://lists.digium.com/pipermail/asterisk-dev/2009-September/039897.html
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@220290 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-24 19:42:25 +00:00
Sean Bright
eb8bfe79c1 Merged revisions 220217 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r220217 | seanbright | 2009-09-24 14:19:41 -0400 (Thu, 24 Sep 2009) | 9 lines
  
  Merged revisions 220213 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r220213 | seanbright | 2009-09-24 14:18:18 -0400 (Thu, 24 Sep 2009) | 1 line
    
    Resolve parallel build warnings.
    
    Reported by Klaus Darilion on the asterisk-dev mailing list.
  ........
................



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@220219 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-24 18:22:07 +00:00
Sean Bright
e230e38d53 Merged revisions 220100 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r220100 | seanbright | 2009-09-24 10:44:08 -0400 (Thu, 24 Sep 2009) | 9 lines
  
  Merged revisions 220099 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r220099 | seanbright | 2009-09-24 10:41:57 -0400 (Thu, 24 Sep 2009) | 2 lines
    
    Remove the remaining bashisms in the Makefile/mkpkgconfig
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@220101 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-24 14:49:32 +00:00
Michiel van Baak
cdc5dea152 Merged revisions 220028 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r220028 | mvanbaak | 2009-09-24 10:36:18 +0200 (Thu, 24 Sep 2009) | 14 lines
  
  Merged revisions 220027 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r220027 | mvanbaak | 2009-09-24 10:33:50 +0200 (Thu, 24 Sep 2009) | 7 lines
    
    mkpkgconfig does not need bash so make it use /bin/sh
    This fixes building on all systems that don't have bash
    at /bin/bash
    
    Reported by _ys on #asterisk-dev
    Tested by _ys on #asterisk-dev
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@220029 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-24 08:37:49 +00:00
Leif Madsen
b4f1b17477 Blocked revisions 219895 via svnmerge
........
  r219895 | lmadsen | 2009-09-23 12:46:46 -0500 (Wed, 23 Sep 2009) | 13 lines
  
  Add Mantis work flow documention.
  
  This commit adds the doxygen changes that I've made to describe the Mantis
  work flow documentation for the open source issue tracker. This should make
  it easier to determine the flow of issues through the issue tracker, and what
  those statuses mean.
  
  (closes issue #15902)
  Reported by: lmadsen
  Patches:
        mantisworkflow.h uploaded by lmadsen (license 10)
  
  Review: https://reviewboard.asterisk.org/r/367/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@219897 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-23 17:47:51 +00:00
Tilghman Lesher
3fde19e6e8 Merged revisions 219818 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r219818 | tilghman | 2009-09-22 16:43:22 -0500 (Tue, 22 Sep 2009) | 17 lines
  
  Merged revisions 219816 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r219816 | tilghman | 2009-09-22 16:37:03 -0500 (Tue, 22 Sep 2009) | 10 lines
    
    When IMAP variables were changed during a reload, Voicemail did not use the new values.
    This change introduces a configuration version variable, which ensures that
    connections with the old values are not reused but are allowed to expire
    normally.
    (closes issue #15934)
     Reported by: viniciusfontes
     Patches: 
           20090922__issue15934.diff.txt uploaded by tilghman (license 14)
     Tested by: viniciusfontes
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@219819 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-22 21:47:26 +00:00
David Vossel
17952fb663 Merged revisions 219721 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r219721 | dvossel | 2009-09-21 11:59:05 -0500 (Mon, 21 Sep 2009) | 9 lines
  
  Merged revisions 219720 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r219720 | dvossel | 2009-09-21 11:55:53 -0500 (Mon, 21 Sep 2009) | 3 lines
    
    Reverting merge 219520. This change was not necessary.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@219724 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-21 17:03:03 +00:00
Tilghman Lesher
2c2ba255c3 Merged revisions 219654 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r219654 | tilghman | 2009-09-20 12:55:49 -0500 (Sun, 20 Sep 2009) | 15 lines
  
  Merged revisions 219653 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r219653 | tilghman | 2009-09-20 12:52:05 -0500 (Sun, 20 Sep 2009) | 8 lines
    
    Really stop the stream, when ast_closestream() is called.
    (closes issue #15129)
     Reported by: bmh
     Patches: 
           20090918__issue15129.diff.txt uploaded by tilghman (license 14)
     Review:
           https://reviewboard.asterisk.org/r/372/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@219663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-20 18:20:06 +00:00
Russell Bryant
b92c592646 Merged revisions 219587 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r219587 | russell | 2009-09-18 21:59:52 -0500 (Fri, 18 Sep 2009) | 13 lines
  
  Merged revisions 219586 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r219586 | russell | 2009-09-18 21:51:13 -0500 (Fri, 18 Sep 2009) | 6 lines
    
    Make sure the iax_pvt exists before dereferencing it.
    
    This fixes the latest crash posted on issue 15609.
    
    (issue #15609)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@219588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-19 03:06:49 +00:00
David Vossel
2556ab814e Merged revisions 219520 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r219520 | dvossel | 2009-09-18 18:20:58 -0500 (Fri, 18 Sep 2009) | 15 lines
  
  Merged revisions 219519 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r219519 | dvossel | 2009-09-18 18:19:50 -0500 (Fri, 18 Sep 2009) | 9 lines
    
    iax2 frame double free
    
    The iax frame's retrans sched id was written over right
    before iax2_frame_free was called.  In iax2_frame_free that
    retrans id is used to delete the sched item.  By writing over
    the retrans field before the sched item could be deleted, it was
    possible for a retransmit to occur on a freed frame.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@219523 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-18 23:23:20 +00:00
David Vossel
0aae0e9d7a Merged revisions 219451 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r219451 | dvossel | 2009-09-18 11:20:41 -0500 (Fri, 18 Sep 2009) | 20 lines
  
  Merged revisions 219450 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r219450 | dvossel | 2009-09-18 11:19:15 -0500 (Fri, 18 Sep 2009) | 14 lines
    
    via-header branches not updated correctly on INVITE
    
    INVITE requests must always contain a new unique branch id. When
    a new branch id is created for an INVITE, the dialog's invite_branch
    variable must be updated so CANCEL requests use the correct branch id.
    
    (closes issue #15262)
    Reported by: maniax
    Patches:
          asterisk-1.6.1.0-sip-branch.patch uploaded by tweety (license 608)
          invite_new_branch_trunk.diff uploaded by dvossel (license 671)
    Tested by: maniax, dvossel
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@219454 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-18 16:22:40 +00:00
Tilghman Lesher
d68ef87f44 Merged revisions 219412 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r219412 | tilghman | 2009-09-18 08:54:51 -0500 (Fri, 18 Sep 2009) | 6 lines
  
  Missing value setting line for maxsecs/maxmessage
  (closes issue #15696)
   Reported by: fhackenberger
   Patches: 
         maxsecs.patch uploaded by fhackenberger (license 592)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@219413 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-18 13:57:07 +00:00
David Vossel
6665ddd859 Blocked revisions 219371 via svnmerge
........
  r219371 | dvossel | 2009-09-17 17:37:28 -0500 (Thu, 17 Sep 2009) | 9 lines
  
  fixes deadlock when performing directed pickup w Invite/replaces
  
  (closes issue #15340)
  Reported by: lmsteffan
  Patches:
        deadlock.patch uploaded by lmsteffan (license 779)
  Tested by: lmsteffan
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@219379 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-17 22:39:45 +00:00
Joshua Colp
30b98da09a Merged revisions 219324 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r219324 | mmichelson | 2009-09-17 17:22:01 -0500 (Thu, 17 Sep 2009) | 12 lines
  
  Merged revisions 219320 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r219320 | mmichelson | 2009-09-17 17:20:50 -0500 (Thu, 17 Sep 2009) | 6 lines
    
    Send a 100 Trying response when we detect a spiral.
    
    This was problematic during spiral tests at SIPit...
    along with some other things as well.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@219365 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-17 22:36:04 +00:00
David Vossel
c4ef289800 Merged revisions 219304 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r219304 | dvossel | 2009-09-17 16:59:21 -0500 (Thu, 17 Sep 2009) | 27 lines
  
  Merged revisions 219303 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r219303 | dvossel | 2009-09-17 16:29:37 -0500 (Thu, 17 Sep 2009) | 21 lines
    
    INVITE w/Replaces deadlock fix
    
    This patch cleans up the locking logic in chan_sip.c's
    handle_invite_replaces() function as well as making use
    of ast_do_masquerade() rather than forcing the masquerade
    on an ast_read().  The code had several redundant unlocks
    that would result in 'freed more times than we've locked!'
    errors. I cleaned these up as well as moving all the unlock
    logic to the end of the function.  This patch should also
    resolve the issue people were having with the replacecall
    channel never being unlocked with one legged calls.
    
    (closes issue #15151)
    Reported by: irroot
    Patches:
          invite_w_replaces_1.4.diff uploaded by dvossel (license 671)
    Tested by: irroot, dvossel
    
    Review: https://reviewboard.asterisk.org/r/371/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@219305 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-17 22:01:46 +00:00
Joshua Colp
73be2486f0 Merged revisions 219264 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r219264 | file | 2009-09-17 14:57:39 -0500 (Thu, 17 Sep 2009) | 2 lines
  
  Ensure no spaces exist before "refresher=" when doing the comparison.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@219265 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-17 19:58:13 +00:00
Matthew Nicholson
44cc22ffbe Merged revisions 219139 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r219139 | mnicholson | 2009-09-17 10:18:01 -0500 (Thu, 17 Sep 2009) | 17 lines
  
  Merged revisions 219136 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r219136 | mnicholson | 2009-09-17 09:58:39 -0500 (Thu, 17 Sep 2009) | 10 lines
    
    Prevent a potential race condition and crash when hanging up a channel by removing the channel from the channel list before begining channel tear down.
    
    This fix may potentially cause problems with CDR backends that access the channel a CDR is associated with via the channel list.  This fix makes the channel unavabile at the time when the CDR backend is invoked.  This has been documented in include/asterisk/cdr.h.
    
    (closes issue #15316)
    Reported by: vmarrone
    Tested by: mnicholson
    
    Review: https://reviewboard.asterisk.org/r/362/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@219198 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-17 15:44:14 +00:00
Tilghman Lesher
563af8b47b Merged revisions 219061 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r219061 | tilghman | 2009-09-16 18:42:12 -0500 (Wed, 16 Sep 2009) | 15 lines
  
  Merged revisions 219023 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r219023 | tilghman | 2009-09-16 18:21:53 -0500 (Wed, 16 Sep 2009) | 8 lines
    
    Properly deal with quotes in the arguments of '#exec' includes.
    (closes issue #15583)
     Reported by: pkempgen
     Patches: 
           20090726__issue15583.diff.txt uploaded by tilghman (license 14)
           20090726__issue15583-1.4-4.diff.txt uploaded by pkempgen (license 169)
     Tested by: pkempgen
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@219064 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-16 23:52:26 +00:00
Mark Michelson
b022998f4d Merged revisions 218933 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r218933 | mmichelson | 2009-09-16 14:25:36 -0500 (Wed, 16 Sep 2009) | 12 lines
  
  Reverse order of args to fread.
  
  This way, we don't always write a null byte into
  byte 1 of the buffer
  
  (closes issue #15905)
  Reported by: ebroad
  Patches:
        freadfix.patch uploaded by ebroad (license 878)
  Tested by: ebroad
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218935 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-16 19:26:34 +00:00
Joshua Colp
f70fb96b96 Merged revisions 218918 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r218918 | file | 2009-09-16 13:31:47 -0500 (Wed, 16 Sep 2009) | 5 lines
  
  On TCP and TLS connections do not attempt to stop retransmission of the packet internally.
  
  This was preventing responses from being properly processed because the packet was not being found
  causing handle_response to return prematurely.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218931 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-16 18:44:25 +00:00
David Brooks
34431fe518 Merged revisions 218868 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218868 | dbrooks | 2009-09-16 13:06:42 -0500 (Wed, 16 Sep 2009) | 20 lines
  
  Merged revisions 218867 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218867 | dbrooks | 2009-09-16 13:00:45 -0500 (Wed, 16 Sep 2009) | 13 lines
    
    Fixes CID pattern matching behavior to mirror that of extension pattern matching.
    
    Pattern matching for extensions uses a type of scoring system, giving values for
    specificity to each character in the pattern. Unfortunately, this is done character
    by character, in order. This does lead to some less specific patterns being first
    in line for matching, but it will usually get the job done.
    
    This patch merely brings CID matching to the same level as extension matching.
    This patch does not attempt to tackle the problem shared by extension matching.
    
    (closes issue #14708)
    Reported by: klaus3000
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218869 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-16 18:11:13 +00:00
Russell Bryant
b7ed7caf1c Merged revisions 218799 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218799 | russell | 2009-09-16 08:34:41 -0500 (Wed, 16 Sep 2009) | 16 lines
  
  Merged revisions 218798 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218798 | russell | 2009-09-16 08:33:43 -0500 (Wed, 16 Sep 2009) | 9 lines
    
    Remove the IAXy firmware from Asterisk.
    
    The firmware can now be found on downloads.digium.com, where the rest of our
    binary downloads live.  This was the last part of our Asterisk tarballs that
    was considered non-free by Debian.  :-)
    
    (closes issue #15838)
    Reported by: paravoid
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218800 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-16 13:36:44 +00:00
Tilghman Lesher
893cd7e270 Merged revisions 218731 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218731 | tilghman | 2009-09-15 17:33:10 -0500 (Tue, 15 Sep 2009) | 13 lines
  
  Merged revisions 218730 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218730 | tilghman | 2009-09-15 17:27:41 -0500 (Tue, 15 Sep 2009) | 6 lines
    
    If the user enters the same password as before, don't signal an error when the change does nothing.
    (closes issue #15492)
     Reported by: cbbs70a
     Patches: 
           20090713__issue15492.diff.txt uploaded by tilghman (license 14)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218732 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-15 22:39:28 +00:00
David Vossel
aae7d711d4 Merged revisions 218687 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r218687 | dvossel | 2009-09-15 14:22:37 -0500 (Tue, 15 Sep 2009) | 2 lines
  
  upward bound checking for port string to int conversion
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218690 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-15 19:31:07 +00:00
Matthew Nicholson
44ad4e3d8e Merged revisions 218586 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218586 | mnicholson | 2009-09-15 11:15:02 -0500 (Tue, 15 Sep 2009) | 15 lines
  
  Merged revisions 218578 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218578 | mnicholson | 2009-09-15 11:03:54 -0500 (Tue, 15 Sep 2009) | 8 lines
    
    Send request contact header field with response to registrer queries instead of the address of record.
    
    (closes issue #14438)
    Reported by: ravindrad
    Patches:
          regquerypatch uploaded by ravindrad (license 684)
    Tested by: ravindrad
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218601 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-15 16:21:24 +00:00
Tilghman Lesher
08673b91a7 Merged revisions 218579 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218579 | tilghman | 2009-09-15 11:04:41 -0500 (Tue, 15 Sep 2009) | 16 lines
  
  Merged revisions 218577 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218577 | tilghman | 2009-09-15 11:01:17 -0500 (Tue, 15 Sep 2009) | 9 lines
    
    Ensure FollowMe sets language in channels it creates.
    Also, not in the original bug report, but related fields are accountcode and
    musicclass, and the inheritance of datastores.
    (closes issue #15372)
     Reported by: Romik
     Patches: 
           20090828__issue15372.diff.txt uploaded by tilghman (license 14)
     Tested by: cervajs
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-15 16:05:25 +00:00
Mark Michelson
3205372e61 Merged revisions 218566 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r218566 | mmichelson | 2009-09-15 10:40:14 -0500 (Tue, 15 Sep 2009) | 4 lines
  
  Use a better method of ensuring null-termination of the buffer
  while reading the SDP when using TCP.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-15 15:42:03 +00:00
Mark Michelson
f3eac28967 Merged revisions 218499,218504 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r218499 | mmichelson | 2009-09-15 09:59:50 -0500 (Tue, 15 Sep 2009) | 3 lines
  
  Fix off-by-one error when reading SDP sent over TCP.
........
  r218504 | mmichelson | 2009-09-15 10:05:53 -0500 (Tue, 15 Sep 2009) | 3 lines
  
  Ensure that SDP read from TCP socket is null-terminated.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-15 15:11:50 +00:00
Kevin P. Fleming
234afd9f5f Merged revisions 218500 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218500 | kpfleming | 2009-09-15 11:02:21 -0400 (Tue, 15 Sep 2009) | 9 lines
  
  Merged revisions 218497 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218497 | kpfleming | 2009-09-15 10:55:58 -0400 (Tue, 15 Sep 2009) | 1 line
    
    Use proper hostname for downloading sound files.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218501 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-15 15:03:16 +00:00
Jeff Peeler
eb92fe9c73 Merged revisions 218430 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218430 | jpeeler | 2009-09-14 17:38:25 -0500 (Mon, 14 Sep 2009) | 18 lines
  
  Merged revisions 218401 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218401 | jpeeler | 2009-09-14 16:47:11 -0500 (Mon, 14 Sep 2009) | 11 lines
    
    Fix handling of DAHDI_EVENT_REMOVED event to prevent crash in do_monitor.
    
    After talking to rmudgett about some of his recent iflist locking changes, it
    was determined that the only place that would destroy a channel without being
    explicitly to do so was in handle_init_event. The loop to walk the interface
    list has been modified to wait to destroy the channel until the dahdi_pvt of
    the channel to be destroyed is no longer needed.
    
    (closes issue #15378)
    Reported by: samy
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218431 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-14 22:49:25 +00:00
Tilghman Lesher
77ad8a2556 Merged revisions 218361 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218361 | tilghman | 2009-09-14 14:29:48 -0500 (Mon, 14 Sep 2009) | 11 lines
  
  Recorded merge of revisions 218331 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218331 | tilghman | 2009-09-14 14:16:35 -0500 (Mon, 14 Sep 2009) | 4 lines
    
    Don't say "Please try again" if we don't give the user another chance to try again.
    (issue #15055, SWP-129)
     Reported by: jthurman
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-14 19:49:04 +00:00
Matthew Nicholson
5debc02dda Merged revisions 218224 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r218224 | mnicholson | 2009-09-14 09:57:23 -0500 (Mon, 14 Sep 2009) | 14 lines
  
  Merged revisions 218223 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r218223 | mnicholson | 2009-09-14 09:53:57 -0500 (Mon, 14 Sep 2009) | 8 lines
    
    Ensure we don't pickup ourselves when doing pickup by exten.
    
    (closes issue #15100)
    Reported by: lmsteffan
    Patches:
          (modified) pickup.patch uploaded by lmsteffan (license 779)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218244 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-14 15:22:12 +00:00
Tzafrir Cohen
2229b6b35f gcc 4.4: Remove a nop memset size 0 that annoys gcc
This memset doesn't write beyond the end of the buffer.
(tmpbuf has size of 4).

Merged revisions 218184 via svnmerge from 
http://svn.digium.com/svn/asterisk/trunk


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218216 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-13 19:10:56 +00:00
Michiel van Baak
897dfbf477 Blocked revisions 218107 via svnmerge
........
  r218107 | mvanbaak | 2009-09-12 15:08:16 +0200 (Sat, 12 Sep 2009) | 8 lines
  
  use the actual given ip address for 'rtp set debug ip <foo>' instead of the word 'ip'
  
  (closes issue #15711)
  Reported by: davidw
  Patches:
        2009082800-rtpdebug.diff.txt uploaded by mvanbaak (license 7)
  Tested by: davidw
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218109 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-12 13:11:42 +00:00
Michiel van Baak
fdb82a5e69 Use the ip for the new 'rtp set debug ip <foo>'.
Since 1.6.X still has the deprecated 'rtp debug ip <foo>'
this patch is different from the fix that went into trunk

(closes issue #15711)
Reported by: davidw
Patches:
      2009082800-rtpdebug.diff.txt uploaded by mvanbaak (license 7)
Tested by: davidw


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218108 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-12 13:10:18 +00:00
Tilghman Lesher
2973257add Merged revisions 217990 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r217990 | tilghman | 2009-09-10 18:54:51 -0500 (Thu, 10 Sep 2009) | 10 lines
  
  Merged revisions 217989 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r217989 | tilghman | 2009-09-10 18:52:22 -0500 (Thu, 10 Sep 2009) | 3 lines
    
    Don't ring another channel, if there's not enough time for a queue member to answer.
    (Fixes AST-228)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@218051 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-11 05:58:58 +00:00
Tilghman Lesher
6ababb90e3 Merged revisions 217916 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r217916 | tilghman | 2009-09-10 18:12:16 -0500 (Thu, 10 Sep 2009) | 2 lines
  
  Make calltoken support work with realtime users and peers.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@217920 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-10 23:17:27 +00:00
David Vossel
8856a69934 sip peer matching by address only with TCP/TLS
This patch removes the contact header matching logic and
adds logic to match all tcp/tls connections by ip only.
Thanks to oej for finding the issue and suggesting solutions.

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



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@217913 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-10 22:31:20 +00:00
David Vossel
c47a1e4451 Merged revisions 217807 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r217807 | dvossel | 2009-09-10 16:07:47 -0500 (Thu, 10 Sep 2009) | 28 lines
  
  Merged revisions 217806 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r217806 | dvossel | 2009-09-10 16:06:07 -0500 (Thu, 10 Sep 2009) | 22 lines
    
    IAX2 encryption regression
    
    The IAX2 Call Token security patch inadvertently broke the use of
    encryption due to the reorganization of code in the socket_process()
    function.  When encryption is used, an incoming full frame must first
    be decrypted before the information elements can be parsed.  The
    security release mistakenly moved IE parsing before decryption in
    order to process the new Call Token IE.  To resolve this, decryption
    of full frames is once again done before looking into the frame.  This
    involves searching for an existing callno, checking the pvt to see if
    encryption is turned on, and decrypting the packet before the internal
    fields of the full frame are accessed.
    
    (closes issue #15834)
    Reported by: karesmakro
    Patches:
          iax2_encryption_fix_1.4.diff uploaded by dvossel (license 671)
    Tested by: dvossel, karesmakro
    
    Review: https://reviewboard.asterisk.org/r/355/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@217858 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-10 21:33:22 +00:00
Matthias Nick
9cdd90d1fe Merged revisions 217730 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r217730 | mnick | 2009-09-10 14:39:41 -0500 (Thu, 10 Sep 2009) | 17 lines
  
  
  Sets the correct musicclass after an announcement
  
  (closes issue #15279)
  Reported by: mbeckwell
  Patches:
        patch.txt uploaded by mnick (license )
  Tested by: mnick
  
  (closes issue #15832)
  Reported by: mbeckwell
  Patches:
        patch.txt uploaded by mnick (license 874)
  Tested by: mnick
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@217736 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-10 19:53:41 +00:00
Olle Johansson
84091c6c41 Merged revisions 217593 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r217593 | oej | 2009-09-10 14:06:55 +0200 (Tor, 10 Sep 2009) | 8 lines

Include ActionID in all events that are responsed to AMI Action SIPShowRegistry

(closes issue #15868)
Reported by: nic_bellamy
Patches: 
      manager_SIPshowregistry_actionid.patch uploaded by nic bellamy (license 299)


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@217596 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-10 12:16:24 +00:00
Tzafrir Cohen
effd11cbf6 gcc 4.4 fix: union instead of cast
gcc 4.4 has more strict rules for aliasing. It doesn't like a 
struct sockaddr_in pointer pointing to a struct sockaddr. So we make it
a union.

Merged revisions 217445 via svnmerge from 
http://svn.digium.com/svn/asterisk/trunk


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@217484 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-09 20:15:37 +00:00