[Cruce-commit] SF.net SVN: cruce:[19] C/trunk/server

[<ca...@us...>]

Revision: 19
          http://cruce.svn.sourceforge.net/cruce/?rev=19&view=rev
Author:   caiusb
Date:     2010-03-10 12:07:15 +0000 (Wed, 10 Mar 2010)

Log Message:
-----------
Am modificat un pic Makefile-ul si am modificat si includ-urile sa compileze
cum trebuie.

Modified Paths:
--------------
    C/trunk/server/Makefile
    C/trunk/server/server.c
    C/trunk/server/server_dummy.c

Modified: C/trunk/server/Makefile
===================================================================
--- C/trunk/server/Makefile	2010-03-10 11:54:31 UTC (rev 18)
+++ C/trunk/server/Makefile	2010-03-10 12:07:15 UTC (rev 19)
@@ -1,4 +1,4 @@
-objects = server.o protocol.o
+objects = server.o protocol.o 
 
 server:	$(objects)
 	cc -o server $(objects)
@@ -20,4 +20,5 @@
 clean:
 	rm -f $(objects)
 	rm -f server
+	rm -f server_dummy.o
 	rm -f dummy

Modified: C/trunk/server/server.c
===================================================================
--- C/trunk/server/server.c	2010-03-10 11:54:31 UTC (rev 18)
+++ C/trunk/server/server.c	2010-03-10 12:07:15 UTC (rev 19)
@@ -6,12 +6,10 @@
 
 //Our libraries
 #include "server.h"
-#include "protocol.h"
+#include "../protocol/protocol.h"
 
-
 #define NUMAR_ECHIPE 2
 
-
  //Server related fields
 struct echipa  echipe[NUMAR_ECHIPE];
 struct sockaddr_in serverSocketAddress;

Modified: C/trunk/server/server_dummy.c
===================================================================
--- C/trunk/server/server_dummy.c	2010-03-10 11:54:31 UTC (rev 18)
+++ C/trunk/server/server_dummy.c	2010-03-10 12:07:15 UTC (rev 19)
@@ -5,24 +5,9 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 
-#include "../server.h"
-#include "../protocol.h"
+#include "server.h"
+#include "../protocol/protocol.h"
 
-int decode_message(char *message) {
-	int code;
-	if (message[1] <= '9' && message[1] >= '0') {
-		code = atoi(message);
-		strcpy(message, message + 3);
-	}
-	code = atoi(message);
-	strcpy(message, message + 2);
-	printf("Decoded this message:\n");
-	printf("code: %d\n", code);
-	printf("message: %s\n", message);
-	printf("---end---\n");
-	return code;
-}
-
 /** address, port **/
 int main(int argc, char *argv[]) {
 	char ip[16];
@@ -72,7 +57,6 @@
 		//printf("Received connection from: %s\n",inet_ntoa(remoteSocket.sin_addr));
 		char message[1024];
 		
-		while(players < 4) {
 		memset(message, 0, 1024);
 		read(connectionFD, &message, 1024);
 		printf("%s\n", message);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.