Commit graph

3154 commits

Author SHA1 Message Date
David Vossel
642249c360 Merged revisions 314067 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r314067 | dvossel | 2011-04-18 10:23:45 -0500 (Mon, 18 Apr 2011) | 22 lines
  
  Remove the need for deadlock avoidance in chan_sip do_monitor.
  
  Deadlock avoidance between the sip pvt and the pvt->owner is
  very difficult.  Now that channel's are ao2 objects, this complication
  is no longer necessary.  It turns out the pvt's msg queue only
  exists because of deadlock avoidance (when deadlock avoidance fails
  msgs were added to a queue to be processed later), so this goes away as well.
  
  The technique used in the new sip_lock_pvt_full() function should
  be used as a template for replacing all locations where deadlock
  avoidance occurs between a channel tech_pvt and the pvt's owner.
  My hope is that this will begin a reversal of the invalid channel
  driver locking architecture we have been using for so long. 
  
  This patch also resolves an issue where the pvt->owner gets
  unlocked during processing the msg queue.
  
  (closes issue #18690)
  Reported by: dvossel
  
  Review: https://reviewboard.asterisk.org/r/1182/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@314078 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-18 16:22:55 +00:00
David Vossel
4b4549106b Merged revisions 314017 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r314017 | dvossel | 2011-04-18 08:41:06 -0500 (Mon, 18 Apr 2011) | 17 lines
  
  sip codec negotiation of dynamic rtp payloads error fix
  
  This patch fixes how chan_sip handles dynamic rtp payload types
  it does not understand.  At the moment if a dynamic payload's mime
  type does not match one we understand, the payload does not get
  removed from our payload table.  As a result of this, the payload
  is set to whatever dynamic codec we use internally for that payload
  number on outgoing INVITES.  This is incorrect.
  
  This patch fixes this by properly checking the rtpmap set function's
  return code to make sure it was found.  The function can return both
  -1 and -2 depending on the source of the mismatch.  We were just
  checking -1 explicitly.
  
  Review: https://reviewboard.asterisk.org/r/1169/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@314018 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-18 13:42:51 +00:00
Leif Madsen
b8b1d085db Add 'description' field for CLI and Manager output
(closes issue #19076)
Reported by: lmadsen
Patches: 
      __20110408-channel-description.txt uploaded by lmadsen (license 10)
Tested by: lmadsen

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@313528 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-13 15:49:33 +00:00
Richard Mudgett
ad30fa7569 Merged revisions 312889 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r312889 | rmudgett | 2011-04-05 11:19:35 -0500 (Tue, 05 Apr 2011) | 5 lines
  
  Add 416 response to OPTIONS packet.
  
  RFC3261 Section 11.2 says the response code to an OPTIONS packet needs to
  be the same as if it were an INVITE.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@312897 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-05 16:21:28 +00:00
Richard Mudgett
e005f07b7d Merged revisions 312866 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r312866 | rmudgett | 2011-04-05 10:38:14 -0500 (Tue, 05 Apr 2011) | 15 lines
  
  Responding to OPTIONS packet with 404 because Asterisk not looking for "s" extension.
  
  The get_destination() function was not using the "s" extension when the
  request URI did not specify an extension.  This is a regression caused
  when the URI parsing code was extracted into parse_uri().
  
  Made get_destination() substitute the "s" extension when the parsed URI
  results in an empty string.
  
  (closes issue #18348)
  Reported by: shmaize
  Patches:
        issue18348_v1.8.patch uploaded by rmudgett (license 664)
  Tested by: shmaize
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@312868 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-04-05 15:40:38 +00:00
Jonathan Rose
f91462e7ca Merged revisions 311352 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r311352 | jrose | 2011-03-18 11:19:05 -0500 (Fri, 18 Mar 2011) | 10 lines
  
  Changes some print statements/events to use a blank string in place of NULL if the string in question is NULL.
  
  This is supposed to improve Solaris compatibility since Solaris goes berserk when trying to output NULL strings.
  
  (closes issue #18759)
  Reported by: bklang
  Patches:
        null-strings.patch uploaded by bklang (license 919)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@311373 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-18 16:24:19 +00:00
Mark Michelson
0d66e03bf4 Merged revisions 310231 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r310231 | mmichelson | 2011-03-10 09:17:04 -0600 (Thu, 10 Mar 2011) | 9 lines
  
  Be more tolerant of what URI we accept for call completion PUBLISH requests.
  
  (closes issue #18946)
  Reported by: GeorgeKonopacki
  Patches: 
        18946.patch uploaded by mmichelson (license 60)
  Tested by: GeorgeKonopacki
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@310238 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-10 15:28:55 +00:00
Jason Parker
070cb4ef87 Merged revisions 309256 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r309256 | qwell | 2011-03-02 13:54:20 -0600 (Wed, 02 Mar 2011) | 15 lines
  
  Merged revisions 309255 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r309255 | qwell | 2011-03-02 13:53:47 -0600 (Wed, 02 Mar 2011) | 8 lines
    
    Fix usage of "hasvoicemail=yes" and "mailbox=" in users.conf for SIP.
    
    Since it's a duplicate, nothing is going to be done, so delme doesn't need to
    be set at all.  Strangely, when this was added, this was being set to 1 in 1.6,
    and 0 in trunk.
    
    (issue AST-439)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@309257 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-02 19:54:43 +00:00
David Vossel
8e603ab4e1 Merged revisions 309084 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r309084 | dvossel | 2011-03-01 10:09:11 -0600 (Tue, 01 Mar 2011) | 15 lines
  
  Merged revisions 309083 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r309083 | dvossel | 2011-03-01 10:05:25 -0600 (Tue, 01 Mar 2011) | 9 lines
    
    Fixes thread blocking issue in the sip TCP/TLS implementation.
    
    (closes issue #18497)
    Reported by: vois
    Patches:
          issues_18497.diff uploaded by dvossel (license 671)
    Tested by: vois, rossbeer, kowalma, Freddi_Fonet
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@309090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-03-01 16:22:27 +00:00
Alec L Davis
b6e37118c9 Merged revisions 308945 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r308945 | alecdavis | 2011-02-26 07:52:53 +1300 (Sat, 26 Feb 2011) | 21 lines
  
  Fix Deadlock with attended transfer of SIP call
  
  Call path 
    sip_set_rtp_peer (locks chan then pvt)
     transmit_reinvite_with_sdp
      try_suggested_sip_codec
       pbx_builtin_getvar_helper (locks p->owner)
  
  But by the time p->owner lock was attempted, seems as though chan and p->owner were different.
  
  So in sip_set_rtp_peer, lock pvt first then lock p->owner using deadlocking methods.
  
  (closes issue #18837)
  Reported by: alecdavis
  Patches: 
        bug18837-trunk.diff3.txt uploaded by alecdavis (license 585)
  Tested by: alecdavis, Irontec, ZX81, cmaj
  
  Review: [https://reviewboard.asterisk.org/r/1126/]
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@308946 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-25 18:58:10 +00:00
Terry Wilson
5deb544d06 Merged revisions 308679 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r308679 | twilson | 2011-02-23 21:41:34 -0600 (Wed, 23 Feb 2011) | 15 lines
  
  Merged revisions 308678 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r308678 | twilson | 2011-02-23 21:38:22 -0600 (Wed, 23 Feb 2011) | 8 lines
    
    Use remotesecret to authenticate with a remote party
    
    The remotesecret option was only being used for outbound registration
    and not for placing calls. This patch uses remotesecret on outbound
    calls if it is set, otherwise secret is still used.
    
    Review: https://reviewboard.asterisk.org/r/1107/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@308680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-24 03:49:07 +00:00
David Vossel
d760e81f37 Media Project Phase2: SILK 8khz-24khz, SLINEAR 8khz-192khz, SPEEX 32khz, hd audio ConfBridge, and other stuff
-Functional changes
1. Dynamic global format list build by codecs defined in codecs.conf
2. SILK 8khz, 12khz, 16khz, and 24khz with custom attributes defined in codecs.conf
3. Negotiation of SILK attributes in chan_sip.
4. SPEEX 32khz with translation
5. SLINEAR 8khz, 12khz, 24khz, 32khz, 44.1khz, 48khz, 96khz, 192khz with translation
   using codec_resample.c
6. Various changes to RTP code required to properly handle the dynamic format list
   and formats with attributes.
7. ConfBridge now dynamically jumps to the best possible sample rate.  This allows
   for conferences to take advantage of HD audio (Which sounds awesome)
8. Audiohooks are no longer limited to 8khz audio, and most effects have been
   updated to take advantage of this such as Volume, DENOISE, PITCH_SHIFT.
9. codec_resample now uses its own code rather than depending on libresample.

-Organizational changes
Global format list is moved from frame.c to format.c
Various format specific functions moved from frame.c to format.c

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@308582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-22 23:04:49 +00:00
Richard Mudgett
b2ef13cb60 Merged revisions 307879 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r307879 | rmudgett | 2011-02-15 10:13:55 -0600 (Tue, 15 Feb 2011) | 37 lines
  
  No response sent for SIP CC subscribe/resubscribe request.
  
  Asterisk does not send a response if we try to subscribe for call
  completion after we have received a 180 Ringing.  You can only subscribe
  for call completion when the call has been cleared.
  
  When we receive the 180 Ringing, for this call, its call-completion state
  is 'CC_AVAILABLE'.  If we then send a subscribe message to Asterisk, it
  trys to change the call-completion state to 'CC_CALLER_REQUESTED'.
  Because this is an invalid state change, it just ignores the message.  The
  only state Asterisk will accept our subscribe message is in the
  'CC_CALLER_OFFERED' state.
  
  Asterisk will go into the 'CC_CALLER_OFFERED' when the SIP client clears
  the call by sending a CANCEL.
  
  Asterisk should always send a response.  Even if its a negative one.
  
  
  The fix is to allow for the CCSS core to notify a CC agent that a failure
  has occurred when CC is requested.  The "ack" callback is replaced with a
  "respond" callback.  The "respond" callback has a parameter indicating
  either a successful response or a specific type of failure that may need
  to be communicated to the requester.
  
  (closes issue #18336)
  Reported by: GeorgeKonopacki
  Tested by: mmichelson, rmudgett
  
  JIRA SWP-2633
  
  (closes issue #18337)
  Reported by: GeorgeKonopacki
  Tested by: mmichelson
  
  JIRA SWP-2634
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307883 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-15 16:18:43 +00:00
David Vossel
08460fc094 Fixes bug in chan_sip where nativeformats are not set correctly.
The nativeformats field was being overwritten when it should have been
appended too.  This caused some format capabilities to be lost briefly and
some log warnings to be output.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307433 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-10 17:12:10 +00:00
Terry Wilson
4f57a3bb7c Merged revisions 306979 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r306979 | twilson | 2011-02-08 12:18:08 -0800 (Tue, 08 Feb 2011) | 16 lines
  
  Merged revisions 306973 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r306973 | twilson | 2011-02-08 12:14:09 -0800 (Tue, 08 Feb 2011) | 9 lines
    
    Merged revisions 306972 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r306972 | twilson | 2011-02-08 12:05:13 -0800 (Tue, 08 Feb 2011) | 2 lines
      
      Fix comparison for REFER Replaces tags with pedantic=yes
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307061 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-08 20:42:44 +00:00
Terry Wilson
a974d1a4ce Merged revisions 306619 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r306619 | twilson | 2011-02-07 14:15:27 -0800 (Mon, 07 Feb 2011) | 24 lines
  
  Merged revisions 306618 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r306618 | twilson | 2011-02-07 13:59:54 -0800 (Mon, 07 Feb 2011) | 17 lines
    
    Merged revisions 306617 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r306617 | twilson | 2011-02-07 13:51:43 -0800 (Mon, 07 Feb 2011) | 10 lines
      
      Don't allow a REFER w/replaces to replace its own dialog
      
      Asterisk currently accepts a REFER with a Refer-To with an embedded Replaces
      header that matches the dialog of the REFER. This would be a situation like A
      calls B, A calls C, A transfers B to A, which is just silly. This patch makes
      the transfer fail instead of making Asterisk freak out and forget to hang other
      channels up.
      
      Review: https://reviewboard.asterisk.org/r/1093/
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306670 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-07 22:31:25 +00:00
David Vossel
2db3c9e058 Fixes use of ast_format_cap_append where ast_format_cap_copy is necessary.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-07 16:33:43 +00:00
Paul Belanger
3556e4c2d4 Replace ast_log(LOG_DEBUG, ...) with ast_debug()
(closes issue #18556)
Reported by: kkm

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306258 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-04 16:55:39 +00:00
Jeff Peeler
285d953fdf Merged revisions 306215 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r306215 | jpeeler | 2011-02-03 17:49:28 -0600 (Thu, 03 Feb 2011) | 20 lines
  
  Fix SIP deadlock involving state changes.
  
  Once again a call to pbx_builtin_getvar_helper (and pbx_builtin_setvar_helper)
  has caused locking problems. Both of these functions lock the channel when
  the channel argument is passed in!
  
  In this case, the suspected problem (the backtrace makes it impossible to tell)
  was the private being locked in sip_set_rtp_peer and then:
  transmit_reinvite_with_sdp
   try_suggested_sip_codec
     pbx_builtin_getvar_helper
  (Traced to verify that the fix was only required in 1.8 and later.)
  
  (closes issue #18491)
  Reported by: cmaj
  Patches: 
        chan_sip_fix_deadlocks_bug_18491.txt uploaded by cmaj (license 830)
  Tested by: cmaj
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306216 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-03 23:50:08 +00:00
David Vossel
c26c190711 Asterisk media architecture conversion - no more format bitfields
This patch is the foundation of an entire new way of looking at media in Asterisk.
The code present in this patch is everything required to complete phase1 of my
Media Architecture proposal.  For more information about this project visit the link below.
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal

The primary function of this patch is to convert all the usages of format
bitfields in Asterisk to use the new format and format_cap APIs.  Functionally
no change in behavior should be present in this patch.  Thanks to twilson
and russell for all the time they spent reviewing these changes.

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



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306010 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-03 16:22:10 +00:00
Richard Mudgett
f71322f239 Merged revisions 305923 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r305923 | rmudgett | 2011-02-02 18:24:40 -0600 (Wed, 02 Feb 2011) | 24 lines
  
  Merged revisions 305889 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r305889 | rmudgett | 2011-02-02 18:15:07 -0600 (Wed, 02 Feb 2011) | 17 lines
    
    Merged revisions 305888 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r305888 | rmudgett | 2011-02-02 18:02:43 -0600 (Wed, 02 Feb 2011) | 8 lines
    
      Minor AST_FRAME_TEXT related issues.
    
      * Include the null terminator in the buffer length.  When the frame is
      queued it is copied.  If the null terminator is not part of the frame
      buffer length, the receiver could see garbage appended onto it.
    
      * Add channel lock protection with ast_sendtext().
    
      * Fixed AMI SendText action ast_sendtext() return value check.
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@305939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-03 00:29:46 +00:00
Andrew Latham
175dd0ebf6 Replace link to old doc with new wiki page.
Link to https://wiki.asterisk.org/wiki/display/AST/SIP+Retransmissions



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@305759 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-02-02 15:25:12 +00:00
Jason Parker
6908539952 Merged revisions 305254 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r305254 | qwell | 2011-01-31 17:07:00 -0600 (Mon, 31 Jan 2011) | 24 lines
  
  Merged revisions 305253 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r305253 | qwell | 2011-01-31 16:59:34 -0600 (Mon, 31 Jan 2011) | 17 lines
    
    Merged revisions 305252 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r305252 | qwell | 2011-01-31 16:56:54 -0600 (Mon, 31 Jan 2011) | 10 lines
      
      Prevent a crash when dialing a technology with no destination (ex: Dial(SIP/))
      
      chan_iax2 and other channel drivers already had code to prevent this.  The
      attempt that app_dial was making to prevent it was not correct, so I fixed that.
      
      (closes issue #18371)
      Reported by: gbour
      Patches: 
            18371.patch uploaded by gbour (license 1162)
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@305255 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-31 23:08:38 +00:00
Matthew Nicholson
48a9694ed0 Merged revisions 304245 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r304245 | mnicholson | 2011-01-26 14:43:27 -0600 (Wed, 26 Jan 2011) | 20 lines
  
  Merged revisions 304244 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r304244 | mnicholson | 2011-01-26 14:42:16 -0600 (Wed, 26 Jan 2011) | 13 lines
    
    Merged revisions 304241 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r304241 | mnicholson | 2011-01-26 14:38:22 -0600 (Wed, 26 Jan 2011) | 6 lines
      
      This patch modifies chan_sip to route responses to the address the request came from.  It also modifies chan_sip to respect the maddr parameter in the Via header.
      
      ABE-2664
      
      Review: https://reviewboard.asterisk.org/r/1059/
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@304246 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-26 20:44:47 +00:00
Terry Wilson
cd9221d2f6 Merged revisions 303962 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r303962 | twilson | 2011-01-25 16:09:01 -0600 (Tue, 25 Jan 2011) | 30 lines
  
  Merged revisions 303960 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r303960 | twilson | 2011-01-25 16:02:42 -0600 (Tue, 25 Jan 2011) | 23 lines
    
    Merged revisions 303906 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r303906 | twilson | 2011-01-25 14:50:59 -0600 (Tue, 25 Jan 2011) | 16 lines
      
      Guard against retransmitting BYEs indefinitely
      
      In the case of an attended transfer (A calls B, A atxfers to C) where
      A becomes unreachable before replying to Asterisk's BYE, Asterisk can
      sometimes retransmit the BYE indefinitely. This is because
      __sip_autodestruct tests p->refer && !ast_test_flag(&p->flags[0],
      SIP_ALREADYGONE and will then transmit a BYE. When this BYE times out,
      it will not ever be marked as ALREADYGONE, so when __sip_autodestruct
      is called again, we end up starting the cycle over.
      
      This patch adds a call to sip_alreadygone(pkt->owner) in retrans_pkt
      in the case of a BYE that has timed out. This should prevent Asterisk
      from trying to transmit new BYE messages in the future.
      
      Review: https://reviewboard.asterisk.org/r/1077/
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303963 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-25 22:15:41 +00:00
Tilghman Lesher
50c432324b Merged revisions 303860 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r303860 | tilghman | 2011-01-25 12:55:27 -0600 (Tue, 25 Jan 2011) | 12 lines
  
  Merged revisions 303858 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r303858 | tilghman | 2011-01-25 12:41:26 -0600 (Tue, 25 Jan 2011) | 5 lines
    
    Fix "sip show user <tab>", so that it actually shows results, instead of just completing the last entry.
    
    (closes issue #16675)
    Reported by: pj
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303861 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-25 18:56:23 +00:00
Matthew Nicholson
e706b5706e According to section 19.1.2 of RFC 3261:
For each component, the set of valid BNF expansions defines exactly
  which characters may appear unescaped.  All other characters MUST be
  escaped.

This patch modifies ast_uri_encode() to encode strings in line with this recommendation.  This patch also adds an ast_escape_quoted() function which escapes '"' and '\' characters in quoted strings in accordance with section 25.1 of RFC 3261.  The ast_uri_encode() function has also been modified to take an ast_flags struct describing the set of rules it should use when escaping characters to allow for it to escape SIP URIs in addition to HTTP URIs and other types of URIs or variations of those two URI types in the future.

The ast_uri_decode() function has also been modified to accept an ast_flags struct describing the set of rules to use when decoding to enable decoding '+' as ' ' in legacy http URLs.

The unit tests for these functions have also been updated.

ABE-2705

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@303509 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-24 18:59:22 +00:00
Sean Bright
06ac89965c Merged revisions 302414 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r302414 | seanbright | 2011-01-19 10:45:17 -0500 (Wed, 19 Jan 2011) | 7 lines
  
  Initialize an uninitialized variable.
  
  (closes issue #18640)
  Reported by: jcovert
  Patches:
        chan_sip.c.patch uploaded by jcovert (license 551)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302415 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-19 15:46:56 +00:00
Matthew Nicholson
785e3a1417 Merged revisions 302314 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302314 | mnicholson | 2011-01-18 15:43:21 -0600 (Tue, 18 Jan 2011) | 18 lines
  
  Merged revisions 302313 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r302313 | mnicholson | 2011-01-18 15:40:03 -0600 (Tue, 18 Jan 2011) | 11 lines
    
    Merged revisions 302311 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r302311 | mnicholson | 2011-01-18 15:35:03 -0600 (Tue, 18 Jan 2011) | 4 lines
      
      URI encode the user part of the contact header.
      
      ABE-2705
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302315 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-18 21:44:49 +00:00
Terry Wilson
ae6b55e4a3 Merged revisions 293493 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r293493 | twilson | 2010-11-01 09:58:00 -0500 (Mon, 01 Nov 2010) | 14 lines
  
  Only offer codecs both sides support for directmedia
  
  When using directmedia, Asterisk needs to limit the codecs offered to just
  the ones that both sides recognize, otherwise they may end up sending audio
  that the other side doesn't understand.
  
  (closes issue #17403)
  Reported by: one47
  Patches: 
        sip_codecs_simplified4 uploaded by one47 (license 23)
  Tested by: one47, falves11
  
  Review: https://reviewboard.asterisk.org/r/967/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@302048 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-17 16:38:21 +00:00
Jeff Peeler
a0e4c4ee5b Merged revisions 301790 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r301790 | jpeeler | 2011-01-14 11:32:52 -0600 (Fri, 14 Jan 2011) | 42 lines
  
  Resolve deadlock involving REFER.
  
  Two fixes:
  1) One must always have the private unlocked before calling
  pbx_builtin_setvar_helper to not invalidate locking order since it locks the
  channel.
  2) Unlock the channel before calling pbx_find_extension, which starts and stops
  autoservice during the lookup. The problem scenario as illustrated by the
  reporter:
  
  Thread: do_monitor
  -----------------------
  handle_request_do
   handle_incoming
    handle_request_refer
     ast_parking_ext_valid
      pbx_find_extension
       ast_autoservice_stop
        while (chan_list_state == as_chan_list_state) { usleep(1000); }
  
  Thread: autoservice_run
  -----------------------
  autoservice_run
   chan = ast_waitfor_n
    ast_waitfor_nandfds
     ast_waitfor_nandfds_classic / simple / complex (depending on your system)
      ast_channel_lock(c[x]);
  
  handle_request_do and schedule_process_request_queue locks the owner
  if it exists. The autoservice thread is waiting for the channel lock, which
  wasn't ever released since the do_monitor thread was waiting for autoservice
  operations to complete. Solved by unlocking the channel but keeping a reference
  to guarantee safety.
  
  (closes issue #18403)
  Reported by: jthurman
  Patches: 
        20110103-blind_deadlock.diff uploaded by jthurman (license 614)
        issue18403.patch uploaded by jpeeler (license 325)
  Tested by: jthurman
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-14 17:34:28 +00:00
Terry Wilson
c6858b9a1d Merged revisions 301683 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r301683 | twilson | 2011-01-12 15:19:48 -0600 (Wed, 12 Jan 2011) | 15 lines
  
  Merged revisions 301682 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r301682 | twilson | 2011-01-12 15:05:02 -0600 (Wed, 12 Jan 2011) | 9 lines
    
    Don't reject all SUBSCRIBE auth requests
    
    When merging another SUBSCRIBE fix from 1.4, some braces were put in
    the wrong place. This patch fixes that.
    
    (closes issue #18597)
    Reported by: thsgmbh
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@301684 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-12 21:24:18 +00:00
Leif Madsen
783ea39ba1 Merged revisions 300521 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r300521 | lmadsen | 2011-01-04 15:53:27 -0600 (Tue, 04 Jan 2011) | 17 lines
  
  Merged revisions 300520 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r300520 | lmadsen | 2011-01-04 15:52:41 -0600 (Tue, 04 Jan 2011) | 9 lines
    
    Fix backwards and broken XML documentation.
    
    (closes issue #18547)
    Reported by: jcovert
    Patches: 
          xmldoc.c.patch uploaded by jcovert (license 551)
          chan_iax2.c.doc.patch uploaded by jcovert (license 551)
          chan_sip.c.patch uploaded by jcovert (license 551)
          chan_agent.c.patch uploaded by jcovert (license 551)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300522 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-04 21:54:20 +00:00
Terry Wilson
94ef793caa Merged revisions 300301 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r300301 | twilson | 2011-01-04 11:54:41 -0600 (Tue, 04 Jan 2011) | 29 lines
  
  Merged revisions 300298 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r300298 | twilson | 2011-01-04 11:37:26 -0600 (Tue, 04 Jan 2011) | 22 lines
    
    Merged revisions 300216 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r300216 | twilson | 2011-01-04 11:11:48 -0600 (Tue, 04 Jan 2011) | 15 lines
      
      Don't authenticate SUBSCRIBE re-transmissions
      
      This only skips authentication on retransmissions that are already
      authenticated. A similar method is already used for INVITES. This
      is the kind of thing we end up having to do when we don't have a
      transaction layer...
      
      (closes issue #18075)
      Reported by: mdu113
      Patches: 
            diff.txt uploaded by twilson (license 396)
      Tested by: twilson, mdu113
      
      Review: https://reviewboard.asterisk.org/r/1005/
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@300302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-01-04 18:06:46 +00:00
Matthew Nicholson
ef23c07447 Merged revisions 299353 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r299353 | mnicholson | 2010-12-21 09:25:03 -0600 (Tue, 21 Dec 2010) | 30 lines
  
  Merged revisions 299242 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r299242 | mnicholson | 2010-12-20 15:25:35 -0600 (Mon, 20 Dec 2010) | 23 lines
    
    Merged revisions 299194,299198,299220 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r299194 | mnicholson | 2010-12-20 14:45:38 -0600 (Mon, 20 Dec 2010) | 6 lines
      
      Respond as soon as possible with a 202 Accepted to refer requests.
      
      This change also plugs a few memory leaks that can occur when parking sip calls.
      
      ABE-2656
    ........
      r299198 | mnicholson | 2010-12-20 15:00:44 -0600 (Mon, 20 Dec 2010) | 2 lines
      
      Remove changes to via processing that were not supposed to go into the last commit.
    ........
      r299220 | mnicholson | 2010-12-20 15:21:39 -0600 (Mon, 20 Dec 2010) | 4 lines
      
      Use ast_free() instead of free()
      
      ABE-2656
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299355 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-21 16:02:52 +00:00
Mark Michelson
59ec959844 Merged revisions 299248 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r299248 | mmichelson | 2010-12-20 15:38:30 -0600 (Mon, 20 Dec 2010) | 20 lines
  
  Fix a couple of CCSS issues.
  
  * Make sure to allocate a cc_params structure
    when creating autopeers.
  
  * Use sip_uri_cmp when retrieving SIP CC agents
    and monitors in case parameters appear in the
    URI.
  
  (closes issue #18504)
  Reported by: kkm
  
  (closes issue #18338)
  Reported by: GeorgeKonopacki
  Patches: 
        18338.diff uploaded by mmichelson (license 60)
  Tested by: GeorgeKonopacki
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299249 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-20 21:40:32 +00:00
Russell Bryant
cc0b7e7df5 Some scheduler API cleanup and improvements.
Previously, I had added the ast_sched_thread stuff that was a generic scheduler
thread implementation.  However, if you used it, it required using different
functions for modifying scheduler contents.  This patch reworks how this is
done and just allows you to optionally start a thread on the original scheduler
context structure that has always been there.  This makes it trivial to switch
to the generic scheduler thread implementation without having to touch any of
the other code that adds or removes scheduler entries.

In passing, I made some naming tweaks to add ast_ prefixes where they were not
there before.

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299091 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-20 17:15:54 +00:00
Tzafrir Cohen
6307b6fe3a Typos: recieved => received
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@299005 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-20 09:14:45 +00:00
Brad Watkins
806d69dc93 Merged revisions 298773 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r298773 | marquis | 2010-12-17 12:26:31 -0500 (Fri, 17 Dec 2010) | 10 lines
  
  Fix parsing of mwi => lines in sip.conf
  
  Reworking parsing of mwi => lines to resolve a segfault.  Also add a set of unit tests for the function that does the parsing.
  
  (closes issue #18350)
  Reported by: gbour
  Tested by: Marquis, gbour
  
  Review: https://reviewboard.asterisk.org/r/1053/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@298774 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-17 17:29:09 +00:00
Tilghman Lesher
8ba7ff54b4 Merged revisions 298539 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r298539 | tilghman | 2010-12-16 03:28:17 -0600 (Thu, 16 Dec 2010) | 8 lines
  
  Ensure the ipaddr field in realtime is large enough to handle IPv6 addresses.
  
  (closes issue #18464)
   Reported by: IgorG
   Patches: 
         realtime_ipv6store.diff uploaded by IgorG (license 20)
         (plus a few additional lines by tilghman)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@298545 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-16 09:29:05 +00:00
Terry Wilson
30f81f902d Merged revisions 297965 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297965 | twilson | 2010-12-09 16:18:19 -0600 (Thu, 09 Dec 2010) | 28 lines
  
  Merged revisions 297960 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r297960 | twilson | 2010-12-09 16:10:31 -0600 (Thu, 09 Dec 2010) | 21 lines
    
    Merged revisions 297959 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r297959 | twilson | 2010-12-09 16:00:30 -0600 (Thu, 09 Dec 2010) | 14 lines
      
      Ignore spurious REGISTER requests
      
      If a REGISTER request with a Call-ID matching an existing transaction is received
      it was possible that the REGISTER request would overwrite the initreq of the
      private structure. This info is used to generate messages for other responses in
      the transaction. This patch ignores REGISTER requests that match non-REGISTER
      transactions.
      
      (closes issue #18051)
      Reported by: eeman
      Tested by: twilson
      
      Review: https://reviewboard.asterisk.org/r/1050/
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@297972 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-09 22:19:56 +00:00
Jeff Peeler
537d235460 Merged revisions 297607 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297607 | jpeeler | 2010-12-06 16:06:37 -0600 (Mon, 06 Dec 2010) | 25 lines
  
  Merged revisions 297605 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r297605 | jpeeler | 2010-12-06 16:03:04 -0600 (Mon, 06 Dec 2010) | 18 lines
    
    Merged revisions 297603 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r297603 | jpeeler | 2010-12-06 15:57:15 -0600 (Mon, 06 Dec 2010) | 12 lines
      
      Improve handling of REGISTER requests with multiple contact headers.
      
      The changes here attempt to more strictly follow RFC 3261 section 10.3.
      Basically the following will now cause a 400 Bad Response to be returned, if:
      - multiple Contact headers are present with one set to expire all bindings ("*")
      - wildcard parameter is specified for Contact without Expires header or Expires
        header is not set to zero.
      
      ABE-2442
      ABE-2443
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@297608 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-06 22:10:41 +00:00
Jeff Peeler
a46bd43ae8 Merged revisions 297075 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r297075 | jpeeler | 2010-12-01 11:53:13 -0600 (Wed, 01 Dec 2010) | 37 lines
  
  Merged revisions 297073 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r297073 | jpeeler | 2010-12-01 11:52:46 -0600 (Wed, 01 Dec 2010) | 30 lines
    
    Merged revisions 297072 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r297072 | jpeeler | 2010-12-01 11:50:09 -0600 (Wed, 01 Dec 2010) | 23 lines
      
      Fix not stopping MOH when transfered local channel queue member is answered.
      
      The problem here is only present when local channels are used with the MOH
      passthru option as well as no optimization (/nm). I will describe the slightly
      bizarre scenario that was used to test, where phones B and C are queue members:
      
      Phone A dials into a queue with two members using local channels and the above
      options. Phone B answers. Phone A blind transfers phone B into the same queue.
      Phone A hangs up. Phone C answers, but phone B didn't stop playing MOH.
      
      In this scenario, the unhold frame that should have gotten to phone B never
      arrived due to the masquerade from the blind transfer. This is usually fine
      since app_queue manages the starting and stopping of MOH. However, with the
      passthrough option enabled when app_queue attempts to stop MOH it tries to do
      so on the local channel rather than the real channel. The easiest solution
      was to just make sure to send an unhold frame during the transfer since it
      wouldn't make sense to have MOH playing after a transfer anyway. This only
      modifies SIP transfers, but the other transfers did not seem to be a problem.
      If DTMF based transfers were a problem it might be okay to add ast_moh_stop
      to finishup, but I didn't want to have to add that unless required.
      
      ABE-2624
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@297076 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-12-01 17:53:54 +00:00
Russell Bryant
40cc550f1f Merged revisions 296628 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r296628 | russell | 2010-11-29 15:26:44 -0600 (Mon, 29 Nov 2010) | 6 lines
  
  Complete some error handling in transmit_publish() in chan_sip.c.
  
  This error handling block caught my eye.  It was missing a couple of things,
  but it should be safe now.  Thanks to mmichelson for the quick peer review
  on IRC.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@296630 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-29 21:31:05 +00:00
Brad Watkins
ad56a4d16e Merged revisions 296352 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r296352 | marquis | 2010-11-26 13:19:02 -0500 (Fri, 26 Nov 2010) | 12 lines
  
  Fix reloading of peer when a user is requested.
  
  Prevent peer reloading from causing multiple MWI subscriptions to be created when using realtime.  This had the effect of sending one NOTIFY for every time a sip peer made a call, in one case eventually overwhelming  the phone and causing it to reboot.
  
  (closes issue #18342)
  Reported by: nivek
  Patches:
        issue0018342p1.patch uploaded by nivek (license 636)
  Tested by: nivek
  
  Review: https://reviewboard.asterisk.org/r/1029/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@296353 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-26 18:23:02 +00:00
Terry Wilson
e5ede71934 Merged revisions 295673 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r295673 | twilson | 2010-11-19 14:06:10 -0800 (Fri, 19 Nov 2010) | 22 lines
  
  Merged revisions 295672 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r295672 | twilson | 2010-11-19 13:55:48 -0800 (Fri, 19 Nov 2010) | 15 lines
    
    Merged revisions 295628 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r295628 | twilson | 2010-11-19 12:53:36 -0800 (Fri, 19 Nov 2010) | 8 lines
      
      Discard responses with more than one Via
      
      This is not a perfect solution as headers that are joined via commas are not
      detected. This is a parsing issue that to fix "correctly" would necessitate 
      a new SIP parser.
      
      Review: https://reviewboard.asterisk.org/r/1019/
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@295674 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-19 22:15:49 +00:00
Jeff Peeler
99a698efb7 Merged revisions 294734 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r294734 | jpeeler | 2010-11-11 15:58:25 -0600 (Thu, 11 Nov 2010) | 32 lines
  
  Merged revisions 294733 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r294733 | jpeeler | 2010-11-11 15:57:22 -0600 (Thu, 11 Nov 2010) | 25 lines
    
    Merged revisions 294688 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r294688 | jpeeler | 2010-11-11 15:12:27 -0600 (Thu, 11 Nov 2010) | 18 lines
      
      Fix problem with qualify option packets for realtime peers never stopping.
      
      The option packets not only never stopped, but if a realtime peer was not in
      the peer list multiple options dialogs could accumulate over time. This
      scenario has the potential to progress to the point of saturating a link just
      from options packets. The fix was to ensure that the poke scheduler checks to
      see if a peer is in the peer list before continuing to poke. The reason a peer
      must be in the peer list to be able to properly manage an options dialog is
      because otherwise the call pointer is lost when the peer is regenerated from
      the database, which is how existing qualify dialogs are detected.
      
      (closes issue #16382)
      (closes issue #17779)
      Reported by: lftsy
      Patches: 
            bug16382-3.patch uploaded by jpeeler (license 325)
      Tested by: zerohalo
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@294735 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-11 22:01:01 +00:00
Matthew Nicholson
2df9e23e35 Merged revisions 294243 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r294243 | mnicholson | 2010-11-08 14:56:30 -0600 (Mon, 08 Nov 2010) | 15 lines
  
  Merged revisions 294242 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r294242 | mnicholson | 2010-11-08 14:50:21 -0600 (Mon, 08 Nov 2010) | 8 lines
    
    Go off hold when we get an empty reinvite telling us to.
    
    (closes issue 0014448)
    Reported by: frawd
    
    (closes issue #17878)
    Reported by: frawd
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@294244 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-08 21:04:01 +00:00
Brett Bryant
bbffb7fb07 Merged revisions 294084 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r294084 | bbryant | 2010-11-05 18:03:11 -0400 (Fri, 05 Nov 2010) | 9 lines
  
  Fixed deadlock avoidance issues while locking channel when adding the
  Max-Forwards header to a request.
  
  (closes issue #17949)
  (closes issue #18200)
  Reported by: bwg
  
  Review: https://reviewboard.asterisk.org/r/997/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@294086 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-05 22:17:16 +00:00
David Vossel
97a1489960 Perform proper handling of forked outbound INVITE requests.
RFC3261 section 12 about dialog creation says an INVITE transaction
results in an established dialog once it receives the 200 OK response.
It is possible to receive multiple differing 200 OK responses for a
single outbound INVITE Request, and this should result in establishing
multiple dialogs.

This patch allows for all differing 200 OK responses to an INVITE request
to establish a separate dialog, but only the first dialog is kept. All other
resulting dialogs from the initial request are immediately ACKed and then
immediately terminated with a BYE request.

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



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@294083 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-05 21:56:38 +00:00
David Vossel
f38f888416 Merged revisions 293924 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r293924 | dvossel | 2010-11-04 16:39:51 -0500 (Thu, 04 Nov 2010) | 4 lines
  
  Fixes ringback tone on sip semi-attended transfer.
  
  ABE-2168
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@294046 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-05 15:26:01 +00:00
Paul Belanger
dcd6dae413 Merged revisions 293887 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r293887 | pabelanger | 2010-11-04 09:27:54 -0400 (Thu, 04 Nov 2010) | 8 lines
  
  Do not output port in IPaddress for AMI sippeers.
  
  (closes issue #18248)
  Reported by: orn
  Patches: 
        ami_sippeers.patch uploaded by pabelanger (license 224)
  Tested by: orn
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@293888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-04 13:29:20 +00:00
Terry Wilson
abc94089cd Merged revisions 293803 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r293803 | twilson | 2010-11-03 11:05:14 -0700 (Wed, 03 Nov 2010) | 25 lines
  
  Avoid valgrind warnings for ast_rtp_instance_get_xxx_address
  
  The documentation for ast_rtp_instance_get_(local/remote)_address stated that
  they returned 0 for success and -1 on failure. Instead, they returned 0 if the
  address structure passed in was already equivalent to the address instance
  local/remote address or 1 otherwise. 90% of the calls to these functions
  completely ignored the return address and passed in an uninitialized struct,
  which would make valgrind complain even though the operation was technically
  safe.
  
  This patch fixes the documentation and converts the get_xxx_address functions
  to void since all they really do is copy the address and cannot fail.
  Additionally two new functions
  (ast_rtp_instance_get_and_cmp_(local/remote)_address) are created for the 3
  times where the return value was actually checked. The
  get_and_cmp_local_address function is currently unused, but exists for the sake
  of symmetry.
  
  The only functional change as a result of this change is that we will not do an
  ast_sockaddr_cmp() on (mostly uninitialized) addresses before doing the
  ast_sockaddr_copy() in the get_*_address functions. So, even though it is an
  API change, it shouldn't have a noticeable change in behavior.
  
  Review: https://reviewboard.asterisk.org/r/995/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@293809 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-03 18:43:18 +00:00
Jeff Peeler
9528e27b8c Merged revisions 293724 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r293724 | jpeeler | 2010-11-02 18:09:06 -0500 (Tue, 02 Nov 2010) | 22 lines
  
  Merged revisions 293723 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r293723 | jpeeler | 2010-11-02 18:07:13 -0500 (Tue, 02 Nov 2010) | 15 lines
    
    Merged revisions 293722 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r293722 | jpeeler | 2010-11-02 18:02:51 -0500 (Tue, 02 Nov 2010) | 8 lines
      
      Add enabled/disabled information for rtautoclear sip show settings output.
      
      When setting to zero/"no", the numeric default was shown making it not obvious
      the disabled setting was respected.
      
      (closes issue #18123)
      Reported by: zerohalo
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@293725 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-11-02 23:10:07 +00:00
Jeff Peeler
a491f69be6 Merged revisions 293305 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r293305 | jpeeler | 2010-10-29 16:48:38 -0500 (Fri, 29 Oct 2010) | 9 lines
  
  Modify sip_setoption to not complain about unknown options.
  
  This now behaves just like the other setoption callbacks. For the curious the
  offending option for the reporter was AST_OPTION_CHANNEL_WRITE which was getting
  passed due to a fix for chan_local in 286189.
  
  (closes issue #17985)
  Reported by: globalnetinc
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@293306 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-29 21:50:18 +00:00
Leif Madsen
8de8e4a11c Merged revisions 292787 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r292787 | lmadsen | 2010-10-22 16:28:43 -0500 (Fri, 22 Oct 2010) | 21 lines
  
  Merged revisions 292786 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r292786 | lmadsen | 2010-10-22 16:16:12 -0500 (Fri, 22 Oct 2010) | 13 lines
    
    Update the LDIF file for LDAP.
    The LDIF file asterisk.ldif was quite a bit out of date from the asterisk.ldap-schema file, so I've
    now updated that to be in sync. The asterisk.ldif file being out of sync was a problem on my systems
    where I was doing an ldapadd to import the schema into the LDAP database, and the existing file
    would cause problems and ERROR messages when registering.
    
    Additional documention has been added based on feedback in the issue I'm closing.
    
    (closes issue #13861)
    Reported by: scramatte
    Patches:
          ldap-update.txt uploaded by lmadsen (license 10)
    Tested by: lmadsen, jcovert, suretec, rgenthner
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@292788 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-22 21:29:20 +00:00
Terry Wilson
9653b5d500 Merged revisions 292309 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r292309 | twilson | 2010-10-19 12:27:32 -0700 (Tue, 19 Oct 2010) | 10 lines
  
  Add sip show peer info about crypto and remove dated comment
  
  This patch adds information about the encryption setting to 'sip show
  peers' and removes an out-of-date comment from res_srtp.c and instead
  directs users to the proper documentation.
  
  (closes issue #18140)
  Reported by: chodorenko
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@292310 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-19 19:35:24 +00:00
David Vossel
8be13e128f Merged revisions 291942 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r291942 | dvossel | 2010-10-15 15:12:04 -0500 (Fri, 15 Oct 2010) | 8 lines
  
  Fixes peer's host port information being lost on sip reload.
  
  (closes issue #18135)
  Reported by: lmadsen
  Patches:
        crazy_ports_v2.diff uploaded by dvossel (license 671)
  Tested by: lmadsen
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291943 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-15 20:12:46 +00:00
Paul Belanger
b1cc567e3f Merged revisions 291758 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r291758 | pabelanger | 2010-10-14 11:15:12 -0400 (Thu, 14 Oct 2010) | 11 lines
  
  Add the ability for ast_find_ourip to return IPv4, IPv6 or both.
  
  While testing chan_gtalk I noticed jabber was using my IPv6 address
  and not IPv4. When using bindaddr=0.0.0.0 it is possible for ast_find_ourip()
  to return both IPv6 and IPv4 results.  Adding a family parameter gives you
  the ablility to choose.
  
  Since jabber/gtalk/h323 do not support IPv6, we should only return IPv4 results.
  
  Review: https://reviewboard.asterisk.org/r/973/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291760 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-14 15:21:42 +00:00
Russell Bryant
0971ebc037 Merged revisions 291394 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r291394 | russell | 2010-10-13 10:46:39 -0500 (Wed, 13 Oct 2010) | 20 lines
  
  Merged revisions 291393 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r291393 | russell | 2010-10-13 10:29:21 -0500 (Wed, 13 Oct 2010) | 13 lines
    
    Merged revisions 291392 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r291392 | russell | 2010-10-13 10:23:19 -0500 (Wed, 13 Oct 2010) | 6 lines
      
      Lock pvt so pvt->owner can't disappear when queueing up a frame.
      
      This fixes a crash due to a hangup race condition.
      
      ABE-2601
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291395 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-13 15:51:39 +00:00
Richard Mudgett
d8b4b9509a Add todo comment about handle_incoming() calling assumption.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291115 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-11 19:07:59 +00:00
Richard Mudgett
924793d6e6 Merged revisions 291112-291113 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r291112 | rmudgett | 2010-10-11 13:48:15 -0500 (Mon, 11 Oct 2010) | 20 lines
  
  Merged revisions 291110-291111 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r291110 | rmudgett | 2010-10-11 13:34:22 -0500 (Mon, 11 Oct 2010) | 9 lines
    
    Merged revisions 291109 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r291109 | rmudgett | 2010-10-11 13:29:43 -0500 (Mon, 11 Oct 2010) | 1 line
      
      Add missing unlock to an exception condition in reload_config().
    ........
  ................
    r291111 | rmudgett | 2010-10-11 13:39:06 -0500 (Mon, 11 Oct 2010) | 1 line
    
    Make exit from handle_request_do() consistent.
  ................
................
  r291113 | rmudgett | 2010-10-11 13:51:13 -0500 (Mon, 11 Oct 2010) | 1 line
  
  Move declaration closer to where now used.
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291114 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-11 18:58:50 +00:00
Jeff Peeler
c44527e185 Merged revisions 289840 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r289840 | jpeeler | 2010-10-01 21:43:45 -0500 (Fri, 01 Oct 2010) | 29 lines
  
  Merged revisions 289798 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r289798 | jpeeler | 2010-10-01 18:01:31 -0500 (Fri, 01 Oct 2010) | 22 lines
    
    Merged revisions 289797 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r289797 | jpeeler | 2010-10-01 17:58:38 -0500 (Fri, 01 Oct 2010) | 15 lines
      
      Change RFC2833 DTMF event duration on end to report actual elapsed time.
      
      The scenario here is with a non P2P early media session. The reported time
      length of DTMF presses are coming up short when sending to the remote side.
      Currently the event duration is a running total that is incremented when sending
      continuation packets. These continuation packets are only triggered upon
      incoming media from the remote side, which means that the running total probably
      is not going to end up matching the actual length of time Asterisk received
      DTMF. This patch changes the end event duration to be lengthened if it is
      detected that the end event is going to come up short.
      
      Review: https://reviewboard.asterisk.org/r/957/
      
      ABE-2476
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289841 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-02 02:46:43 +00:00
Jeff Peeler
bb485fc6f9 Merged revisions 289701 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r289701 | jpeeler | 2010-10-01 11:22:19 -0500 (Fri, 01 Oct 2010) | 28 lines
  
  Merged revisions 289700 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r289700 | jpeeler | 2010-10-01 11:21:04 -0500 (Fri, 01 Oct 2010) | 21 lines
    
    Merged revisions 289699 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r289699 | jpeeler | 2010-10-01 11:20:00 -0500 (Fri, 01 Oct 2010) | 14 lines
      
      Ensure user portion of SIP URI matches dialplan when using encoded characters.
      
      This commit takes a simliar approach to 288112 and checks the dialplan to
      determine the proper action for an incoming contact header as to whether or not
      it should be decoded or not. sip_new was blindly always decoding the extension,
      which also caused the outgoing contact header to be incorrect as well as failing
      to match the encoded extension in the dialplan.
      
      (closes issue #17892)
      Reported by: wdoekes
      Patches: 
            bug17892-1.patch uploaded by jpeeler (license 325)
      Tested by: wdoekes
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289702 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-01 16:23:16 +00:00
Stefan Schmidt
15cb4412f8 don't iterate through all dialogs to find and delete old subscribes
On every incoming subscribe there is a iteration through all dialogs to find old subscribes and delete them. This is slow and not RFC conform. This was only needed in 1.2 cause a subscribe was not deleted when a dialog was destroyed, after 1.4 a subscribe get removed when its dialog is destroyed.

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



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289623 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-10-01 10:04:31 +00:00
Matthew Nicholson
72fbcfd95d Merged revisions 289554 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r289554 | mnicholson | 2010-09-30 14:53:10 -0500 (Thu, 30 Sep 2010) | 11 lines
  
  Merged revisions 289553 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r289553 | mnicholson | 2010-09-30 14:51:27 -0500 (Thu, 30 Sep 2010) | 4 lines
    
    Properly handle channel allocation failures duing invites with replaces.
    
    ABE-2588
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289555 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-30 19:54:59 +00:00
Richard Mudgett
8bbe682e45 Merged revisions 289054-289055 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

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


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


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

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


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

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


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

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


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

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


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

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


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

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


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

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

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



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

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


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

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


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

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


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

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287646 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-20 21:35:46 +00:00
Olle Johansson
7c77cebd4e We do not handle AST_CAUSE_INTERWORKING which we set on a lot of incoming
SIP messages. Adding error based on RFC 3398 recommendations.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@287087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-16 16:49:28 +00:00
Jeff Peeler
41b95ee887 Merged revisions 286931 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r286931 | jpeeler | 2010-09-15 14:22:15 -0500 (Wed, 15 Sep 2010) | 16 lines
  
  Add parking extension for non-default parking lots.
  
  This is a new feature that allows for parking to custom parking lots to be
  accessed directly, rather than with channel variables or by changing the
  default parking lot. The extension is set with the parkext option just as the
  default parking lot is done. Also, the manager action has been updated to
  optionally allow a specified parking lot.
  
  (closes issue #14882)
  Reported by: vmikhnevych
  Patches: 
        patch_14882.txt uploaded by mnick (license 874)
        modified by me
  
  Review: https://reviewboard.asterisk.org/r/884/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@286939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-15 19:23:56 +00:00
Matthew Nicholson
f9c7f53a1f Merged revisions 286868 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r286868 | mnicholson | 2010-09-15 08:05:52 -0500 (Wed, 15 Sep 2010) | 16 lines
  
  Set tohost to the domain specified in the configuration file instead of the IP address of the host we are calling.
  
  This fixes a regression introduced in r274783.
  
  (closes issue #17960)
  Reported by: adriavidal
  Patches:
        sip-tohost-fix1.diff uploaded by mnicholson (license 96)
  Tested by: mich, mnicholson, adriavidal
  
  (closes issue #17676)
  Reported by: outcast
  Patches:
        sip-tohost-fix1.diff uploaded by mnicholson (license 96)
  Tested by: mnicholson
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@286869 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-15 13:10:50 +00:00
David Vossel
c994bfae3d Merged revisions 286834 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r286834 | dvossel | 2010-09-14 16:57:35 -0500 (Tue, 14 Sep 2010) | 2 lines
  
  Sets subscribed type for outgoing MWI subscriptions so correct Event header is used.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@286835 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-14 22:02:00 +00:00
Matthew Nicholson
2bb5307c8d Merged revisions 286758 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r286758 | mnicholson | 2010-09-14 14:28:38 -0500 (Tue, 14 Sep 2010) | 27 lines
  
  Merged revisions 286757 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r286757 | mnicholson | 2010-09-14 14:27:28 -0500 (Tue, 14 Sep 2010) | 20 lines
    
    Merged revisions 286756 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r286756 | mnicholson | 2010-09-14 14:26:18 -0500 (Tue, 14 Sep 2010) | 13 lines
      
      Don't clear the username from a realtime database when a registration expires.
      
      Non-realtime chan_sip does not clear the username from memory when a registration expiries so realtime probably shouldn't either.
      
      (closes issue #17551)
      Reported by: ricardolandim
      Patches:
            reg-expiry-username-1.4-fix1.diff uploaded by mnicholson (license 96)
            reg-expiry-username-1.6.2-fix1.diff uploaded by mnicholson (license 96)
            reg-expiry-username-1.8-fix1.diff uploaded by mnicholson (license 96)
            reg-expiry-username-trunk-fix1.diff uploaded by mnicholson (license 96)
      Tested by: ricardolandim, mnicholson
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@286759 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-14 19:29:43 +00:00
Jason Parker
7b2c877fcb Merged revisions 286457 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r286457 | qwell | 2010-09-13 14:40:05 -0500 (Mon, 13 Sep 2010) | 12 lines
  
  Merged revisions 286456 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r286456 | qwell | 2010-09-13 14:38:35 -0500 (Mon, 13 Sep 2010) | 5 lines
    
    Remove "Internal IP" from sip show settings, as it's not at all useful to display.
    
    (closes issue #17840)
    Reported by: oej
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@286458 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-13 19:40:42 +00:00
Olle Johansson
a6480ff889 Formatting changes.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@286271 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-11 17:10:54 +00:00
David Vossel
83bc091ac3 Merged revisions 285568 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r285568 | dvossel | 2010-09-08 17:14:19 -0500 (Wed, 08 Sep 2010) | 16 lines
  
  Merged revisions 285567 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r285567 | dvossel | 2010-09-08 17:11:28 -0500 (Wed, 08 Sep 2010) | 9 lines
    
    Merged revisions 285566 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r285566 | dvossel | 2010-09-08 17:07:31 -0500 (Wed, 08 Sep 2010) | 2 lines
      
      In retrans_pkt, do not unlock pvt until the end of the function on a transmit failure.
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285569 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-08 22:15:34 +00:00
David Vossel
ede9032f92 Merged revisions 285564 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r285564 | dvossel | 2010-09-08 16:48:37 -0500 (Wed, 08 Sep 2010) | 60 lines
  
  Merged revisions 285563 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r285563 | dvossel | 2010-09-08 16:47:29 -0500 (Wed, 08 Sep 2010) | 54 lines
    
    Fixes interoperability problems with session timer behavior in Asterisk.
    
    CHANGES:
    1. Never put "timer" in "Require" header.  This is not to our benefit
    and RFC 4028 section 7.1 even warns against it.  It is possible for one
    endpoint to perform session-timer refreshes while the other endpoint does
    not support them.  If in this case the end point performing the refreshing
    puts "timer" in the Require field during a refresh, the dialog will
    likely get terminated by the other end.
    
    2. Change the behavior of 'session-timer=accept' in sip.conf (which is
    the default behavior of Asterisk with no session timer configuration
    specified) to only run session-timers as result of an incoming INVITE
    request if the INVITE contains an "Session-Expires" header... Asterisk is
    currently treating having the "timer" option in the "Supported" header as
    a request for session timers by the UAC.  I do not agree with this.  Session
    timers should only be negotiated in "accept" mode when the incoming INVITE
    supplies a "Session-Expires" header, otherwise RFC 4028 says we should
    treat a request containing no "Session-Expires" header as a session with
    no expiration.
    
    Below I have outlined some situations and what Asterisk's behavior is.
    The table reflects the behavior changes implemented by this patch.
    
    SITUATIONS:
    -Asterisk as UAS
    1. Incoming INVITE: NO  "Session-Expires"
    2. Incoming INVITE: HAS "Session-Expires"
    
    -Asterisk as UAC
    3. Outgoing INVITE: NO  "Session-Expires". 200 Ok Response HAS "Session-Expires" header
    4. Outgoing INVITE: NO  "Session-Expires". 200 Ok Response NO  "Session-Expires" header
    5. Outgoing INVITE: HAS "Session-Expires".
    
    Active   - Asterisk will have an active refresh timer regardless if the other endpoint does.
    Inactive - Asterisk does not have an active refresh timer regardless if the other endpoint does.
    XXXXXXX  - Not possible for mode.
    ______________________________________
    |SITUATIONS | 'session-timer' MODES  |
    |___________|________________________|
    |           | originate  |  accept   |
    |-----------|------------|-----------|
    |1.         |   Active   | Inactive  |
    |2.         |   Active   |  Active   |
    |3.         | XXXXXXXX   | Active    |
    |4.         | XXXXXXXX   | Inactive  |
    |5.         |   Active   | XXXXXXXX  |
    --------------------------------------
    
    
    (closes issue #17005)
    Reported by: alexrecarey
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285565 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-08 21:52:08 +00:00
Jason Parker
dc7e1c6183 Merged revisions 285455 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r285455 | qwell | 2010-09-07 17:22:14 -0500 (Tue, 07 Sep 2010) | 8 lines
  
  Don't automatically add domains for wildcard bindaddrs.
  
  (closes issue #17832)
  Reported by: oej
  Patches: 
        17832-wildcard.diff uploaded by qwell (license 4)
  Tested by: qwell
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285456 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-07 22:23:32 +00:00
Jason Parker
9b6fac435b Merged revisions 285369 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r285369 | qwell | 2010-09-07 15:58:34 -0500 (Tue, 07 Sep 2010) | 7 lines
  
  Add note to 'sip show settings' regarding dual-stack support, and a :: bindaddress.
  
  (closes issue #17831)
  Reported by: oej
  Patches: 
        17831-v6wildcardbind.diff uploaded by qwell (license 4)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285394 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-07 21:21:49 +00:00
Terry Wilson
3b5727bf38 Merged revisions 285017 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r285017 | twilson | 2010-09-03 18:19:54 -0500 (Fri, 03 Sep 2010) | 4 lines
  
  Call correct lock function as transferer is a sip_pvt not a channel
  
  Both functions are #defined to ao2_lock, but still...
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285029 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-03 23:23:47 +00:00
David Vossel
1b2039e7db Merged revisions 285006 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r285006 | dvossel | 2010-09-03 17:21:50 -0500 (Fri, 03 Sep 2010) | 9 lines
  
  Disables auth_options_request option by default.
  
  The auth_options_request option was created to do authentication
  on OPTIONS request just like INVITES are done.  Since it has been
  noted that some endpoints use OPTIONS requests as a way of qualifying
  a peer and that a 401 authentication response could result in
  interoperability issues, this option has been disabled by default.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@285007 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-03 22:23:47 +00:00
David Vossel
16eac93882 Merged revisions 284952 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r284952 | dvossel | 2010-09-03 13:03:23 -0500 (Fri, 03 Sep 2010) | 2 lines
  
  During OPTIONS authentication, the authpeer does not need to be returned for any reason.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@284953 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-03 18:04:10 +00:00
David Vossel
d17eded2e9 Merged revisions 284950 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r284950 | dvossel | 2010-09-03 12:29:02 -0500 (Fri, 03 Sep 2010) | 14 lines
  
  authenticate OPTIONS requests just like we would an INVITE
  
  OPTIONS requests should be treated the same as an INVITE
  This includes authentication.  This patch adds the ability for
  incoming out of dialog OPTION requests to be authenticated
  before providing a response indicating whether an extension
  is available or not.  The authentication routine works the
  exact same way as it does for incoming INVITEs.  This means
  that if a peer has 'insecure=invite' in their peer definition,
  the same will be true for the processing of the OPTIONS request.
  
  Review: https://reviewboard.asterisk.org/r/881/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@284951 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-03 17:30:04 +00:00
David Vossel
804c8c38fd Merged revisions 284705 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r284705 | dvossel | 2010-09-02 11:56:43 -0500 (Thu, 02 Sep 2010) | 20 lines
  
  Merged revisions 284704 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r284704 | dvossel | 2010-09-02 11:48:51 -0500 (Thu, 02 Sep 2010) | 13 lines
    
    Merged revisions 284703 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r284703 | dvossel | 2010-09-02 11:47:15 -0500 (Thu, 02 Sep 2010) | 7 lines
      
      Removed relatedpeer code from sip_autodestruct
      
      Handling of the relatedpeer structure associated with a
      sip_pvt should be done during the final sip_destruction
      function, not in sip_autodestruct.
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@284706 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-02 16:57:43 +00:00
Tilghman Lesher
8190e96fad Merged revisions 284610 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r284610 | tilghman | 2010-09-02 00:20:59 -0500 (Thu, 02 Sep 2010) | 10 lines
  
  When optional_api is non-optional, force dependent modules to be loaded.
  
  (closes issue #17707)
   Reported by: ira
   Patches: 
         20100819__issue17707__asterisk1.8.diff.txt uploaded by tilghman (license 14)
   Tested by: tilghman
   
  Review: https://reviewboard.asterisk.org/r/876/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@284628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-02 05:27:53 +00:00
David Vossel
c28c620936 Merged revisions 284561 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r284561 | dvossel | 2010-09-01 16:47:01 -0500 (Wed, 01 Sep 2010) | 9 lines
  
  During request to dialog matching, verify init_ruri is present before comparing.
  
  During request to dialog matching, we attempt a best effort routine for fork
  detection which requires several elements to be in place.  The dialog's
  initial request uri is one of those elements.  Since it is best effort,
  if the init_ruri is not present for some reason we can not proceed with that
  routine.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@284562 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-01 21:48:32 +00:00
Terry Wilson
920f5ea8b7 Merged revisions 284477 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r284477 | twilson | 2010-09-01 13:44:36 -0500 (Wed, 01 Sep 2010) | 17 lines
  
  Fix SRTP for changing SSRC and multiple a=crypto SDP lines
  
  Adding code to Asterisk that changed the SSRC during bridges and masquerades
  broke SRTP functionality. Also broken was handling the situation where an
  incoming INVITE had more than one crypto offer. This patch caches the SRTP
  policies the we use so that we can change the ssrc and inform libsrtp of the
  new streams. It also uses the first acceptable a=crypto line from the incoming
  INVITE.
  
  (closes issue #17563)
  Reported by: Alexcr
  Patches: 
        srtp.diff uploaded by twilson (license 396)
  Tested by: twilson
  
  Review: https://reviewboard.asterisk.org/r/878/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@284479 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-09-01 18:52:27 +00:00
Tilghman Lesher
d99e8609de Merged revisions 284415 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r284415 | tilghman | 2010-08-31 15:22:10 -0500 (Tue, 31 Aug 2010) | 21 lines
  
  Merged revisions 284399 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r284399 | tilghman | 2010-08-31 15:18:32 -0500 (Tue, 31 Aug 2010) | 14 lines
    
    Merged revisions 284393 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r284393 | tilghman | 2010-08-31 15:13:21 -0500 (Tue, 31 Aug 2010) | 7 lines
      
      Don't send a devstate change on poke_noanswer if the state did not change.
      
      (closes issue #17741)
       Reported by: schmidts
       Patches: 
             chan_sip.c.patch uploaded by schmidts (license 1077)
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@284440 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-31 20:47:28 +00:00
Leif Madsen
7e718275a5 Add trustrpid and sendrpid global values to 'sip show settings'
(closes issue #17860)
Reported by: jtodd
Patches:
      __20100816-chan_sip-sip-show-settings.txt uploaded by lmadsen (license 10)
Tested by: lmadsen, russell

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@284315 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-31 18:53:51 +00:00
David Vossel
22c5c7c437 Merged revisions 284032 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r284032 | dvossel | 2010-08-27 17:37:11 -0500 (Fri, 27 Aug 2010) | 21 lines
  
  Merged revisions 284002 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r284002 | dvossel | 2010-08-27 17:27:50 -0500 (Fri, 27 Aug 2010) | 14 lines
    
    Merged revisions 283960 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r283960 | dvossel | 2010-08-27 17:17:26 -0500 (Fri, 27 Aug 2010) | 8 lines
      
      Parse all "Accept" headers for SIP SUBSCRIBE requests.
      
      (closes issue #17758)
      Reported by: ibc
      Patches:
            multiple_accept_headers_1.4.diff uploaded by dvossel (license 671)
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@284033 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-27 22:39:48 +00:00
David Vossel
522806df97 Merged revisions 283692 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r283692 | dvossel | 2010-08-26 10:26:37 -0500 (Thu, 26 Aug 2010) | 32 lines
  
  Merged revisions 283691 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r283691 | dvossel | 2010-08-26 10:24:40 -0500 (Thu, 26 Aug 2010) | 25 lines
    
    Merged revisions 283690 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r283690 | dvossel | 2010-08-26 10:22:28 -0500 (Thu, 26 Aug 2010) | 19 lines
      
      Fixed how Asterisk destroys a dialog on channel hangup before invite receives a response.
      
      If an ast_channel with a SIP tech pvt hangs up before the sip dialog gets a response
      to its outgoing INVITE, Asterisk used to pretend_ack the INVITE.  This is not rfc
      compliant and results in confusion at the other endpoint.  sip_pretend_ack will ack
      and remove all the packets in the retransmit queue.  This means that the INVITE will
      stop retransmitting, and that any response to that INVITE that comes after the pretend_ack
      occurs will be ignored.
      
      Instead of faking any sort of acknowledgement for an outgoing INVITE during an internal
      hangup, we should let the protocol stack process the INVITE transaction and terminate
      the dialog properly.  This is achieved by setting the PENDING_BYE flag.  When this flag
      is used, once the dialog proceeds to an escapable state the transaction will either be
      canceled with a SIP_CANCEL or completed followed immediately by a BYE.  Attempting to do
      this any other way is incorrect.  If the endpoint is not responding to the INVITE request,
      the INVITE must continue to be retransmitted until it times out which will result in the
      dialog being destroyed.
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@283693 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-26 15:28:07 +00:00
David Vossel
75232687f4 Merged revisions 283595 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r283595 | dvossel | 2010-08-25 17:57:56 -0500 (Wed, 25 Aug 2010) | 14 lines
  
  Merged revisions 283594 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r283594 | dvossel | 2010-08-25 17:56:42 -0500 (Wed, 25 Aug 2010) | 7 lines
    
    Add to and from tags to NOTIFY dialog-info xml body so pickup can occur.
    
    When pedantic mode is used, the dialog-info xml generated during a
    ringing event must contain the to and from tag values.  Otherwise if
    a pickup occurs using INVITE with replaces, Astrisk will not be able
    to locate the subscription.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@283596 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-25 22:59:15 +00:00
David Vossel
848135748f Merged revisions 283559 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r283559 | dvossel | 2010-08-25 10:54:11 -0500 (Wed, 25 Aug 2010) | 16 lines
  
  Merged revisions 283558 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r283558 | dvossel | 2010-08-25 10:52:54 -0500 (Wed, 25 Aug 2010) | 10 lines
    
    Asterisk will not advertise session timers are supported when 'session-timers=refuse' is used.
    
    Asterisk now dynamically builds the "Supported" header depending
    on what is enabled/disabled in sip.conf.  Session timers used
    to always be advertised as being supported even when they were disabled
    in the configuration.  This caused problems with some end points.
    
    (issue #17005)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@283560 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-25 15:56:05 +00:00
Russell Bryant
2e4c877542 Merged revisions 283527 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r283527 | russell | 2010-08-25 09:55:00 -0500 (Wed, 25 Aug 2010) | 2 lines
  
  Convert ast_log(LOG_DEBUG, ...) to ast_debug(...)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@283528 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-25 14:55:47 +00:00
Leif Madsen
ea7ddb38fc Merged revisions 283457 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r283457 | lmadsen | 2010-08-24 13:56:29 -0500 (Tue, 24 Aug 2010) | 9 lines
  
  Fix issue where TOS is no longer set on RTP packets.
  Fix issue where the tos is no longer being set on RTP packets through res_rtp_asterisk.
  
  (closes issue #17890)
  Reported by: elguero
  Patches:
        qos_18.diff uploaded by elguero (license 37)
  
  Review: https://reviewboard.asterisk.org/r/868
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@283458 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-24 18:58:46 +00:00
David Vossel
bb9be59671 Merged revisions 283382 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r283382 | dvossel | 2010-08-24 11:11:18 -0500 (Tue, 24 Aug 2010) | 25 lines
  
  Merged revisions 283381 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r283381 | dvossel | 2010-08-24 11:07:37 -0500 (Tue, 24 Aug 2010) | 18 lines
    
    Merged revisions 283380 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r283380 | dvossel | 2010-08-24 11:01:51 -0500 (Tue, 24 Aug 2010) | 11 lines
      
      This fix makes sure the ast_channel hangs up correctly when the dialog's PENDING_BYE flag is set.
      
      When the pending bye flag is used, it is possible that the dialog will terminate
      and leave the sip_pvt->owner channel up.  This is because we never hangup the
      ast_channel after sending the SIP_BYE request.  When we receive the response for
      the SIP_BYE we set need_destroy which we would expect to destroy the dialog on the
      next do_monitor loop, but this is not the case.  The dialog will only be destroyed
      once the owner is hungup even with the need_destroy flag set.  This patch sets the
      softhangup flag on the ast_channel when a SIP_BYE request is sent as a result of the
      pending bye flag.
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@283383 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-24 16:12:36 +00:00
David Vossel
5ef8140eb2 Merged revisions 282895 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r282895 | dvossel | 2010-08-19 16:07:20 -0500 (Thu, 19 Aug 2010) | 25 lines
  
  Merged revisions 282894 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r282894 | dvossel | 2010-08-19 16:05:54 -0500 (Thu, 19 Aug 2010) | 18 lines
    
    Merged revisions 282893 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r282893 | dvossel | 2010-08-19 16:03:24 -0500 (Thu, 19 Aug 2010) | 11 lines
      
      tos_sip option was not being set correctly
      
      When tos_sip is used, the tos of the sip socket is only set
      correctly if the socket binding changes on a reload.  If the binding
      stays the same but the TOS changes, the new tos value would not take
      into effect.  This patch fixes that.
      
      
      (closes issue #17712)
      Reported by: nickb
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282896 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-19 21:08:39 +00:00
David Vossel
da683f0cc0 Merged revisions 282891 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r282891 | dvossel | 2010-08-19 15:34:41 -0500 (Thu, 19 Aug 2010) | 11 lines
  
  Merged revisions 282890 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r282890 | dvossel | 2010-08-19 15:31:22 -0500 (Thu, 19 Aug 2010) | 5 lines
    
    fixes sip peer memory leaks in the peer_by_ip table
    
    (issue #17798)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282892 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-19 20:35:42 +00:00
Matthew Nicholson
a49703a77d Merged revisions 282860 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r282860 | mnicholson | 2010-08-19 15:01:11 -0500 (Thu, 19 Aug 2010) | 30 lines
  
  Merged revisions 282859 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r282859 | mnicholson | 2010-08-19 14:44:00 -0500 (Thu, 19 Aug 2010) | 23 lines
    
    Merged revisions 277944 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r277944 | pabelanger | 2010-07-19 15:56:07 -0500 (Mon, 19 Jul 2010) | 16 lines
      
      Regression with T.38 negotiation
      
      Prior to 1.4.26.3 T.38 negotiation worked properly, in the case
      of the reporter.  
      
      (issue #16852)
      Reported by: cfc
      
      (closes issue #16705)
      Reported by: mpiazzatnetbug
      Patches:
            issue16705_2.diff uploaded by ebroad (license 878)
      Tested by: vrban, ebroad, c0rnoTa, samdell3
      
      Review: https://reviewboard.asterisk.org/r/754/
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282861 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-19 20:02:52 +00:00
Matthew Nicholson
70a7d40da7 Merged revisions 282639 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r282639 | mnicholson | 2010-08-18 08:10:39 -0500 (Wed, 18 Aug 2010) | 13 lines
  
  Properly handle 200 and unknown responses conatined in NOTIFY requests received in response to REFER requests.
  
  This patch fixes the way asterisk handles NOTIFY requests received in response to REFER requests.  These changes to NOTIFY handler were first introduced in r217482.  This new change properly handles the 200 response by queueing an AST_TRANSFER_SUCCESS control frame and also prevents that control frame from being queued when provisional and unknown responses are received.
  
  (issue #17486)
  Reported by: davidw
  Tested by: mnicholson
  
  (issue #12713)
  Reported by: davidw
  
  Review: https://reviewboard.asterisk.org/r/860/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282640 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-18 13:11:38 +00:00
David Vossel
f283b0a61a Merged revisions 282577 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r282577 | dvossel | 2010-08-17 16:36:57 -0500 (Tue, 17 Aug 2010) | 16 lines
  
  Merged revisions 282576 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r282576 | dvossel | 2010-08-17 16:35:17 -0500 (Tue, 17 Aug 2010) | 9 lines
    
    fixes no default transport for temp peer creation in chan_sip
    
    (closes issue #17829)
    Reported by: falves11
    Patches:
          issue_17829.rev1.txt uploaded by russell (license 2)
          issue_17829.diff uploaded by dvossel (license 671)
    Tested by: falves11
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282578 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-17 21:37:46 +00:00
David Vossel
eca5209181 Merged revisions 282302 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r282302 | dvossel | 2010-08-13 17:23:38 -0500 (Fri, 13 Aug 2010) | 10 lines
  
  remove current STUN support from chan_sip.c
  
  This patch removes the current broken/useless stun
  support from chan_sip.
  
  (closes issue #17622)
  Reported by: philipp2
  
  Review: https://reviewboard.asterisk.org/r/855/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282304 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-13 22:27:20 +00:00
David Vossel
0f8eaa6299 Merged revisions 282269 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r282269 | dvossel | 2010-08-13 15:03:56 -0500 (Fri, 13 Aug 2010) | 4 lines
  
  res_stun_monitor for monitoring network changes behind a NAT device
  
  Review: https://reviewboard.asterisk.org/r/854
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282270 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-13 20:05:44 +00:00
David Vossel
86142d711f Merged revisions 282236 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r282236 | dvossel | 2010-08-13 13:58:10 -0500 (Fri, 13 Aug 2010) | 23 lines
  
  Merged revisions 282235 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r282235 | dvossel | 2010-08-13 13:54:53 -0500 (Fri, 13 Aug 2010) | 16 lines
    
    only do magic pickup when notifycid is enabled
    
    A new way of doing BLF pickup was introduced into 1.6.2.  This feature
    adds a call-id value into the XML of a SIP_NOTIFY message sent to alert
    a subscriber that a device is ringing.  This option should only be enabled
    when the new 'notifycid' option is set... but this was not the case.  Instead
    the call-id value was included for every RINGING Notify message, which
    caused a regression for people who used other methods for call pickup.
    
    (closes issue #17633)
    Reported by: urosh
    Patches:
          chan_sip.txt uploaded by urosh (license )
          blf_cid_issue.diff uploaded by dvossel (license 671)
    Tested by: dvossel, urosh, okrief, alecdavis
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@282237 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-13 18:58:49 +00:00
Matthew Nicholson
8e178bb9eb Merged revisions 281874 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r281874 | mnicholson | 2010-08-11 16:11:54 -0500 (Wed, 11 Aug 2010) | 10 lines
  
  handle all possible responses to REFER requests
  
  (closes issue #17486)
  Reported by: davidw
  Patches:
        Issue17486-counterbid.diff.txt uploaded by davidw (license 780)
  Tested by: davidw
  
  Review: https://reviewboard.asterisk.org/r/837/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@281876 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-11 21:12:25 +00:00
Matthew Nicholson
fbb801fc15 Merged revisions 281760 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r281760 | mnicholson | 2010-08-11 12:27:59 -0500 (Wed, 11 Aug 2010) | 4 lines
  
  Avoid a deadlock in add_header_max_forwards().
  
  Related to r276951
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@281761 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-11 17:29:16 +00:00
Russell Bryant
e8aea605dc Merged revisions 281532 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r281532 | russell | 2010-08-10 11:54:20 -0500 (Tue, 10 Aug 2010) | 8 lines
  
  Ensure that the proper external address is used for the RTP destination.
  
  (closes issue #17044)
  Reported by: ebroad
  Tested by: ebroad
  
  Review: https://reviewboard.asterisk.org/r/566/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@281533 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-10 16:55:50 +00:00
David Vossel
62ab85a834 Merged revisions 281432 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r281432 | dvossel | 2010-08-09 15:47:53 -0500 (Mon, 09 Aug 2010) | 20 lines
  
  Merged revisions 281430 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r281430 | dvossel | 2010-08-09 15:46:50 -0500 (Mon, 09 Aug 2010) | 13 lines
    
    fixes SIP peers memory leak
    
    We zeroed out the peer's addr before it was removed from the
    peers_by_ip container.  This made it impossible to be removed
    from the container as the addr is the key used by the container
    to find the peer.
    
    (closes issue #17774)
    Reported by: kkm
    Patches:
          017774-sip-peer-leak-1.6.2.10.diff uploaded by kkm (license 888)
          017774-sip-peer-leak-1.8.diff uploaded by kkm (license 888)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@281433 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-09 20:49:13 +00:00
dfb810efc3 Merged revisions 280778 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r280778 | simon.perreault | 2010-08-03 15:54:03 -0400 (Tue, 03 Aug 2010) | 9 lines
  
  Fixed IPv6-related SIP parsing bugs.
  
  (closes issue #17663)
  Reported by: oej
  Patches:
        diff uploaded by sperreault (license 252)
        diff2 uploaded by sperreault (license 252)
        get_domain.diff uploaded by sperreault (license 252)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@280780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-03 19:59:37 +00:00
dc0f39a760 Reverted r280706 and r280707. Will commit in branch 1.8 and merge to trunk properly.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@280745 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-03 19:05:50 +00:00
b641ad14a4 Fixed IPv6-related SIP parsing bugs.
(closes issue #17663)
Reported by: oej
Patches:
      diff uploaded by sperreault (license 252)
      diff2 uploaded by sperreault (license 252)
      get_domain.diff uploaded by sperreault (license 252)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@280707 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-03 16:52:01 +00:00
David Vossel
f507546498 if totag is not present for an ACK request, do not send an error response
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@280627 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-08-02 14:30:50 +00:00
David Vossel
5e2999324b Merged revisions 280552 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r280552 | dvossel | 2010-07-29 15:43:47 -0500 (Thu, 29 Jul 2010) | 17 lines
  
  Merged revisions 280551 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r280551 | dvossel | 2010-07-29 15:42:29 -0500 (Thu, 29 Jul 2010) | 11 lines
    
    fixes wrong SRV query for TLS connection
    
    (closes issue #17612)
    Reported by: marcelloceschia
    Patches:
          chan-sip_srvQuery.patch uploaded by marcelloceschia (license 1079)
          chan-sip_Trunk_srvQuery.patch uploaded by st (license 907)
          chan-sip_asterisk18b1_srvQuery.patch uploaded by marcelloceschia (license 1079)
    Tested by: marcelloceschia, st, pabelanger
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@280553 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-29 20:44:37 +00:00
David Vossel
91cfe9a93e respond with 481 when request requiring totag has no totag to match against
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@280518 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-29 19:35:34 +00:00
Olle Johansson
8e4efe2164 Formatting changes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@280093 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-28 14:14:06 +00:00
Mark Michelson
eecac589ec Merged revisions 279887 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r279887 | mmichelson | 2010-07-27 13:54:07 -0500 (Tue, 27 Jul 2010) | 16 lines
  
  Fix parsing error in sip_sipredirect().
  
  The code was written in a way that did a bad job of
  parsing the port out of a URI. Specifically, it would
  do badly when dealing with an IPv6 address. In this
  particular scenario, there was no value from parsing
  the port out, so I just removed that logic. And while
  I was messing around in the function, I changed some
  variable names to be more descriptive.
  
  (closes issue #17661)
  Reported by: oej
  Patches: 
        17661.diff uploaded by mmichelson (license 60)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@279888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-27 18:55:06 +00:00
David Vossel
d61a4088f5 Merged revisions 279817 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r279817 | dvossel | 2010-07-27 11:09:15 -0500 (Tue, 27 Jul 2010) | 2 lines
  
  fix sip transaction match with authentication, fix confusing log message when using getaddrinfo
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@279818 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-27 16:11:11 +00:00
Mark Michelson
805082efd4 Merged revisions 279785 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r279785 | mmichelson | 2010-07-27 10:15:22 -0500 (Tue, 27 Jul 2010) | 20 lines
  
  Merged revisions 279784 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r279784 | mmichelson | 2010-07-27 10:13:24 -0500 (Tue, 27 Jul 2010) | 14 lines
    
    Fix bad behavior of dynamic_exclude_static option in sip.conf.
    
    We were attempting to create a contactdeny rule based on the peer's
    IP address before the peer's IP address had been set. By moving the
    processing further down in the function, we can ensure stuff works
    as we expect for it to.
    
    (closes issue #17717)
    Reported by: mmichelson
    Patches: 
          17717.patch uploaded by mmichelson (license 60)
    Tested by: DennisD
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@279786 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-27 15:16:45 +00:00
David Vossel
4a98994542 Merged revisions 279568 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r279568 | dvossel | 2010-07-26 14:59:03 -0500 (Mon, 26 Jul 2010) | 21 lines
  
  transaction matching using top most Via header
  
  This patch modifies the way chan_sip.c does transaction to dialog
  matching.  Asterisk now stores information in the top most Via header
  of the initial incoming request and compares that against other Requests
  that have the same call-id.  This results in Asterisk being able to
  detect a forked call in which it has received multiple legs of the
  fork.  I completely stripped out the previous matching code and made
  the comparisons a little more explicit and easier to understand.  My
  comments in the code should offer all the details involving this patch.  
  
  This patch also fixes a bug with the usage of the OBJ-MULTIPLE flag to
  find multiple dialogs with the same call-id.  Since the callback
  function was returning (CMP_MATCH | CMP_STOP) only the first item
  found was being returned.  I fixed this by making a new callback
  function for finding multiple dialogs that only returns (CMP_MATCH)
  on a match allowing for multiple items to be returned.
  
  Review: https://reviewboard.asterisk.org/r/776/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@279569 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-26 20:00:52 +00:00
Mark Michelson
d1ad460b3d SIP URI comparison fixes.
This initially was created to work around the issue of
using a string comparison instead of a binary comparison
for IP addresses. It evolved a bit when test cases were
created and it was discovered that comparison of URI
parameters was not working exactly as it should.

sip_uri_cmp() and its helpers have been moved to reqresp_parser.c
and a new test has been added.

(closes issue #17662)
Reported by: oej

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



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278980 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-23 16:33:52 +00:00
Russell Bryant
09206a7db8 ... just kidding. Enable SIP by default. :-)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278945 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-23 15:57:23 +00:00
Russell Bryant
98f0f3933f Disable SIP support by default for Asterisk 1.8.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278944 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-23 15:57:01 +00:00
Mark Michelson
57a92a6a7c Allow IPv6 addresses for UDPTL streams.
Review: https://reviewboard.asterisk.org/r/795



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278908 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-23 15:16:33 +00:00
David Vossel
3819ba7ac7 update sip subscription debug message to a warning message
If the Expire header of a SUBSCRIBE is less that our expiremin,
a log warning will be displayed.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278619 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-22 14:56:26 +00:00
David Vossel
318798e932 send "423 Interval too small" Response to Subscribe with Expires less that min allowed
[RFC3265]3.1.6.1....
   The notifier MAY also check that the duration in the "Expires" header
   is not too small.  If and only if the expiration interval is greater
   than zero AND smaller than one hour AND less than a notifier-
   configured minimum, the notifier MAY return a "423 Interval too
   small" error which contains a "Min-Expires" header field.  The "Min-
   Expires" header field is described in SIP [1].




git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278536 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-21 18:52:14 +00:00
Matthew Nicholson
43b486453b Properly set the port number for UDPTL media sessions.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278461 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-21 15:51:24 +00:00
David Vossel
c26791d5f8 fixes sip CANCEL race condition
If Asterisk sends a 4xx error and the other side sends a CANCEl
before receiving the 4xx and responding with the ACK, Asterisk
will process the CANCEL and send a 487 Request Terminated as
a new final response to the INVITE.  Since we are issuing a new
final response to the INVITE, the old one must be pretend_acked
else it will keep retransmitting.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278234 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-20 21:41:21 +00:00
Tilghman Lesher
b4e18d5660 Add load priority order, such that preload becomes unnecessary in most cases
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278132 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-20 19:35:02 +00:00
Mark Michelson
cb5892bb67 Fix port setting of external address in SIP.
There are two changes here:

1. Since the externip setting can now have a port attached
to it, calling it "externip" is misleading. The option is now
documented and parsed as "externaddr." This also extends to the
"matchexterniplocally" setting. It is now documented and parsed
as "matchexternaddrlocally." The old names for the options may
still be used, but they are no longer used in the sip.conf.sample
file.

2. If no port is set for the externaddr, and UDP is the transport
to be used, then we will set the port of the externaddr to that of
the udpbindaddr. This was how things worked prior to the IPv6 merge,
so this is a regression fix.

(closes issue #17665)
Reported by: mmichelson
Patches: 
      17665.diff#2 uploaded by pprindeville (license 347)
Tested by: pprindeville



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@277873 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-19 17:16:23 +00:00
Mark Michelson
6fa79e8f77 Make ACLs IPv6-capable.
ACLs can now be configured to match IPv6 networks. This is only
relevant for ACLs in chan_sip for now since other channel drivers
do not support IPv6 addressing. However, once those channel drivers
are outfitted to support IPv6 addressing, the ACLs will already be
ready for IPv6 support.

https://reviewboard.asterisk.org/r/791



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@277814 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-19 14:17:16 +00:00
Matthew Nicholson
5150954d4a Merged revisions 277497 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r277497 | mnicholson | 2010-07-16 16:18:38 -0500 (Fri, 16 Jul 2010) | 4 lines
  
  Default to no udptl error correction so that error correction will be disabled in the event that the remote end indicates that they do not support the error correction mode we requested.
  
  FAX-128
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@277530 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-16 21:24:45 +00:00
Olle Johansson
93373d7bdf Formatting fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@277065 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-16 13:10:24 +00:00
Olle Johansson
cbe0a6dc02 Formatting changes (guideline corrections)
Found a unused bag of curly brackets under my table. I always wondered where 
they had gone. They where indeed needed in chan_sip.c


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@276989 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-16 10:31:42 +00:00
Olle Johansson
e129b31fc6 Add ability to configure the Max-Forwards header in the dialplan, as well as in
sip.conf configuration for the channel and for devices.

The Max-Forwards header is used to prevent loops in a SIP network. Each intermediary,
like SIP proxys and SBCs, decrement this counter and detects when it reaches zero,
at which point the SIP request is nicely killed in a SIP-friendly way.

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

Thanks to dvossel for the review and good advice.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@276951 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-16 10:00:58 +00:00
Mark Michelson
dfba265a0b Fix reversed logic of if statement.
Found based on message from Philip Prindeville on the
Asterisk Developers mailing list.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@276909 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-16 05:42:24 +00:00
Jeff Peeler
44ae0033be Correct not setting the bindport before attempting to open the socket.
Related to changes from 276571, I was accidentally testing with a port set in
my configuration causing me to miss this. Also moved the TCP handling as well
to occur before build_peer is called.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@276788 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-15 20:21:03 +00:00
Jeff Peeler
2b2a6123de Fix MWI notification transmission problems over SIP.
MWI updates were not being sent if no messages were found in the event cache.
This was corrected since a phone may need to clear its MWI status configured
previously from another mailbox.

Upon module or sip reload, MWI updates could not be sent due to the sipsock
socket not being set early enough in reload_config. The code handling the
descriptor assignment and such has simply been moved before the call to
build_peer.

Issuing a sip reload cleared the IP address of the peer, but skipped checking
the database for registration information. The database is now checked both
for sip reload and actually reloading the module.

If a transmission occurs before the do_monitor thread has started, do not
attempt to send a signal to it.

(closes issue #17398)
Reported by: ip-rob


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@276571 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-14 22:58:24 +00:00
Mark Michelson
1e8c66e749 Fix errors where incorrect address information was printed.
ast_sockaddr_stringiy_fmt (which is call by all ast_sockaddr_stringify* functions)
uses thread-local storage for storing the string that it creates. In cases where
ast_sockaddr_stringify_fmt was being called twice within the same statement, the
result of one call would be overwritten by the result of the other call. This
usually was happening in printf-like statements and was resulting in the same
stringified addressed being printed twice instead of two separate addresses.

I have fixed this by using ast_strdupa on the result of stringify functions if
they are used twice within the same statement. As far as I could tell, there were
no instances where a pointer to the result of such a call were saved anywhere, so
this is the only situation I could see where this error could occur.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@276570 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2010-07-14 22:32:29 +00:00