-# Copyright 2005 James Bunton <james@delx.cjb.net>
+# Copyright 2005-2006 James Bunton <james@delx.cjb.net>
# Licensed for distribution under the GPL version 2, check COPYING for details
-from tlib.throttle import Throttler
-from tlib.xmlw import Element
+from throttle import Throttler
from twisted.internet import protocol
+from twisted.words.xish.domish import Element
import disco
import lang
self.filesize = filesize
if not checkSizeOk(self.filesize):
LogEvent(INFO, session.jabberID, "File too large.")
- session.legacycon.sendMessage(to, "", lang.get(session.lang).msnFtSizeRejected % (self.filename, config.ftSizeLimit, config.website), True)
+ text = lang.get(session.lang).msnFtSizeRejected % (self.filename, config.ftSizeLimit, config.website)
+ session.legacycon.sendMessage(to, "", text, True)
+ session.sendMessage(to=session.jabberID, fro=to, body=text)
self.reject()
return
if not checkSizeOk(legacyftp.filesize):
LogEvent(INFO, session.jabberID, "File too large.")
legacyftp.reject()
- session.legacycon.sendMessage(senderJID, "", lang.get(session.lang).msnFtSizeRejected % (legacyftp.filename, config.ftSizeLimit, config.website), False)
+ text = lang.get(session.lang).msnFtSizeRejected % (legacyftp.filename, config.ftSizeLimit, config.website)
+ session.legacycon.sendMessage(senderJID, "", text, False)
+ session.sendMessage(to=session.jabberID, fro=senderJID, body=text)
return
self.session = session
self.toJID = self.session.jabberID + "/" + self.session.highestResource()
# SOCKS5
-from tlib import socks5
+import socks5
import struct
class JEP65ConnectionSend(protocol.Protocol):
-# TODO, clean up and move this to tlib.socks5
+# TODO, clean up and move this to socks5
STATE_INITIAL = 1
STATE_WAIT_AUTHOK = 2
STATE_WAIT_CONNECTOK = 3
def connectionLost(self, reason):
if self.state == self.STATE_READY:
self.factory.consumer.close()
+ else:
+ self.factory.consumer.error()
def _waitAuthOk(self):
ver, method = struct.unpack("!BB", self.buf[:2])