Trace

_setup_libssh2.py

@@ -20,9 +20,11 @@ def build_ssh2():
     os.chdir('src')
     check_call('cmake ../libssh2 -DBUILD_SHARED_LIBS=ON \
     -DENABLE_ZLIB_COMPRESSION=ON -DENABLE_CRYPT_NONE=ON \
-    -DENABLE_MAC_NONE=ON -DCRYPTO_BACKEND=OpenSSL',
+    -DENABLE_MAC_NONE=ON -DCRYPTO_BACKEND=OpenSSL \
+    -DENABLE_DEBUG_LOGGING=ON',
                shell=True, env=os.environ)
-    check_call('cmake --build . --config Release', shell=True, env=os.environ)
+    # check_call('cmake --build . --config Release', shell=True, env=os.environ)
+    check_call('cmake --build . --config Debug', shell=True, env=os.environ)
     os.chdir('..')
 
     for src in glob('src/src/libssh2.so*'):

examples/example_echo.py

@@ -1,6 +1,7 @@
 from __future__ import print_function
 import os
 import socket
+from datetime import datetime
 
 from ssh2.session import Session
 from ssh2.utils import version
@@ -35,20 +36,31 @@
 
 # Channel initialise, exec and wait for end
 channel = session.open_session()
-channel.execute('echo me')
-channel.wait_eof()
-channel.close()
-channel.wait_closed()
+channel.shell()
+channel.write("sleep 1; echo this took one second\n")
+channel.write("for x in 1 2 3; do sleep 1; echo a line per second for three seconds; done\n")
+channel.write("sleep 1; echo this took another second\n")
+# channel.execute('echo me')
+# channel.send_eof()
+# channel.close()
+# channel.wait_closed()
 
 # Get exit status
-print("Exit status: %s" % channel.get_exit_status())
+# print("Exit status: %s" % channel.get_exit_status())
 
 # Print output
+start = datetime.now()
+channel.send_eof()
+channel.wait_eof()
 size, data = channel.read()
 while size > 0:
     print(data)
     size, data = channel.read()
 
+print("Exit code: %s" % (channel.get_exit_status()))
+end = datetime.now()
+print("Took %s seconds" % (end - start).total_seconds())
+
 # SFTP capabilities, uncomment and enter a filename
 
 # sftp = session.sftp_init()

setup.py

@@ -107,7 +107,7 @@
     version=versioneer.get_version(),
     cmdclass=cmdclass,
     url='https://github.com/ParallelSSH/ssh2-python',
-    license='LGPLv2',
+    license='LGPLv2.1',
     author='Panos Kittenis',
     author_email='22e889d8@opayq.com',
     description=('Super fast SSH library - bindings for libssh2'),

ssh2/c_ssh2.pxd

@@ -462,3 +462,13 @@ cdef extern from "libssh2.h" nogil:
                                          const char *path)
     IF HAVE_AGENT_FWD:
         int libssh2_channel_request_auth_agent(LIBSSH2_CHANNEL *channel)
+    enum:
+        LIBSSH2_TRACE_TRANS
+        LIBSSH2_TRACE_KEX
+        LIBSSH2_TRACE_AUTH
+        LIBSSH2_TRACE_CONN
+        LIBSSH2_TRACE_SCP
+        LIBSSH2_TRACE_SFTP
+        LIBSSH2_TRACE_ERROR
+        LIBSSH2_TRACE_PUBLICKEY
+        LIBSSH2_TRACE_SOCKET