moved generic recv function to new file; use payload length inside packets instead of packet length

1 files changed, 3 insertions, 3 deletions

diff --git a/src/main.c b/src/main.c
index 8acf5ec..6e68d35 100644
--- a/src/main.c
+++ b/src/main.c
@@ -41,7 +41,7 @@ int main(int argc, char **argv)
 		for(int i=0; i<opponents; i++)
 		{
 			// wait for greeting from client i and read nick
-			char* name = server_recv(csocks[i], msg_type_hello);
+			char* name = net_recv(csocks[i], msg_type_hello);
 			players.names[i+1] = name;
 			printf("player connected: len:%d, name:%s\n", strlen(name), name);
 		}
@@ -75,12 +75,12 @@ int main(int argc, char **argv)
 		client_hello(sock, nickname);
 
 		// retrieve list of all players from server
-		players = client_recv(sock, msg_type_start_game);
+		players = net_recv(sock, msg_type_start_game);
 		for(int i=0; i<players->count; i++)
 			printf("Player %d: %s\n", i, players->names[i]);
 
 		// receive test hand
-		testhand = client_recv(sock, msg_type_deal_cards);
+		testhand = net_recv(sock, msg_type_deal_cards);
 		printf("received cards: ");
 		for(int i=0; i<MAX_HAND_CARDS; i++)
 			printf("%d, ", *testhand[i]);