# HG changeset patch
# User wenzelm
# Date 1662931640 -7200
# Node ID c4dc343fdbcbcab2d9a924f970472751dd84f3de
# Parent  f17393e21388cd14c2a6e04c16784c780a304198
clarified signature: avoid exposure of JSch types;

diff -r f17393e21388 -r c4dc343fdbcb src/Pure/General/ssh.scala
--- a/src/Pure/General/ssh.scala	Sun Sep 11 22:51:54 2022 +0200
+++ b/src/Pure/General/ssh.scala	Sun Sep 11 23:27:20 2022 +0200
@@ -187,40 +187,6 @@
   }
 
 
-  /* port forwarding */
-
-  object Port_Forwarding {
-    def open(
-      ssh: Session,
-      ssh_close: Boolean,
-      local_host: String,
-      local_port: Int,
-      remote_host: String,
-      remote_port: Int
-    ): Port_Forwarding = {
-      val port = ssh.session.setPortForwardingL(local_host, local_port, remote_host, remote_port)
-      new Port_Forwarding(ssh, ssh_close, local_host, port, remote_host, remote_port)
-    }
-  }
-
-  class Port_Forwarding private[SSH](
-    ssh: SSH.Session,
-    ssh_close: Boolean,
-    val local_host: String,
-    val local_port: Int,
-    val remote_host: String,
-    val remote_port: Int
-  ) extends AutoCloseable {
-    override def toString: String =
-      local_host + ":" + local_port + ":" + remote_host + ":" + remote_port
-
-    def close(): Unit = {
-      ssh.session.delPortForwardingL(local_host, local_port)
-      if (ssh_close) ssh.close()
-    }
-  }
-
-
   /* Sftp channel */
 
   type Attrs = SftpATTRS
@@ -310,12 +276,14 @@
 
   class Session private[SSH](
     val options: Options,
-    val session: JSch_Session,
+    session: JSch_Session,
     on_close: () => Unit,
     val nominal_host: String,
     val nominal_user: String,
     val nominal_port: Int
   ) extends System {
+    ssh =>
+
     def host: String = if (session.getHost == null) "" else session.getHost
 
     override def hg_url: String =
@@ -332,15 +300,25 @@
     /* port forwarding */
 
     def port_forwarding(
-        remote_port: Int, remote_host: String = "localhost",
-        local_port: Int = 0, local_host: String = "localhost",
-        ssh_close: Boolean = false): Port_Forwarding =
-      Port_Forwarding.open(this, ssh_close, local_host, local_port, remote_host, remote_port)
+      remote_port: Int,
+      remote_host: String = "localhost",
+      local_port: Int = 0,
+      local_host: String = "localhost",
+      ssh_close: Boolean = false
+    ): Port_Forwarding = {
+      val local_port1 = session.setPortForwardingL(local_host, local_port, remote_host, remote_port)
+      new Port_Forwarding(local_host, local_port1, remote_host, remote_port) {
+        override def close(): Unit = {
+          session.delPortForwardingL(this.local_host, this.local_port)
+          if (ssh_close) ssh.close()
+        }
+      }
+    }
 
 
     /* sftp channel */
 
-    val sftp: ChannelSftp = session.openChannel("sftp").asInstanceOf[ChannelSftp]
+    private val sftp: ChannelSftp = session.openChannel("sftp").asInstanceOf[ChannelSftp]
     sftp.connect(connect_timeout(options))
 
     override def close(): Unit = { sftp.disconnect(); session.disconnect(); on_close() }
@@ -477,6 +455,16 @@
     }
   }
 
+  abstract class Port_Forwarding private[SSH](
+    val local_host: String,
+    val local_port: Int,
+    val remote_host: String,
+    val remote_port: Int
+  ) extends AutoCloseable {
+    override def toString: String =
+      local_host + ":" + local_port + ":" + remote_host + ":" + remote_port
+  }
+
 
   /* system operations */