From 835dba95f810cc925ac856171014b9dbea8c90be Mon Sep 17 00:00:00 2001
From: Niclas Eklund <nick@erlang.org>
Date: Mon, 22 Mar 2010 14:22:24 +0000
Subject: Fix usage of ip_v6_disabled and publish it

---
 lib/ssh/doc/src/notes.xml |  6 ++++++
 lib/ssh/doc/src/ssh.xml   |  7 +++++++
 lib/ssh/src/ssh.appup.src |  4 ++++
 lib/ssh/src/ssh.erl       | 16 ++++++++--------
 lib/ssh/vsn.mk            |  3 ++-
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 6ea7f099b3..2533ab8085 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -33,6 +33,12 @@
 
     <section><title>Improvements and New Features</title>
       <list>
+        <item>
+          <p>The configuration parameter ip_v6_disabled is now available,
+             which makes it possible for the user to alter the IP version
+             SSH shall use.</p>
+          <p>Own Id: OTP-8535 Aux Id:</p>
+        </item>
         <item>
           <p>The ssh_connection:send operation now accepts infinity as timeout.</p>
           <p>Own Id: OTP-8534 Aux Id:</p>
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index 60150f0d37..71e6b2cd3d 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -159,6 +159,9 @@
 	  <item>
 	    <p>Allow an existing file-descriptor to be used
 	  (simply passed on to the transport protocol).</p></item>
+	  <tag><c><![CDATA[{ip_v6_disabled, boolean()}]]></c></tag>
+	  <item>
+	    <p>Determines if SSH shall use IPv6 or not.</p></item>
 	</taglist>
       </desc>   
     </func>
@@ -252,6 +255,10 @@
 	  <item>
 	    <p>Allow an existing file-descriptor to be used
 	  (simply passed on to the transport protocol).</p></item>
+	  <tag><c><![CDATA[{ip_v6_disabled, boolean()}]]></c></tag>
+	  <item>
+	    <p>Determines if SSH shall use IPv6 or not (only used when 
+               HostAddress is set to any).</p></item>
         </taglist>
       </desc>
     </func>
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index b6004ad54a..b082d66988 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -20,9 +20,11 @@
 {"%VSN%",	
  [
   {"1.1.8", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []},
+             {load_module, ssh, soft_purge, soft_purge, []},
              {load_module, ssh_connection, soft_purge, soft_purge, []}]},
   {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
              {load_module, ssh_connection, soft_purge, soft_purge, []},
+             {load_module, ssh, soft_purge, soft_purge, []},
              {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
   {"1.1.6", [{restart_application, ssh}]},
   {"1.1.5", [{restart_application, ssh}]},
@@ -32,9 +34,11 @@
  ],
  [
   {"1.1.8", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []},
+             {load_module, ssh, soft_purge, soft_purge, []},
              {load_module, ssh_connection, soft_purge, soft_purge, []}]},
   {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
              {load_module, ssh_connection, soft_purge, soft_purge, []},
+             {load_module, ssh, soft_purge, soft_purge, []},
              {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
   {"1.1.6", [{restart_application, ssh}]},
   {"1.1.5", [{restart_application, ssh}]},
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index f9a986a8b6..0eef3f95c0 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 
@@ -330,10 +330,10 @@ handle_options([{nodelay, _} = Opt | Rest], SockOpts, Opts) ->
 handle_options([Opt | Rest], SockOpts, Opts) ->
     handle_options(Rest, SockOpts, [Opt | Opts]).
 
+%% Has IPv6 been disabled?
 inetopt(true) ->
-    inet6;
-
+    inet;
 inetopt(false) ->
-    inet.
+    inet6.
 
 
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 5538b950b3..c275cb7acf 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -4,7 +4,8 @@ SSH_VSN = 1.1.9
 APP_VSN    = "ssh-$(SSH_VSN)"
 
 TICKETS = OTP-8524 \
-	OTP-8534
+	OTP-8534 \
+	OTP-8535
 
 TICKETS_1.1.8 = OTP-8356 \
 	OTP-8401
-- 
cgit v1.2.3