Commit Graph

6956 Commits

Author SHA1 Message Date
Leif Madsen
d4938a111e Introduce <support_level> tags in MODULEINFO.
This change introduces MODULEINFO into many modules in Asterisk in order to show
the community support level for those modules. This is used by changes committed
to menuselect by Russell Bryant recently (r917 in menuselect). More information about
the support level types and what they mean is available on the wiki at
https://wiki.asterisk.org/wiki/display/AST/Asterisk+Module+Support+States

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@328209 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-14 20:13:06 +00:00
Terry Wilson
4a19bd7e74 Update chan_gtalk to work with changed GMail-based calls
The messages sent by the GMail client have changed, but include the
old-style messages as well. This patch checks for this case and
uses the old-style offer.

(closes issue ASTERISK-18084)
Review: https://reviewboard.asterisk.org/r/1312/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@327682 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-11 19:41:59 +00:00
Richard Mudgett
181898fdb6 INVITE 403 Forbidden response always retransmits the maximum times.
Asterisk sends a 403 Forbidden response if authentication fails for an
INVITE as required.  However, it ignores the ACK and keeps retransmitting
the response.

* Made not delete the to-tag in the dialog so the expected ACK can be
matched with the dialog and stop the retransmissions.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@327211 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-08 21:41:58 +00:00
Russell Bryant
e4760be3b2 Resolve some set-but-unused-variable warnings.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@327044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-08 15:28:44 +00:00
Matthew Nicholson
b13cfc92ec use sips: or sip: depending on the transport in use when building reply digest
URIs


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@326683 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-07 15:28:25 +00:00
Matthew Nicholson
89cdbd257c make the uri parameter used in reply digests more standards compliant in
certain cases by prepending "sip:" or "sips:" to it


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@326681 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-07 15:25:49 +00:00
Tilghman Lesher
9a3fd9a994 Removing type attributes, as a change to menuselect makes them no longer necessary.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@326469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-06 14:35:01 +00:00
Tilghman Lesher
d104b4e701 Add the attribute "type" to each "<use>" for menuselect.
This matters only when autoconf fails to detect that weak linking is supported.
External optional dependencies will become optional in both cases, as they are
removed at compile time when not detected.  However, runtime-optional modules
are made mandatory when weak linking is not found.  This change affects only
the external optional dependencies; previously, they were incorrectly required
when weak linking support was not detected.

Patches:
	20110702__issue18062__asterisk_trunk.diff.txt by tilghman (License #5003)

Tested by: iasgoscouk


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@326411 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-05 22:08:29 +00:00
Richard Mudgett
48e78804e2 Used auth= parameter freed during "sip reload" causes crash.
If you use the auth= parameter and do a "sip reload" while there is an
ongoing call.  The peer->auth data points to free'd memory.

The patch does several things:

1) Puts the authentication list into an ao2 object for reference counting
to fix the reported crash during a SIP reload.

2) Converts the authentication list from open coding to AST list macros.

3) Adds display of the global authentication list in "sip show settings".

(closes issue ASTERISK-17939)
Reported by: wdoekes
Patches:
      jira_asterisk_17939_v1.8.patch (license #5621) patch uploaded by rmudgett

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

JIRA SWP-3526


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@326291 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-05 17:22:59 +00:00
Richard Mudgett
6348add664 Better way to get chan and pvt lock for issue ASTERISK-17431.
Redoes -r308945 for issue ASTERISK-17431 deadlock fix for
sip_set_udptl_peer() and sip_set_rtp_peer().

* Lock the channels in the defined order and avoid the need for a deadlock
avoidance loop.

* Lock the channel before getting the pointer to the private structure to
be sure that the pointer will not change due to a masquerade or channel
hangup.

* To preserve sanity, check that chan and p->owner are the same.  (Pointer
rearangements should not happen without the protection of locks because
bad things tend to happen otherwise.)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@326144 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-07-01 21:07:22 +00:00
Richard Mudgett
cf8b27cd39 Misc minor changes in chan_sip.
* Add load failure exit if primary SIP container(s) could not get created
in chan_sip.c:load_module().

* Removed a redundant static prototype.

* Some typos.

* Some whitespace.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@325935 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-30 20:39:45 +00:00
Kinsey Moore
484a8a8363 chan_sip: cleanup from the introduction of ast_str
Remove the length field from sip_req and sip_pkt in chan_sip since they are
redundant (ast_str holds its own length) and refactor the necessary functions.

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@325740 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-29 21:49:21 +00:00
Kevin P. Fleming
c7416e1072 Fix random misspelling noticed on asterisk-users.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@325416 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-28 21:50:43 +00:00
David Vossel
4a2db97e3c Fixes locking inversion caused by holding sip pvt lock during async_goto.
(closes ASTERISK-17352)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@325339 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-28 20:31:00 +00:00
Terry Wilson
9ab694ab68 Merged revisions 325277 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r325277 | twilson | 2011-06-28 15:06:16 -0500 (Tue, 28 Jun 2011) | 9 lines
  
  Merged revisions 325275 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r325275 | twilson | 2011-06-28 15:03:19 -0500 (Tue, 28 Jun 2011) | 2 lines
    
    Don't leak SIP username information
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@325279 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-28 20:07:51 +00:00
Richard Mudgett
3f8e739710 Use the device name and not the channel name to initialize the device state.
Correct ASTERISK-11323 implementation as I don't see how it ever worked as
claimed when it used the channel name and not the device name.

(issue ASTERISK-11323)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@325212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-28 17:30:16 +00:00
Richard Mudgett
1eb5fcc5a5 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/branches/1.8@324914 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-27 15:37:19 +00:00
David Vossel
5a8af0d613 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/branches/1.8@324685 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-23 18:31:00 +00:00
Kinsey Moore
1e7ff89467 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/branches/1.8@324678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-23 18:29:17 +00:00
David Vossel
e1adc7cefa 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/branches/1.8@324652 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-23 18:23:21 +00:00
Richard Mudgett
e397e0fc54 Use correct variable for text SRTP media.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@324491 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-22 19:16:29 +00:00
Terry Wilson
0ada0bfea3 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/branches/1.8@324484 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-22 18:52:04 +00:00
Richard Mudgett
9de3aa9c60 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/branches/1.8@324481 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-22 18:41:20 +00:00
Richard Mudgett
f5e0f04c19 Comments and whitespace in chan_sip.c
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@324479 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-22 18:26:55 +00:00
Terry Wilson
6ca0976235 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/branches/1.8@324237 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-20 17:33:07 +00:00
Richard Mudgett
f2dd8858ee 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/branches/1.8@324174 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-17 18:23:19 +00:00
Terry Wilson
29f41f057e Shame on me
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@324049 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-16 22:41:01 +00:00
Terry Wilson
c84e7b911e 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/branches/1.8@324048 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-16 22:35:41 +00:00
Jonathan Rose
f9e5239e8a 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/branches/1.8@323371 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-14 16:38:43 +00:00
Terry Wilson
ee2920afba 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/branches/1.8@323370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-14 16:33:55 +00:00
Matthew Nicholson
aad782c474 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/branches/1.8@323040 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-10 19:20:41 +00:00
Matthew Nicholson
099d17c4cb 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/branches/1.8@322807 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-09 17:37:07 +00:00
Jonathan Rose
5f46b994f4 Adds ast_escape_encoded utility to properly handle escaping of quoted field before uri.
This commit backports a feature in trunk affecting initreqprep so that display name won't
be encoded improperly. Also includes unit tests for the ast_escape_quoted function.
This patch gives 1.8 a much improved outlook in countries which don't use standard
ASCII characters.

(closes issue ASTERISK-16949)
Reported by: Örn Arnarson
Review: https://reviewboard.asterisk.org/r/1235/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@322585 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-09 14:06:42 +00:00
Gregory Nietsky
f644955b66 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/branches/1.8@322322 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-08 06:18:38 +00:00
Richard Mudgett
ca817c31e8 Correct IAX2 and SIP event subscription description string.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@321812 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-06-03 19:55:21 +00:00
David Vossel
238e5de95a 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/branches/1.8@321515 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-31 18:52:54 +00:00
Leif Madsen
b4f0e4b5c9 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/branches/1.8@321511 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-31 16:04:47 +00:00
Jonathan Rose
a99d9c7770 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/branches/1.8@321273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-27 14:59:34 +00:00
Mark Murawki
a35ebe0f61 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/branches/1.8@321155 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-26 21:48:45 +00:00
Mark Murawki
d21c41b26a 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/branches/1.8@321100 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-26 20:09:35 +00:00
Russell Bryant
d62797476f Remove some variables that were set but unused.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@320947 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-26 15:57:13 +00:00
Richard Mudgett
b6ed006d32 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/branches/1.8@320883 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-25 22:25:18 +00:00
Jonathan Rose
b2d4426842 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/branches/1.8@320504 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-23 14:33:20 +00:00
Matthew Nicholson
0f7713ec17 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/branches/1.8@320180 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-20 18:48:46 +00:00
Jonathan Rose
b3a2f27111 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/branches/1.8@319938 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-20 13:28:24 +00:00
Terry Wilson
35a3aa4601 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/branches/1.8@319654 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-18 23:15:58 +00:00
Terry Wilson
0219829eef 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/branches/1.8@319552 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-18 20:22:36 +00:00
Richard Mudgett
789411102a 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/branches/1.8@319469 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-17 21:57:56 +00:00
Terry Wilson
ac0cc37ab5 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/branches/1.8@319204 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-16 18:17:43 +00:00
David Vossel
215638e661 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/branches/1.8@319145 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2011-05-16 15:57:26 +00:00