Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes endian issue with master server code. 

We always want the structure packed to be 'network byte order' (big-endian).

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5728 4a71c877-e1ca-e34f-864e-861f7616d084
master
Buginator 2008-08-01 18:11:00 +00:00
parent 2c20b8e0e7
commit 2df15ab5c6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/masterserver/wzmasterserver.py
View File

@ -16,6 +16,7 @@
# MasterServer v0.1 by Gerard Krol (gerard_) and Tim Perrei (Kamaze)
# v1.0 by Freddie Witherden (EvilGuru)
# v2.0 by Gerhard Schaden (gschaden)
# v2.0a by Buginator (fixed endian issue)
# --------------------------------------------------------------------------
#
################################################################################
@ -26,8 +27,8 @@ from __future__ import with_statement
################################################################################
#
__author__ = "Gerard Krol, Tim Perrei, Freddie Witherden, Gerhard Schaden, Dennis Schridde"
__version__ = "2.0"
__author__ = "Gerard Krol, Tim Perrei, Freddie Witherden, Gerhard Schaden, Dennis Schridde, Buginator"
__version__ = "2.0a"
__bpydoc__ = """\
This script runs a Warzone 2100 2.x masterserver
"""
@ -118,6 +119,8 @@ class GameDB:
#
################################################################################
# Game class
# NOTE: This must match exactly what we have defined for GAMESTRUCT in netplay.h
# The structure MUST be packed network byte order !
class Game:
""" class for a single game """
@ -148,7 +151,7 @@ class Game:
def getData(self):
""" use local variables and build a c-structure, for sending to the clients"""
return struct.pack("64sII16sIIIIII",
return struct.pack("!64sII16sIIIIII",
self.description.ljust(64, "\x00"),
self.size, self.flags,
self.host.ljust(16, "\x00"),