- Update: the generate-doc.bat to use python 2.6 directory and update the epydoc.cfg

- Fix: do not try to reconnect when no password provided
- Codechange: add separate functions for unpacking/packing packet headers

Author: yorickvanpelt

generate-doc.bat

@@ -1,2 +1,2 @@
-c:\Python25\Scripts\epydoc.py -v --config web/api/epydoc.cfg
+c:\Python26\Scripts\epydoc.py -v --config web/api/epydoc.cfg
 @pause

ottd-client.py

@@ -501,6 +501,7 @@ def joinGame(self):
                     else:
                         LOG.info("server is password protected, but no pass provided, exiting!")
                         self.runCond=False
+                        self.reconnectCond = False
                 elif type == const.NETWORK_COMPANY_PASSWORD:
                     #if self.password != '':
                     #salted_password=""*32

ottd_lib.py

@@ -443,9 +443,12 @@ def packetTest(self):
 
         self.sendMsg_TCP(PACKET_CLIENT_JOIN, payload)
 
-        
+    def createPacketHeader(self, command, payload):
+        return struct.pack(self.header_format, self.header_size + len(payload), command)
+    def parsePacketHeader(self, header):
+        return struct.unpack(self.header_format, header[:self.header_size])
     def sendMsg(self, type, command, payload = ""):
-        header = struct.pack(self.header_format, self.header_size + len(payload), command)
+        header = self.createPacketHeader(command, payload)
         return self.sendRaw(header + payload, type)
     def sendMsg_TCP(self, *args, **kwargs):
         return self.sendMsg(M_TCP, *args, **kwargs)
@@ -464,8 +467,8 @@ def receiveMsg_UDP(self, datapacket = False):
                 return None
             data = self.socket_udp.recv(4096)
             #print data
-            [size, command], osize = unpackFromExt(self.header_format, data, 0)
-            LOG.debug("received size: %d/%d, command: %d"% (size, osize, command))
+            size, command = self.parsePacketHeader(data)
+            LOG.debug("received size: %d, command: %d"% (size, command))
             content = data[self.header_size:]
             if datapacket:
                 return DataPacket(size, command, content)
@@ -488,8 +491,8 @@ def receiveMsg_TCP(self, datapacket = False):
         if readcounter > 1:
             note += "HEADER SEGMENTED INTO %s SEGMENTS!" % readcounter
 
-        (size, command) = struct.unpack(self.header_format, data)
-        if not command in [PACKET_SERVER_FRAME, PACKET_SERVER_SYNC]:
+        size, command = self.parsePacketHeader(data)
+        if not command in (PACKET_SERVER_FRAME, PACKET_SERVER_SYNC):
             if command in packet_names:
                 LOG.debug("received size: %d, command: %s (%d)"% (size, packet_names[command], command))
             else:

web/api/epydoc.cfg

@@ -7,9 +7,9 @@ url: http://openttd-python.googlecode.com
 # The list of modules to document.  Modules can be named using
 # dotted names, module filenames, or package directory names.
 # This option may be repeated.
-modules: ottd_lib, ottd_client_event, irc_lib, log, ottd_config, ottd_constants, ottd_grfs, sstruct, struct_zerostrings,webserver, plugins
+modules: ottd_lib, ottd_client_event, irc_lib, log, ottd_config, ottd_constants, ottd_grfs, sstruct, struct_zerostrings,webserver, plugins, ottd_savegame, lib.ottdbot
 
-# Write html output to the directory "apidocs"
+# Write html output to the directory "web/api"
 output: html
 target: web/api