X-Git-Url: https://git.ucc.asn.au/?p=progcomp2013.git;a=blobdiff_plain;f=qchess%2Fsrc%2Fnetwork.py;h=a1ab013f50a3dce6f8c4b46ed6ad5aeac9a2acc3;hp=75df117ccb60723c6f92c1f499082c39eeb617ac;hb=f7cca7e99d39a6b04b605e988d182a9b8a9e4be3;hpb=32068c190bbd18ad0285f1eba0996719941b88a3 diff --git a/qchess/src/network.py b/qchess/src/network.py index 75df117..a1ab013 100644 --- a/qchess/src/network.py +++ b/qchess/src/network.py @@ -4,38 +4,98 @@ import select network_timeout_start = -1.0 # Timeout in seconds to wait for the start of a message network_timeout_delay = 1.0 # Maximum time between two characters being received -class Network(): - def __init__(self, colour, address = None): +class Network(Player): + def __init__(self, colour, address = (None,4562), baseplayer = None): + + if baseplayer != None: + name = baseplayer.name + " --> @network" + else: + name = "<-- @network" + + + + Player.__init__(self, name, colour) + debug("Colour is " + str(self.colour)) + self.socket = socket.socket() + self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + self.baseplayer = baseplayer #self.socket.setblocking(0) + + self.address = address + self.server = (address[0] == None) - if colour == "white": - self.port = 4562 - else: - self.port = 4563 - - self.src = None - - # print str(self) + " listens on port " + str(self.port) - - if address == None: - self.host = socket.gethostname() - self.socket.bind((self.host, self.port)) + if self.colour == "black": + self.address = (self.address[0], self.address[1] + 1) + + debug(str(self) + ":"+str(self.address)) + + self.board = None + + + def connect(self): + if self.address[0] == None: + self.host = "0.0.0.0" #socket.gethostname() # Breaks things??? + self.socket.bind((self.host, self.address[1])) self.socket.listen(5) - self.src, self.address = self.socket.accept() + self.src, self.actual_address = self.socket.accept() + self.src.send("ok\n") - if self.get_response() == "QUIT": + s = self.get_response() + if s == "QUIT": + self.src.close() + return + elif s != "ok": self.src.close() + self.__init__(colour, (self.address[0], int(s)), baseplayer) + return + else: - self.host = address - self.socket.connect((address, self.port)) + self.socket.connect(self.address) self.src = self.socket self.src.send("ok\n") - if self.get_response() == "QUIT": + s = self.get_response() + if s == "QUIT": + self.src.close() + return + elif s != "ok": self.src.close() + self.__init__(colour, (self.address[0], int(s)), baseplayer) + return + + + def select(self): + if self.baseplayer != None: + s = self.baseplayer.select() + self.send_message(str(s[0]) + " " + str(s[1])) + return s + return map(int,self.get_response().split(" ")) + + def get_move(self): + if self.baseplayer != None: + s = self.baseplayer.get_move() + self.send_message(str(s[0]) + " " + str(s[1])) + return s + return map(int,self.get_response().split(" ")) + + def update(self, result): + if self.baseplayer != None: + result = self.baseplayer.update(result) + self.send_message(result) + return result + if self.server: + self.send_message(result) + else: + s = self.get_response() + if self.board != None: + self.board.update(s) + + def __str__(self): + return "Network<"+str(self.colour)+","+str(self.baseplayer)+">:"+str(self.address) def get_response(self): + debug(str(self) + " get_response called...") # Timeout the start of the message (first character) if network_timeout_start > 0.0: ready = select.select([self.src], [], [], network_timeout_start)[0] @@ -58,6 +118,7 @@ class Network(): else: raise Exception("UNRESPONSIVE") + debug(str(self) + " get_response returns " + s.strip(" \r\n")) return s.strip(" \r\n") def send_message(self,s): @@ -70,6 +131,8 @@ class Network(): self.src.send(s + "\n") else: raise Exception("UNRESPONSIVE") + + debug(str(self) + " send_message sent " + s) def check_quit(self, s): s = s.split(" ") @@ -78,114 +141,16 @@ class Network(): game.final_result = " ".join(s[1:]) + " " + str(opponent(self.colour)) game.stop() return True + + def quit(self, result): + if self.baseplayer != None: + self.send_message("QUIT") + + with game.lock: + game.final_result = result + game.stop() - - -class NetworkSender(Player,Network): - def __init__(self, base_player, address = None): - self.base_player = base_player - Player.__init__(self, base_player.name, base_player.colour) - - self.address = address - - def connect(self): - Network.__init__(self, self.base_player.colour, self.address) - - - - def select(self): - [x,y] = self.base_player.select() - choice = self.board.grid[x][y] - s = str(x) + " " + str(y) - #print str(self) + ".select sends " + s - self.send_message(s) - return [x,y] - - def get_move(self): - [x,y] = self.base_player.get_move() - s = str(x) + " " + str(y) - #print str(self) + ".get_move sends " + s - self.send_message(s) - return [x,y] - - def update(self, s): - self.base_player.update(s) - s = s.split(" ") - [x,y] = map(int, s[0:2]) - selected = self.board.grid[x][y] - if selected != None and selected.colour == self.colour and len(s) > 2 and not "->" in s: - s = " ".join(s[0:3]) - for i in range(2): - if selected.types[i][0] == '?': - s += " " + str(selected.types[i]) - else: - s += " unknown" - #print str(self) + ".update sends " + s - self.send_message(s) - - - def quit(self, final_result): - self.base_player.quit(final_result) - #self.src.send("QUIT " + str(final_result) + "\n") - self.src.close() - -class NetworkReceiver(Player,Network): - def __init__(self, colour, address=None): - - Player.__init__(self, "NetworkReceiver", colour) - - self.address = address - - self.board = None - def connect(self): - Network.__init__(self, self.colour, self.address) - - def select(self): - - s = self.get_response() - #print str(self) + ".select gets " + s - [x,y] = map(int,s.split(" ")) - if x == -1 and y == -1: - #print str(self) + ".select quits the game" - with game.lock: - game.final_state = "network terminated " + self.colour - game.stop() - return [x,y] - def get_move(self): - s = self.get_response() - #print str(self) + ".get_move gets " + s - [x,y] = map(int,s.split(" ")) - if x == -1 and y == -1: - #print str(self) + ".get_move quits the game" - with game.lock: - game.final_state = "network terminated " + self.colour - game.stop() - return [x,y] - def update(self, result): - - result = result.split(" ") - [x,y] = map(int, result[0:2]) - selected = self.board.grid[x][y] - if selected != None and selected.colour == self.colour and len(result) > 2 and not "->" in result: - s = self.get_response() - #print str(self) + ".update - receives " + str(s) - s = s.split(" ") - selected.choice = int(s[2]) - for i in range(2): - selected.types[i] = str(s[3+i]) - if s[3+i] == "unknown": - selected.types[i] = '?'+selected.types[i] - else: - selected.types[i] = selected.types[i][1:] - selected.current_type = selected.types[selected.choice] - else: - pass - #print str(self) + ".update - ignore result " + str(result) - - def quit(self, final_result): - self.src.close() -