diff --git a/src/server/tabletennis.c b/src/server/tabletennis.c --- a/src/server/tabletennis.c +++ b/src/server/tabletennis.c @@ -45,8 +45,8 @@ struct tabletennis struct timespec time_last_check; }; -static int tabletennis_pong_request_handle(struct general_info *geninfo, struct distrend_client *client, size_t req_len, void *req_data); -static int tabletennis_ping_request_handle(struct general_info *geninfo, struct distrend_client *client, size_t req_len, void *req_data); +static int tabletennis_pong_request_handle(struct general_info *geninfo, struct distrend_client *client, struct distren_request *req, void *req_data); +static int tabletennis_ping_request_handle(struct general_info *geninfo, struct distrend_client *client, struct distren_request *req, void *req_data); tabletennis_t tabletennis_new(struct distrend_listens *listens, unsigned int ping_interval, unsigned int pong_time) { @@ -193,25 +193,25 @@ void tabletennis_free(tabletennis_t tabl * * @todo throttling? */ -static int tabletennis_ping_request_handle(struct general_info *geninfo, struct distrend_client *client, size_t req_len, void *req_data) +static int tabletennis_ping_request_handle(struct general_info *geninfo, struct distrend_client *client, struct distren_request *req, void *req_data) { struct distren_request *pong_req; - if(req_len > 32) + if(req->len > 32) distrend_send_disconnect(client, "You have tried to send a PING packet with a length longer than 32 bytes."); /** respond to the client using the data he sent in his PONG command. */ - distren_request_new(&pong_req, req_len, DISTREN_REQUEST_PONG); + distren_request_new(&pong_req, req->len, DISTREN_REQUEST_PONG); distrend_client_write_request(client, pong_req, req_data); distren_request_free(pong_req); return 0; } -static int tabletennis_pong_request_handle(struct general_info *geninfo, struct distrend_client *client, size_t req_len, void *req_data) +static int tabletennis_pong_request_handle(struct general_info *geninfo, struct distrend_client *client, struct distren_request *req, void *req_data) { fprintf(stderr, "got pong\n"); @@ -221,7 +221,7 @@ static int tabletennis_pong_request_hand * client->tabletennis_client.time_next_check as the cookie. */ if(client->tabletennis_client.state == TABLETENNIS_NEED_PONG - && req_len == sizeof(client->tabletennis_client.time_next_check) + && req->len == sizeof(client->tabletennis_client.time_next_check) && !memcmp(req_data, &client->tabletennis_client.time_next_check, sizeof(client->tabletennis_client.time_next_check))) { /* valid match */