Leahnaya/dwc_network_server_emulator
1
0
Fork 0
mirror of https://github.com/barronwaffles/dwc_network_server_emulator.git synced 2026-08-25 03:55:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

leseratte's patches

Browse Source 
Fixes various typos and errors and also fixes a bug in
perform_otherslist.
This commit is contained in:
polaris
2014-04-14 06:57:10 -04:00
parent 3e0136f5be
commit e14e986a50
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gamespy_player_search_server.py
View File

@@ -47,7 +47,7 @@ class PlayerSearch(LineReceiver):
self.setRawMode()
self.db = gs_database.GamespyDatabase()
self,address = address
self.address = address
self.leftover = ""
def connectionMade(self):
@@ -57,7 +57,7 @@ class PlayerSearch(LineReceiver):
pass
def rawDataReceived(self, data):
self.log(logging.DEBUG, "SEARCH RESPONSE: %s" % data)
logger.log(logging.DEBUG, "SEARCH RESPONSE: %s" % data)
data = self.leftover + data
commands, self.leftover = gs_query.parse_gamespy_message(data)
@@ -68,7 +68,7 @@ class PlayerSearch(LineReceiver):
if data_parsed['__cmd__'] == "otherslist":
self.perform_otherslist(data_parsed)
else:
self.log(logging.DEBUG, "Found unknown search command, don't know how to handle '%s'." % data_parsed['__cmd__'])
logger.log(logging.DEBUG, "Found unknown search command, don't know how to handle '%s'." % data_parsed['__cmd__'])
def perform_otherslist(self, data_parsed):
# Reference: http://wiki.tockdom.com/wiki/MKWii_Network_Protocol/Server/gpsp.gs.nintendowifi.net
@@ -82,18 +82,20 @@ class PlayerSearch(LineReceiver):
if "numopids" in data_parsed and "opids" in data_parsed:
numopids = int(data_parsed['numopids'])
opids = data_parsed['opids'].split('|')
if len(opids) != numopids:
self.log(logging.ERROR, "Unexpected number of opids, got %d, expected %d." % (len(opids), numopids))
if (len(opids) != numopids) and (not int(opids[0]) == 0):
logger.log(logging.ERROR, "Unexpected number of opids, got %d, expected %d." % (len(opids), numopids))
# Return all uniquenicks despite any unexpected/missing opids
for opid in opids:
profile = self.db.get_profile_from_profileid(opid)
msg_d.append(('o', opid))
if profile != None:
msg_d.append(('o', opid))
msg_d.append(('uniquenick', profile['uniquenick']))
else:
msg_d.append(('uniquenick', ''))
msg_d.append(('oldone', ""))
msg = gs_query.create_gamespy_message(msg_d)
@@ -101,4 +103,5 @@ class PlayerSearch(LineReceiver):
if __name__ == "__main__":
gsps = GameSpyPlayerSearchServer()
gsps.start()
gsps.start()