Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision 7d7df4748ab15beae98bb90e6044426f863a6628)
+++ client/Client/main.cpp	(revision aee34b9d5bd16b8502a9f91c9a461654fb8d0e1c)
@@ -3,4 +3,5 @@
 
 #include <winsock2.h>
+#include <WS2tcpip.h>
 
 #include <stdio.h>
@@ -32,12 +33,11 @@
 int main(int argc, char *argv[])
 {
-   int sock, n;
-   int length;
-   struct sockaddr_in server, from;
-   struct hostent *hp;
-   char buffer[256];
-   
+	int sock, n;
+	struct sockaddr_in server, from;
+	struct hostent *hp;
+	char buffer[256];
+
 	if (argc != 3) {
-		printf("Usage: server port\n");
+		cout << "Usage: server port" << endl;
 		exit(1);
 	}
@@ -51,30 +51,34 @@
 	
 	if (wsaerr != 0) {
-		printf("The Winsock dll not found.\n");
+		cout << "The Winsock dll not found." << endl;
 		exit(1);
 	}else
-		printf("The Winsock dll was found.\n");
+		cout << "The Winsock dll was found." << endl;
 	
 	sock= socket(AF_INET, SOCK_DGRAM, 0);
-	if (sock < 0) error("socket");
+	if (sock < 0)
+		error("socket");
 
 	server.sin_family = AF_INET;
 	hp = gethostbyname(argv[1]);
-	if (hp==0) error("Unknown host");
+	if (hp==0)
+		error("Unknown host");
 
-	memcpy((char *)&server.sin_addr,
-			(char *)hp->h_addr,
-			hp->h_length);
-   server.sin_port = htons(atoi(argv[2]));
-   length=sizeof(struct sockaddr_in);
-   printf("Please enter the message: ");
-   memset(buffer, 0, 256);
-   fgets(buffer,255,stdin);
-   n=sendto(sock,buffer,
-            strlen(buffer),0,(const struct sockaddr *)&server,length);
-	if (n < 0) error("Sendto");
-	n = recvfrom(sock,buffer,256,0,(struct sockaddr *)&from, &length);
-	if (n < 0) error("recvfrom");
+	memcpy((char *)&server.sin_addr, (char *)hp->h_addr, hp->h_length);
+	server.sin_port = htons(atoi(argv[2]));
+	cout << "Please enter the message: ";
+	memset(buffer, 0, 256);
+	fgets(buffer,255,stdin);
 
+	socklen_t fromlen = sizeof(server);
+
+	n=sendto(sock,buffer, strlen(buffer), 0, (const struct sockaddr *)&server, fromlen);
+	if (n < 0)
+		error("Sendto");
+
+	n = recvfrom(sock, buffer, 256, 0, (struct sockaddr *)&from, &fromlen);
+	if (n < 0)
+		error("recvfrom");
+	
 	buffer[n] = '\0';
 	cout << "Got an ack: " << endl;