From 5ab5af3b1472fe93eb164f5bbece798a402eea65 Mon Sep 17 00:00:00 2001 From: Mario Kilies Date: Mon, 24 Jan 2011 14:41:52 +0100 Subject: Second part of huge refactoring of networking related code. --- src/net/server.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'src/net/server.c') diff --git a/src/net/server.c b/src/net/server.c index 6154f98..1e35efd 100644 --- a/src/net/server.c +++ b/src/net/server.c @@ -107,9 +107,11 @@ void server_get_players(int serversock, socket_list_t* client_socks, const uint8 * @param[in] sock Socket to use * @return Username of client */ -bool server_parse_hello(const uint8_t* payload, const uint8_t payload_len) +bool server_parse_hello(const msg_t *m) { - assert(payload != NULL && payload_len < MAX_PLAYER_NAME_LENGTH && payload_len > 0); + assert(m != NULL); + assert(m->hdr.payload_length > 0); + assert(m->hdr.payload_length < MAX_PLAYER_NAME_LENGTH); data_store* ds = datamodel(); @@ -117,31 +119,33 @@ bool server_parse_hello(const uint8_t* payload, const uint8_t payload_len) { if(strlen(ds->players.players[i].player_name) > 0) // search for first empty (not yet assigned) slot continue; - memcpy(ds->players.players[i].player_name, payload, payload_len); - ds->players.players[i].player_name[payload_len] = '\0'; + memcpy(ds->players.players[i].player_name, m->payload, m->hdr.payload_length); + ds->players.players[i].player_name[m->hdr.payload_length] = '\0'; } return true; } -card* server_parse_selected_card(const uint8_t* payload, const uint8_t payload_len) +card* server_parse_selected_card(const msg_t *m) { - assert(payload != NULL && payload_len == 1); + assert(m != NULL); + assert(m->hdr.payload_length == 1); card* c = malloc(sizeof(card)); assert(c != NULL); - *c = payload[0]; + *c = m->payload[0]; return c; } -uint8_t* server_parse_selected_stack(const uint8_t* payload, const uint8_t payload_len) +uint8_t* server_parse_selected_stack(const msg_t *m) { - assert(payload != NULL && payload_len == 1); + assert(m != NULL); + assert(m->hdr.payload_length == 1); uint8_t* index = malloc(sizeof(uint8_t)); assert(index != NULL); - *index = payload[0]; + *index = m->payload[0]; return index; } -- cgit v1.2.3