Changeset 138

Timestamp:

09/18/04 20:37:57 (4 years ago)

Author:

jajcus

Message:

- fixed support for multiple servers (round-robin and failover)
- allow binding to a configured address and port before connecting to a server
(both improvements by Petr Mensik)

Files:

• trunk/jjigw.dtd (modified) (1 diff)
• trunk/jjigw/config.py (modified) (3 diffs)
• trunk/jjigw/ircsession.py (modified) (4 diffs)

trunk/jjigw.dtd

@@ -23 +23 @@
-<!ELEMENT server        (#PCDATA) >
-<!ATTLIST server 
-
+
+
+
-<!ELEMENT channel       (#PCDATA) >
-<!ATTLIST channel 

trunk/jjigw/config.py

@@ -47 +47 @@
-            print >>sys.stderr,"Bad port value: %r, using default: 6667" % (self.port,)
-            self.port=6667
+        self.bindport=node.prop("bindport")
+        if not self.bindport:
+            self.bindport=0
+        self.bind=node.prop("bind")
-    def __repr__(self):
-        return "<ServerConfig %s:%s/>" % (self.host,self.port)
@@ -54 +58 @@
-        self.name=node.getContent()
-        self.encoding=node.prop("encoding")
+        self.description=node.prop("description")
+        self.browseable=node.prop("browseable")
-
-class NetworkConfig:
@@ -76 +82 @@
-    def get_servers(self):
-        r=self.servers
-1:
+:-1
-        return r
-    def get_channel_config(self,channel):

trunk/jjigw/ircsession.py

@@ -224 +224 @@
-                    try:
-                        self.socket.close()
-
+
+
-                        pass
-                    self.socket=None
-
+
+
-            finally:
-                self.lock.release()
@@ -252 +254 @@
-            self.socket.close()
-            self.socket=None
+        self.exited = 0
-        server=self.servers_left.pop(0)
-        self.__logger.debug("Trying to connect to %r" % (server,))
@@ -258 +261 @@
-        try:
-            self.socket=socket.socket(socket.AF_INET,socket.SOCK_STREAM)
+            if server.bind:
+                self.__logger.debug("Binding local socket to: %s:%d" 
+                        % (server.bind, server.bindport))
+                self.socket.bind((server.bind, server.bindport))
+                if not self.socket:
+                    self.__logger.debug("Error binding interface")
-            self.socket.connect((server.host,server.port))
-        except (IOError,OSError,socket.error),err:
@@ -275 +284 @@
-        if self.raw_channel:
-            self.pass_message_to_raw_channel("Connected.")
+        self.__logger.debug("Connected.")
-        self._send("NICK %s" % (self.nick,))
-        user=md5.new(self.jid.bare().as_string()).hexdigest()[:64]