Commit Graph

7123 Commits

Author SHA1 Message Date
Damien Wedhorn 7cb2ac8664 Add skinny version 17 protocol support.
Added some data to skinny packet structures to make compatible
with v17. Added protocolversion to device, set on registration
based on the version provided by device.

v17 includes some increased ip space for ip6. This patch increases
ip space in the packets but still only uses ip4. Some packet
structures duplicated (ip4 and ip6 types). ip4 type used unless
version is greater or equal to 17.

Tested by snuff and myself on 7961 with recent 8.5 firmware. Also
tested compatible with old 7960 and older 30VIPs.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340071 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-10 00:57:06 +00:00
Damien Wedhorn c5546e2bd7 Increase SKINNY_MAX_PACKET and add some logging.
Increase SKINNY_MAX_PACKET to 2000 bytes to handle some messages
in v17 that are greater than the old 1000 bytes. Also add some
useful logging regarding packet and session handling.

A device (with protocol v17) was sending a packet with length 
greater than 1000 which resulted in the TCP session being
destroyed and registration being retryed.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340070 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-10 00:36:02 +00:00
Damien Wedhorn 0ac40dc255 Merged revisions 340031 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r340031 | wedhorn | 2011-10-10 09:18:27 +1100 (Mon, 10 Oct 2011) | 8 lines
  
  Return -1 to skinny_session if register rejected.
  
  If device registration is rejected, return -1 so that the session is
  destroyed immediately. Previously, a segfault would occur on a 
  graceful shutdown if a register is rejected and the skinny_session
  has not yet timed out.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@340032 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-09 22:21:42 +00:00
Damien Wedhorn b90964eda5 Merged revisions 339992 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r339992 | wedhorn | 2011-10-10 08:09:12 +1100 (Mon, 10 Oct 2011) | 9 lines
  
  Remove log message on traverse session list.
  
  On destroying a session, a list of sessions is traversed to find the 
  matching session. For each session not matching, skinny erroneously
  logged that the session was not matched. While technically correct
  the message was misleading, and tended to indicate errors that 
  were not there.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339993 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-09 21:15:09 +00:00
Igor Goncharovskiy 7e5ce2ac49 Merged revisions 339942 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339942 | igorg | 2011-10-09 08:18:02 +0700 (Вск, 09 Окт 2011) | 12 lines
  
  Merged revisions 339938 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r339938 | igorg | 2011-10-09 08:16:09 +0700 (Вск, 09 Окт 2011) | 6 lines
    
    Fix compilation issue, caused by missed session structure
    
    (closes issue ASTERISK-18694)
    Reported by: alex70
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339947 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-09 01:19:30 +00:00
Igor Goncharovskiy 326c3a39d5 Merged revisions 339885 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339885 | igorg | 2011-10-08 22:46:27 +0700 (Сбт, 08 Окт 2011) | 13 lines
  
  Merged revisions 339884 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r339884 | igorg | 2011-10-08 22:45:20 +0700 (Сбт, 08 Окт 2011) | 7 lines
    
    
    Fix segfault in Unistim channel
    
    (closes issue ASTERISK-18638)
    Reported by: jonnt
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339886 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-08 15:48:34 +00:00
Igor Goncharovskiy a01b34f488 Merged revisions 339831 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339831 | igorg | 2011-10-08 22:01:35 +0700 (Сбт, 08 Окт 2011) | 14 lines
  
  Merged revisions 339830 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r339830 | igorg | 2011-10-08 21:56:35 +0700 (Сбт, 08 Окт 2011) | 8 lines
    
    
    Fix char array cast as short array in send_client() function (for ARM
    platform)
    
    (closes issue ASTERISK-17314)
    Reported by: jjoshua
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339832 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-08 15:05:41 +00:00
Damien Wedhorn d59bb319fc Fixed segfault on core stop gracefully.
There was an issue that the cap and confcap pointers for each line and device
were being memcpy'd so they all pointed to the same ast_format_cap. On
destroying, a segfault occured on the second call to the same struct.

skinny reload now works again as well.

Tested by snuff and myself. 


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-06 20:18:45 +00:00
Richard Mudgett 2f82296096 Merged revisions 339626 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339626 | rmudgett | 2011-10-06 12:53:00 -0500 (Thu, 06 Oct 2011) | 25 lines
  
  Merged revisions 339625 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r339625 | rmudgett | 2011-10-06 12:49:38 -0500 (Thu, 06 Oct 2011) | 18 lines
    
    Fix debugging messages generated by 'udptl debug'.
    
    * Makes chan_sip set the tag to the channel name.
    
    * Fixes received debug message sequence number.
    
    * Removed tx/rx debug message type since it was hard coded to 0.
    
    * Made udptl.c logged message header consistent if possible: "UDPTL (%s): ".
    
    * Removed unused rx_expected_seq_no from struct ast_udptl.
    
    (closes issue ASTERISK-18401)
    Reported by: Kevin P. Fleming
    Patches:
          jira_asterisk_18401_v1.8.patch (license #5621) patch uploaded by rmudgett
    Tested by: Matthew Nicholson
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339627 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-06 17:54:42 +00:00
Leif Madsen 34bf1527e8 Merged revisions 339148 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339148 | lmadsen | 2011-10-03 15:13:16 -0500 (Mon, 03 Oct 2011) | 14 lines
  
  Merged revisions 339147 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r339147 | lmadsen | 2011-10-03 15:12:43 -0500 (Mon, 03 Oct 2011) | 6 lines
    
    Remove duplicated Maxforwards line in AMI output.
    
    (Closes issue ASTERISK-18637)
    Reported by: Jacek Konieczny
    Patches:
         asterisk-sipshowpeer.patch (License #6298) uploaded by Jacek Konieczny
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339149 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-03 20:13:44 +00:00
Terry Wilson 2644af39b4 Merged revisions 339088 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r339088 | twilson | 2011-10-03 11:44:27 -0700 (Mon, 03 Oct 2011) | 17 lines
  
  Merged revisions 339086 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r339086 | twilson | 2011-10-03 11:40:52 -0700 (Mon, 03 Oct 2011) | 10 lines
    
    Properly ignore AST_CONTROL_UPDATE_RTP_PEER in more places
    
    After the change in r336294, the new AST_CONTROL_UPDATE_RTP_PEER frame
    is sent when a re-invite happens. If we receive a re-invite from a device
    the waitstream_core was not aware of the new control frame and would drop
    the call.
    
    (closes issue ASTERISK-18610)
    	Reported by: Kristijan_Vrban
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-10-03 18:58:33 +00:00
Richard Mudgett cb0a0a9f29 Merged revisions 338801 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r338801 | rmudgett | 2011-09-30 17:06:48 -0500 (Fri, 30 Sep 2011) | 19 lines
  
  Merged revisions 338800 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r338800 | rmudgett | 2011-09-30 17:05:10 -0500 (Fri, 30 Sep 2011) | 12 lines
    
    Fix segfault in analog_ss_thread() not checking ast_read() for NULL.
    
    NOTE: The problem was reported against v1.6.2.  It is unlikely to ever
    happen on v1.8 and above since chan_dahdi.c:analog_ss_thread() is unlikely
    to be used.  The version in sig_analog.c has largely replaced it.
    
    (closes issue ASTERISK-18648)
    Reported by: Stephan Bosch
    Patches:
          jira_asterisk_18648_v1.8.patch (license #5621) patch uploaded by rmudgett
    Tested by: Stephan Bosch
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338802 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-30 22:08:48 +00:00
Olle Johansson 260648043b Formatting changes only
--Denna och nedanstående rader kommer inte med i loggmeddelandet--

M    channels/chan_sip.c


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338755 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-30 19:25:36 +00:00
Richard Mudgett 977742747d Fix formatting of AMI header for SIP show peer.
ASTERISK-17486 exposed the problem for AMI parsers.

(closes issue ASTERISK-18649)
Reported by: Jacek Konieczny
Patches:
      asterisk-sipshowpeer_response_end.patch (license #6298) patch uploaded by Jacek Konieczny
........

Merged revisions 338663 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 338664 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338665 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-30 16:40:14 +00:00
Gregory Nietsky c4a7d0e2c7 Merged revisions 338417 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r338417 | irroot | 2011-09-29 14:16:42 +0200 (Thu, 29 Sep 2011) | 19 lines
  
  Merged revisions 338416 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r338416 | irroot | 2011-09-29 14:13:05 +0200 (Thu, 29 Sep 2011) | 12 lines
    
    The rtptimeout setting is ignored on a per peer basis.
    
    Not only is the rtptimeout ignored in some cases but 
    rtpkeepalive and rtpholdtimeout is affected.
    
    this commit also removes rtptimeout/rtpholdtimeout on
    text rtp.
    
    (closes issue ASTERISK-18559)
    
    Review: https://reviewboard.asterisk.org/r/1452
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338435 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-29 12:22:43 +00:00
Richard Mudgett 50350a47ea Merged revisions 338323 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r338323 | rmudgett | 2011-09-28 17:36:57 -0500 (Wed, 28 Sep 2011) | 12 lines
  
  Merged revisions 338322 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r338322 | rmudgett | 2011-09-28 17:35:52 -0500 (Wed, 28 Sep 2011) | 5 lines
    
    Make duplicate call ptr warning message more helpful.
    
    * Adds the value of the call ptr to the duplicate call ptr message to help
    trace why there is a duplicate call ptr.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338324 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-28 22:38:00 +00:00
Jason Parker a6c29b931e Merged revisions 338228 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r338228 | qwell | 2011-09-28 15:54:35 -0500 (Wed, 28 Sep 2011) | 9 lines
  
  Merged revisions 338227 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r338227 | qwell | 2011-09-28 15:52:47 -0500 (Wed, 28 Sep 2011) | 1 line
    
    Add support levels to non-module sections of menuselect (cflags, utils, etc).
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338229 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-28 20:55:42 +00:00
Richard Mudgett 36a8264892 Merged revisions 338225 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r338225 | rmudgett | 2011-09-28 15:26:39 -0500 (Wed, 28 Sep 2011) | 12 lines
  
  Merged revisions 338224 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r338224 | rmudgett | 2011-09-28 15:24:41 -0500 (Wed, 28 Sep 2011) | 5 lines
    
    Fix chan_dahd compiling with gcc 4.6 when PRI and SS7 not present.
    
    (closes issue ASTERISK-18357)
    Reported by: Matthew Nicholson
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338226 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-28 20:28:14 +00:00
Olle Johansson 6e0f7be7c9 Whitespace (red blobs) fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@338042 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-27 12:45:25 +00:00
Richard Mudgett e39f6bba33 Merged revisions 337721 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r337721 | rmudgett | 2011-09-22 16:37:41 -0500 (Thu, 22 Sep 2011) | 25 lines
  
  Merged revisions 337720 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r337720 | rmudgett | 2011-09-22 16:29:46 -0500 (Thu, 22 Sep 2011) | 18 lines
    
    Made ISDN not add numbering plan prefix strings to empty numbers.
    
    When the Caller-ID is restricted, the expected behavior is for the
    Caller-ID to be blank.  In chan_dahdi, the national prefix is placed onto
    the Caller-ID number even if it is restricted (empty) causing the
    Caller-ID to be the national prefix rather than blank.
    
    This behavior was lost when sig_pri was extracted from chan_dahdi.
    
    * Made not add prefix strings to empty connected line, calling, and ANI
    number strings.
    
    (closes issue ASTERISK-18577)
    Reported by: Kris Shaw
    Patches:
          jira_asterisk_18577_v1.8.patch (license #5621) patch uploaded by rmudgett
    Tested by: Kris Shaw
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-22 21:42:35 +00:00
Jonathan Rose 5982bdcb7c Merged revisions 337595,337597 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r337595 | jrose | 2011-09-22 10:35:50 -0500 (Thu, 22 Sep 2011) | 12 lines
  
  Generate Security events in chan_sip using new Security Events Framework
  
  Security Events Framework was added in 1.8 and support was added for AMI to generate
  events at that time. This patch adds support for chan_sip to generate security events.
  
  (closes issue ASTERISK-18264)
  Reported by: Michael L. Young
  Patches:
       security_events_chan_sip_v4.patch (license #5026) by Michael L. Young
  Review: https://reviewboard.asterisk.org/r/1362/
........
  r337597 | jrose | 2011-09-22 10:47:05 -0500 (Thu, 22 Sep 2011) | 10 lines
  
  Forgot to svn add new files to r337595
  
  Part of Generating security events for chan_sip
  
  (issue ASTERISK-18264)
  Reported by: Michael L. Young
  Patches:
      security_events_chan_sip_v4.patch (License #5026) by Michael L. Young
  Reviewboard: https://reviewboard.asterisk.org/r/1362/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337600 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-22 16:35:20 +00:00
Gregory Nietsky 308ec93d64 Merged revisions 337487 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r337487 | irroot | 2011-09-22 11:26:26 +0200 (Thu, 22 Sep 2011) | 16 lines
  
  Merged revisions 337486 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r337486 | irroot | 2011-09-22 11:22:26 +0200 (Thu, 22 Sep 2011) | 10 lines
    
    If IP address is used in chan_h323 host parameter of peer configuration.
    module tries to resolve IP address to IP address and fails.
    
    Simple fix to set family of socket this is a hangover from ipv6 changes.
    
    (closes issue ASTERISK-18237)
    (issue ASTERISK-17278)
    (issue ASTERISK-17500)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337488 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-22 09:31:41 +00:00
Richard Mudgett 7fe331fd59 Merged revisions 337008 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r337008 | rmudgett | 2011-09-20 14:12:24 -0500 (Tue, 20 Sep 2011) | 22 lines
  
  Merged revisions 337007 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r337007 | rmudgett | 2011-09-20 14:10:30 -0500 (Tue, 20 Sep 2011) | 15 lines
    
    Check if a channel was created before using the pointer in sig_ss7_new_ast_channel().
    
    Fixes the crash in ASTERISK-17955 gdb-11918.txt backtrace.
    
    * Added some missing libss7 access lock protection.
    
    * Prevent cancelling the ss7_linkset() thread at inoportune times just
    like the pri_dchannel() thread.
    
    (issue ASTERISK-17955)
    Reported by: Ian M Sherman
    Patches:
          jira_asterisk_17955_v1.8.patch (license #5621) patch uploaded by rmudgett
          (attached to related ASTERISK-17966)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@337009 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-20 19:13:36 +00:00
Richard Mudgett b3768f04c3 Merged revisions 336978 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r336978 | rmudgett | 2011-09-20 13:14:40 -0500 (Tue, 20 Sep 2011) | 28 lines
  
  Merged revisions 336977 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r336977 | rmudgett | 2011-09-20 13:12:17 -0500 (Tue, 20 Sep 2011) | 21 lines
    
    Fix deadlock from not releasing SS7 linkset lock.
    
    sig_ss7_hangup() failed to release the SS7 linkset lock if the call had
    the alreadyhungup flag set.
    
    * Made unlock the SS7 linkset lock in sig_ss7_hangup() if the
    alreadyhungup flag is set.
    
    * Made ss7_start_call() not hold any locks while creating the channel for
    an incoming call to prevent deadlock.
    
    * Made ss7_grab() a void function, since it could never fail, to simplify
    calling code.
    
    * Made obtain the channel lock to do softhangup in some places.
    
    Patches:
          jira_ast_668_v1.8.patch (license #5621) patch uploaded by rmudgett
    
    JIRA AST-668
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-20 18:20:10 +00:00
Gregory Nietsky 8493c46308 Merged revisions 336936 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r336936 | irroot | 2011-09-20 18:51:59 +0200 (Tue, 20 Sep 2011) | 14 lines
  
  
  Allow Setting Auth Tag Bit length Based on invite or config option
  
  Update the SIP SRTP API to allow use of 32 or 80 bit taglen.
  Curently only 80 bit is supported.
  
  The outgoing invite will use the taglen of the incoming invite preventing
  one-way audio.
  
  (Closes issue ASTERISK-17895)
  
  Review: https://reviewboard.asterisk.org/r/1173/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336937 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-20 16:56:11 +00:00
Terry Wilson 098efb6641 Merged revisions 336792 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r336792 | twilson | 2011-09-19 17:13:34 -0500 (Mon, 19 Sep 2011) | 9 lines
  
  Merged revisions 336791 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r336791 | twilson | 2011-09-19 17:07:58 -0500 (Mon, 19 Sep 2011) | 2 lines
    
    Don't interfere with T.38 reinvites

    This is an update to the fix for ASTERISK-18340 and ASTERISK-17725
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336837 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-19 22:28:17 +00:00
Richard Mudgett 0f9330b58c Merged revisions 336570 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r336570 | rmudgett | 2011-09-19 10:32:00 -0500 (Mon, 19 Sep 2011) | 11 lines
  
  Merged revisions 336569 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r336569 | rmudgett | 2011-09-19 10:25:34 -0500 (Mon, 19 Sep 2011) | 4 lines
    
    Rework sig_pri_hangup() to be simpler and clearer.
    
    JIRA AST-675
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336571 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-19 15:36:39 +00:00
Olle Johansson 1ec4cb8ea0 Merged revisions 336502 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r336502 | oej | 2011-09-19 15:38:53 +0200 (Mån, 19 Sep 2011) | 12 lines
  
  Merged revisions 336501 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r336501 | oej | 2011-09-19 15:33:50 +0200 (Mån, 19 Sep 2011) | 5 lines
    
    Add diversion header to a 302 redirect response if we have diversion data 
    
    (closes issue ASTERISK-18143)
    	patch by oej
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-19 13:57:26 +00:00
Gregory Nietsky d9306c4087 Merged revisions 336500 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r336500 | irroot | 2011-09-19 15:31:50 +0200 (Mon, 19 Sep 2011) | 19 lines
  
  Merged revisions 336499 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r336499 | irroot | 2011-09-19 15:27:52 +0200 (Mon, 19 Sep 2011) | 13 lines
    
    A long time ago in a galaxy far far away a IPv6 update was made,
    chan_h323 was not updated causeing all to flee to chan_ooh323.
    
    the brave Jedi [asterisk developers] pondered this miscarrige of justice
    and restored order to the force for the sake of closing out 2 old issues.
    
    (closes issue ASTERISK-17278)
    (closes issue ASTERISK-17500)
    Reported by: dread, sybasesql
    Tested by: irroot
    Reviewed by: IRC (russellb, kpfleming)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336503 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-19 13:41:52 +00:00
Olle Johansson 5b4b76d3aa Merged revisions 336381 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r336381 | oej | 2011-09-19 12:05:00 +0200 (Mån, 19 Sep 2011) | 16 lines
  
  Merged revisions 336378 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r336378 | oej | 2011-09-19 11:40:44 +0200 (Mån, 19 Sep 2011) | 9 lines
    
    Add missing unlock at MWI message sending time
    
    (closes issue ASTERISK-18573)
    
    Patches:
       sip_mwi_lock.patch (license #5041) by Gregory Hinton Nietsky
    
    Thanks to irrot for the reminder, to Gregory for the patch!
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336382 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-19 10:10:11 +00:00
Jonathan Rose beae2df26e Merged revisions 336307 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r336307 | jrose | 2011-09-16 16:09:20 -0500 (Fri, 16 Sep 2011) | 20 lines
  
  Merged revisions 336294 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r336294 | jrose | 2011-09-16 14:53:40 -0500 (Fri, 16 Sep 2011) | 13 lines
    
    Fix bad RTP media bridges in directmedia calls on peers separated by multiple Asterisk nodes.
    
    In a situation involving devices on separate Asterisk trunks, the remote RTP bridge would
    break when starting a call with directmedia. This patch queues a new type of control frame
    so that our RTP bridge loop can properly detect when these situations occur and check to see
    if peers need to be updated in order to send their media to the proper location.
    
    (Closes issue ASTERISK-18340)
    Reported by: Thomas Arimont
    (Closes issue ASTERISK-17725)
    Reported by: kwk
    Tested by: twilson, jrose
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336311 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-16 21:20:02 +00:00
Gregory Nietsky b5a641d1fe Merged revisions 336167 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r336167 | irroot | 2011-09-16 12:12:03 +0200 (Fri, 16 Sep 2011) | 22 lines
  
  Merged revisions 336166 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r336166 | irroot | 2011-09-16 12:09:17 +0200 (Fri, 16 Sep 2011) | 16 lines
    
    The round robin routing routine in chan_misdn.c is broken.
    
    it rotates between ports but never checks the channels in the ports.
    
    i have extensivly tested it and verified it works on 1 upto 4 ports.
    before the patch only 1 out of each port was used now all are used as
    expected.
    
    (closes issue ASTERISK-18413)
    Reported by: irroot
    Tested by: irroot
    Reviewed by: irroot
        
    Review: https://reviewboard.asterisk.org/r/1410/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@336168 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-16 10:16:56 +00:00
Gregory Nietsky 40b76b6893 Merged revisions 335991 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r335991 | irroot | 2011-09-15 10:29:12 +0200 (Thu, 15 Sep 2011) | 17 lines
  
  Merged revisions 335978 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r335978 | irroot | 2011-09-15 10:15:22 +0200 (Thu, 15 Sep 2011) | 11 lines
    
    lock the channel before calling ast_bridged_channel() to prevent a seg fault.
    
    AMI agents list called on shutdown causes a segfault, introducing proper locking
    will prevent this.
    
    (closes issue ASTERISK-18092)
    
    Reported by: agustina
    Patches: chan_agent.patch (License #5041) patch uploaded by irroot
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335993 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-15 08:40:07 +00:00
Richard Mudgett a27555687b Merged revisions 335852 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r335852 | rmudgett | 2011-09-14 11:00:37 -0500 (Wed, 14 Sep 2011) | 18 lines
  
  Merged revisions 335851 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r335851 | rmudgett | 2011-09-14 10:53:25 -0500 (Wed, 14 Sep 2011) | 11 lines
    
    Fixed cut-n-paste regression using the wrong variable.
    
    Fixes the missing DAHDI channels when using the newer chan_dahdi.conf
    sections for channel configuration.
    
    (closes issue ASTERISK-18496)
    Reported by: Sean Darcy
    Patches:
          jira_asterisk_18496_v1.8.patch (license #5621) patch uploaded by rmudgett
    Tested by: Sean Darcy, rmudgett
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335853 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-14 16:05:38 +00:00
Olle Johansson 5c6d438231 Documentation updates
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335385 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-12 14:33:43 +00:00
Olle Johansson 55b060fb35 Small documentation updates
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335349 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-12 14:22:56 +00:00
Olle Johansson 404151ad65 New sip.conf option for setting default tonezone for channel or individual devices
Review: https://reviewboard.asterisk.org/r/1429/

(closes issue ASTERISK-18497)

Thanks to russellb for peer review.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335325 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-12 13:57:57 +00:00
Olle Johansson e4a11bcb6e Merged revisions 335323 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r335323 | oej | 2011-09-12 15:47:13 +0200 (Mån, 12 Sep 2011) | 19 lines
  
  Merged revisions 335319 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r335319 | oej | 2011-09-12 15:25:30 +0200 (Mån, 12 Sep 2011) | 12 lines
    
    Lock the peer->mvipvt to avoid crashes with SIP history enabled
    
    After the launch of 1.6 event-based MWI we have two threads handling the peer->mwipvt,
    which cause issues with SIP history additions in combination with the max limit for
    number of history entries.
    
    Review: https://reviewboard.asterisk.org/r/1373/
    
    (closes issue ASTERISK-18288)
    
    Thanks to irrot for peer review. Work with this bug funded by IPvision AS
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335324 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-12 13:50:24 +00:00
Kinsey Moore c5c1fed9b6 Merged revisions 335321 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r335321 | kmoore | 2011-09-12 08:27:04 -0500 (Mon, 12 Sep 2011) | 16 lines
  
  Merged revisions 335320 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r335320 | kmoore | 2011-09-12 08:25:42 -0500 (Mon, 12 Sep 2011) | 9 lines
    
    Prevent IAX2 from getting IPv6 addresses via DNS
    
    IAX2 does not support IPv6 and getting such addresses from DNS can cause error
    messages on the remote end involving bad IPv4 address casts in the presence of
    IPv6/IPv4 tunnels.  This patch ensures that IAX2 will not encounter IPv6
    addresses via DNS queries.
    
    (closes issue ASTERISK-18090)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335322 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-12 13:27:45 +00:00
Stefan Schmidt 986f2d8836 Merged revisions 335260 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r335260 | schmidts | 2011-09-12 11:11:45 +0000 (Mon, 12 Sep 2011) | 12 lines
  
  Merged revisions 335259 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r335259 | schmidts | 2011-09-12 11:09:19 +0000 (Mon, 12 Sep 2011) | 6 lines
    
    build_peer doesnt unlink a peer object from peers_by_ip container which leads to a wrong refcounter value.
    adding an ao2_unlink from the peers_by_ip container fix it.
    
    Review: https://reviewboard.asterisk.org/r/1428/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335261 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-12 11:15:01 +00:00
Matthew Jordan 8b5ba33fe0 Merged revisions 335078 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r335078 | mjordan | 2011-09-09 11:27:01 -0500 (Fri, 09 Sep 2011) | 29 lines
  
  Merged revisions 335064 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r335064 | mjordan | 2011-09-09 11:09:09 -0500 (Fri, 09 Sep 2011) | 23 lines
    
    Updated SIP 484 handling; added Incomplete control frame
    
    When a SIP phone uses the dial application and receives a 484 Address 
    Incomplete response, if overlapped dialing is enabled for SIP, then
    the 484 Address Incomplete is forwarded back to the SIP phone and the
    HANGUPCAUSE channel variable is set to 28.  Previously, the Incomplete
    application dialplan logic was automatically triggered; now, explicit
    dialplan usage of the application is required.
    
    Additionally, this patch adds a new AST_CONTOL_FRAME type called
    AST_CONTROL_INCOMPLETE.  If a channel driver receives this control frame,
    it is an indication that the dialplan expects more digits back from the
    device.  If the device supports overlap dialing it should attempt to 
    notify the device that the dialplan is waiting for more digits; otherwise,
    it can handle the frame in a manner appropriate to the channel driver.
    
    (closes issue ASTERISK-17288)
    Reported by: Mikael Carlsson
    Tested by: Matthew Jordan
    
    Review: https://reviewboard.asterisk.org/r/1416/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335079 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-09 16:28:23 +00:00
Paul Belanger 272afe432b Merged revisions 334844 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r334844 | pabelanger | 2011-09-07 15:37:24 -0400 (Wed, 07 Sep 2011) | 11 lines
  
  Merged revisions 334843 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r334843 | pabelanger | 2011-09-07 15:35:52 -0400 (Wed, 07 Sep 2011) | 4 lines
    
    Cleanup chan_iax2.c log messages
    
    Review: https://code.asterisk.org/code/cru/CR-AST-11
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@334845 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-07 19:38:58 +00:00
Paul Belanger 39ac2e639f Merged revisions 334514 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r334514 | pabelanger | 2011-09-06 11:47:59 -0400 (Tue, 06 Sep 2011) | 6 lines
  
  authdebug is now disabled by default
  
  To enable this functionaility again set authdebug = yes in iax.conf
  
  Review: https://reviewboard.asterisk.org/r/1414/
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@334517 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-09-06 16:08:10 +00:00
Matthew Nicholson 9dd15059f6 Merged revisions 334157 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r334157 | mnicholson | 2011-08-31 13:53:40 -0500 (Wed, 31 Aug 2011) | 11 lines
  
  Merged revisions 334156 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r334156 | mnicholson | 2011-08-31 13:50:33 -0500 (Wed, 31 Aug 2011) | 4 lines
    
    Disable T.38 when we get a invite with image media port set to 0
    
    ASTERISK-17678
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@334158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-31 18:54:33 +00:00
Richard Mudgett 89e79698fd Optimize chan_sip.c check_rtp_timeout() function.
* Make check_rtp_timeout() remember the values returned by
ast_rtp_instance_get_timeout(), ast_rtp_instance_get_hold_timeout(), and
ast_rtp_instance_get_keepalive() instead of repeatedly calling them.

(closes issue ASTERISK-18319)
Reported by: Rob Gagnon
Patches:
      issue-18319-trunk-r333066.diff (License #6159) patch uploaded by Rob Gagnon

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@334115 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-31 18:11:23 +00:00
Richard Mudgett 1961bb6160 Merged revisions 334013 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r334013 | rmudgett | 2011-08-31 11:00:49 -0500 (Wed, 31 Aug 2011) | 30 lines
  
  Merged revisions 334012 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r334012 | rmudgett | 2011-08-31 10:57:12 -0500 (Wed, 31 Aug 2011) | 23 lines
    
    No DAHDI channel available for conference, user introduction disabled.
    
    The following error will consistently occur when trying to dial into a
    MeetMe conference when the server does not have DAHDI hardware installed:
    
    app_meetme.c: No DAHDI channel available for conference, user introduction
    disabled (is chan_dahdi loaded?)
    
    While chan_dahdi is loaded correctly during compilation and install of
    Asterisk/Dahdi, including associated modules, etc., a chan_dahdi.conf
    configuration file in /etc/asterisk is not created by FreePBX if hardware
    does not exist, causing MeetMe to be unable to open a DAHDI pseudo
    channel.
    
    * Allow chan_dahdi to create a pseudo channel when there is no
    chan_dahdi.conf file to load.
    
    (closes issue ASTERISK-17398)
    Reported by: Preston Edwards
    Patches:
          jira_asterisk_17398_v1.8.patch (license #5621) patch uploaded by rmudgett
    Tested by: rmudgett
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@334014 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-31 16:02:11 +00:00
Richard Mudgett ab17a27f97 Merged revisions 334010 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r334010 | rmudgett | 2011-08-31 10:23:11 -0500 (Wed, 31 Aug 2011) | 50 lines
  
  Merged revisions 334009 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r334009 | rmudgett | 2011-08-31 10:20:31 -0500 (Wed, 31 Aug 2011) | 43 lines
    
    Call pickup race leaves orphaned channels or crashes.
    
    Multiple users attempting to pickup a call that has been forked to
    multiple extensions either crashes or fails a masquerade with a "bad
    things may happen" message.
    
    This is the scenario that is causing all the grief:
    1) Pickup target is selected
    2) target is marked as being picked up in ast_do_pickup()
    3) target is unlocked by ast_do_pickup()
    4) app dial or queue gets a chance to hang up losing calls and calls
    ast_hangup() on target
    5) SINCE A MASQUERADE HAS NOT BEEN SETUP YET BY ast_do_pickup() with
    ast_channel_masquerade(), ast_hangup() completes successfully and the
    channel is no longer in the channels container.
    6) ast_do_pickup() then calls ast_channel_masquerade() to schedule the
    masquerade on the dead channel.
    7) ast_do_pickup() then calls ast_do_masquerade() on the dead channel
    8) bad things happen while doing the masquerade and in the process
    ast_do_masquerade() puts the dead channel back into the channels container
    9) The "orphaned" channel is visible in the channels list if a crash does
    not happen.
    
    This patch does the following:
    
    * Made ast_hangup() set AST_FLAG_ZOMBIE on a successfully hung-up channel
    and not release the channel lock until that has happened.
    
    * Made __ast_channel_masquerade() not setup a masquerade if either channel
    has AST_FLAG_ZOMBIE set.
    
    * Fix chan_agent misuse of AST_FLAG_ZOMBIE since it would no longer work.
    
    (closes issue ASTERISK-18222)
    Reported by: Alec Davis
    Tested by: rmudgett, Alec Davis, irroot, Karsten Wemheuer
    
    (closes issue ASTERISK-18273)
    Reported by: Karsten Wemheuer
    Tested by: rmudgett, Alec Davis, irroot, Karsten Wemheuer
    
    Review: https://reviewboard.asterisk.org/r/1400/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@334011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-31 15:25:35 +00:00
Kinsey Moore 82229cc690 Merged revisions 334007 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r334007 | kmoore | 2011-08-31 10:19:30 -0500 (Wed, 31 Aug 2011) | 14 lines
  
  Merged revisions 334006 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r334006 | kmoore | 2011-08-31 10:18:37 -0500 (Wed, 31 Aug 2011) | 7 lines
    
    Correct an AMI protocol violation with SIPshowpeer
    
    The response of SIPshowpeer ends with "\r\n\r\n". Since other commands are
    ended by using \r\n this confuses any interfacing script.
    
    (closes issue ASTERISK-17486)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@334008 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-31 15:20:21 +00:00
Terry Wilson ba3d34708e Merged revisions 333837 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r333837 | twilson | 2011-08-29 16:41:13 -0500 (Mon, 29 Aug 2011) | 22 lines
  
  Merged revisions 333836 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r333836 | twilson | 2011-08-29 16:38:31 -0500 (Mon, 29 Aug 2011) | 15 lines
    
    Refresh peer address if DNS unavailable at peer creation
    
    If Asterisk starts and no DNS is available, outbound registrations will fail
    indefinitely. This patch copies the address from the sip_registry struct, which
    will be updated, to the peer->addr when necessary.
    
    If dnsmgr is enabled, the registration fails without the patch because even
    though the address on the registry is updated via dnsmgr, the address is just
    copied on the first try. Since we use ast_sockaddr_copy, dnsmgr can't update
    the address that is copied to the sip_pvt or peers.
    
    Closes issue ASTERISK-18000
    
    Review: https://reviewboard.asterisk.org/r/1335/
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@333838 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-29 21:43:33 +00:00
Tzafrir Cohen ad02be1f2b chan_vpb: remove unused variables (gcc4.6)
GCC 4.6 detects variables that get assined to, but never used later.
Also removes some remmed-out lines that become invalid.

(closes issue ASTERISK-18336)
Signed-off-by: Tzafrir Cohen (License #5035) <tzafrir.cohen@xorcom.com>,

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@333509 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-08-28 09:57:47 +00:00