Huge refactoring of network related code.

1 files changed, 16 insertions, 19 deletions

diff --git a/src/net/client.c b/src/net/client.c
index 2606bd4..46b4ec3 100644
--- a/src/net/client.c
+++ b/src/net/client.c
@@ -62,7 +62,7 @@ int client_connect_server(const char* host, const char* port)
 	return sock;
 }
 
-bool client_recv_player_list(const uint8_t* payload, const uint8_t data_len)
+bool client_parse_player_list(const uint8_t* payload, const uint8_t data_len)
 {
 	assert(payload != NULL);
 
@@ -86,7 +86,7 @@ bool client_recv_player_list(const uint8_t* payload, const uint8_t data_len)
 	return true;
 }
 
-bool client_recv_deal_cards(const uint8_t* payload, const uint8_t payload_len)
+bool client_parse_deal_hand(const uint8_t* payload, const uint8_t payload_len)
 {
 	assert(payload != NULL);
 	assert(payload_len == MAX_HAND_CARDS); // deal_cards packet have fixed size
@@ -99,7 +99,7 @@ bool client_recv_deal_cards(const uint8_t* payload, const uint8_t payload_len)
 	return true;
 }
 
-bool client_recv_selected_stack(const uint8_t* payload, const uint8_t payload_len)
+bool client_parse_selected_stack(const uint8_t* payload, const uint8_t payload_len)
 {
 	assert(payload != NULL && payload_len == 1);
 
@@ -111,7 +111,7 @@ bool client_recv_selected_stack(const uint8_t* payload, const uint8_t payload_le
 	return true;
 }
 
-bool client_recv_initial_stacks(const uint8_t* payload, const uint8_t payload_len)
+bool client_parse_initial_stacks(const uint8_t* payload, const uint8_t payload_len)
 {
 	assert(payload != NULL && payload_len == NUM_TABLE_STACKS);
 
@@ -122,35 +122,32 @@ bool client_recv_initial_stacks(const uint8_t* payload, const uint8_t payload_le
 	return true;
 }
 
-uint8_t client_send_hello(uint8_t* payload, const uint8_t payload_len)
+void client_prep_hello(msg_t *m)
 {
 	data_store* ds = datamodel();
 	uint8_t namelen = strlen(ds->nickname);
-	
-	memcpy(payload, ds->nickname, namelen);
-
-	return namelen;
+	m->hdr.type = msg_type_hello;
+	memcpy(m->payload, ds->nickname, namelen);
+	m->hdr.payload_length = namelen;
 }
 
-uint8_t client_send_selected_card(uint8_t* payload, const uint8_t payload_len)
+void client_prep_selected_card(msg_t *m)
 {
 	data_store* ds = datamodel();
 	card c = ds->selected_card;
-
 	assert(c >= MIN_CARD && c <= MAX_CARD);
 
-	payload[0] = c;
-
-	return 1;
+	m->hdr.type = msg_type_selected_card;
+	m->payload[0] = c;
+	m->hdr.payload_length = 1;
 }
 
-uint8_t client_send_selected_stack(uint8_t* payload, const uint8_t payload_len)
+void client_prep_selected_stack(msg_t *m)
 {
 	data_store* ds = datamodel();
-
-	payload[0] = ds->stack_index;
 	assert(ds->stack_index <= NUM_TABLE_STACKS);
 
-	return 1;
+	m->hdr.type = msg_type_selected_stack_c;
+	m->payload[0] = ds->stack_index;
+	m->hdr.payload_length = 1;
 }
-