Data received after the connection has been cleaned up is now ignored (instead of...

[pymsnt] / src / tlib / msn / msn.py

diff --git a/src/tlib/msn/msn.py b/src/tlib/msn/msn.py
index 3ac0d2dbaf31294fdc848be18fe8b2b35bccbaf7..373c5511e6021c359c675e0f992dccb1e7be3c16 100644 (file)
--- a/src/tlib/msn/msn.py
+++ b/src/tlib/msn/msn.py
@@ -786,11 +786,12 @@ class MSNEventBase(LineReceiver):
         raise NotImplementedError
 
     def sendLine(self, line):
-        if LINEDEBUG: log.msg(">> " + line)
+        if LINEDEBUG: log.msg("<< " + line)
         LineReceiver.sendLine(self, line)
 
     def lineReceived(self, line):
-        if LINEDEBUG: log.msg("<< " + line)
+        if LINEDEBUG: log.msg(">> " + line)
+        if not self.connected: return
         if self.currentMessage:
             self.currentMessage.readPos += len(line+"\r\n")
             try:
@@ -827,6 +828,7 @@ class MSNEventBase(LineReceiver):
             self.handle_UNKNOWN(cmd, params.split(' '))
 
     def rawDataReceived(self, data):
+        if not self.connected: return
         extra = ""
         self.currentMessage.readPos += len(data)
         diff = self.currentMessage.readPos - self.currentMessage.length
@@ -3020,10 +3022,12 @@ class SLPLink_AvatarReceive(SLPLink_Receive):
                 "AppID"    : 1,\
                 "Context"  : context}
         self.sendSLPMessage("INVITE", "application/x-msnmsgr-sessionreqbody", data)
+        self.handlePacket = self.wait_dataprep
 
     def handleSLPMessage(self, slpMessage):
         if slpMessage.status == "200":
-            self.handlePacket = self.wait_dataprep
+            pass
+            #self.handlePacket = self.wait_dataprep # Moved upwards
         else:
             if MSNP2PDEBUG: log.msg("SLPLink is over due to error or BYE")
             self.killLink()