Changeset 14

Timestamp:

02/01/04 19:07:42 (5 years ago)

Author:

jajcus

Message:

- error handling improvements (still a lot to do here)

Files:

• trunk/jjigw.py (modified) (17 diffs)

trunk/jjigw.py

@@ -11 +11 @@
-import string
-import random
+import signal
-
-from pyxmpp import ClientStream,JID,Iq,Presence,Message,StreamError
@@ -348 +349 @@
-            pass
-
-
+ # RPL_CHANNELMODEIS
-        for m in self.toggle_modes:
-            try:
@@ -496 +497 @@
-        self.nick=nick
-        self.thread=threading.Thread(name=u"%s on %s as %s" % (jid,config.network.jid,nick),
-
-
+
+
+
+
-        self.socket=None
-        self.lock=threading.RLock()
-        self.cond=threading.Condition(self.lock)
-        self.servers_left=self.network.get_servers()
-        self.thread.setDaemon(1)
-        self.thread.start()
-        self.input_buffer=""
-        self.used_for=[]
-        self.server=""
+        self.join_requests=[]
+        self.messages_to_channel=[]
+        self.messages_to_user=[]
-        self.ready=0
-        self.channels={}
-        self.users={}
-        self.user=IRCUser(self,nick)
+        self.thread.start()
-
-    def register_user(self,user):
@@ -562 +567 @@
-
-    def thread_run(self):
+        clean_exit=1
-        try:
-            self.thread_loop()
-        except:
+            clean_exit=0
-            self.print_exception()
-        self.lock.acquire()
-        try:
+            if not self.exited and self.socket:
+                if clean_exit and self.component.shutdown:
+                    self._send("QUIT :JJIGW shutdown")
+                elif clean_exit and self.exit:
+                    self._send("QUIT :%s" % (self.exit.encode(self.default_encoding,"replace")))
+                else:
+                    self._send("QUIT :Internal JJIGW error")
+                self.exited=1
-            if self.socket:
-                try:
@@ -580 +595 @@
-        finally:
-            self.lock.release()
+        for j in self.used_for:
+            p=Presence(fr=j,to=self.jid,type="unavailable")
+            self.component.send(p)
+        self.used_for=[]
-    
-    def thread_loop(self):
-        self.debug("thread_loop()")
-
+ and not self.component.shutdown
-            self.lock.acquire()
-            try:
@@ -598 +617 @@
-                    while self.input_buffer.find("\r\n")>-1:
-                        input,self.input_buffer=self.input_buffer.split("\r\n",1)
-
+safe_
-            finally:
-                self.lock.release()
@@ -612 +631 @@
-        if not self.servers_left:
-            self.debug("No servers left, quitting")
-1
+"No servers left, quitting"
-            return
-        if self.socket:
@@ -635 +654 @@
-        self._send("USER %s 0 * :JJIGW User %s" % (user,user))
-        self.server=server[0]
-        self.ready=1
-        self.cond.notify()
-
-    def _send(self,str):
-
-
+
+
+
+
+
-
-    def send(self,str):
@@ -649 +670 @@
-            self.lock.release()
-
+    def _safe_process_input(self,input):
+        try:
+            self._process_input(input)
+        except:
+            self.print_exception()
+    
-    def _process_input(self,input):
-        self.debug("Server message: %r" % (input,))
@@ -724 +751 @@
-        m=Message(type=typ,fr=fr,to=self.jid,body=remove_evil_characters(strip_colors(body)))
-        self.component.send(m)
+
+    def login_error(self,join_condition,message_condition):
+        self.lock.acquire()
+        try:
+            if join_condition:
+                for s in self.join_requests:
+                    p=s.make_error_response(join_condition)
+                    self.component.send(p)
+                    try:
+                        self.used_for.remove(s.get_to())
+                    except ValueError:
+                        pass
+                self.join_requests=[]
+            if message_condition:
+                for s in self.messages_to_user+self.messages_to_channel:
+                    p=s.make_error_response(message_condition)
+                    self.component.send(p)
+                self.messages_to_user=[]
+                self.messages_to_channel=[]
+            self.exit="IRC user registration failed"
+        finally:
+            self.lock.release()
+
+    def irc_cmd_001(self,prefix,command,params): # RPL_WELCOME
+        self.lock.acquire()
+        try:
+            self.debug("Connected successfully")
+            self.ready=1
+            for s in self.join_requests:
+                self.join(s)
+            for s in self.messages_to_user:
+                self.message_to_user(s)
+            for s in self.messages_to_channel:
+                self.message_to_channel(s)
+        finally:
+            self.lock.release()
+
+    def irc_cmd_431(self,prefix,command,params): # ERR_NONICKNAMEGIVEN
+        if self.ready:
+            return
+        self.login_error("undefined-condition","not-authorized")
+ 
+    def irc_cmd_432(self,prefix,command,params): # ERR_ERRONEUSNICKNAME
+        if self.ready:
+            return
+        self.login_error("bad-request","not-authorized")
+ 
+    def irc_cmd_433(self,prefix,command,params): # ERR_NICKNAMEINUSE
+        if self.ready:
+            return
+        self.login_error("conflict","not-authorized")
+ 
+    def irc_cmd_436(self,prefix,command,params): # ERR_NICKCOLLISION
+        if self.ready:
+            return
+        self.login_error("conflict","not-authorized")
+ 
+    def irc_cmd_437(self,prefix,command,params): # ERR_UNAVAILRESOURCE
+        if self.ready:
+            return
+        self.login_error("resource-constraint","not-authorized")
+ 
+    def irc_cmd_437(self,prefix,command,params): # ERR_RESTRICTED
+        if self.ready:
+            return
+        pass
- 
-    def irc_cmd_QUIT(self,prefix,command,params):
@@ -730 +823 @@
-        self.unregister_user(user)
-
-
+ # RPL_WHOREPLY
-        self.debug("WHO reply received")
-        if len(params)<7:
@@ -766 +859 @@
-
-    def join(self,stanza):
+        self.cond.acquire()
+        try:
+            if not self.ready:
+                self.join_requests.append(stanza)
+                return
+        finally:
+            self.cond.release()
-        to=stanza.get_to()
-        channel=node_to_channel(to.node,self.default_encoding)
-        if self.channels.has_key(normalize(channel)):
-            return
-        self.cond.acquire()
-        try:
-            # FIXME: may hang the main thread
-            while not self.ready and not self.exit:
-                self.cond.wait()
-        finally:
-            self.cond.release()
-        if self.exit:
-            return
-        channel=Channel(self,channel)
-        channel.join(stanza)
@@ -784 +875 @@
-
-    def message_to_channel(self,stanza):
-
-
+
+
+
+
+
+
+
-        channel=stanza.get_to().node
-        channel=node_to_channel(channel,self.default_encoding)
@@ -801 +897 @@
-
-    def message_to_user(self,stanza):
-
-
+
+
+
+
+
+
+
-        to=stanza.get_to()
-        if to.resource and (to.node[0] in "#+!" or to.node.startswith(",amp,")):
@@ -827 +928 @@
-            reason="Unknown reason"
-        self.send("QUIT :%s" % (reason,))
-
+
+
-
-    def debug(self,msg):
@@ -840 +942 @@
-                config.connect.secret,config.connect.host,config.connect.port,
-                category="gateway",type="irc")
-
+
+
+
-        self.irc_sessions={}
-        self.config=config
+
+    def signal_handler(self,signum,frame):
+        self.debug("Signal %i received, shutting down..." % (signum,))
+        self.shutdown=1
+
+    def run(self,timeout):
+        self.connect()
+        while (not self.shutdown and self.stream 
+                and not self.stream.eof and self.stream.socket is not None):
+            self.stream.loop_iter(timeout)
+        if self.shutdown:
+            for sess in self.irc_sessions.values():
+                sess.disconnect("JJIGW shutdown")
+        threads=threading.enumerate()
+        for th in threads:
+            try:
+                th.join(10*timeout)
+            except:
+                pass
+        for th in threads:
+            try:
+                th.join(timeout)
+            except:
+                pass
+        self.disconnect()
+        self.debug("Exitting normally")
-
-    def send(self,stanza):
@@ -1040 +1170 @@
-c=Component(config)
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-# vi: sw=4 ts=8 sts=4