[Dudusdl-commits] CVS: dudusdl/src loading.c,1.4,1.5 network.c,1.2,1.3

[Colin L. <col...@us...>]

Update of /cvsroot/dudusdl/dudusdl/src
In directory usw-pr-cvs1:/tmp/cvs-serv21279

Modified Files:
	loading.c network.c 
Log Message:
problemes de htons corrigés


Index: loading.c
===================================================================
RCS file: /cvsroot/dudusdl/dudusdl/src/loading.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- loading.c	19 Jul 2002 09:03:23 -0000	1.4
+++ loading.c	19 Jul 2002 11:32:20 -0000	1.5
@@ -135,8 +135,8 @@
 
       // This part was completely rewritten
       
-      SDL_WaitEvent(&event);
-
+      SDL_PollEvent(&event);
+      
       switch (event.type) {
       case SDL_KEYDOWN:
 	switch (event.key.keysym.sym) {
@@ -205,6 +205,9 @@
 	  break;
 	case SDLK_c:
 	  enable_cpu = !enable_cpu;
+	  break;
+	case SDLK_ESCAPE:
+	  exit(0);
 	  break;
 	default:
 	  break;

Index: network.c
===================================================================
RCS file: /cvsroot/dudusdl/dudusdl/src/network.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- network.c	19 Jul 2002 09:49:29 -0000	1.2
+++ network.c	19 Jul 2002 11:32:21 -0000	1.3
@@ -20,6 +20,7 @@
 
 #include "dudusdl.h"
 #include "network.h"
+#include <netinet/in.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -70,8 +71,9 @@
 
 	memset((char *) &server_address, 0, sizeof(server_address));
 	server_address.sin_family = AF_INET;
-	server_address.sin_addr.s_addr = htonl(INADDR_ANY);
-	server_address.sin_port = htonl(41279);
+	server_address.sin_addr.s_addr = INADDR_ANY;
+	server_address.sin_port = htons(41279);
+
 
 	if (bind(server_sock, (struct sockaddr *) &server_address,
 	  sizeof(server_address)) < 0 ) {
@@ -79,10 +81,15 @@
 		close(server_sock);
 		return 0;
 	}
-
+	printf("Binded socket\n");
 	/* Set up queue for incoming connections. */
-	listen(server_sock,1);
+	if (listen(server_sock,1) < 0) {
+		perror("listen");
+		close(server_sock);
+		return 0;
+	}
 	
+	printf("Listening on socket\n");
 	/* timeout for select */
 	timeout.tv_sec = 0;
 	timeout.tv_usec = 100;
@@ -96,6 +103,7 @@
 	if (client_sock < 0)
 		perror("accept");
 	
+	printf("Accepted socket.\n");
 	setnonblocking(client_sock);
 	
 }
@@ -149,23 +157,28 @@
 		return 0;
 	}
 	
+	printf("Got hostname\n");
 	
 	memset((char *) &server_address, 0, sizeof(server_address));
 	memcpy((char *)&server_address.sin_addr,host->h_addr,host->h_length);
 
-	server_address.sin_family = host->h_addrtype;
-	server_address.sin_port = htonl(41279);
-
-	if ((client_sock= socket(host->h_addrtype,SOCK_STREAM,0)) < 0) {    /* get socket */
+	server_address.sin_family = AF_INET;
+	server_address.sin_port = htons(41279);
+	
+	if ((client_sock= socket(AF_INET,SOCK_STREAM,0)) < 0) {    /* get socket */
 		perror("socket");
 		return 0;
 	}
 
+	printf("Created socket\n");
+	
 	if (connect(client_sock,(struct sockaddr *)&server_address,sizeof server_address) < 0) { /* connect */
 		perror("connect");
 		return 0;
 	}
 
+	printf("Connected.\n");
+	
 	setnonblocking(client_sock);
 		
 	/* timeout for select */