Changeset 442

Timestamp:

05/07/08 15:26:10 (8 months ago)

Author:

mgoldman

Message:

Clarifications and modifications per PeBenito?

Files:

• branches/trunk-pmd-intproto/network/server.py (modified) (9 diffs)

branches/trunk-pmd-intproto/network/server.py

@@ -20 +20 @@
-                client_sock and a (host,port) structure for actions that take place
-                after an accept() """
-
+c
-                          info2key=info2ip):
-                self.host = host
@@ -26 +26 @@
-                self.backlog = backlog
-                self.server = None
+                self.clients = {}
+                self.accept_func = accept_func
+                self.info2key = info2key
-                self.open_socket()
-                self.clients = {}
-                self.accept_fun = accept_fun
-                self.info2key = info2key
-        
-        def __del__(self):
@@ -37 +37 @@
-
-        def open_socket(self):
+                ''' Handles opening of the server socket '''
-                try:
-                        self.server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -55 +56 @@
-                        res.append((client, addr))
-                        self.clients[client] = addr
-
+c
-                return res
-
@@ -64 +65 @@
-
-        def accept_and_wait(self, timeout = None):
+                ''' Wraps select.  If a client tries to connect, service
+                    That client and go back to waiting for input from connected
+                        clients '''
-                cl = self.clients.keys()
-                cl.append(self.server)
@@ -78 +82 @@
-                    Accepts all waiting clients, then processes data
-                    from clients with input waiting. """
-                while self.accept_client(0).__len__():
-                        pass
-                for c in self.waiting_clients(0):
-                        try:
@@ -88 +90 @@
-        
-        def get_clients(self):
-                while self.accept_client(0).__len__():
-                        pass
-                return self.clients
-
-        def shutdown(self):
+                ''' Orderly shutdown all the listening client sockets in prep
+                        for exit '''
-                [c.shutdown(socket.SHUT_RDWR) for c in self.clients.keys()]
-                [c.close() for c in self.clients.keys()]
@@ -98 +100 @@
-        
-        def send_all(self, msg):
-print "sending all"
+''' Send a message to all clients we know about. '''
-                [pickle.dump(msg, c.makefile()) for c in self.clients.keys()]
-                print "sent all"
-        
-        def remove(self, socket):
+                ''' remove a client from managment by the server '''
-                try:
-                        print "removal"
@@ -121 +123 @@
-                l = filter(lambda (c, i): self.info2key(i) == key, self.clients.items())
-                return [(c, pickle.load(c.makefile())) for (c, i) in l]
-                        
-
-# class UDPServer:
-#       def __init__(self, host='', port=50000):
-#               self.host = host
-#               self.port = port
-#               self.server = None
-
-
-cont = True
-
-def handle_client(client, addr):
-        recvd = client.recv(1024)
-        if(len(recvd) == 0):
-                client.shutdown(socket.SHUT_RDWR)
-                client.close()
-                return
-        if recvd[0:4] == "quit":
-                globals()["cont"] = False
-                return
-        client.send(recvd)
-
-if __name__ == "__main__":
-        print "Starting an echo server.\n"
-        s = Server("", 50000)
-        while cont:
-                s.service_clients(handle_client)
-        s.shutdown()