traipse_dev: orpg/networking/mplay

comparison orpg/networking/mplay_client.py @ 119:9314d63c0941 alpha

Traipse Alpha 'OpenRPG' {091029-00} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc's main goal is to offer more advanced features and enhance the productivity of the user. Update Summary: Adds Bookmarks (Alpha) with cool Smiley Star and Plus Symbol images! Changes made to the map for increased portability. SnowDog has changes planned in Core, though. Added an initial push to the BCG. Not much to see, just shows off how it is re-writing Main code. Fix to remote admin commands Minor fix to texted based server, works in /System/ folder Some Core changes to gametree to correctly disply Pretty Print, thanks David! Fix to Splitter Nodes not being created. Added images to Plugin Control panel for Autostart feature Fix to massive amounts of images loading; from Core fix to gsclient so with_statement imports Added 'boot' command to remote admin Prep work in Pass tool for remote admin rankings and different passwords, ei, Server, Admin, Moderator, etc. Remote Admin Commands more organized, more prep work. Added Confirmation window for sent nodes. Minor changes to allow for portability to an OpenSUSE linux OS (hopefully without breaking) {091028} 00: Made changes to gametree to start working with Element Tree, mostly from Core Minor changes to Map to start working with Element Tree, from Core Preliminary changes to map efficiency, from FlexiRPG Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG Changes to main.py to start working with Element Tree {091029} 00: Changes made to server to start working with Element Tree. Changes made to Meta Server Lib. Prepping test work for a multi meta network page. Minor bug fixed with mini to gametree Zoom Mouse plugin added. Known Issue: Disconnecting causes an server side error. XML data is not being passed correctly.

author	sirebral
date	Thu, 29 Oct 2009 20:35:28 -0500
parents	217fb049bd00
children	36919b8a3ef9

comparison

equal deleted inserted replaced

-:217fb049bd00
+:9314d63c0941
 import os
 import time
 from orpg.orpgCore import component
 from orpg.orpg_xml import xml
-from xml.etree.ElementTree import ElementTree, Element
+from xml.etree.ElementTree import ElementTree, Element, iselement
 from xml.etree.ElementTree import fromstring, tostring
+from xml.parsers.expat import ExpatError
 try:
 import bz2
 cmpBZ2 = True
 except: cmpBZ2 = False
 # Wait to be told it's okay to start running
 self.startedEvent.wait()
 # Loop as long as we have a connection
 while( self.get_status() == MPLAY_CONNECTED ):
-try: readMsg = self.outbox.get( block=1 )
+try: readMsg = self.outbox.get(block=1)
 except Exception, text:
 self.log_msg( ("outbox.get() got an exception:  ", text) )
 # If we are here, it's because we have data to send, no doubt!
 if self.status == MPLAY_CONNECTED:
 self.inbox.put( readMsg )
 self.update_idle_time() #update the last message time
 if bytes == 0:
 self.log_msg( "Remote has disconnected!" )
 self.set_status( MPLAY_DISCONNECTING )
-self.outbox.put( "" )    # Make sure the other thread is woken up!
+self.outbox.put("")    # Make sure the other thread is woken up!
 self.sendThreadExitEvent.set()
 self.log_msg( "recvThread has terminated..." )
 def sendMsg( self, sock, msg ):
 """Very simple function that will properly encode and send a message to te
 slice = buffer(mpacket, offset, len(mpacket)-offset)
 sent = sock.send(slice)
 offset += sent
 sentm = offset
 else:
-# Calculate our message length
+length = len(msg) # Calculate our message length
-length = len(msg)
+lp = pack('!i', length) # Encode the message length into network byte order
-# Encode the message length into network byte order
-lp = pack('!i', length)
 try:
-# Send the encoded length
+sentl = sock.send( lp ) # Send the encoded length
-sentl = sock.send( lp )
 # Now, send the message the the length was describing
 sentm = sock.send( msg )
 if self.isServer(): self.log_msg(("data_sent", sentl+sentm))
 except socket.error, e: self.log_msg( e )
 except Exception, e: self.log_msg( e )
 except socket.error, e:
 self.log_msg( e )
 data = ""
 return data
-def recvMsg( self, sock ):
+def recvMsg(self, sock):
-"""This method now expects to receive a message having a 4-byte prefix length.  It will ONLY read
+"""This method now expects to receive a message having a 4-byte prefix length.  It will ONLY read completed messages.  In the event that the remote's connection is terminated, it will throw an exception which should allow for the caller to more gracefully handle this exception event.
-completed messages.  In the event that the remote's connection is terminated, it will throw an
-exception which should allow for the caller to more gracefully handle this exception event.
+Because we use strictly reading ONLY based on the length that is told to use, we no longer have to worry about partially adjusting for fragmented buffers starting somewhere within a buffer that we've read.  Rather, it will get ONLY a whole message and nothing more.  Everything else will remain buffered with the OS until we attempt to read the next complete message."""
-Because we use strictly reading ONLY based on the length that is told to use, we no longer have to
-worry about partially adjusting for fragmented buffers starting somewhere within a buffer that we've
-read.  Rather, it will get ONLY a whole message and nothing more.  Everything else will remain buffered
-with the OS until we attempt to read the next complete message."""
 msgData = ""
 try:
 lenData = self.recvData( sock, MPLAY_LENSIZE )
-# Now, convert to a usable form
+(length,) = unpack('!i', lenData) # Now, convert to a usable form
-(length,) = unpack('!i', lenData)
+msgData = self.recvData( sock, length ) # Read exactly the remaining amount of data
-# Read exactly the remaining amount of data
-msgData = self.recvData( sock, length )
 if self.isServer():
 self.log_msg(("data_recv", length+4))
-# Make the peer IP address available for reference later
+if self.remote_ip is None: # Make the peer IP address available for reference later
-if self.remote_ip is None:
 self.remote_ip = self.sock.getpeername()
 except IOError, e: self.log_msg( e )
 except Exception, e: self.log_msg( e )
 return msgData
 def initialize_threads(self):
 "Starts up our threads (2) and waits for them to make sure they are running!"
 self.status = MPLAY_CONNECTED
 self.sock.setblocking(1)
 # Confirm that our threads have started
-thread.start_new_thread( self.sendThread,(0,) )
+thread.start_new_thread( self.sendThread,(0,))
-thread.start_new_thread( self.recvThread,(0,) )
+thread.start_new_thread( self.recvThread,(0,))
 self.startedEvent.set()
 def disconnect(self):
 self.set_status(MPLAY_DISCONNECTING)
 self.log_msg("client stub " + self.ip +" disconnecting...")
 self.log_msg("closing sockets...")
-try: self.sock.shutdown( 2 )
+try: self.sock.shutdown(2)
 except Exception, e:
 print "Caught exception:  " + str(e)
 print
 print "Continuing"
 self.set_status(MPLAY_DISCONNECTED)
 print e
 """
 The IP field should really be deprecated as too many systems are NAT'd and/or behind firewalls for a
 client provided IP address to have much value.  As such, we now label it as deprecated.
 """
-def toxml(self,action):
+def toxml(self, action):
-"""
 el = Element('player')
 el.set('name', myescape(self.name))
 el.set('action', action)
 el.set('id', self.id)
 el.set('group_id', self.group_id)
 el.set('status', self.text_status)
 el.set('version', self.version)
 el.set('protocol_version', self.protocol_version)
 el.set('client_string', self.client_string)
 el.set('useCompression', str(self.useCompression))
 cmpType = 'None'
 if cmpBZ2 and (self.compressionType == 'Undefined' or self.compressionType == bz2):
 cmpType = 'bz2'
 elif cmpZLIB and (self.compressionType == 'Undefined' or self.compressionType == zlib):
 cmpType = 'zlib'
 el.set('cmpType', cmpType)
-return el
+return tostring(el)
-"""
-xml_data = '<player name="' + myescape(self.name) + '"'
-xml_data += ' action="' + action + '" id="' + self.id + '"'
-xml_data += ' group_id="' + self.group_id + '" ip="' + self.ip + '"'
-xml_data += ' status="' + self.text_status + '"'
-xml_data += ' version="' + self.version + '"'
-xml_data += ' protocol_version="' + self.protocol_version + '"'
-xml_data += ' client_string="' + self.client_string + '"'
-xml_data += ' useCompression="' + str(self.useCompression) + '"'
-if cmpBZ2 and (self.compressionType == 'Undefined' or self.compressionType == bz2):
-xml_data += ' cmpType="bz2"'
-elif cmpZLIB and (self.compressionType == 'Undefined' or self.compressionType == zlib):
-xml_data += ' cmpType="zlib"'
-else: xml_data += ' cmpType="None"'
-xml_data += ' />'
-return xml_data
 def log_msg(self,msg):
 if self.log_console:
 self.log_console(msg)
 return status
 def my_role(self):
 #Leaving this for testing.
 return self.role
-"""
-if self.role == "GM":
-return self.ROLE_GM
-elif self.role == "Player":
-return self.ROLE_PLAYER
-elif self.role == "Lurker":
-return self.ROLE_LURKER
-return -1
-"""
 def set_status(self,status):
 self.statLock.acquire()
 self.status = status
 self.statLock.release()
 self.ignore_id.remove(m)
 self.ignore_name.remove(name)
 return (0,id,name)
 self.ignore_name.append(self.players[id][0])
 self.ignore_id.append(self.players[id][2])
-return (1,self.players[id][2],self.players[id][0])
+return (1, self.players[id][2], self.players[id][0])
 def boot_player(self,id,boot_pwd = ""):
-#self.send(BOOT_MSG,id)
+el = Element('boot')
-msg = '<boot boot_pwd="' + boot_pwd + '"/>'
+el.set('boot_pwd', boot_pwd)
-self.send(msg,id)
+self.send(tostring(el), id)
 #---------------------------------------------------------
 # [START] Snowdog Password/Room Name altering code 12/02
 #---------------------------------------------------------
-def set_room_pass(self,npwd,pwd=""):
+def set_room_pass(self, npwd, pwd=""):
-recycle_bin = "<alter key=\"pwd\" "
+el = Element('alter')
-recycle_bin += "val=\"" +npwd+ "\" bpw=\"" + pwd + "\" "
+el.set('key', 'pwd')
-recycle_bin += "plr=\"" + self.id +"\" gid=\"" + self.group_id + "\" />"
+el.set('val', npwd)
-self.outbox.put(recycle_bin); del recycle_bin #makes line easier to read. --TaS
+el.set('bpw', pwd)
+el.set('plr', self.id)
+el.set('gid', self.group_id)
+self.outbox.put(tostring(el))
 self.update()
-def set_room_name(self,name,pwd=""):
+def set_room_name(self, name, pwd=""):
 loc = name.find("&")
 oldloc=0
 while loc > -1:
 loc = name.find("&",oldloc)
 if loc > -1:
 if loc > -1:
 b = name[:loc]
 e = name[loc+1:]
 name = b + "&#39;" + e
 oldloc = loc+1
-recycle_bin = "<alter key=\"name\" "
+el = Element('alter')
-recycle_bin += "val=\"" + name + "\" bpw=\"" + pwd + "\" "
+el.set('key', 'pwd')
-recycle_bin += "plr=\"" + self.id +"\" gid=\"" + self.group_id + "\" />"
+el.set('val', npwd)
-self.outbox.put(recycle_bin); del recycle_bin #makes line easier to read. --TaS
+el.set('bpw', pwd)
+el.set('plr', self.id)
+el.set('gid', self.group_id)
+self.outbox.put(tostring(el))
 self.update()
 #---------------------------------------------------------
 # [END] Snowdog Password/Room Name altering code  12/02
 #---------------------------------------------------------
 def display_roles(self):
-self.outbox.put("<role action=\"display\" player=\"" + self.id +"\" group_id=\""+self.group_id + "\" />")
+el = Element('role')
+el.set('action', 'display')
+el.set('player', self.id)
+el.set('group_id', self.group_id)
+self.outbox.put(tostring(el))
 def get_role(self):
-self.outbox.put("<role action=\"get\" player=\"" + self.id +"\" group_id=\""+self.group_id + "\" />")
+el = Element('role')
+el.set('action', 'get')
-def set_role(self,player,role,pwd=""):
+el.set('player', self.id)
-recycle_bin = "<role action=\"set\" player=\"" + player + "\" "
+el.set('group_id', self.group_id)
-recycle_bin += "role=\"" +role+ "\" boot_pwd=\"" + pwd + "\" group_id=\"" + self.group_id + "\" />"
+self.outbox.put(tostring(el))
-self.outbox.put(recycle_bin); del recycle_bin #makes line easer to read. --TaS
+def set_role(self, player, role, pwd=""):
+el = Element('role')
+el.set('action', 'set')
+el.set('player', player)
+el.set('role', role)
+el.set('boot_pwd', pwd)
+el.set('group_id', self.group_id)
+self.outbox.put(tostring(el))
 self.update()
-def send(self,msg,player="all"):
+def send(self, msg, player="all"):
 if self.status == MPLAY_CONNECTED and player != self.id:
+### Pre Alpha ###
+#el = Element('msg')
+#el.set('to', player)
+#el.set('from', self.id)
+#el.set('group_id', self.group_id)
+#el.append(fromstring(msg))
+#self.outbox.put(tostring(el))
+### Current chat is not ready for Element Tree ###
 self.outbox.put("<msg to='"+player+"' from='"+self.id+"' group_id='"+self.group_id+"' />"+msg)
 self.check_my_status()
 def send_sound(self, snd_xml):
 if self.status == MPLAY_CONNECTED:
 self.outbox.put(snd_xml)
 self.check_my_status()
-def send_create_group(self,name,pwd,boot_pwd,minversion):
+def send_create_group(self, name, pwd, boot_pwd, min_version):
-recycle_bin = "<create_group from=\""+self.id+"\" "
+el = Element('create_group')
-recycle_bin += "pwd=\""+pwd+"\" name=\""+ name+"\" boot_pwd=\""+boot_pwd+"\" "
+el.set('from', self.id)
-recycle_bin += "min_version=\"" + minversion +"\" />"
+el.set('pwd', pwd)
-self.outbox.put(recycle_bin); del recycle_bin #makes line easier to read. --TaS
+el.set('name', name)
+el.set('boot_pwd', boot_pwd)
-def send_join_group(self,group_id,pwd):
+el.set('min_version', min_version)
+self.outbox.put(tostring(el))
+def send_join_group(self, group_id, pwd):
 if (group_id != 0): self.update_role("Lurker")
-self.outbox.put("<join_group from=\""+self.id+"\" pwd=\""+pwd+"\" group_id=\""+str(group_id)+"\" />")
+el = Element('join_group')
+el.set('from', self.id)
+el.set('pwd', pwd)
+el.set('group_id', str(group_id))
+print 'send join group ', str(group_id)
+self.outbox.put(tostring(el))
 def poll(self, evt=None):
-try:
+try: msg = self.inbox.get_nowait()
-msg = self.inbox.get_nowait()
 except:
 if self.get_status() != MPLAY_CONNECTED:
 self.check_my_status()
 else:
 try: self.pretranslate(msg)
 self.add_msg_handler('role', self.on_role, True)
 self.add_msg_handler('player', self.on_player, True)
 self.add_msg_handler('password', self.on_password, True)
 self.add_msg_handler('sound', self.on_sound, True)
-def pretranslate(self,data):
+def pretranslate(self, data):
 # Pre-qualify our data.  If we don't have atleast 5-bytes, then there is
 # no way we even have a valid message!
 if len(data) < 5: return
-end = data.find(">")
+try: el = fromstring(data)
-head = data[:end+1]
+except ExpatError:
-msg = data[end+1:]
+end = data.find(">")
-xml_dom = self.xml.parseXml(head)
+head = data[:end+1]
-xml_dom = xml_dom._get_documentElement()
+msg = data[end+1:]
-tag_name = xml_dom._get_tagName()
+el = fromstring(head)
-id = xml_dom.getAttribute("from")
+try:
-if id == '': id = xml_dom.getAttribute("id")
+el1 = fromstring(msg)
-if self.msg_handlers.has_key(tag_name): self.msg_handlers[tag_name](id, data, xml_dom)
+el.append(el1)
-else:
+except ExpatError:
-#Unknown messages recived ignoring
+el.text = msg
-#using pass insted or printing an error message
+#logger.general("Bad Message: \n" + data)
-#because plugins should now be able to send and proccess messages
+id = el.get('from') or el.get('id')
-#if someone is using a plugin to send messages and this user does not
+if el.tag in self.msg_handlers: self.msg_handlers[el.tag](id, data, el)
-#have the plugin they would be getting errors
-pass
+def on_sound(self, id, data, etreeEl):
-if xml_dom: xml_dom.unlink()
-def on_sound(self, id, data, xml_dom):
 (ignore_id,ignore_name) = self.get_ignore_list()
 for m in ignore_id:
 if m == id:
 # yes we are
 print "ignoring sound from player:"
 return
 chat = self.get_chat()
-snd = xml_dom.getAttribute("url")
+chat.sound_player.play(etreeEl.get('url'), 'remote', etreeEl.get('loop'))
-loop_sound = xml_dom.getAttribute("loop")
-chat.sound_player.play(snd, "remote", loop_sound)
+def on_msg(self, id, data, etreeEl):
-def on_msg(self, id, data, xml_dom):
 end = data.find(">")
 head = data[:end+1]
 msg = data[end+1:]
-if id == "0":
+if msg[-6:] == '</msg>': msg = msg[:-6]
-self.on_receive(msg,None)      #  None get's interpreted in on_receive as the sys admin.
+if id == "0": self.on_receive(msg, None)
-#  Doing it this way makes it harder to impersonate the admin
+#  None get's interpreted in on_receive as the sys admin.
-else:
+#  Doing it this way makes it harder to impersonate the admin
-if self.is_valid_id(id): self.on_receive(msg,self.players[id])
+elif self.is_valid_id(id): self.on_receive(msg, self.players[id])
-if xml_dom: xml_dom.unlink()
+def on_ping(self, id, msg, etreeEl):
-def on_ping(self, id, msg, xml_dom):
 #a REAL ping time implementation by Snowdog 8/03
 # recieves special server <ping time="###" /> command
 # where ### is a returning time from the clients ping command
 #get current time, pull old time from object and compare them
 # the difference is the latency between server and client * 2
 ct = time.clock()
-ot = xml_dom.getAttribute("time")
+ot = etreeEl.get("time")
 latency = float(float(ct) - float(ot))
-latency = int( latency * 10000.0 )
+latency = int(latency * 10000.0)
-latency = float( latency) / 10.0
+latency = float(latency) / 10.0
 ping_msg = "Ping Results: " + str(latency) + " ms (parsed message, round trip)"
-self.on_receive(ping_msg,None)
+self.on_receive(ping_msg, None)
-if xml_dom: xml_dom.unlink()
+def on_group(self, id, msg, etreeEl):
-def on_group(self, id, msg, xml_dom):
+act = etreeEl.get("action")
-name = xml_dom.getAttribute("name")
+group_data = (id, etreeEl.get("name"), etreeEl.get("pwd"), etreeEl.get("players"))
-players = xml_dom.getAttribute("players")
+if act == 'new' or 'update':
-act = xml_dom.getAttribute("action")
-pwd = xml_dom.getAttribute("pwd")
-group_data = (id, name, pwd, players)
-if act == 'new':
 self.groups[id] = group_data
-self.on_group_event(mplay_event(GROUP_NEW, group_data))
+if act == 'update': self.on_group_event(mplay_event(GROUP_UPDATE, group_data))
+elif act == 'new': self.on_group_event(mplay_event(GROUP_NEW, group_data))
 elif act == 'del':
 del self.groups[id]
 self.on_group_event(mplay_event(GROUP_DEL, group_data))
-elif act == 'update':
-self.groups[id] = group_data
+def on_role(self, id, msg, etreeEl):
-self.on_group_event(mplay_event(GROUP_UPDATE, group_data))
+act = etreeEl.get("action")
-if xml_dom: xml_dom.unlink()
-def on_role(self, id, msg, xml_dom):
-act = xml_dom.getAttribute("action")
-role = xml_dom.getAttribute("role")
 if (act == "set") or (act == "update"):
 try:
 (a,b,c,d,e,f,g,h) = self.players[id]
 if id == self.id:
-self.players[id] = (a,b,c,d,e,f,g,role)
+self.players[id] = (a,b,c,d,e,f,g,etreeEl.get("role"))
-self.update_role(role)
+self.update_role(etreeEl.get("role"))
-else: self.players[id] = (a,b,c,d,e,f,g,role)
+else: self.players[id] = (a,b,c,d,e,f,g,etreeEl.get("role"))
-self.on_player_event(mplay_event(PLAYER_UPDATE,self.players[id]))
+self.on_player_event(mplay_event(PLAYER_UPDATE, self.players[id]))
 except: pass
-if xml_dom: xml_dom.unlink()
+def on_player(self, id, msg, etreeEl):
-def on_player(self, id, msg, xml_dom):
+act = etreeEl.get("action")
-act = xml_dom.getAttribute("action")
+try: player = (etreeEl.get("name"), etreeEl.get("ip"), id, etreeEl.get("status"),
-ip = xml_dom.getAttribute("ip")
+etreeEl.get("version"), etreeEl.get("protocol_version"),
-name = xml_dom.getAttribute("name")
+etreeEl.get("client_string"), self.players[id][7])
-status = xml_dom.getAttribute("status")
-version = xml_dom.getAttribute("version")
-protocol_version = xml_dom.getAttribute("protocol_version")
-client_string = xml_dom.getAttribute("client_string")
-try: player = (name, ip, id, status,
-version, protocol_version,
-client_string, self.players[id][7])
 except Exception, e:
-player = (name, ip, id, status,
+player = (etreeEl.get("name"), etreeEl.get("ip"), id, etreeEl.get("status"),
-version, protocol_version,
+etreeEl.get("version"), etreeEl.get("protocol_version"),
-client_string, "Player")
+etreeEl.get("client_string"), "Player")
+print e
 if act == "new":
 self.players[id] = player
 self.on_player_event(mplay_event(PLAYER_NEW, self.players[id]))
 elif act == "group":
-self.group_id = xml_dom.getAttribute("group_id")
+self.group_id = etreeEl.get('group_id')
 self.clear_players()
 self.on_mplay_event(mplay_event(MPLAY_GROUP_CHANGE, self.groups[self.group_id]))
-self.players[self.id] = self.get_my_info() #(self.name,self.ip,self.id,self.text_status)
+self.players[self.id] = self.get_my_info()
+#(self.name,self.ip,self.id,self.text_status)
 self.on_player_event(mplay_event(PLAYER_NEW, self.players[self.id]))
 elif act == "failed":
 self.on_mplay_event(mplay_event(MPLAY_GROUP_CHANGE_F))
 elif act == "del":
-self.on_player_event(mplay_event(PLAYER_DEL,self.players[id]))
+self.on_player_event(mplay_event(PLAYER_DEL, self.players[id]))
 if self.players.has_key(id): del self.players[id]
 if id == self.id: self.do_disconnect()
 #  the next two cases handle the events that are used to let you know when others are typing
 elif act == "update":
 if id == self.id:
 self.players[id] = player
 self.update_self_from_player(player)
 else: self.players[id] = player
 dont_send = 0
 for m in self.ignore_id:
 if m == id: dont_send=1
-if dont_send != 1: self.on_player_event(mplay_event(PLAYER_UPDATE,self.players[id]))
+if dont_send != 1: self.on_player_event(mplay_event(PLAYER_UPDATE, self.players[id]))
-if xml_dom: xml_dom.unlink()
+def on_password(self, id, msg, etreeEl):
-def on_password(self, id, msg, xml_dom):
+self.on_password_signal(etreeEl.get("signal"), etreeEl.get("type"),
-signal = type = id = data = None
+etreeEl.get("id"), etreeEl.get("data"))
-id = xml_dom.getAttribute("id")
-type = xml_dom.getAttribute("type")
-signal = xml_dom.getAttribute("signal")
-data = xml_dom.getAttribute("data")
-self.on_password_signal( signal,type,id,data )
-if xml_dom:
-xml_dom.unlink()
 def check_my_status(self):
 status = self.get_status()
 if status == MPLAY_DISCONNECTING: self.do_disconnect()
 """Establish a connection to a server while still using sendThread & recvThread for its
 communication."""
 if self.is_connected():
 self.log_msg( "Client is already connected to a server?!?  Need to disconnect first." )
 return 0
-xml_dom = None
 self.inbox = Queue.Queue(0)
 self.outbox = Queue.Queue(0)
 addressport_ar = addressport.split(":")
 if len(addressport_ar) == 1:
 address = addressport_ar[0]
 self.host_server = addressport
 self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 try:
 self.sock.connect((address,port))
 # send client into with id=0
-self.sendMsg( self.sock, self.toxml("new") )
+outgoing = self.toxml('new')
-data = self.recvMsg( self.sock )
+if iselement(outgoing): outgoing = tostring(outgoing)
+self.sendMsg(self.sock, outgoing)
+data = self.recvMsg(self.sock)
 # get new id and group_id
-xml_dom = self.xml.parseXml(data)
+el = fromstring(data)
-xml_dom = xml_dom._get_documentElement()
+self.id = el.get('id')
-self.id = xml_dom.getAttribute("id")
+self.group_id = el.get('group_id')
-self.group_id = xml_dom.getAttribute("group_id")
+if el.get('useCompression') == 'True':
-if xml_dom.hasAttribute('useCompression') and xml_dom.getAttribute('useCompression') == 'True':
 self.useCompression = True
-if xml_dom.hasAttribute('cmpType'):
+if cmpBZ2 and el.get('cmpType') == 'bz2':
-if cmpBZ2 and xml_dom.getAttribute('cmpType') == 'bz2':
+self.compressionType = bz2
-self.compressionType = bz2
+elif cmpZLIB and el.get('cmpType') == 'zlib':
-elif cmpZLIB and xml_dom.getAttribute('cmpType') == 'zlib':
+self.compressionType = zlib
-self.compressionType = zlib
+else: self.compressionType = None
-else: self.compressionType = None
-else: self.compressionType = bz2
 #send confirmation
-self.sendMsg( self.sock, self.toxml("new") )
+outgoing = self.toxml('new')
+if iselement(outgoing): outgoing = tostring(outgoing)
+self.sendMsg(self.sock, outgoing)
 except Exception, e:
+print e
 self.log_msg(e)
-if xml_dom: xml_dom.unlink()
 return 0
 # Start things rollings along
 self.initialize_threads()
 self.on_mplay_event(mplay_event(MPLAY_CONNECTED))
 self.players[self.id] = (self.name, self.ip, self.id,
 self.text_status, self.version,
 self.protocol_version, self.client_string, self.role)
 self.on_player_event(mplay_event(PLAYER_NEW,self.players[self.id]))
-if xml_dom: xml_dom.unlink()
 return 1
 def start_disconnect(self):
 self.on_mplay_event(mplay_event(MPLAY_DISCONNECTING))
-self.outbox.put( self.toxml("del") )
+outgoing = self.toxml('del')
+if iselement(outgoing): outgoing = tostring(outgoing)
+self.outbox.put(outgoing)
 ## Client Side Disconect Forced -- Snowdog 10-09-2003
 #pause to allow GUI events time to sync.
 time.sleep(1)
 self.do_disconnect()

Mercurial > traipse_dev

comparison orpg/networking/mplay_client.py @ 119:9314d63c0941 alpha