Commit Graph

2371 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Mark Michelson
4a9497891c Merged revisions 193954 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r193954 | mmichelson | 2009-05-12 15:28:13 -0500 (Tue, 12 May 2009) | 18 lines
  
  Update spiral support in trunk and 1.6.X to match what is in 1.4.
  
  In 1.4, a SIP spiral is treated the same way as a call forward. This
  works much better than what is currently in trunk and 1.6.X. The code
  in trunk and 1.6.X did not create a new call to the recipient of the spiral,
  instead trying to continue the same call. In addition to just being plain
  wrong, this also had the side effect of only being able to spiral calls
  to other SIP channels.
  
  With this in place, as long as call forwards are honored, SIP spirals
  will work properly. This means that it will work for outbound calls
  made  by the Queue, Dial, and Page applications. For originated calls and
  spool calls, however, the spiral will not work properly until a generic
  call forward mechanism is introduced into Asterisk.
  
  (relates to issue #13630)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@193960 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-12 20:50:30 +00:00
David Vossel
80a37a02a6 Merged revisions 193387 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r193387 | dvossel | 2009-05-08 15:32:51 -0500 (Fri, 08 May 2009) | 7 lines
  
  TCP not matching valid peer.
  
  find_peer() does not find a valid peer when using pvt->recv as the sockaddr_in argument.  Because of the way TCP works, the port number in pvt->recv is not what we're looking for at all.  There is currently only one place that find_peer searches for a peer using the sockaddr_in argument.  If the peer is not found after using pvt->recv (works for UDP since the port number will be correct), a temp sockaddr_in struct is made using the Contact header in the sip_request.  This has the correct port number in it.
  
  Review: http://reviewboard.digium.com/r/236/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@193449 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-08 21:32:25 +00:00
Tilghman Lesher
2a0f0439e5 Merged revisions 192933 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r192933 | tilghman | 2009-05-07 11:43:56 -0500 (Thu, 07 May 2009) | 17 lines
  
  Merged revisions 192932 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r192932 | tilghman | 2009-05-07 11:29:08 -0500 (Thu, 07 May 2009) | 10 lines
    
    Eliminate repetition of fullcontact during reconstruction.
    If the fullcontact field appears in both the sippeers and the
    sipregs table, then during reconstruction of the field, it will
    otherwise be doubled.
    (closes issue #14754)
     Reported by: Alexei Gradinari
     Patches: 
           20090506__bug14754.diff.txt uploaded by tilghman (license 14)
     Tested by: lmadsen
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@192934 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-07 16:45:23 +00:00
Joshua Colp
2f3e7752f2 Merged revisions 192634 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r192634 | file | 2009-05-06 10:34:35 -0300 (Wed, 06 May 2009) | 14 lines
  
  Merged revisions 192633 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r192633 | file | 2009-05-06 10:30:51 -0300 (Wed, 06 May 2009) | 7 lines
    
    Update some old logic to stop both begin and end DTMF frames from reaching the core if rfc2833 is not enabled.
    
    (closes issue #15036)
    Reported by: dimas
    Patches:
          v1-15036.patch uploaded by dimas (license 88)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@192635 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-06 13:36:19 +00:00
Joshua Colp
e088059f46 Merged revisions 192387 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r192387 | file | 2009-05-05 11:22:47 -0300 (Tue, 05 May 2009) | 10 lines
  
  Fix a bug with setting t38pt_udptl at the user or peer level.
  
  If an incoming call authenticated as a user or peer and t38pt_udptl was
  not set to yes in general then no UDPTL session would be present and any
  T38 related things would fail. This commit changes it so that if after
  authenticating T38 is enabled but no UDPTL session is present one will be
  created.
  
  (issue AST-215)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@192397 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-05 14:25:15 +00:00
Tilghman Lesher
26c5ebaa04 Merged revisions 191560 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r191560 | tilghman | 2009-05-01 15:01:21 -0500 (Fri, 01 May 2009) | 13 lines
  
  Merged revisions 191559 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r191559 | tilghman | 2009-05-01 15:00:23 -0500 (Fri, 01 May 2009) | 6 lines
    
    SIP Response 410 maps to cause code 22 (or 23), not 1.
    (closes issue #14993)
     Reported by: BigJimmy
     Patches: 
           causepatch uploaded by BigJimmy (license 371)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@191561 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-05-01 20:02:33 +00:00
Russell Bryant
a92f2e2a77 Merged revisions 190357 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
r190357 | russell | 2009-04-23 16:13:07 -0500 (Thu, 23 Apr 2009) | 10 lines

Merged revisions 190356 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r190356 | russell | 2009-04-23 16:07:07 -0500 (Thu, 23 Apr 2009) | 2 lines

Remove a bogus ast_channel_unlock().

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@190358 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-23 21:14:29 +00:00
David Vossel
d9073982da Merged revisions 189771 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r189771 | dvossel | 2009-04-21 15:28:37 -0500 (Tue, 21 Apr 2009) | 11 lines
  
  Fixes segfault when switching UDP to TCP in sip.conf after reload.
  
  If transport in sip.conf is switched from UDP to TCP, Asterisk segfaults right after issuing a sip reload.  The problem is the socket type is changed to TCP but the fd may still be present for UDP.  Later, when the TCP session should be created or set using an existing one, it isn't because the old file descriptor is still present.  Now every time transport is changed during a sip.conf reload, the file descriptor is set to -1, signifying it must be created or found.
  
  (closes issue #14727)
  Reported by: pj
  Tested by: dvossel
  
  Review: http://reviewboard.digium.com/r/229/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@189773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-21 20:41:41 +00:00
Mark Michelson
58705bdf54 Merged revisions 189097 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r189097 | mmichelson | 2009-04-17 15:20:23 -0500 (Fri, 17 Apr 2009) | 13 lines
  
  Prevent a crash when SIP blonde transferring an unbridged call.
  
  If one attempts to use the attended transfer button on a SIP phone
  to transfer an unbridged call (such as a call to an IVR) but hangs
  up while the target of the transfer is still ringing, we need to not
  crash.
  
  The problem was that ast_hangup was called from outside the channel
  thread.
  
  AST-211
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@189101 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-17 20:21:05 +00:00
Joshua Colp
0bc53ef61e Merged revisions 188947 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r188947 | file | 2009-04-17 11:44:56 -0300 (Fri, 17 Apr 2009) | 22 lines
  
  Merged revisions 188946 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r188946 | file | 2009-04-17 11:41:25 -0300 (Fri, 17 Apr 2009) | 15 lines
    
    Fix a bug where a value used to create the channel name was bogus.
    
    This commit fixes the scenario where an incoming call is authenticated
    using a peer entry. Previously the channel name was created using either
    the username setting from the sip.conf entry or the IP address that the
    call came from. Now the channel name will be created using the peer name
    itself. This commit will not change the way the channel name is generated
    for users or friends.
    
    (closes issue #14256)
    Reported by: Nick_Lewis
    Patches:
          chan_sip.c-chname.patch uploaded by Nick (license 657)
    Tested by: Nick_Lewis, file
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@188948 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-17 14:46:49 +00:00
Tilghman Lesher
fdfaea10c0 Merged revisions 188836 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r188836 | tilghman | 2009-04-16 16:57:37 -0500 (Thu, 16 Apr 2009) | 14 lines
  
  Merged revisions 188835 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r188835 | tilghman | 2009-04-16 16:41:13 -0500 (Thu, 16 Apr 2009) | 7 lines
    
    Only update realtime, if global option rtupdate != false
    (closes issue #14885)
     Reported by: deepesh
     Patches: 
           20090413__bug14885.diff.txt uploaded by tilghman (license 14)
     Tested by: deepesh
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@188837 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-16 22:03:35 +00:00
Joshua Colp
eac8868bc6 Merged revisions 188247 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r188247 | file | 2009-04-14 10:14:21 -0300 (Tue, 14 Apr 2009) | 7 lines
  
  Fix a bug with the change I made yesterday to outbound proxy support.
  
  Per discussion with oej on IRC we need the actual IP address, not the
  outbound proxy IP address, in the sa field. This change matches the already
  existing code for all other uses of the outbound proxy setting.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@188248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-14 13:16:05 +00:00
Joshua Colp
24f7a42dc5 Merged revisions 188067 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r188067 | file | 2009-04-13 13:28:06 -0300 (Mon, 13 Apr 2009) | 10 lines
  
  Fix a bug where using an outbound proxy would cause the local address to be 127.0.0.1.
  
  Copy the outbound proxy IP address into the SIP dialog structure as the IP address we will
  be sending to. This has to be done because the logic that determines what local IP address to use
  in the SIP messages is not aware of an outbound proxy being in place. It only knows what IP address
  we are sending to.
  
  (closes issue #12006)
  Reported by: mnicholson
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@188068 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-13 16:30:43 +00:00
Mark Michelson
9145d4bbc8 Merge revision 187488 to 1.6.0.
A note to all of you. Don't block revisions in a branch if you actually
meant to merge them. Two very old revisions somehow didn't get merged into
1.6.0 and this change was dependent on those two old revisions. What should have
taken 2 minutes has now wasted about 30 minutes of my time :(



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@187555 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-09 20:14:33 +00:00
Mark Michelson
f10c9a61b3 Merged revisions 141810,141868 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r141810 | mmichelson | 2008-09-08 16:18:49 -0500 (Mon, 08 Sep 2008) | 22 lines
  
  Merged revisions 141809 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
  r141809 | mmichelson | 2008-09-08 16:10:10 -0500 (Mon, 08 Sep 2008) | 14 lines
  
  Fix pedantic mode of chan_sip to only check the
  remote tag of an endpoint once a dialog has
  been confirmed. Up until that point, it is possible
  and legal for the far-end to send provisional
  responses with a different To: tag each time. With
  this patch applied, these provisional messages
  will not cause a matching problem.
  
  (closes issue #11536)
  Reported by: ibc
  Patches:
        11536v2.patch uploaded by putnopvut (license 60)
  
  
  ........
................
  r141868 | mmichelson | 2008-09-08 17:14:40 -0500 (Mon, 08 Sep 2008) | 4 lines
  
  Um, apparently I didn't actually finish merging before committing.
  Bad bad bad
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@187554 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-09 20:09:13 +00:00
Tilghman Lesher
92b4eb8d40 Merged revisions 187363 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r187363 | tilghman | 2009-04-09 11:39:43 -0500 (Thu, 09 Apr 2009) | 10 lines
  
  Merged revisions 187362 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r187362 | tilghman | 2009-04-09 11:38:37 -0500 (Thu, 09 Apr 2009) | 3 lines
    
    Permit zero-length text messages in SIP.
    (Related to an issue posted to the -users list, subject "AEL2, BASE64_DECODE and hexadecimal")
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@187364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-09 16:40:29 +00:00
Mark Michelson
f30f904099 Merged revisions 186837 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r186837 | mmichelson | 2009-04-07 19:01:49 -0500 (Tue, 07 Apr 2009) | 7 lines
  
  Fix bad merge from fix for issue 13867.
  
  (closes issue #14686)
  Reported by: davidw
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@186838 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-08 00:02:19 +00:00
Mark Michelson
0af241cd79 Remove an invalid call to free memory.
A bad merge from trunk to 1.6.0 meant freeing memory that
should not be freed. In trunk, pkt->data is an ast_str, but
in 1.6.0, it is allocated in the same chunk of memory as the
sip_pkt. This only affects 1.6.0.

(closes issue #14819)
Reported by: cwolff09



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@186517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-03 21:27:52 +00:00
Tilghman Lesher
5225fc08dc Merged revisions 186060 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r186060 | tilghman | 2009-04-02 12:10:28 -0500 (Thu, 02 Apr 2009) | 16 lines
  
  Merged revisions 186059 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ................
    r186059 | tilghman | 2009-04-02 12:09:13 -0500 (Thu, 02 Apr 2009) | 9 lines
    
    Merged revisions 186056 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.2
    
    ........
      r186056 | tilghman | 2009-04-02 12:02:18 -0500 (Thu, 02 Apr 2009) | 2 lines
      
      Fix for AST-2009-003
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@186061 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-02 17:12:40 +00:00
David Vossel
5e9150506c Merged revisions 185846 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r185846 | dvossel | 2009-04-01 14:03:32 -0500 (Wed, 01 Apr 2009) | 16 lines
  
  Merged revisions 185845 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r185845 | dvossel | 2009-04-01 14:02:00 -0500 (Wed, 01 Apr 2009) | 10 lines
    
    Fixes issue with dropped calles due to re-Invite glare and re-Invites never executing after a 491
    
    Acknowledgement for 491 responses were never being processed because it didn't match our pending invite's seqno.  Since the ACK was never processed, the 491 frame would continue to be retransmitted until eventually the call was dropped due to max retries.  Now during a pending invite, if we receive another invite, we send an 491 and hold on to that glare invite's seqno in the "glareinvite" variable for that sip_pvt struct.  When ACK's are received, we first check to see if it is in response to our pending invite, if not we check to see if it is in response to a glare invite.  In this case, it is in response to the glare invite and must be dealt with or the call is dropped.  I've changed the wait time for resending the re-Invite after receving a 491 response to comply with RFC 3261.  Before this patch the scheduled re-Invite would only change a flag indicating that the re-Invite should be sent out, now it actually sends it out as well. 
    
    (closes issue #12013)
    Reported by: alx
    
    Review: http://reviewboard.digium.com/r/213/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@185847 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-01 19:05:27 +00:00
Joshua Colp
1c3ca72745 Merged revisions 184948 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r184948 | file | 2009-03-30 11:37:47 -0300 (Mon, 30 Mar 2009) | 21 lines
  
  Merged revisions 184947 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r184947 | file | 2009-03-30 11:35:47 -0300 (Mon, 30 Mar 2009) | 14 lines
    
    Improve our handling of T38 in the initial INVITE from a device.
    
    We now answer with matching media streams to what is requested. If an INVITE
    is received with both a T38 and RTP media stream this means we answer with both.
    For any outgoing calls created as a result of this inbound one no T38 is requested
    in the initial INVITE. Instead if we start receiving udptl packets we trigger a
    reinvite on the outbound side.
    
    (closes issue #12437)
    Reported by: marsosa
    Tested by: pinga-fogo, okrief, file, afu
    
    Review: http://reviewboard.digium.com/r/208/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@184949 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-30 14:39:32 +00:00
Joshua Colp
28b8ea89dd Merged revisions 184566 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r184566 | file | 2009-03-27 10:15:26 -0300 (Fri, 27 Mar 2009) | 16 lines
  
  Merged revisions 184565 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r184565 | file | 2009-03-27 10:06:45 -0300 (Fri, 27 Mar 2009) | 9 lines
    
    Fix an issue where nat=yes would not always take effect for the RTP session on outgoing calls.
    
    If calls were placed using an IP address or hostname the global nat setting was copied over
    but was not set on the RTP session itself. This caused the RTP stack to not perform symmetric RTP
    actions.
    
    (closes issue #14546)
    Reported by: acunningham
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@184580 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-27 13:20:10 +00:00
Joshua Colp
b2ca3bfb1e Merged revisions 184280 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r184280 | file | 2009-03-25 16:22:06 -0300 (Wed, 25 Mar 2009) | 5 lines
  
  Fix issue with a T38 reinvite being sent even if not configured to do so.
  
  If we receive a T38 request negotiate control frame we should only attempt to do so
  if the option is enabled on the dialog.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@184281 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-25 19:23:59 +00:00
Mark Michelson
2099b522d5 Merged revisions 183117 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r183117 | mmichelson | 2009-03-19 11:07:54 -0500 (Thu, 19 Mar 2009) | 20 lines
  
  Merged revisions 183115 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r183115 | mmichelson | 2009-03-19 11:04:02 -0500 (Thu, 19 Mar 2009) | 14 lines
    
    Fix an issue where cancelled outgoing SIP calls would erroneously report the device as "in use."
    
    A user was having an issue where if an outgoing SIP call was canceled, the SIP device
    would remain in use if we had not received any response to the initial INVITE we sent out.
    The SIP device would remain in use until the autocongestion timer was exhausted.
    
    I tracked down the cause of this to be the section of code I am removing here. I asked several
    people what the purpose of this code was meant to be, but no one could give me any sort of
    answer as to why this was here. The person who was having this issue has been using this patch
    for several months and it has stopped the problems they have had.
    
    AST-196
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@183118 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-19 16:08:47 +00:00
Joshua Colp
369b1b702a Merged revisions 183108 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r183108 | file | 2009-03-19 12:37:23 -0300 (Thu, 19 Mar 2009) | 11 lines
  
  Improve our triggering of a T38 switchover internally when triggered by a received reinvite.
  
  Previously we reached across the channel bridge to get the other party's SIP dialog
  structure in order to trigger an outgoing reinvite. This is extremely dangerous to do
  and only works if bridged to another SIP channel. This patch changes this to use the
  T38 control frame method of requesting a switchover. This change also causes the SIP
  channel driver to propogate back whether the switchover worked or not instead of blindly
  accepting the incoming T38 reinvite.
  
  Review: http://reviewboard.digium.com/r/200/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@183109 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-19 15:40:46 +00:00
Joshua Colp
ee6dcca4f2 Merged revisions 182022 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r182022 | file | 2009-03-13 14:25:09 -0300 (Fri, 13 Mar 2009) | 7 lines
  
  Fix an issue with requesting a T38 reinvite before the call is answered.
  
  The code responsible for sending the T38 reinvite did not check if an INVITE was
  already being handled. This caused things to get confused and the call to fail.
  The code now defers sending the T38 reinvite until the current INVITE is done being
  handled.

  (issue AST-191)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@182036 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-13 17:28:14 +00:00
Mark Michelson
504ae23462 Merged revisions 181769 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r181769 | mmichelson | 2009-03-12 13:30:58 -0500 (Thu, 12 Mar 2009) | 28 lines
  
  Merged revisions 181768 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r181768 | mmichelson | 2009-03-12 13:29:48 -0500 (Thu, 12 Mar 2009) | 22 lines
    
    Properly send a 487 on an INVITE we have not responded to if we receive a BYE.
    
    If we receive an INVITE from an endpoint and then later receive a BYE from that
    same endpoint before we have sent a final response for the INVITE, then we need
    to respond to the INVITE with a 487. 
    
    There was logic in the code prior to this commit which seemed to exist solely to 
    handle this situation, but there was one condition in an if statement which 
    was incorrect. The only way we would send a 487 was if the sip_pvt had no owner
    channel. This made no sense since we created the owner channel when we received
    the INVITE, meaning that the majority of the time we would never send the 487.
    The 487 being sent should not rely on whether we have created a channel. Its
    delivery should be dependent on the current state of the initial INVITE transaction.
    With this commit, that logic is now correctly in place.
    
    (closes issue #14149)
    Reported by: legranjl
    Patches:
          14149.patch uploaded by mmichelson (license 60)
    Tested by: legranjl
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@181770 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-12 18:32:38 +00:00
Joshua Colp
ed9ddfd8a5 Merged revisions 181345 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r181345 | file | 2009-03-11 14:26:40 -0300 (Wed, 11 Mar 2009) | 21 lines
  
  Merged revisions 181328 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r181328 | file | 2009-03-11 14:22:52 -0300 (Wed, 11 Mar 2009) | 14 lines
    
    Fix issue where an attended transfer could not be completed under a rare scenario.
    
    When completing an attended transfer chan_sip does a check to make sure the extension
    in the URI portion of the Refer-To header is a local valid extension. We don't actually
    need to check this since we know for sure the other channel is already up and talking to
    the extension. Some devices do not put the extension in the Refer-To header either, which
    can cause the extension check to fail. We now no longer do this check if it is an attended
    transfer.
    
    (closes issue #14628)
    Reported by: sverre
    Patches:
          14628.diff uploaded by file (license 11)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@181352 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-11 17:28:12 +00:00
Joshua Colp
be3fc819ab Merged revisions 181296 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r181296 | file | 2009-03-11 13:40:48 -0300 (Wed, 11 Mar 2009) | 16 lines
  
  Merged revisions 181295 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r181295 | file | 2009-03-11 13:36:50 -0300 (Wed, 11 Mar 2009) | 9 lines
    
    Fix a problem with inband DTMF detection on outgoing SIP calls when dtmfmode=auto.
    
    When dtmfmode was set to auto the inband DTMF detector was not setup
    on outgoing SIP calls. This caused inband DTMF detection to fail.
    The inband DTMF detector is now setup for both dtmfmode inband and auto.
    
    (closes issue #13713)
    Reported by: makoto
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@181297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-11 16:42:21 +00:00
Jeff Peeler
368b57494b Merged revisions 181135 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r181135 | jpeeler | 2009-03-10 23:06:44 -0500 (Tue, 10 Mar 2009) | 20 lines
  
  Fix malloc debug macros to work properly with h323.
  
  The main problem here was that cstdlib was undefining free thereby causing the
  proper debug macros to not be used. ast_h323.cxx has been changed to call
  ast_free instead to avoid the issue. 
  
  A few other issues were addressed:
  - There were a few instances of functions improperly passing ast_free instead
  of ast_free_ptr.
  - Some clean up was done to avoid the debug macros intentionally being redefined.
  (copied below from Kevin's commit, appreciate the help)
  - disable astmm.h from doing anything when STANDALONE is defined, which is used
  by the tools in the utils/ directory that use parts of Asterisk header files in
  hackish ways; also ensure that utils/extconf.c and utils/conf2ael.c are
  compiled with STANDALONE defined.
  
  (closes issue #13593)
  Reported by: pj
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@181137 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-11 04:17:26 +00:00
Mark Michelson
d90ef47592 Merged revisions 181032-181033 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r181032 | mmichelson | 2009-03-10 19:46:47 -0500 (Tue, 10 Mar 2009) | 19 lines
  
  Merged revisions 181029,181031 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r181029 | mmichelson | 2009-03-10 19:30:26 -0500 (Tue, 10 Mar 2009) | 9 lines
    
    Fix incorrect tag checking on transfers when pedantic=yes is enabled.
    
    (closes issue #14611)
    Reported by: klaus3000
    Patches:
          patch_chan_sip_attended_transfer_1.4.23.txt uploaded by klaus3000 (license 65)
    Tested by: klaus3000
  ........
    r181031 | mmichelson | 2009-03-10 19:32:40 -0500 (Tue, 10 Mar 2009) | 3 lines
    
    Remove unused variables.
  ........
................
  r181033 | mmichelson | 2009-03-10 19:49:00 -0500 (Tue, 10 Mar 2009) | 3 lines
  
  Add missing comment that quotes RFC 3891
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@181034 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-11 00:52:22 +00:00
Joshua Colp
c6837adabc If a port is specified when dialing a peer then use it.
(closes issue #14626)
Reported by: acunningham


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@180799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-10 13:32:58 +00:00
Joshua Colp
b332b085ee Ensure that the new outgoing dialog to a peer is able to set the socket details, even if the default is present.
(closes issue #14480)
Reported by: jon


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@180718 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-09 20:14:05 +00:00