Attachment 7187 Details for Bug 17109 – window_size channel adaptation to Paramiko version

[patch] window_size channel adaptation to Paramiko version

paramiko.diff (text/plain), 1.75 KB, created by Davy Defaud on 2015-11-07 17:42:00 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Davy Defaud

Created: 2015-11-07 17:42:00 CET

Size: 1.75 KB

patch

obsolete

>=== modified file 'plugins/wb.admin/backend/wb_admin_ssh.py'
>--- a/plugins/wb.admin/backend/wb_admin_ssh.py	2014-09-22 03:27:52 +0000
>+++ b/plugins/wb.admin/backend/wb_admin_ssh.py	2014-09-25 22:29:18 +0000
>@@ -85,9 +85,12 @@ if paramiko and server_version_str2tuple
>            m.add_byte(chr(MSG_CHANNEL_OPEN))
>            m.add_string(kind)
>            m.add_int(chanid)
>-            if (server_version_str2tuple(paramiko.__version__) <= (1, 14, 99)):
>+            if server_version_str2tuple(paramiko.__version__) < (1, 15, 0):
>                m.add_int(self.window_size)
>                m.add_int(self.max_packet_size)
>+            else:
>+                m.add_int(self.default_window_size)
>+                m.add_int(self.default_max_packet_size)
>            if (kind == 'forwarded-tcpip') or (kind == 'direct-tcpip'):
>                m.add_string(dest_addr[0])
>                m.add_int(dest_addr[1])
>@@ -101,8 +104,10 @@ if paramiko and server_version_str2tuple
>            self.channel_events[chanid] = event = threading.Event()
>            self.channels_seen[chanid] = True
>            chan._set_transport(self)
>-            if (server_version_str2tuple(paramiko.__version__) <= (1, 14, 99)):
>+            if server_version_str2tuple(paramiko.__version__) < (1, 15, 0):
>                chan._set_window(self.window_size, self.max_packet_size)
>+            else:
>+                chan._set_window(self.default_window_size, self.default_max_packet_size)
>        finally:
>            self.lock.release()
>        self._send_user_message(m)
>@@ -672,6 +677,7 @@ class WbAdminSSH(object):
>        read_timeout = 10
>
>        if self.client is not None:
>+            chan = None
>            transport = self.client.get_transport()
>            try:
>                spawn_process = False

=== modified file 'plugins/wb.admin/backend/wb_admin_ssh.py'
--- a/plugins/wb.admin/backend/wb_admin_ssh.py	2014-09-22 03:27:52 +0000
+++ b/plugins/wb.admin/backend/wb_admin_ssh.py	2014-09-25 22:29:18 +0000
@@ -85,9 +85,12 @@ if paramiko and server_version_str2tuple
            m.add_byte(chr(MSG_CHANNEL_OPEN))
            m.add_string(kind)
            m.add_int(chanid)
-            if (server_version_str2tuple(paramiko.__version__) <= (1, 14, 99)):
+            if server_version_str2tuple(paramiko.__version__) < (1, 15, 0):
                m.add_int(self.window_size)
                m.add_int(self.max_packet_size)
+            else:
+                m.add_int(self.default_window_size)
+                m.add_int(self.default_max_packet_size)
            if (kind == 'forwarded-tcpip') or (kind == 'direct-tcpip'):
                m.add_string(dest_addr[0])
                m.add_int(dest_addr[1])
@@ -101,8 +104,10 @@ if paramiko and server_version_str2tuple
            self.channel_events[chanid] = event = threading.Event()
            self.channels_seen[chanid] = True
            chan._set_transport(self)
-            if (server_version_str2tuple(paramiko.__version__) <= (1, 14, 99)):
+            if server_version_str2tuple(paramiko.__version__) < (1, 15, 0):
                chan._set_window(self.window_size, self.max_packet_size)
+            else:
+                chan._set_window(self.default_window_size, self.default_max_packet_size)
        finally:
            self.lock.release()
        self._send_user_message(m)
@@ -672,6 +677,7 @@ class WbAdminSSH(object):
        read_timeout = 10

        if self.client is not None:
+            chan = None
            transport = self.client.get_transport()
            try:
                spawn_process = False

Actions: View | Diff

Attachments on bug 17109: 7187