Commit Graph

5549 Commits

Author SHA1 Message Date
Jeff Peeler
21af4c4acb Merged revisions 203853 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r203853 | jpeeler | 2009-06-26 17:11:31 -0500 (Fri, 26 Jun 2009) | 12 lines
  
  Merged revisions 203848 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r203848 | jpeeler | 2009-06-26 17:09:19 -0500 (Fri, 26 Jun 2009) | 5 lines
    
    Make sure to recreate the dahdi pseudo channel after dahdi restart
    
    (closes issue #14477)
    Reported by: timking
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@203855 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-26 22:12:48 +00:00
Russell Bryant
3be09ad7e9 Merged revisions 203779 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r203779 | russell | 2009-06-26 15:45:00 -0500 (Fri, 26 Jun 2009) | 5 lines
  
  Ensure the TCP read buffer is fully initialized before handling each packet.
  
  (closes issue #14452)
  Reported by: umberto71
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@203780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-26 20:46:55 +00:00
Jeff Peeler
cb69985027 reverse whitespace change 203711 that was based on looking at sig_analog (which has about a 1000 line indentation change that is not worth doing here)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@203717 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-26 19:54:51 +00:00
David Vossel
9fa99fc5b7 Merged revisions 203710 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r203710 | dvossel | 2009-06-26 14:47:11 -0500 (Fri, 26 Jun 2009) | 7 lines
  
  moving debug message from level 0 to 1.
  
  (closes issue #15404)
  Reported by: leobrown
  Patches:
        iax_codec_debug.patch uploaded by leobrown (license 541)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@203716 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-26 19:49:33 +00:00
Jeff Peeler
a184348797 whitespace fix
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@203711 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-26 19:47:45 +00:00
Joshua Colp
fc33f7b57e Merged revisions 203699 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r203699 | file | 2009-06-26 16:27:24 -0300 (Fri, 26 Jun 2009) | 2 lines
  
  Improve T.38 negotiation by exchanging session parameters between application and channel.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@203701 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-26 19:29:02 +00:00
Jeff Peeler
7f0af9cf29 Merged revisions 203672 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r203672 | jpeeler | 2009-06-26 14:03:25 -0500 (Fri, 26 Jun 2009) | 16 lines
  
  Check if polarityonanswerdelay has elapsed before setting a channel as answered
  after a polarity reversal.
  
  Previously on a polarity switch event chan_dahdi would set the channel
  immediately as answered. This would cause problems if a polarity reversal
  occurred when the line was picked up as the dial would not have yet occurred. 
  Now if the polarity reversal occurs before delay has elapsed after coming off
  hook or an answer, it is ignored. Also, some refactoring was done in
  _handle_event.
  
  (closes issue #13917)
  Reported by: alecdavis
  Patches:
        chan_dahdi.bug13917.feb09.diff2.txt uploaded by alecdavis (license 585)
  Tested by: alecdavis
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@203698 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-26 19:25:51 +00:00
Russell Bryant
8ee2d538bd Merged revisions 203116 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r203116 | russell | 2009-06-25 11:04:10 -0500 (Thu, 25 Jun 2009) | 18 lines
  
  Merged revisions 203115 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r203115 | russell | 2009-06-25 11:02:16 -0500 (Thu, 25 Jun 2009) | 11 lines
    
    Resolve a crash related to a T.38 reinvite race condition.
    
    This change resolves a crash observed locally during some T.38 testing.
    A call was set up using a call file, and when the T.38 reinvite came in,
    the channel state was still AST_STATE_DOWN.  The reason is explained by
    a comment in the code that previously lived in the handling of
    AST_STATE_RINGING.  This change modifies the logic to handle the same
    race condition for any channel state that is not UP.
    
    (closes ABE-1895)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@203117 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-25 16:05:36 +00:00
Richard Mudgett
db7b94fafb Merged revisions 203037 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r203037 | rmudgett | 2009-06-24 16:08:55 -0500 (Wed, 24 Jun 2009) | 15 lines
  
  Merged revisions 203036 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r203036 | rmudgett | 2009-06-24 16:01:43 -0500 (Wed, 24 Jun 2009) | 8 lines
    
    Improved chan_dahdi.conf pritimer error checking.
    
    Valid format is: pritimer=timer_name,timer_value
    
    *  Fixed segfault if the ',' is missing.
    *  Completely check the range returned by pri_timer2idx() to prevent
    possible access outside array bounds.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@203044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-24 21:18:48 +00:00
Mark Michelson
a228e74faa Merged revisions 202967 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r202967 | mmichelson | 2009-06-24 13:29:10 -0500 (Wed, 24 Jun 2009) | 9 lines
  
  Merged revisions 202966 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r202966 | mmichelson | 2009-06-24 13:28:47 -0500 (Wed, 24 Jun 2009) | 3 lines
    
    Use the handy UNLINK macro instead of hand-coding the same thing in-line.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202968 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-24 18:29:43 +00:00
Joshua Colp
03914b9a4a Merged revisions 202925 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r202925 | file | 2009-06-24 15:08:17 -0300 (Wed, 24 Jun 2009) | 2 lines
  
  Ensure the default settings are applied for T.38 when we set it up for a peer.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202926 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-24 18:09:31 +00:00
Matthew Fredrickson
d9ab6e17c1 Merged revisions 202761 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
r202761 | mattf | 2009-06-23 17:08:43 -0500 (Tue, 23 Jun 2009) | 1 line

I could have sworn I committed this patch ages ago, but... bug fix with setting NAI properly on linksets in certain situations.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202763 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-23 22:09:53 +00:00
David Vossel
cbdbf23bdc Merged revisions 202672 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r202672 | dvossel | 2009-06-23 11:31:30 -0500 (Tue, 23 Jun 2009) | 18 lines
  
  Merged revisions 202671 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r202671 | dvossel | 2009-06-23 11:28:46 -0500 (Tue, 23 Jun 2009) | 12 lines
    
    MWI NOTIFY contains a wrong URI if Asterisk listens to non-standard port and transport
    
    (closes issue #14659)
    Reported by: klaus3000
    Patches:
          patch_chan_sip_fixMWIuri_1.4.txt uploaded by klaus3000 (license 65)
          mwi_port-transport_trunk.diff uploaded by dvossel (license 671)
    Tested by: dvossel, klaus3000
    
    Review: https://reviewboard.asterisk.org/r/288/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-23 16:40:15 +00:00
Mark Michelson
b535dda70c Merged revisions 202603 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r202603 | mmichelson | 2009-06-23 10:23:00 -0500 (Tue, 23 Jun 2009) | 8 lines
  
  Blocked revisions 202601 via svnmerge
  
  ........
    r202601 | mmichelson | 2009-06-23 10:22:35 -0500 (Tue, 23 Jun 2009) | 3 lines
    
    Fix more memory leaks that may result if rtp is not successfully allocated.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202612 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-23 15:25:03 +00:00
Mark Michelson
436dce6109 Recorded merge of revisions 202574 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r202574 | mmichelson | 2009-06-23 10:11:47 -0500 (Tue, 23 Jun 2009) | 8 lines
  
  Blocked revisions 202572 via svnmerge
  
  ........
    r202572 | mmichelson | 2009-06-23 10:08:27 -0500 (Tue, 23 Jun 2009) | 3 lines
    
    Fix potential memory leak in chan_sip when video rtp is not allocated properly.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202577 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-23 15:16:06 +00:00
Russell Bryant
eca12f6e13 Merged revisions 202415 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r202415 | russell | 2009-06-22 11:05:08 -0500 (Mon, 22 Jun 2009) | 9 lines
  
  Merged revisions 202414 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r202414 | russell | 2009-06-22 11:00:00 -0500 (Mon, 22 Jun 2009) | 2 lines
    
    Make Polycom subscription type override check more explicit.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202416 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-22 16:06:43 +00:00
Mark Michelson
25b0edc60a Merged revisions 202343 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r202343 | mmichelson | 2009-06-22 09:58:24 -0500 (Mon, 22 Jun 2009) | 36 lines
  
  Merged revisions 202341-202342 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r202341 | mmichelson | 2009-06-22 09:42:55 -0500 (Mon, 22 Jun 2009) | 26 lines
    
    Fix a situation in which Asterisk would not stop retransmitting 487s.
    
    If a CANCEL were received by Asterisk, we would send a 487 in response
    to the original INVITE and a 200 OK for the CANCEL. If there were a network
    hiccup which caused the 200 OK and the 487 to be lost, then the UA communicating
    with Asterisk may try to retransmit its CANCEL. Asterisk's response to this used
    to be to try sending another 487 to the canceled INVITE and another 200 OK to the
    CANCEL.
    
    The problem here is that the originally-sent 487 was sent "reliably" meaning that
    it will be retransmitted until it is received properly. So when we receive the second
    CANCEL it is likely that the first batch of 487s we sent is still going strong and
    reaches the UA. The result was that the second set of 487s would be retransmitted
    constantly until the maximum number of retries had been reached.
    
    The fix for this is that if we receive a second CANCEL for an INVITE, then we cancel
    the retransmission of the first set of 487s and start a second set. This causes the
    dialog to be terminated reasonably.
    
    (closes issue #14584)
    Reported by: klaus3000
    Patches:
          14584_v2.patch uploaded by mmichelson (license 60)
    Tested by: klaus3000
  ........
    r202342 | mmichelson | 2009-06-22 09:44:58 -0500 (Mon, 22 Jun 2009) | 3 lines
    
    Remove an extra debug line left from previous commit.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202344 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-22 15:05:00 +00:00
Mark Michelson
03f46e7a81 Merged revisions 202337 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r202337 | mmichelson | 2009-06-22 09:35:09 -0500 (Mon, 22 Jun 2009) | 31 lines
  
  Merged revisions 202336 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r202336 | mmichelson | 2009-06-22 09:34:05 -0500 (Mon, 22 Jun 2009) | 25 lines
    
    Fix a possible infinite loop in SDP parsing during glare situation.
    
    There was a while loop in get_ip_and_port_from_sdp which was controlled
    by a call to get_sdp_iterate. The loop would exit either if what we were
    searching for was found or if the return was NULL. The problem is that
    get_sdp_iterate never returns NULL. This means that if what we were searching
    for was not present, the loop would run infinitely. This modification of the
    loop fixes the problem.
    
    (closes issue #15213)
    Reported by: schmidts
    
    (closes issue #15349)
    Reported by: samy
    
    (closes issue #14464)
    Reported by: pj
    
    (closes issue #15345)
    Reported by: aragon
    Patches:
          sip_inf_loop.patch uploaded by mmichelson (license 60)
    Tested by: aragon
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202338 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-22 14:35:35 +00:00
Matthew Nicholson
93017afcc8 Added deadlock protection to try_suggested_sip_codec in chan_sip.c.
Review: https://reviewboard.asterisk.org/r/287/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@202006 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-19 21:07:53 +00:00
David Vossel
ac6ab2899d Merged revisions 201994 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r201994 | dvossel | 2009-06-19 15:24:37 -0500 (Fri, 19 Jun 2009) | 14 lines
  
  Merged revisions 201993 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r201993 | dvossel | 2009-06-19 15:22:02 -0500 (Fri, 19 Jun 2009) | 8 lines
    
    timestamp was being converted to host order as a short rather than a long
    
    (closes issue #15361)
    Reported by: ffloimair
    Patches:
          ts_issue.diff uploaded by dvossel (license 671)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201997 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-19 20:27:31 +00:00
David Vossel
986be7d2a2 Merged revisions 201678 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r201678 | dvossel | 2009-06-18 11:37:42 -0500 (Thu, 18 Jun 2009) | 11 lines
  
  fixes some memory leaks and redundant conditions
  
  (closes issue #15269)
  Reported by: contactmayankjain
  Patches:
        patch.txt uploaded by contactmayankjain (license 740)
        memory_leak_stuff.trunk.diff uploaded by dvossel (license 671)
  Tested by: contactmayankjain, dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201682 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-18 16:58:03 +00:00
Mark Michelson
82f2aa293d Merged revisions 201462 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r201462 | mmichelson | 2009-06-17 15:10:01 -0500 (Wed, 17 Jun 2009) | 12 lines
  
  Fix problem with no audio due to ignoring the SDP.
  
  A recent change to our SDP version comparison made audio not function
  on some calls. This was because of a test wherein we were trying to
  see if an unsigned value was less than 0. This is a dumb comparison
  and arguably the compiler should have warned about it. Alas, though,
  it slipped past. Now it's fixed by changing the variable to be a
  signed type.
  
  Found by several developers. Tested by mnicholson and dbrooks.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201463 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-17 20:10:50 +00:00
David Brooks
ca7b9b9fe4 Merged revisions 201381 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r201381 | dbrooks | 2009-06-17 14:15:07 -0500 (Wed, 17 Jun 2009) | 16 lines
  
  Merged revisions 201380 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r201380 | dbrooks | 2009-06-17 13:45:50 -0500 (Wed, 17 Jun 2009) | 9 lines
    
    Checks for NULL sip_pvt pointer in chan_sip.c->acf_channel_read()
    
    Zombie channels could be passed, and chan_sip.c wasn't checking for it.
    Could crash Asterisk. Now checking for NULL pointer.
    
    (closes issue #15330)
    Reported by: okrief
    Tested by: dbrooks
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201443 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-17 19:35:23 +00:00
David Vossel
6cbe57b730 Merged revisions 201223 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r201223 | dvossel | 2009-06-16 17:29:30 -0500 (Tue, 16 Jun 2009) | 2 lines
  
  fix issue with build_contact introduced by the "SIP trasnport type issues" commit
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@201226 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-16 22:31:42 +00:00
David Vossel
c2d79c89bb Merged revisions 200946 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r200946 | dvossel | 2009-06-16 11:03:30 -0500 (Tue, 16 Jun 2009) | 32 lines
  
  SIP transport type issues
  
  What this patch addresses:
  1. ast_sip_ouraddrfor() by default binds to the UDP address/port
  reguardless if the sip->pvt is of type UDP or not.  Now when no
  remapping is required, ast_sip_ouraddrfor() checks the sip_pvt's
  transport type, attempting to set the address and port to the
  correct TCP/TLS bindings if necessary.
  2.  It is not necessary to send the port number in the Contact
  header unless the port is non-standard for the transport type.
  This patch fixes this and removes the todo note.
  3.  In sip_alloc(), the default dialog built always uses transport
  type UDP.  Now sip_alloc() looks at the sip_request (if present)
  and determines what transport type to use by default.
  4.  When changing the transport type of a sip_socket, the file
  descriptor must be set to -1 and in some cases the tcptls_session's
  ref count must be decremented and set to NULL.  I've encountered
  several issues associated with this process and have created a function,
  set_socket_transport(), to handle the setting of the socket type.
  
  
  (closes issue #13865)
  Reported by: st
  Patches:
        dont_add_port_if_tls.patch uploaded by Kristijan (license 753)
        13865.patch uploaded by mmichelson (license 60)
        tls_port_v5.patch uploaded by vrban (license 756)
        transport_issues.diff uploaded by dvossel (license 671)
  Tested by: mmichelson, Kristijan, vrban, jmacz, dvossel
  
  Review: https://reviewboard.asterisk.org/r/278/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200992 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-16 17:11:51 +00:00
Kevin P. Fleming
40757d599e Merged revisions 165180,200689 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r165180 | mnicholson | 2008-12-17 12:49:12 -0600 (Wed, 17 Dec 2008) | 14 lines
  
  This patch adds a new 'ignoresdpversion' option to sip.conf.  When this is
  enabled (either globally or for a specific peer), chan_sip will treat any SDP
  data it receives as new data and update the media stream accordingly.  By
  default, Asterisk will only modify the media stream if the SDP session version
  received is different from the current SDP session version.  This option is
  required to interoperate with devices that have non-standard SDP session
  version implementations (observed by toc on the bug tracker with Microsoft OCS
  which always uses 0 as the session version).
  
  http://reviewboard.digium.com/r/94/
  (closes issue #13958)
  Reported by: toc
  Tested by: toc
........
  r200689 | kpfleming | 2009-06-15 15:42:38 -0500 (Mon, 15 Jun 2009) | 12 lines
  
  Accept T.38 re-INVITE responses with invalid SDP versions.
  
  This commit changes the 'incoming SDP version' check logic a bit more; when
  'ignoresdpversion' is *not* set for a peer, if we initiate a re-INVITE to
  switch to T.38, we'll always accept the peer's SDP response, even if they
  don't properly increment the SDP version number as they should. If this situation
  occurs, a warning message will be generated suggesting that the peer's
  configuration be changed to include the 'ignoresdpversion' configuration option
  (although ideally they'd fix their SIP implementation to be RFC compliant).
  
  AST-221
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200724 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-15 21:29:27 +00:00
Mark Michelson
5f0b3e489f Merged revisions 200514 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r200514 | mmichelson | 2009-06-15 10:22:11 -0500 (Mon, 15 Jun 2009) | 11 lines
  
  Merged revisions 200513 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r200513 | mmichelson | 2009-06-15 10:21:46 -0500 (Mon, 15 Jun 2009) | 5 lines
    
    Add INFO to our allowed methods so that endpoints know they may send it to us.
    
    AST-223
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200515 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-15 15:22:34 +00:00
Mark Michelson
bd9f6cf82d Merged revisions 200146 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r200146 | mmichelson | 2009-06-11 16:17:14 -0500 (Thu, 11 Jun 2009) | 5 lines
  
  Fix a crash due to a potentially NULL p->options.
  
  Thanks to mnicholson for pointing it out.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200149 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-11 21:18:03 +00:00
Mark Michelson
7a3b46c789 The 1.6.0 branch was missing all invite_branch logic. It has now been added.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199975 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-10 20:20:53 +00:00
David Vossel
6cab2f47e6 Merged revisions 199818 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r199818 | dvossel | 2009-06-09 15:47:57 -0500 (Tue, 09 Jun 2009) | 11 lines
  
  CLI NOTIFY sending wrong transport type.
  
  SIP's cli NOTIFY command only used UDP rather than copying the transport type from the peer.
  
  (closes issue #15283)
  Reported by: jthurman
  Patches:
        sip-notify-tcp-svn199728.patch uploaded by jthurman (license 614)
  Tested by: jthurman, dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199821 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-09 20:54:10 +00:00
Mark Michelson
29113e4ad5 Merged revisions 199227 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r199227 | mmichelson | 2009-06-05 08:51:08 -0500 (Fri, 05 Jun 2009) | 14 lines
  
  Correct "dahdi show channels" output when specifying a group.
  
  Since a DAHDI channel may belong to multiple groups, we need to use
  a bitwise and instead of equivalence to determine whether to display
  the channel information.
  
  
  (closes issue #15248)
  Reported by: gentian
  Patches:
        15248.patch uploaded by mmichelson (license 60)
  Tested by: gentian
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199228 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-05 13:51:26 +00:00
David Vossel
ea62e16ffe Merged revisions 199139 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r199139 | dvossel | 2009-06-04 14:10:16 -0500 (Thu, 04 Jun 2009) | 9 lines
  
  Merged revisions 199138 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r199138 | dvossel | 2009-06-04 14:00:15 -0500 (Thu, 04 Jun 2009) | 3 lines
    
    Additional updates to AST-2009-001
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@199142 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-04 19:16:58 +00:00
David Vossel
d1b1506bc5 Merged revisions 198824 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r198824 | dvossel | 2009-06-02 12:55:35 -0500 (Tue, 02 Jun 2009) | 8 lines
  
  fixes issue with channels not going down after transfer
  
  Iax2 currently does not support native bridging if the timeoutms value is set.  We check for that in iax2_bridge, but then set timeoutms to 0 by default.  If the timeoutms is not provided it is set to -1. By setting timeoutms to 0 it is processed causing a bridging retry loop.
  
  (closes issue #15216)
  Reported by: oxymoron
  Tested by: dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@198825 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-02 17:56:19 +00:00
Joshua Colp
bc1b330dec Merged revisions 198791 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r198791 | file | 2009-06-02 10:48:06 -0300 (Tue, 02 Jun 2009) | 5 lines
  
  Correct documentation for the register line, specifically where the domain should be specified.
  
  (closes issue #14367)
  Reported by: Nick_Lewis
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@198792 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-06-02 13:49:24 +00:00
Eliel C. Sardanons
93e30e3e23 Merged revisions 197621 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r197621 | eliel | 2009-05-28 12:01:48 -0400 (Thu, 28 May 2009) | 19 lines
  
  Merged revisions 197562 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r197562 | eliel | 2009-05-28 11:21:32 -0400 (Thu, 28 May 2009) | 13 lines
    
    Use the address we already know when reloading a peer with nat=yes.
    
    If we already have an address for a peer, and we are reloading the sip
    configuration, try to use that address to contact the peer, instead of
    getting it from the Contact.
    
    (closes issue #15194)
    Reported by: ibc
    Patches:
          sip.patch uploaded by eliel (license 64)
          Tested by: manwe
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@197704 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-28 19:00:21 +00:00
Joshua Colp
b422316b51 Merged revisions 197697 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r197697 | file | 2009-05-28 15:45:11 -0300 (Thu, 28 May 2009) | 2 lines
  
  Fix a bug where the trunkmtu setting was not set to the default value of 1240 on load but was on reload.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@197698 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-28 18:46:42 +00:00
David Vossel
6c05ae7cc1 'iax show peer blah' now outputs whether or not peer 'blah' is in trunk mode or not.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@197622 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-28 16:06:05 +00:00
Mark Michelson
a66b938920 Merged revisions 197606 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r197606 | mmichelson | 2009-05-28 10:32:19 -0500 (Thu, 28 May 2009) | 22 lines
  
  Recorded merge of revisions 197588 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r197588 | mmichelson | 2009-05-28 10:27:49 -0500 (Thu, 28 May 2009) | 16 lines
    
    Allow for media to arrive from an alternate source when responding to a reinvite with 491.
    
    When we receive a SIP reinvite, it is possible that we may not be able to process the
    reinvite immediately since we have also sent a reinvite out ourselves. The problem is
    that whoever sent us the reinvite may have also sent a reinvite out to another party,
    and that reinvite may have succeeded.
    
    As a result, even though we are not going to accept the reinvite we just received, it
    is important for us to not have problems if we suddenly start receiving RTP from a new
    source. The fix for this is to grab the media source information from the SDP of the
    reinvite that we receive. This information is passed to the RTP layer so that it will
    know about the alternate source for media.
    
    Review: https://reviewboard.asterisk.org/r/252
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@197615 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-28 15:34:48 +00:00
Joshua Colp
cd950bcbf8 Merged revisions 197467 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r197467 | file | 2009-05-28 10:47:45 -0300 (Thu, 28 May 2009) | 15 lines
  
  Merged revisions 197466 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r197466 | file | 2009-05-28 10:44:58 -0300 (Thu, 28 May 2009) | 8 lines
    
    Fix a bug where the flag indicating the presence of rport would get overwritten by the nat setting.
    
    The presence of rport is now stored as a separate flag. Once the dialog is setup and authenticated
    (or it passes through unauthenticated) the proper nat flag is set.
    
    (closes issue #13823)
    Reported by: dimas
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@197469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-28 13:50:19 +00:00
David Vossel
2b5d7b9ce7 Fixes merge issue during r196454.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@197086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-27 15:58:24 +00:00
Sean Bright
6aa494b8f2 Merged revisions 196988 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r196988 | seanbright | 2009-05-27 09:02:54 -0400 (Wed, 27 May 2009) | 9 lines
  
  Display an error message when chan_alsa fails to load due to a missing
  or inaccessible configuration file.
  
  Before this change, when chan_alsa failed to load due to a missing or
  inaccessible configuration file, no message would be displayed.  With this
  change, when chan_alsa fails to load due to a missing or inaccessible
  configuration file, a message will be displayed.
  
  (closes issue #14760)
  Reported by: Nick_Lewis
  Patches:
        chan_alsa.c-confload.patch uploaded by Nick (license 657)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@196989 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-27 13:04:10 +00:00
Joshua Colp
6c1703877b Merged revisions 196721 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r196721 | file | 2009-05-26 10:43:13 -0300 (Tue, 26 May 2009) | 7 lines
  
  Fix a bug where the sip unregister CLI command did not completely unregister the peer.
  
  (closes issue #15118)
  Reported by: alecdavis
  Patches:
        chan_sip_unregister.diff2.txt uploaded by alecdavis (license 585)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@196722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-26 13:44:47 +00:00
David Vossel
5249104890 Merged revisions 196416 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r196416 | dvossel | 2009-05-22 16:09:45 -0500 (Fri, 22 May 2009) | 19 lines
  
  SIP set outbound transport type from Registration
  
  In sip.conf the transport option allows for the configuration of what transport types (udp, tcp, and tls) a peer will accept, but only the first type listed was used for outbound connections.  This patch changes this.  Now the default transport type is only used until the peer registers.  When registration takes place the transport type is parsed out of the Contact header.  If the Contact header's transport type is equal to one that the peer supports, the peer's default transport type for outbound connections is set to match the Contact header's type.  If the Contact header's transport type is not present, then the peer's default transport type is set to match the one the peer registered with.  When a peer unregisters or the registration expires, the default transport type for that peer is reset.
  
  (closes issue #12282)
  Reported by: rjain
  Patches:
        reg_patch_1.diff uploaded by dvossel (license 671)
  Tested by: dvossel
  
  (closes issue #14727)
  Reported by: pj
  Patches:
        reg_patch_3.diff uploaded by dvossel (license 671)
  Tested by: pj, dvossel
  
  Review: https://reviewboard.asterisk.org/r/249/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@196454 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-22 22:51:09 +00:00
Joshua Colp
9495819c2e Merged revisions 196117 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r196117 | file | 2009-05-22 10:56:47 -0300 (Fri, 22 May 2009) | 12 lines
  
  Merged revisions 196116 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r196116 | file | 2009-05-22 10:54:17 -0300 (Fri, 22 May 2009) | 5 lines
    
    Fix a bug where using immediate with mISDN caused a cause code of 16 to get sent back instead of 1 if the 's' extension did not exist.
    
    (closes issue #12286)
    Reported by: lmamane
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@196118 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-22 13:57:56 +00:00
David Vossel
be7700852b Merged revisions 195995 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r195995 | dvossel | 2009-05-21 14:11:49 -0500 (Thu, 21 May 2009) | 20 lines
  
  Merged revisions 195991 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r195991 | dvossel | 2009-05-21 14:04:56 -0500 (Thu, 21 May 2009) | 14 lines
    
    Sign problem calculating timestamp for iax frame leads to no audio on the receiving peer.
    
    There are rare cases in which a frame's delivery timestamp is slightly less than the iax2_pvt's offset.  This causes the pvt's timestamp to be a small negative number, but since the timestamp value is unsigned it looks like a huge positive number.  This patch checks for this negative case and sets the ms to zero.  A similar check is already done right below this one in the 'else' statement.
    
    (closes issue #15032)
    Reported by: guillecabeza
    Patches:
          chan_iax2.c.patch_timestamp uploaded by guillecabeza (license 380)
    Tested by: guillecabeza
    
    (closes issue #14216)
    Reported by: Andrey Sofronov
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@195997 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-21 19:12:55 +00:00
Joshua Colp
0b6e79502e Merged revisions 195449 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r195449 | file | 2009-05-19 11:43:54 -0300 (Tue, 19 May 2009) | 14 lines
  
  Merged revisions 195448 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r195448 | file | 2009-05-19 11:41:45 -0300 (Tue, 19 May 2009) | 7 lines
    
    Fix a bug where direct RTP setup would partially occur even when disabled if the calling channel was answered.
    
    (issue #13545)
    Reported by: davidw
    (issue #14244)
    Reported by: mbnwa
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@195450 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-19 14:45:54 +00:00
Joshua Colp
bbcf0052fd Merged revisions 195089 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r195089 | file | 2009-05-18 10:36:17 -0300 (Mon, 18 May 2009) | 5 lines
  
  Fix a bug where specifying an empty outboundproxy would cause packets to get sent to ourself.
  
  (closes issue #15106)
  Reported by: timeshell
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@195090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-18 13:37:20 +00:00
David Vossel
70e4d673f1 Merged revisions 194874 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r194874 | dvossel | 2009-05-15 17:44:44 -0500 (Fri, 15 May 2009) | 23 lines
  
  Merged revisions 194873 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r194873 | dvossel | 2009-05-15 17:43:13 -0500 (Fri, 15 May 2009) | 17 lines
    
    IAX2 REGAUTH loop
    
    IAX was not sending REGREJ to terminate invalid registrations.  Instead it sent another REGAUTH if the authentication challenge failed.  This caused a loop of REGREQ and REGAUTH frames.
    
    (Related to Security fix AST-2009-001)
    
    (closes issue #14867)
    Reported by: aragon
    Tested by: dvossel
    
    (closes issue #14717)
    Reported by: mobeck
    Patches:
          regauth_loop_update_patch.diff uploaded by dvossel (license 671)
    Tested by: dvossel
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@194875 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-15 22:45:52 +00:00
David Vossel
134d5899c8 Merged revisions 194833 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r194833 | dvossel | 2009-05-15 15:52:12 -0500 (Fri, 15 May 2009) | 24 lines
  
  Merged revisions 194557,194685 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r194557 | dvossel | 2009-05-14 17:59:43 -0500 (Thu, 14 May 2009) | 10 lines
    
    IAX2 "Ghost" Channels
    
    There is a bug tracker issue where people are reporting "Ghost" channels in their 'iax2 show channels' output.  The confusion is caused by channels being listed as "(NONE)" with format "unknown".  These are not channels of coarse.  They are usually just pending registration or poke requests, but it is confusing output.  To help make sense of this I have added two columns to 'iax2 show channels'.  One shows the first message which started the transaction, and the second shows the last message sent by either side of the call.  This helps diagnose why the entry exists and why it may not go away.
    
    (closes issue #14207)
    Reported by: clive18
    
    Review: https://reviewboard.asterisk.org/r/246/
  ........
    r194685 | dvossel | 2009-05-15 10:40:37 -0500 (Fri, 15 May 2009) | 6 lines
    
    Update to previous IAX2 "Ghost" Channels patch.
    
    Fixed some comments made on reviewboard for the previous patch.
    
    (issue #14207)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@194834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-15 21:08:26 +00:00
Mark Michelson
bd0383c3be Merged revisions 194496 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r194496 | mmichelson | 2009-05-14 17:20:51 -0500 (Thu, 14 May 2009) | 30 lines
  
  Merged revisions 194484 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r194484 | mmichelson | 2009-05-14 17:17:55 -0500 (Thu, 14 May 2009) | 24 lines
    
    Fix a race condition where a reinvite could trigger a 482 response.
    
    The loop detection/spiral detection code in chan_sip used the owner
    channel's state as a criterion for determining if the incoming INVITE
    is a looped request. The problem with this is that the INVITE-handling
    code happens in a different thread than the thread that marks the owner
    channel as being up. As a result, if a reinvite were to come in very quickly,
    say from another Asterisk on the same LAN, it was possible for the reinvite
    to arrive before the owner channel had been set to the up state.
    
    This patch corrects the problem by using the invitestate of the sip_pvt
    instead, since that can be guaranteed to be set correctly by the time
    the reinvite arrives. Since there is a switch statement further in the
    INVITE-handling code, the AST_STATE_RINGING state also checks the invitestate
    of the sip_pvt in case we should actually be treating the channel as if it were
    up already.
    
    (closes issue #12215)
    Reported by: jpyle
    Patches:
          12215_confirmed.patch uploaded by mmichelson (license 60)
    Tested by: lmadsen
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@194504 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-14 22:22:44 +00:00