Merge branch 'master' of https://github.com/JamoBox/ProjectTox-Core into JamoBox-master

Conflicts:
	toxcore/LAN_discovery.h

1 files changed, 11 insertions, 10 deletions

diff --git a/toxcore/friend_requests.h b/toxcore/friend_requests.h
index f4cbf67d..b5c46056 100644
--- a/toxcore/friend_requests.h
+++ b/toxcore/friend_requests.h
@@ -34,8 +34,9 @@ typedef struct {
     uint8_t handle_friendrequest_isset;
     void *handle_friendrequest_userdata;
 
-    /*NOTE: the following is just a temporary fix for the multiple friend requests received at the same time problem
-    TODO: Make this better (This will most likely tie in with the way we will handle spam.)*/
+    /* NOTE: The following is just a temporary fix for the multiple friend requests received at the same time problem.
+     *  TODO: Make this better (This will most likely tie in with the way we will handle spam.)
+     */
 
 #define MAX_RECEIVED_STORED 32
 
@@ -43,21 +44,21 @@ typedef struct {
     uint16_t received_requests_index;
 } Friend_Requests;
 
-/* Try to send a friendrequest to peer with public_key
-    data is the data in the request and length is the length. */
-int send_friendrequest(DHT *dht, uint8_t *public_key, uint32_t nospam_num, uint8_t *data, uint32_t length);
-/*
- * Set and get the nospam variable used to prevent one type of friend request spam
+/* Try to send a friendrequest to peer with public_key.
+ *  data is the data in the request and length is the length.
  */
+int send_friendrequest(DHT *dht, uint8_t *public_key, uint32_t nospam_num, uint8_t *data, uint32_t length);
+/* Set and get the nospam variable used to prevent one type of friend request spam. */
 void set_nospam(Friend_Requests *fr, uint32_t num);
 uint32_t get_nospam(Friend_Requests *fr);
 
-/* set the function that will be executed when a friend request for us is received.
-    function format is function(uint8_t * public_key, uint8_t * data, uint16_t length) */
+/* Set the function that will be executed when a friend request for us is received.
+ *  Function format is function(uint8_t * public_key, uint8_t * data, uint16_t length)
+ */
 void callback_friendrequest(Friend_Requests *fr, void (*function)(uint8_t *, uint8_t *, uint16_t, void *),
                             void *userdata);
 
-/* sets up friendreq packet handlers */
+/* Sets up friendreq packet handlers. */
 void friendreq_init(Friend_Requests *fr, Net_Crypto *c);