[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.0.44.2-13-g96ea578

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:56:40 CEST 2013


The branch, twofactorauth has been updated
       via  96ea578dfcd128ef96503e9480b73f7a6bbb143a (commit)
      from  01d8f6f70570b26a460a248b190fe6d4bc2b0a40 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 x2go/rforward.py |   35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/x2go/rforward.py b/x2go/rforward.py
index 2f365fc..ed4d495 100644
--- a/x2go/rforward.py
+++ b/x2go/rforward.py
@@ -125,11 +125,24 @@ class X2goRevFwTunnel(threading.Thread):
         self._accept_channels = True
 
     def __del__(self):
+        """\
+        Class destructor.
+
+        """
         self.stop_thread()
         self.cancel_port_forward('', self.server_port)
 
     def cancel_port_forward(self, address, port):
+        """\
+        Cancel a port forwarding request. This cancellation request is sent to the server and
+        on the server the port forwarding should be unregistered.
 
+        @param address: remote server address
+        @type address: C{str}
+        @param port: remote port
+        @type port: C{int}
+
+        """
         timeout = Timeout(10)
         timeout.start()
         try:
@@ -141,9 +154,9 @@ class X2goRevFwTunnel(threading.Thread):
 
     def pause(self):
         """\
-        Prevent acceptance of new incoming connections through the Paramiko/SSH 
-        reverse forwarding tunnel. Also, any active connection on this L{X2goRevFwTunnel} 
-        instance is closed immediately, if this method is called.
+        Prevent acceptance of new incoming connections through the Paramiko/SSH
+        reverse forwarding tunnel. Also, any active connection on this L{X2goRevFwTunnel}
+        instance will be closed immediately, if this method is called.
 
         """
         if self._accept_channels == True:
@@ -272,6 +285,18 @@ def x2go_rev_forward_channel_handler(chan=None, addr='', port=0, parent_thread=N
         tunneled SSH connections associated to this L{X2goRevFwTunnel} instance
         from within a Python X2go application.
 
+    @param chan: channel
+    @type chan: C{class}
+    @param addr: bind address
+    @type addr: C{str}
+    @param port: bind port
+    @type port: C{int}
+    @param parent_thread: the calling L{X2goRevFwTunnel} instance
+    @type parent_thread: L{X2goRevFwTunnel} instance
+    @param logger: you can pass an L{X2goLogger} object to the
+        L{X2goRevFwTunnel} constructor
+    @type logger: L{X2goLogger} instance
+
     """
     fw_socket = socket.socket()
     if logger is None:
@@ -314,11 +339,13 @@ class X2goRevFwChannelThread(threading.Thread):
     """
     def __init__(self, channel, remote=None, **kwargs):
         """\
+        Initializes a reverse forwarding channel thread.
+
         @param channel: incoming Paramiko/SSH channel from the L{X2goSession}'s transport
             accept queue
         @type channel: class
         @param remote: tuple (addr, port) that specifies the data endpoint of the channel
-        @type remote: (str, int)
+        @type remote: C{tuple(str, int)}
 
         """
         self.channel = channel


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).




More information about the x2go-commits mailing list