#1646: initial paramiko support

git-svn-id: https://xpra.org/svn/Xpra/trunk@19933 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Jul 16, 2018 · 49f4955 · 49f4955
1 parent c4f75b5
commit 49f4955
Show file tree

Hide file tree

Showing 3 changed files with 366 additions and 205 deletions.
diff --git a/src/xpra/client/client_base.py b/src/xpra/client/client_base.py
@@ -267,7 +267,8 @@ def setup_connection(self, conn):
         process = getattr(conn, "process", None)        #ie: ssh is handled by anotherprocess
         if process:
             proc, name, command = process
-            getChildReaper().add_process(proc, name, command, ignore=True, forget=False)
+            if proc:
+                getChildReaper().add_process(proc, name, command, ignore=True, forget=False)
         netlog("setup_connection(%s) protocol=%s", conn, self._protocol)
 
     def _process_udp_control(self, packet):

diff --git a/src/xpra/log.py b/src/xpra/log.py
@@ -261,6 +261,7 @@ def enable_format(format_string):
                 #internal / network:
                 ("network"      , "All network code"),
                 ("bandwidth"    , "Bandwidth detection and management"),
+                ("ssh"          , "SSH connections"),
                 ("http"         , "HTTP requests"),
                 ("rfb"          , "RFB Protocol"),
                 ("mmap"         , "mmap transfers"),