From 241aca98bdc8106221ee7d7dbcea9f2fa17f24bc Mon Sep 17 00:00:00 2001 From: Konstantin Kowalski Date: Fri, 26 Jul 2013 23:07:25 -0400 Subject: A *lot* of style changes. --- core/friend_requests.c | 50 ++++++++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) (limited to 'core/friend_requests.c') diff --git a/core/friend_requests.c b/core/friend_requests.c index d1b0da57..7a2cdc24 100644 --- a/core/friend_requests.c +++ b/core/friend_requests.c @@ -35,24 +35,23 @@ int send_friendrequest(uint8_t * public_key, uint8_t * data, uint32_t length) uint8_t packet[MAX_DATA_SIZE]; int len = create_request(packet, public_key, data, length, 32); /* 32 is friend request packet id */ - if(len == -1) + if (len == -1) return -1; IP_Port ip_port = DHT_getfriendip(public_key); - if(ip_port.ip.i == 1) + if (ip_port.ip.i == 1) return -1; - if(ip_port.ip.i != 0) - { - if(sendpacket(ip_port, packet, len) != -1) + if (ip_port.ip.i != 0) { + if (sendpacket(ip_port, packet, len) != -1) return 0; return -1; } int num = route_tofriend(public_key, packet, len); - if(num == 0) + if (num == 0) return -1; return num; @@ -62,8 +61,7 @@ static void (*handle_friendrequest)(uint8_t *, uint8_t *, uint16_t); static uint8_t handle_friendrequest_isset = 0; /* set the function that will be executed when a friend request is received. */ -void callback_friendrequest(void (*function)(uint8_t *, uint8_t *, uint16_t)) -{ +void callback_friendrequest(void (*function)(uint8_t *, uint8_t *, uint16_t)) { handle_friendrequest = function; handle_friendrequest_isset = 1; } @@ -78,9 +76,8 @@ static uint8_t recieved_requests[MAX_RECIEVED_STORED][crypto_box_PUBLICKEYBYTES] static uint16_t recieved_requests_index; /*Add to list of recieved friend requests*/ -static void addto_recievedlist(uint8_t * client_id) -{ - if(recieved_requests_index >= MAX_RECIEVED_STORED) +static void addto_recievedlist(uint8_t * client_id) { + if (recieved_requests_index >= MAX_RECIEVED_STORED) recieved_requests_index = 0; memcpy(recieved_requests[recieved_requests_index], client_id, crypto_box_PUBLICKEYBYTES); @@ -89,46 +86,43 @@ static void addto_recievedlist(uint8_t * client_id) /* Check if a friend request was already recieved return 0 if not, 1 if we did */ -static int request_recieved(uint8_t * client_id) -{ +static int request_recieved(uint8_t * client_id) { uint32_t i; - for(i = 0; i < MAX_RECIEVED_STORED; ++i) - if(memcmp(recieved_requests[i], client_id, crypto_box_PUBLICKEYBYTES) == 0) + for (i = 0; i < MAX_RECIEVED_STORED; ++i) { + if (memcmp(recieved_requests[i], client_id, crypto_box_PUBLICKEYBYTES) == 0) return 1; + } return 0; } -int friendreq_handlepacket(uint8_t * packet, uint32_t length, IP_Port source) -{ - - if(packet[0] == 32) - { - if(length <= crypto_box_PUBLICKEYBYTES * 2 + crypto_box_NONCEBYTES + 1 + ENCRYPTION_PADDING && - length > MAX_DATA_SIZE + ENCRYPTION_PADDING) +int friendreq_handlepacket(uint8_t * packet, uint32_t length, IP_Port source) { + if (packet[0] == 32) { + if (length <= crypto_box_PUBLICKEYBYTES * 2 + crypto_box_NONCEBYTES + 1 + ENCRYPTION_PADDING && + length > MAX_DATA_SIZE + ENCRYPTION_PADDING) return 1; - if(memcmp(packet + 1, self_public_key, crypto_box_PUBLICKEYBYTES) == 0) /* check if request is for us. */ - { - if(handle_friendrequest_isset == 0) + if (memcmp(packet + 1, self_public_key, crypto_box_PUBLICKEYBYTES) == 0) {// check if request is for us. + if (handle_friendrequest_isset == 0) return 1; uint8_t public_key[crypto_box_PUBLICKEYBYTES]; uint8_t data[MAX_DATA_SIZE]; int len = handle_request(public_key, data, packet, length); - if(len == -1) + if (len == -1) return 1; - if(request_recieved(public_key)) + if (request_recieved(public_key)) return 1; addto_recievedlist(public_key); (*handle_friendrequest)(public_key, data, len); } - else /* if request is not for us, try routing it. */ + else {/* if request is not for us, try routing it. */ if(route_packet(packet + 1, packet, length) == length) return 0; + } } return 1; } -- cgit v1.2.3