Commit Graph

17940 Commits

Author SHA1 Message Date
Tilghman Lesher
5a26f37df8 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.1@219820 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-22 21:47:41 +00:00
David Vossel
2198f6c381 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.1@219723 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-21 17:02:20 +00:00
Tilghman Lesher
269cf79c4b 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.1@219667 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-20 18:21:05 +00:00
Russell Bryant
27f242d63a 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.1@219589 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-19 03:10:20 +00:00
David Vossel
16c81690ba 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.1@219522 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-18 23:22:11 +00:00
David Vossel
fcc585fb18 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.1@219453 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-18 16:22:00 +00:00
Tilghman Lesher
f7ea3005d2 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.1@219414 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-18 13:57:13 +00:00
David Vossel
7aed661bbe 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.1@219378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-17 22:39:24 +00:00
Joshua Colp
cfb4ad0445 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.1@219367 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-17 22:36:49 +00:00
David Vossel
05332c17ce 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.1@219306 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-17 22:04:56 +00:00
Joshua Colp
cc03bc6c04 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.1@219266 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-17 19:58:35 +00:00
Matthew Nicholson
3dbbef0acc 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.1@219199 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-17 15:44:14 +00:00
Tilghman Lesher
23faa9744a 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.1@219062 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-16 23:52:09 +00:00
Mark Michelson
3b80ec6636 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.1@218936 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-16 19:27:32 +00:00
Joshua Colp
97a642d4aa 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.1@218932 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-16 19:24:31 +00:00
David Brooks
1edd6dc414 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.1@218890 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-16 18:23:15 +00:00
Russell Bryant
6fa719913e 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.1@218801 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-16 13:37:32 +00:00
Tilghman Lesher
28f7949944 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.1@218734 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-15 22:46:52 +00:00
Tilghman Lesher
dca5c3596f Merged revisions 139281,175058,175089 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
(closes issue #13985)

................
  r139281 | phsultan | 2008-08-21 04:55:31 -0500 (Thu, 21 Aug 2008) | 5 lines
  
  Fix two memory leaks in chan_gtalk, thanks Eliel!
  (closes issue #13310)
  Reported by: eliel
  Patches:
        chan_gtalk.c.patch uploaded by eliel (license 64)
................
  r175058 | phsultan | 2009-02-12 04:31:36 -0600 (Thu, 12 Feb 2009) | 20 lines
  
  Merged revisions 175029 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r175029 | phsultan | 2009-02-12 11:16:21 +0100 (Thu, 12 Feb 2009) | 12 lines
  
  Set the initiator attribute to lowercase in our replies when receiving calls.
  
  This attribute contains a JID that identifies the initiator of the GoogleTalk
  voice session. The GoogleTalk client discards Asterisk's replies if the 
  initiator attribute contains uppercase characters.
  
  (closes issue #13984)
  Reported by: jcovert
  Patches:
        chan_gtalk.2.patch uploaded by jcovert (license 551)
  Tested by: jcovert
  
  ........
................
  r175089 | phsultan | 2009-02-12 08:25:03 -0600 (Thu, 12 Feb 2009) | 6 lines
  
  Issue a warning message if our candidate's IP is the loopback address.
  
  (closes issue #13985)
  Reported by: jcovert
  Tested by: phsultan
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@218727 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-15 21:53:03 +00:00
David Vossel
4b40f9811c 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.1@218689 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-15 19:27:21 +00:00
Matthew Nicholson
f24f54bd77 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.1@218592 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-15 16:18:33 +00:00
Tilghman Lesher
c4865fe228 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.1@218581 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-15 16:05:35 +00:00
Mark Michelson
b885ba2f76 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.1@218574 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-15 15:42:29 +00:00
Jeff Peeler
0cba7bf3c6 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.1@218569 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-15 15:41:09 +00:00
Mark Michelson
78fb052fe6 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.1@218506 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-15 15:12:35 +00:00
Kevin P. Fleming
a9f85929b4 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.1@218502 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-15 15:04:53 +00:00
Tilghman Lesher
7a56903be3 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.1@218363 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-14 19:49:17 +00:00
Joshua Colp
59fe8ebbc1 Merged revisions 218295 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r218295 | file | 2009-09-14 13:16:39 -0500 (Mon, 14 Sep 2009) | 2 lines
  
  Do not attempt to add a parking extension if an error occurred while reading the configuration.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@218297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-14 18:17:36 +00:00
Matthew Nicholson
ff2c6a4db0 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.1@218227 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-14 15:17:50 +00:00
Tzafrir Cohen
36a844213f 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.1@218218 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-13 21:48:02 +00:00
Michiel van Baak
c6c26fc5ba 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 0015711)
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.1@218112 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-12 13:15:39 +00:00
Michiel van Baak
f82c02cc2c 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.1@218110 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-12 13:13:43 +00:00
Tilghman Lesher
3ab986bdb9 Merged revisions 218050 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r218050 | tilghman | 2009-09-11 00:58:11 -0500 (Fri, 11 Sep 2009) | 3 lines
  
  Check the origination priority for more matches, not the current priority.
  Found by Pavel Troller on the -dev list.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@218054 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-11 05:59:49 +00:00
Tilghman Lesher
6d32c10c14 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.1@218053 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-11 05:59:17 +00:00
Tilghman Lesher
87641f061a 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.1@217924 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-10 23:18:45 +00:00
David Vossel
828790449e 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.1@217826 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-10 21:23:19 +00:00
Matthias Nick
43ba36ed2e 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.1@217738 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-10 19:55:54 +00:00
Olle Johansson
bf62a4f70f Blocked revisions 216805 via svnmerge
........
r216805 | oej | 2009-09-07 18:08:08 +0200 (MÃ¥n, 07 Sep 2009) | 2 lines

Since it's possible to have more than 999 calls, I'm changing the call counter roof to something higher.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@217666 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-10 18:47:18 +00:00
Tilghman Lesher
c0c763be9b Merged revisions 217638 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r217638 | tilghman | 2009-09-10 13:17:14 -0500 (Thu, 10 Sep 2009) | 4 lines
  
  Verify support for wide ODBC character types before using them.
  (closes issue #15870)
   Reported by: nic_bellamy
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@217642 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-10 18:18:39 +00:00
Olle Johansson
3205bd2c30 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.1@217595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-10 12:11:07 +00:00
Tzafrir Cohen
7cce857d3c 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.1@217518 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-09 20:30:29 +00:00
Olle Johansson
207485c74d Merged revisions 217368 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r217368 | oej | 2009-09-09 12:39:43 +0200 (Ons, 09 Sep 2009) | 2 lines

Not having any TLS session to write to is a serious XMIT_ERROR. 

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@217370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-09 11:02:28 +00:00
Sean Bright
be3c80c535 Merged revisions 217286 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r217286 | seanbright | 2009-09-08 18:17:08 -0400 (Tue, 08 Sep 2009) | 4 lines
  
  Fix compilation of app_meetme.
  
  Reported by ebroad in #asterisk-bugs
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@217295 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-08 22:20:06 +00:00
Tilghman Lesher
1cdd533d6a Merged revisions 217199 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r217199 | tilghman | 2009-09-08 15:28:41 -0500 (Tue, 08 Sep 2009) | 14 lines
  
  Merged revisions 217156 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r217156 | tilghman | 2009-09-08 15:01:45 -0500 (Tue, 08 Sep 2009) | 7 lines
    
    When MOH is playing on the channel, announcements sent through the conference are not heard.
    (closes issue #14588)
     Reported by: voipas
     Patches: 
           20090716__issue14588__2.diff.txt uploaded by tilghman (license 14)
     Tested by: lmadsen, twisted, tilghman
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@217213 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-08 20:32:02 +00:00
Kevin P. Fleming
4d834c9af8 Merged revisions 217074 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r217074 | kpfleming | 2009-09-08 11:37:28 -0500 (Tue, 08 Sep 2009) | 9 lines
  
  Ensure that the default autoconf CFLAGS are not used.
  
  A recent change to the configure script that allows the user to specify
  CFLAGS and/or LDFLAGS to the script had the unfortunate side effect of
  letting autoconf's default CFLAGS (-g -O2) feed in to the rest of the build
  system, thereby overriding the DONT_OPTIMIZE setting in menuselect. That
  problem is now corrected.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@217076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-08 16:39:24 +00:00
Tilghman Lesher
91954c4ba4 Merged revisions 217033 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r217033 | tilghman | 2009-09-08 10:30:18 -0500 (Tue, 08 Sep 2009) | 4 lines
  
  Remove what appears to be an unnecessary define.
  (closes issue #15851)
   Reported by: tzafrir
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@217035 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-08 15:36:01 +00:00
David Vossel
5232a8397d Merged revisions 216993 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r216993 | dvossel | 2009-09-08 09:26:30 -0500 (Tue, 08 Sep 2009) | 14 lines
  
  caller id number empty
  
  parse_uri was not being given the correct scheme's, as
  a result, uri parsing did not parse the username correctly.
  One of the side effects of this is an empty caller id.
  
  (closes issue #15839)
  Reported by: ebroad
  Patches:
        blank_cidv2.patch uploaded by ebroad (license 878)
        parse_uri_fix.diff uploaded by dvossel (license 671)
  Tested by: ebroad, dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@216995 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-08 14:27:49 +00:00
Olle Johansson
1c94611d61 Merged revisions 216842 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r216842 | oej | 2009-09-07 18:35:12 +0200 (MÃ¥n, 07 Sep 2009) | 2 lines

Make sure we reset global_exclude_static at channel reload

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@216844 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-07 16:41:04 +00:00
Olle Johansson
65537fd00b Merged revisions 216695 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r216695 | oej | 2009-09-07 15:06:19 +0200 (MÃ¥n, 07 Sep 2009) | 8 lines

If there is no session timer setting in the INVITE, set it to default value (not unset minimum = -1)

Patch by oej

closes issue #15621
Reported by: fnordian
Tested by: atis

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@216697 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-07 13:10:39 +00:00
Olle Johansson
57accf67ed Make code and documentation agree with each other
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@216657 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-07 12:01:31 +00:00