server.c & client.c updated