Still not working. *sigh*

git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@19 55fbd22a-6204-0410-b2f0-b6c764c7e90a

committer: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>

diff --git a/src/ft.py b/src/ft.py
index 6cc6bade3e0051defb93560fbbb0de21e9788840..b77382413174fbff6cc09615706910f883fa2bb6 100644 (file)
--- a/src/ft.py
+++ b/src/ft.py
@@ -69,11 +69,7 @@ class FTReceive:
                LogEvent(ERROR)
 
        def messageOobMode(self):
-               d = self.legacyftp.accept()
-               d.addCallback(messageOobModeCB)
-               d.addErrback(self.error)
-
-               def messageOobModeCB():
+               def messageOobModeCB(ignored=None):
                        global oobSite
                        filename = str(random.randint(0, sys.maxint))
                        oobSite.resource.putFile(self, filename)
@@ -85,10 +81,15 @@ class FTReceive:
                        x.attributes["xmlns"] = disco.XOOB
                        x.addElement("url").addContent(config.ftOOBRoot + "/" + filename)
                        self.session.pytrans.send(m)
+
+               d = self.legacyftp.accept()
+               d.addCallback(messageOobModeCB)
+               d.addErrback(self.error)
+
        
-       def error(self):
-               #FIXME
-               pass
+       def error(self, ignored=None):
+               # FIXME
+               LogEvent(WARN)
                
 
 

diff --git a/src/tlib/msnft.py b/src/tlib/msnft.py
index 74422d6f4aebd888bbd642bba57304027be7596b..ebcde183077ccd86cf00820927dd6a7b542a1fc6 100644 (file)
--- a/src/tlib/msnft.py
+++ b/src/tlib/msnft.py
@@ -15,7 +15,6 @@ import config
 import random
 
 MAXAUTHCOOKIE = 2**32-1
-MAXAUTHCOOKIE = 1000
 
 
 class MSNFTReceive_Base:
@@ -149,6 +148,7 @@ class MSNFTP_Receive(ClientFactory, MSNFTReceive_Base):
                        self.d = Deferred()
                        self.serverSocket = reactor.listenTCP(self.port, self)
                        self.timeout = reactor.callLater(20, self.gotError)
+                       return self.d
        
        def buildProtocol(self, addr):
                LogEvent(INFO, self.switchboard.userHandle)
@@ -156,7 +156,7 @@ class MSNFTP_Receive(ClientFactory, MSNFTReceive_Base):
                self.serverSocket = None
                self.timeout.cancel()
                self.timeout = None
-               self.d.callback()
+               self.d.callback(None)
                self.d = None
                return MSNFTP_FileReceive(self.authCookie, self.switchboard.userHandle, self)