Commit Graph

7169 Commits

Author SHA1 Message Date
David Vossel
4812697542 Fixes issue with video and text not being reinvited correctly with directmedia
If a SDP does not modify the session, we ignore it.  However, we were defaulting
no text and video support to true before checking to see if the sdp modified
anything or not.  This would result in process_sdp ignoring an sdp but removing
video and text from the call during direct media reinvites.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@325151 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-28 15:34:59 +00:00
Terry Wilson
04fc1c6cea Don't forget to build the Via when sending MESSAGE
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@325046 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-28 00:07:47 +00:00
Richard Mudgett
04226479b3 Merged revisions 324914 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r324914 | rmudgett | 2011-06-27 10:37:19 -0500 (Mon, 27 Jun 2011) | 21 lines
  
  When subscribing MWI to an unsolicited mailbox the first notification is incorrect.
  
  A remote peer subscribed to MWI with the unsolicited option and a local
  phone subscribed to the remote mailbox.  The notify message-summary events
  are sent correctly except for the first one when subscribing, which will
  always be 0.  This means the phone MWI indicator will be wrong until the
  mailbox read/unread count changes and the event is fired.
  
  Looks like this is a regression from ASTERISK-16149.
  
  * Fix the logic to check the cache and if allowed then fallback to
  manually counting mailbox messages.
  
  (closes issue ASTERISK-17997)
  Reported by: rsw686
  Patches:
        jira_asterisk_17997_v1.8.patch (license #5621) uploaded by rmudgett
  Tested by: rsw686
  
  JIRA SWP-3551
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324915 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-27 15:38:44 +00:00
Kinsey Moore
3c10d69544 Merged revisions 324678 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r324678 | kmoore | 2011-06-23 13:29:17 -0500 (Thu, 23 Jun 2011) | 11 lines
  
  Merged revisions 324643 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r324643 | kmoore | 2011-06-23 13:21:12 -0500 (Thu, 23 Jun 2011) | 4 lines
    
    Addresses AST-2011-008, memory corruption and remote crash in SIP driver.
    
    AST-2011-008
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324708 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-23 18:52:59 +00:00
David Vossel
6693c49a6a Merged revisions 324685 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r324685 | dvossel | 2011-06-23 13:31:00 -0500 (Thu, 23 Jun 2011) | 8 lines
  
  Fixes sip crash when calling remove_uri_parameters with NULL
  
  AST-2011-009
  
  (closes issue ASTERISK-18017)
  Reported by: jaredmauch
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324689 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-23 18:31:42 +00:00
David Vossel
d5ea9e5ae2 Merged revisions 324652 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r324652 | dvossel | 2011-06-23 13:23:21 -0500 (Thu, 23 Jun 2011) | 20 lines
  
  Merged revisions 324634 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r324634 | dvossel | 2011-06-23 13:18:46 -0500 (Thu, 23 Jun 2011) | 13 lines
    
    Merged revisions 324627 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r324627 | dvossel | 2011-06-23 13:16:52 -0500 (Thu, 23 Jun 2011) | 7 lines
      
      Addresses AST-2011-010, remote crash in IAX2 driver
      
      Thanks to twilson for identifying the issue and providing the patches.
      
      AST-2011-010
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324664 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-23 18:26:09 +00:00
Richard Mudgett
10480072aa Merged revisions 324491 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r324491 | rmudgett | 2011-06-22 14:16:29 -0500 (Wed, 22 Jun 2011) | 1 line
  
  Use correct variable for text SRTP media.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324495 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-22 19:17:56 +00:00
Terry Wilson
385b8c6f8b Merged revisions 324484 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r324484 | twilson | 2011-06-22 13:52:04 -0500 (Wed, 22 Jun 2011) | 20 lines
  
  Stop sending IPv6 link-local scope-ids in SIP messages
  
  The idea behind the patch listed below was used, but in a more targeted manner.
  There are now address stringification functions for addresses that are meant to
  be sent to a remote party. Link-local scope-ids only make sense on the machine
  from which they originate and so are stripped in the new functions.
  
  There is also a host sanitization function added to chan_sip which is used
  for when peer and dialog tohost fields or sip_registry hostnames are used to
  craft a SIP message.
  
  Also added are some basic unit tests for netsock2 address parsing.
  
  (closes issue ASTERISK-17711)
  Reported by: ch_djalel
  Patches:
        asterisk-1.8.3.2-ipv6_ll_scope.patch uploaded by ch_djalel (license 1251)
  
  Review: https://reviewboard.asterisk.org/r/1278/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324487 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-22 19:12:24 +00:00
Richard Mudgett
9000732418 Merged revisions 324481 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

Also fixed a reference leak in an error path in sip_msg_send().

........
  r324481 | rmudgett | 2011-06-22 13:41:20 -0500 (Wed, 22 Jun 2011) | 19 lines

  Timout or error on INFO or MESSAGE transaction causes call to be lost.

  When exchanging INFO messages within a call, 4xx error causes the call to
  be disconnected although RFC 2976 explicitly states that such transactions
  do not modify the state of the dialog.

  When exchanging MESSAGE messages within a call, 4xx error causes the call
  to be disconnected.  To provide least surprise, we should not disconnect
  the call since a MESSAGE is like INFO in this case.  (Implied by RFC 3428
  Section 2)

  (closes issue ASTERISK-17901)
  Reported by: neutrino88

  Review: https://reviewboard.asterisk.org/r/1257/
  Review: https://reviewboard.asterisk.org/r/1258/

  JIRA SWP-3486
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324482 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-22 18:45:24 +00:00
Richard Mudgett
e8c0be8fc2 Merged revisions 324479 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r324479 | rmudgett | 2011-06-22 13:26:55 -0500 (Wed, 22 Jun 2011) | 1 line
  
  Comments and whitespace in chan_sip.c
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324480 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-22 18:27:43 +00:00
David Vossel
b005d8dd53 Fixes issue with finding correct extension when message context is used.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-21 15:49:23 +00:00
Terry Wilson
ece8a5702a Merged revisions 324237 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r324237 | twilson | 2011-06-20 12:33:07 -0500 (Mon, 20 Jun 2011) | 12 lines
  
  Ignore media offers with a port of 0
  
  Section 5.1 of RFC3264 states:
    A port number of zero in the offer indicates that the stream is offered
    but MUST NOT be used.
  
  (closes issue ASTERISK-17845)
  Reported by: jacco
  Patches: 
        issue19281_2.patch uploaded by jacco (license 1277)
  Tested by: jacco, twilson
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324238 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-20 17:34:45 +00:00
Richard Mudgett
6f74606fda Merged revisions 324174 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r324174 | rmudgett | 2011-06-17 13:23:19 -0500 (Fri, 17 Jun 2011) | 5 lines
  
  Add header string to libpri debug output.
  
  Add header string to libpri debug output so the libpri output can be
  found/extracted easier from huge debug trace files.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324175 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-17 18:23:54 +00:00
Terry Wilson
34e2305ae7 Merged revisions 324048 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r324048 | twilson | 2011-06-16 17:35:41 -0500 (Thu, 16 Jun 2011) | 8 lines
  
  Lock the channel before calling the setoption callback
  
  The channel needs to be locked before calling these callback functions. Also,
  sip_setoption needs to lock the pvt and a check p->rtp is non-null before using
  it.
  
  Review: https://reviewboard.asterisk.org/r/1220/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@324050 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-16 22:49:49 +00:00
Terry Wilson
abd7ef817e Merged revisions 323370 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r323370 | twilson | 2011-06-14 09:33:55 -0700 (Tue, 14 Jun 2011) | 10 lines
  
  Add rtpkeepalives back to 1.8
  
  The RTP-engine conversion left out support for handling rtpkeepalives.
  This patch adds them back.
  
  (closes issue ASTERISK-17304)
  Reported by: lmadsen
  
  Review: https://reviewboard.asterisk.org/r/1226/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@323374 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-14 17:03:37 +00:00
Jonathan Rose
00181729b4 Merged revisions 323371 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r323371 | jrose | 2011-06-14 11:38:43 -0500 (Tue, 14 Jun 2011) | 12 lines
  
  Changes contact use in build_peer to use the FORCE_RPORT flag instead of RPORT_PRESENT
  
  It turned out that this was causing NAT=Yes to always use rport when present which was
  against 1.6.2 behavior and the check itself was redundant since the only way this
  segment of code could be reached was if RPORT_PRESENT was already evaluated as true
  earlier.
  
  (closes issue ASTERISK-17789)
  Reported by: byronclark
  Patches: 
        use_sip_nat_force_rport.patch uploaded by byronclark (license 1200)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@323372 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-14 16:47:18 +00:00
David Vossel
379370a396 Store sip peer name as var data on a outofcall msg.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@323325 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-14 14:37:41 +00:00
David Vossel
0bd877621e Addition of "outofcall_message_context" sip.conf option.
Review: https://reviewboard.asterisk.org/r/1265/



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@323212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-13 19:43:57 +00:00
Matthew Nicholson
4c459c2c85 Merged revisions 323040 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r323040 | mnicholson | 2011-06-10 14:20:41 -0500 (Fri, 10 Jun 2011) | 5 lines
  
  Unlock the sip channel during fax detection like chan_dahdi does to prevent a deadlock with ast_autoservice_stop.
  
  (closes issue ASTERISK-17798)
  tested by mnicholson
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@323041 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-10 19:22:48 +00:00
Matthew Nicholson
53ef4bfc16 Merged revisions 322807 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r322807 | mnicholson | 2011-06-09 12:37:07 -0500 (Thu, 09 Jun 2011) | 5 lines
  
  don't drop any voice frames when checking for T.38 during early media
  
  (closes issue ASTERISK-17705)
  Review: https://reviewboard.asterisk.org/r/1186/
  patch by oej
  reported by oej
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@322808 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-09 17:43:27 +00:00
Damien Wedhorn
7df5d0d416 Add autoanswer to skinny.
Autoanswer added to skinny based on incoming chan var SKINNY_AUTOANSWER.
Initial value must be the time to autoanswer in ms, then optionally :BEEP
to play a tone when answered and :MUTE to mute the mic when answering. 
eg 3000:MUTE:BEEP will ring for 3 secs, then answer, mute the mic, and 
play a beep. just 3000 would answer afer 3 secs of ringing with no 
beep and full two way audio. 



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@322544 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-09 11:05:07 +00:00
Damien Wedhorn
9598e5bc2f Remove skinny do_monitor and use ast_sched_start instead
The do_monitor seemed to be there for task scheduling and network monitoring. However, the network monitoring has a dedicated thread so the ast_io_wait was basically just a usleep as it didn't actually seem to be monitoring anything.

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@322381 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-08 11:38:56 +00:00
Gregory Nietsky
4cd9bc43c2 Merged revisions 322322 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r322322 | irroot | 2011-06-08 08:18:38 +0200 (Wed, 08 Jun 2011) | 18 lines
  
    Make handle_request_publish do dialog expiration and destruction.
  
    This patch fixes handle_request_publish so that it does dialog expiration and destruction.
  
    Without this patch the incoming PUBLISH requests will get stuck in the dialog list.
    Restarting asterisk is the only way to remove them.
  
    Personal observation on one system the server hung up while looping through the channels
    rendering asterisk unusable and all sip phones unregisterd when they try reregister
    more requests are added.
  
    (closes issue #18898)
    Reported by: gareth
    Tested by: loloski, Chainsaw, wimpy, se, kuj, irroot
  
    Jira: https://issues.asterisk.org/jira/browse/ASTERISK-17915
    Review: https://reviewboard.asterisk.org/r/1253
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@322323 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-08 06:45:55 +00:00
Richard Mudgett
ba625fa7d5 Correct some whitespace and a reference debug message.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@322284 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-07 23:14:25 +00:00
Richard Mudgett
397c379a7d Merged revisions 321812-321813 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r321812 | rmudgett | 2011-06-03 14:55:21 -0500 (Fri, 03 Jun 2011) | 1 line
  
  Correct IAX2 and SIP event subscription description string.
........
  r321813 | rmudgett | 2011-06-03 14:56:09 -0500 (Fri, 03 Jun 2011) | 1 line
  
  Constify subscription description parameter string.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@321814 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-03 19:57:03 +00:00
Russell Bryant
9cd3cf2e71 Fix message destination extension.
Don't send all messages to 's'.  Get the destination from the request URI.
(Found using automated test cases).


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@321617 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-02 22:09:05 +00:00
Russell Bryant
3f4d0e8743 Support routing text messages outside of a call.
Asterisk now has protocol independent support for processing text messages
outside of a call.  Messages are routed through the Asterisk dialplan.
SIP MESSAGE and XMPP are currently supported.  There are options in sip.conf
and jabber.conf that enable these features.

There is a new application, MessageSend().  There are two new functions,
MESSAGE() and MESSAGE_DATA().  Documentation will be available on
the project wiki, wiki.asterisk.org.

Thanks to Terry Wilson for the assistance with development and to David Vossel
for helping with some additional testing.

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@321546 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-01 21:31:40 +00:00
David Vossel
3588746c75 Merged revisions 321515 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r321515 | dvossel | 2011-05-31 13:52:54 -0500 (Tue, 31 May 2011) | 12 lines
  
  Chan_local locking cleanup.
  
  This patch removes all of the unnecessary deadlock
  avoidance loops that occur in chan_local.  It also
  resolves an issue with a deadlock triggered by
  local channel optimizations.
  
  (issue #18028)
  
  Review: https://reviewboard.asterisk.org/r/1231/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@321516 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-31 19:01:42 +00:00
Leif Madsen
42907d40cd Merged revisions 321511 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r321511 | lmadsen | 2011-05-31 12:04:47 -0400 (Tue, 31 May 2011) | 8 lines
  
  Enhance NOTICE message to know who couldn't access the dialplan.
  
  (closes issue #19390)
  Reported by: lmadsen
  Patches: 
        __20110531-sip-notice-tweak.txt uploaded by lmadsen (license 10)
  Tested by: russell
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@321512 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-31 16:06:21 +00:00
Jonathan Rose
0caae96609 Merged revisions 321273 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r321273 | jrose | 2011-05-27 09:59:34 -0500 (Fri, 27 May 2011) | 3 lines
  
  markm committed a patch I was working on yesterday, this fixes it to mesh up with suggestions by mnicholson.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@321289 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-27 16:35:49 +00:00
Mark Murawki
9a7f807278 Merged revisions 321155 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r321155 | markm | 2011-05-26 17:48:45 -0400 (Thu, 26 May 2011) | 10 lines
  
  Fixed build problem with dev mode enabled, which was caused by commit 321100.  Reformulated patch to be more generic.
  
  Moved the sip uri parse variable initalization to parse_uri_full in reqresp_parser.c.  This will ensure that any use of parse uri will have null output variables if the parse fails.
  
  (closes issue #19346)
  Reported by: kobaz
  Tested by: kobaz,JonathanRose
  
  Review: [full review board URL with trailing slash]
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@321156 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-26 21:50:06 +00:00
Mark Murawki
0648d9595b Merged revisions 321100 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r321100 | markm | 2011-05-26 16:09:35 -0400 (Thu, 26 May 2011) | 11 lines
  
  ast_sockaddr_resolve() in netsock2.c may deref a null pointer
  
  Added a null check in netsock2 ast_sockaddr_resolve() as well as added default initalizers in chan_sip parse_uri_legacy_check() to make sure that invalid uris will make null (and not undefined) user,pass,domain,transport variables
  
  (closes issue #19346)
  Reported by: kobaz
  Patches: 
        netsock2.patch uploaded by kobaz (license 834)
  Tested by: kobaz, Marquis
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@321101 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-26 20:16:28 +00:00
Russell Bryant
39281ed5df Merged revisions 320947 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r320947 | russell | 2011-05-26 10:57:13 -0500 (Thu, 26 May 2011) | 2 lines
  
  Remove some variables that were set but unused.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@321003 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-26 16:54:06 +00:00
Richard Mudgett
dbfac9cb55 Merged revisions 320883 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r320883 | rmudgett | 2011-05-25 17:25:18 -0500 (Wed, 25 May 2011) | 17 lines
  
  Native SIP CCSS sends bad CC cancel SUBSCRIBE message.
  
  The SUBSCRIBE message used to cancel a CC request has incorrect To/From
  SIP headers.  They are reversed and the dialog tags are the same when they
  should not be.  If pedantic mode was disabled, then the cancel would have
  succeeded despite the incorrect message.
  
  * The SIP_OUTGOING flag was not set correctly for the dialog and I had to
  move some CC subscribe handling code as a result.
  
  * Initialized the dialog subscribed type to CALL_COMPLETION earlier.  If a
  CC request SUBSCRIBE message comes in and the CC instance is not found,
  the 404 response was duplicated.
  
  JIRA AST-568
  JIRA SWP-3493
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@320884 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-25 22:28:01 +00:00
Jonathan Rose
12d7d81e6c Merged revisions 320504 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r320504 | jrose | 2011-05-23 09:33:20 -0500 (Mon, 23 May 2011) | 10 lines
  
  Fixes segfault occuring in chan_sip.c at __set_address_from_contact
  
  Checks to see if domain contains anything before sending it off to ast_sockaddr_resolve
  which is where the segfault was occuring due to null str.
  
  (closes issue #18857)
  Reported by: sybasesql
  
  Review: https://reviewboard.asterisk.org/r/1225/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@320505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-23 14:40:59 +00:00
Matthew Nicholson
81bd779c24 Merged revisions 320180 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r320180 | mnicholson | 2011-05-20 13:48:46 -0500 (Fri, 20 May 2011) | 16 lines
  
  This commit modifies the way polling is done on TLS sockets.
  
  Because of the buffering the TLS layer does, polling is unreliable. If poll is
  called while there is data waiting to be read in the TLS layer but not at the
  network layer, the messaging processing engine will not proceed until something
  else writes data to the socket, which may not occur. This change modifies the
  logic around TLS sockets to only poll after a failed read on a non-blocking
  socket. This way we know that there is no data waiting to be read from the
  buffering layer.
  
  (closes issue #19182)
  Reported by: st
  Patches:
        ssl-poll-fix3.diff uploaded by mnicholson (license 96)
  Tested by: mnicholson
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@320181 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-20 18:49:48 +00:00
Jonathan Rose
f90bc95f0d Merged revisions 319938 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r319938 | jrose | 2011-05-20 08:28:24 -0500 (Fri, 20 May 2011) | 12 lines
  
  Adds legacy_useroption_parsing to address interoperability concerns.
  
  With the new option engaged, Asterisk should interpret user fields with useroptions
  contained within the userfield of the uri by stripping them out of the original message
  whenever a semicolon is encountered in the userfield string.
  
  (closes issue #18344)
  Reported by: danimal
  Tested by: jrose
  
  Review: https://reviewboard.asterisk.org/r/1223/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-20 13:42:15 +00:00
Terry Wilson
573108e63c Merged revisions 319654 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r319654 | twilson | 2011-05-18 16:15:58 -0700 (Wed, 18 May 2011) | 22 lines
  
  Merged revisions 319653 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r319653 | twilson | 2011-05-18 16:11:57 -0700 (Wed, 18 May 2011) | 15 lines
    
    Merged revisions 319652 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r319652 | twilson | 2011-05-18 16:04:35 -0700 (Wed, 18 May 2011) | 8 lines
      
      Make sure everyone gets an unhold when a transfer succeeds
      
      Some phones, like the Snom phones, send a hold to the transfer target after
      before sending the REFER. We need to make sure that we unhold the parties
      that are being connected after the masquerade. If Local channels with the /nm
      option are used when dialing the parties, hold music would still be playing on
      the transfer target, even after being connected with the transferee.
    ........
  ................
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319661 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-18 23:18:32 +00:00
Terry Wilson
99aaceacad Merged revisions 319552 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r319552 | twilson | 2011-05-18 13:22:36 -0700 (Wed, 18 May 2011) | 11 lines
  
  Unbreak the storing of registrations for restart
  
  The fix for issue 18882 broke retrieving non-realtime peers from the ast_db
  on restart/reload. This patch tries to unbreak things while leaving the intent
  of the original fix intact.
  (closes issue #19318)
  Reported by: remiq
  Patches: 
        diff.txt uploaded by twilson (license 396)
  Tested by: lmadsen, remiq
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319564 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-18 20:25:32 +00:00
Richard Mudgett
3e25489e4c Merged revisions 319469 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r319469 | rmudgett | 2011-05-17 16:57:56 -0500 (Tue, 17 May 2011) | 22 lines
  
  Merged revision 319468 from
  https://origsvn.digium.com/svn/asterisk/be/branches/C.3-bier
  
  ..........
    r319468 | rmudgett | 2011-05-17 16:49:31 -0500 (Tue, 17 May 2011) | 15 lines
  
    The mISDN HDLC mode is prevented on dialed channels.
  
    The use of mISDN HDLC mode is prevented if the mISDN dial technology
    option 'h1' is used when config option astdtmf=yes.
  
    There is a bug in channels/misdn/isdn_lib.c which prevents the use of HDLC
    mode.  Instead of setting the channel to HDLC mode it is set to
    transparent(no dsp, no hdlc), although hdlc is not "no hdlc".  I.e the
    logging message is correct, but the if condition is not.
  
    Make check the nodsp and hdlc flags.
  
    JIRA ABE-2787
    JIRA SWP-3437
  ..........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319471 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-17 22:04:59 +00:00
Damien Wedhorn
0bb90a372e Remove extraneous line variables.
The vars were either explicitly or implicitly not used.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319470 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-17 21:59:55 +00:00
Richard Mudgett
5257a915a8 Option needed for Q931_IE_TIME_DATE to be optional in CONNECT message.
The NEC SV8300 rejects the Q931_IE_TIME_DATE for Q.SIG.

Add option to specify if and how much of the current time is put in
Q931_IE_TIME_DATE.
* Send date/time ie never.
* Send date/time ie date only.
* Send date/time ie date and hour.
* Send date/time ie date, hour, and minute.
* Send date/time ie date, hour, minute, and second.
* Send date/time ie default: Libpri will send date and hhmm only when in
NT PTMP mode to support ISDN phones.

(closes issue #19221)
Reported by: kenner

JIRA SWP-3396


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319427 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-17 20:13:27 +00:00
Damien Wedhorn
069b70c522 Fix up skinny hints.
Probably haven't been working for a couple of years. May still need
some more love, but they are now working, both as a hint device and
monitoring a hint. Changes centre around the long ago change
to remove the requirement for a device name in a skinny line, and 
changes to the transmit_* functions.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319316 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-16 21:39:33 +00:00
Terry Wilson
d34d46a16e Merged revisions 319204 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r319204 | twilson | 2011-05-16 13:17:43 -0500 (Mon, 16 May 2011) | 11 lines
  
  Merged revisions 319202 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r319202 | twilson | 2011-05-16 11:00:21 -0700 (Mon, 16 May 2011) | 4 lines
    
    Unlink a peer from peers_by_ip when expiring a registration
    
    Review: https://reviewboard.asterisk.org/r/1218/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-16 18:21:17 +00:00
David Vossel
980d896bde Merged revisions 319145 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r319145 | dvossel | 2011-05-16 10:57:26 -0500 (Mon, 16 May 2011) | 9 lines
  
  Merged revisions 319144 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r319144 | dvossel | 2011-05-16 10:56:16 -0500 (Mon, 16 May 2011) | 2 lines
    
    Fixes issue with peer ref-counting during handle_request_subscribe.
    (closes issue #19293)
    Reported by: irroot
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319146 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-16 15:58:12 +00:00
Matthew Nicholson
8e719c62b0 Merged revisions 319142 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r319142 | mnicholson | 2011-05-16 10:53:26 -0500 (Mon, 16 May 2011) | 8 lines
  
  Make sure tcptls_session exists before dereferencing it.
  
  (closes issue #19192)
  Reported by: stknob
  Patches:
        10-tcptls-unreachable-peer-segfault.patch uploaded by Chainsaw (license 723)
  Tested by: vois, Chainsaw
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319143 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-16 15:54:52 +00:00
Gregory Nietsky
32d43ebe19 When a error in T.38 negotiation happens or its rejected on a channel the
state of the channel reverts to unknown this should be rejected.
 
 this is important for negotiating T.38 gateway see #13405

 This patch adds a option T38_REJECTED that behaves as T38_DISABLED except it reports state rejected.

 Trivial Change to res_fax to honnor UNAVAILABLE and REJECTED states.

 (closes issue #18889)
 Reported by: irroot
 Tested by: irroot, darkbasic, 	mnicholson

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



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319087 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-16 14:56:53 +00:00
Damien Wedhorn
969a317d81 Add activatesub and dialandactivate sub.
When called, activatesub first cleans up the active sub and then
handles the sub passed. dialandactivatesub first sets sub->exten
and then calls activatesub. Revise handle_offhook to utilise the
callid sent to chan_skinny. Some other minor fixes especially around
d->hookstate (which still needs some more work).


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319024 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-15 23:17:57 +00:00
Brett Bryant
547490144c Merged revisions 318917 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r318917 | bbryant | 2011-05-13 13:56:04 -0400 (Fri, 13 May 2011) | 11 lines
  
  This patch allows TCP peers into the ast_db where they were previously
  restricted.
  
  (closes issue #18882)
  Reported by: cmaj
  Patches: 
        patch-chan_sip-1.8.3-rc2-allow-tcp-peer-store-db-and-readonly-rt-backend.diff.txt
        uploaded by cmaj (license 830)
  Tested by: cmaj
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@318918 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-13 17:58:53 +00:00
Damien Wedhorn
54bb8a0ca8 Move exten used for dialing from device to subchannel.
There were some issues where if a simple switch was cancelled and a
new switch started before the first had timed out where the d->exten
would be used for both subchannels. This was bad leading to possible
invalid extensions if some digits had been entered in the abandoned
simple switch and the second one was completed before the first timed
out, or the second would be cancelled because d->exten would be set to
nothing on the time out of the first.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@318833 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-13 08:33:35 +00:00