1 files changed, 131 insertions, 106 deletions

diff --git a/toxcore/tox.c b/toxcore/tox.c
index a97e52bc..494de478 100644
--- a/toxcore/tox.c
+++ b/toxcore/tox.c
@@ -24,7 +24,7 @@
 #include "Messenger.h"
 /*
  * returns a FRIEND_ADDRESS_SIZE byte address to give to others.
- * format: [client_id (32 bytes)][nospam number (4 bytes)][checksum (2 bytes)]
+ * Format: [client_id (32 bytes)][nospam number (4 bytes)][checksum (2 bytes)]
  *
  */
 void tox_getaddress(void *tox, uint8_t *address)
@@ -34,20 +34,20 @@ void tox_getaddress(void *tox, uint8_t *address)
 }
 
 /*
- * add a friend
- * set the data that will be sent along with friend request
+ * Add a friend.
+ * Set the data that will be sent along with friend request.
  * address is the address of the friend (returned by getaddress of the friend you wish to add) it must be FRIEND_ADDRESS_SIZE bytes. TODO: add checksum.
- * data is the data and length is the length
- * returns the friend number if success
- * return FA_TOOLONG if message length is too long
- * return FAERR_NOMESSAGE if no message (message length must be >= 1 byte)
- * return FAERR_OWNKEY if user's own key
- * return FAERR_ALREADYSENT if friend request already sent or already a friend
- * return FAERR_UNKNOWN for unknown error
- * return FAERR_BADCHECKSUM if bad checksum in address
- * return FAERR_SETNEWNOSPAM if the friend was already there but the nospam was different
- * (the nospam for that friend was set to the new one)
- * return FAERR_NOMEM if increasing the friend list size fails
+ * data is the data and length is the length.
+ * returns the friend number if success.
+ * return FA_TOOLONG if message length is too long.
+ * return FAERR_NOMESSAGE if no message (message length must be >= 1 byte).
+ * return FAERR_OWNKEY if user's own key.
+ * return FAERR_ALREADYSENT if friend request already sent or already a friend.
+ * return FAERR_UNKNOWN for unknown error.
+ * return FAERR_BADCHECKSUM if bad checksum in address.
+ * return FAERR_SETNEWNOSPAM if the friend was already there but the nospam was different.
+ * (the nospam for that friend was set to the new one).
+ * return FAERR_NOMEM if increasing the friend list size fails.
  */
 int tox_addfriend(void *tox, uint8_t *address, uint8_t *data, uint16_t length)
 {
@@ -55,9 +55,10 @@ int tox_addfriend(void *tox, uint8_t *address, uint8_t *data, uint16_t length)
     return m_addfriend(m, address, data, length);
 }
 
-/* add a friend without sending a friendrequest.
-    returns the friend number if success
-    return -1 if failure. */
+/* Add a friend without sending a friendrequest.
+ *  returns the friend number if success.
+ *  return -1 if failure.
+ */
 int tox_addfriend_norequest(void *tox, uint8_t *client_id)
 {
     Messenger *m = tox;
@@ -65,48 +66,53 @@ int tox_addfriend_norequest(void *tox, uint8_t *client_id)
 }
 
 /* return the friend id associated to that client id.
-    return -1 if no such friend */
+ * return -1 if no such friend.
+ */
 int tox_getfriend_id(void *tox, uint8_t *client_id)
 {
     Messenger *m = tox;
     return getfriend_id(m, client_id);
 }
 
-/* copies the public key associated to that friend id into client_id buffer.
-    make sure that client_id is of size CLIENT_ID_SIZE.
-    return 0 if success
-    return -1 if failure */
+/* Copies the public key associated to that friend id into client_id buffer.
+ *  Make sure that client_id is of size CLIENT_ID_SIZE.
+ *  return 0 if success.
+ *  return -1 if failure.
+ */
 int tox_getclient_id(void *tox, int friend_id, uint8_t *client_id)
 {
     Messenger *m = tox;
     return getclient_id(m, friend_id, client_id);
 }
 
-/* remove a friend */
+/* Remove a friend. */
 int tox_delfriend(void *tox, int friendnumber)
 {
     Messenger *m = tox;
     return m_delfriend(m, friendnumber);
 }
 
-/* return 4 if friend is online
-    return 3 if friend is confirmed
-    return 2 if the friend request was sent
-    return 1 if the friend was added
-    return 0 if there is no friend with that number */
+/* return 4 if friend is online.
+ * return 3 if friend is confirmed.
+ * return 2 if the friend request was sent.
+ * return 1 if the friend was added.
+ * return 0 if there is no friend with that number.
+ */
 int tox_friendstatus(void *tox, int friendnumber)
 {
     Messenger *m = tox;
     return m_friendstatus(m, friendnumber);
 }
 
-/* send a text chat message to an online friend
-    returns the message id if packet was successfully put into the send queue
-    return 0 if it was not
-    you will want to retain the return value, it will be passed to your read receipt callback
-    if one is received.
-    m_sendmessage_withid will send a message with the id of your choosing,
-    however we can generate an id for you by calling plain m_sendmessage. */
+/* Send a text chat message to an online friend.
+ *  returns the message id if packet was successfully put into the send queue.
+ *  return 0 if it was not.
+ *
+ *  You will want to retain the return value, it will be passed to your read receipt callback
+ *  if one is received.
+ *  m_sendmessage_withid will send a message with the id of your choosing,
+ *  however we can generate an id for you by calling plain m_sendmessage.
+ */
 uint32_t tox_sendmessage(void *tox, int friendnumber, uint8_t *message, uint32_t length)
 {
     Messenger *m = tox;
@@ -119,45 +125,47 @@ uint32_t tox_sendmessage_withid(void *tox, int friendnumber, uint32_t theid, uin
     return m_sendmessage_withid(m, friendnumber, theid, message, length);
 }
 
-/* send an action to an online friend
-    returns 1 if packet was successfully put into the send queue
-    return 0 if it was not */
+/* Send an action to an online friend.
+ *  returns 1 if packet was successfully put into the send queue.
+ *  return 0 if it was not.
+ */
 int tox_sendaction(void *tox, int friendnumber, uint8_t *action, uint32_t length)
 {
     Messenger *m = tox;
     return m_sendaction(m, friendnumber, action, length);
 }
 
-/* Set our nickname
-   name must be a string of maximum MAX_NAME_LENGTH length.
-   length must be at least 1 byte
-   length is the length of name with the NULL terminator
-   return 0 if success
-   return -1 if failure */
+/* Set our nickname.
+ * name must be a string of maximum MAX_NAME_LENGTH length.
+ * length must be at least 1 byte.
+ * length is the length of name with the NULL terminator.
+ * return 0 if success.
+ * return -1 if failure.
+ */
 int tox_setname(void *tox, uint8_t *name, uint16_t length)
 {
     Messenger *m = tox;
     return setname(m, name, length);
 }
 
-/*
-   Get your nickname.
-   m        The messanger context to use.
-   name    Pointer to a string for the name.
-   nlen     The length of the string buffer.
-   returns Return the length of the name, 0 on error.
-*/
+/* Get your nickname.
+ * m -  The messanger context to use.
+ * name - Pointer to a string for the name.
+ * nlen -  The length of the string buffer.
+ * return length of the name.
+ * return 0 on error.
+ */
 uint16_t tox_getselfname(void *tox, uint8_t *name, uint16_t nlen)
 {
     Messenger *m = tox;
     return getself_name(m, name, nlen);
 }
 
-/* get name of friendnumber
-    put it in name
-    name needs to be a valid memory location with a size of at least MAX_NAME_LENGTH (128) bytes.
-    return 0 if success
-    return -1 if failure */
+/* Get name of friendnumber and put it in name.
+ *  name needs to be a valid memory location with a size of at least MAX_NAME_LENGTH (128) bytes.
+ *  return 0 if success.
+ *  return -1 if failure.
+ */
 int tox_getname(void *tox, int friendnumber, uint8_t *name)
 {
     Messenger *m = tox;
@@ -179,18 +187,19 @@ int tox_set_userstatus(void *tox, USERSTATUS status)
     return m_set_userstatus(m, status);
 }
 
-/* return the length of friendnumber's status message,
-    including null
-    pass it into malloc */
+/* return the length of friendnumber's status message, including null.
+ * Pass it into malloc.
+ */
 int tox_get_statusmessage_size(void *tox, int friendnumber)
 {
     Messenger *m = tox;
     return m_get_statusmessage_size(m, friendnumber);
 }
 
-/* copy friendnumber's status message into buf, truncating if size is over maxlen
-    get the size you need to allocate from m_get_statusmessage_size
-    The self variant will copy our own status message. */
+/* Copy friendnumber's status message into buf, truncating if size is over maxlen.
+ *  Get the size you need to allocate from m_get_statusmessage_size.
+ *  The self variant will copy our own status message.
+ */
 int tox_copy_statusmessage(void *tox, int friendnumber, uint8_t *buf, uint32_t maxlen)
 {
     Messenger *m = tox;
@@ -206,7 +215,8 @@ int tox_copy_self_statusmessage(void *tox, uint8_t *buf, uint32_t maxlen)
 /* Return one of USERSTATUS values.
  * Values unknown to your application should be represented as USERSTATUS_NONE.
  * As above, the self variant will return our own USERSTATUS.
- * If friendnumber is invalid, this shall return USERSTATUS_INVALID. */
+ * If friendnumber is invalid, this shall return USERSTATUS_INVALID.
+ */
 USERSTATUS tox_get_userstatus(void *tox, int friendnumber)
 {
     Messenger *m = tox;
@@ -221,7 +231,8 @@ USERSTATUS tox_get_selfuserstatus(void *tox)
 
 
 /* Sets whether we send read receipts for friendnumber.
- * This function is not lazy, and it will fail if yesno is not (0 or 1).*/
+ * This function is not lazy, and it will fail if yesno is not (0 or 1).
+ */
 void tox_set_sends_receipts(void *tox, int friendnumber, int yesno)
 {
     Messenger *m = tox;
@@ -229,8 +240,9 @@ void tox_set_sends_receipts(void *tox, int friendnumber, int yesno)
 }
 
 
-/* set the function that will be executed when a friend request 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 is received.
+ *  Function format is function(uint8_t * public_key, uint8_t * data, uint16_t length)
+ */
 void tox_callback_friendrequest(void *tox, void (*function)(uint8_t *, uint8_t *, uint16_t, void *), void *userdata)
 {
     Messenger *m = tox;
@@ -238,8 +250,9 @@ void tox_callback_friendrequest(void *tox, void (*function)(uint8_t *, uint8_t *
 }
 
 
-/* set the function that will be executed when a message from a friend is received.
-    function format is: function(int friendnumber, uint8_t * message, uint32_t length) */
+/* Set the function that will be executed when a message from a friend is received.
+ *  Function format is: function(int friendnumber, uint8_t * message, uint32_t length)
+ */
 void tox_callback_friendmessage(void *tox, void (*function)(Messenger *tox, int, uint8_t *, uint16_t, void *),
                                 void *userdata)
 {
@@ -247,17 +260,19 @@ void tox_callback_friendmessage(void *tox, void (*function)(Messenger *tox, int,
     m_callback_friendmessage(m, function, userdata);
 }
 
-/* set the function that will be executed when an action from a friend is received.
-    function format is: function(int friendnumber, uint8_t * action, uint32_t length) */
+/* Set the function that will be executed when an action from a friend is received.
+ *  function format is: function(int friendnumber, uint8_t * action, uint32_t length)
+ */
 void tox_callback_action(void *tox, void (*function)(Messenger *tox, int, uint8_t *, uint16_t, void *), void *userdata)
 {
     Messenger *m = tox;
     m_callback_action(m, function, userdata);
 }
 
-/* set the callback for name changes
-    function(int friendnumber, uint8_t *newname, uint16_t length)
-    you are not responsible for freeing newname */
+/* Set the callback for name changes.
+ *  function(int friendnumber, uint8_t *newname, uint16_t length)
+ *  You are not responsible for freeing newname.
+ */
 void tox_callback_namechange(void *tox, void (*function)(Messenger *tox, int, uint8_t *, uint16_t, void *),
                              void *userdata)
 {
@@ -265,9 +280,10 @@ void tox_callback_namechange(void *tox, void (*function)(Messenger *tox, int, ui
     m_callback_namechange(m, function, userdata);
 }
 
-/* set the callback for status message changes
-    function(int friendnumber, uint8_t *newstatus, uint16_t length)
-    you are not responsible for freeing newstatus */
+/* Set the callback for status message changes.
+ *  function(int friendnumber, uint8_t *newstatus, uint16_t length)
+ *  You are not responsible for freeing newstatus.
+ */
 void tox_callback_statusmessage(void *tox, void (*function)(Messenger *tox, int, uint8_t *, uint16_t, void *),
                                 void *userdata)
 {
@@ -275,74 +291,83 @@ void tox_callback_statusmessage(void *tox, void (*function)(Messenger *tox, int,
     m_callback_statusmessage(m, function, userdata);
 }
 
-/* set the callback for status type changes
-    function(int friendnumber, USERSTATUS kind) */
+/* Set the callback for status type changes.
+ *  function(int friendnumber, USERSTATUS kind)
+ */
 void tox_callback_userstatus(void *tox, void (*function)(Messenger *tox, int, USERSTATUS, void *), void *userdata)
 {
     Messenger *m = tox;
     m_callback_userstatus(m, function, userdata);
 }
 
-/* set the callback for read receipts
-    function(int friendnumber, uint32_t receipt)
-    if you are keeping a record of returns from m_sendmessage,
-    receipt might be one of those values, and that means the message
-    has been received on the other side. since core doesn't
-    track ids for you, receipt may not correspond to any message
-    in that case, you should discard it. */
+/* Set the callback for read receipts.
+ *  function(int friendnumber, uint32_t receipt)
+ *
+ *  If you are keeping a record of returns from m_sendmessage;
+ *  receipt might be one of those values, meaning the message
+ *  has been received on the other side.
+ *  Since core doesn't track ids for you, receipt may not correspond to any message.
+ *  in that case, you should discard it.
+ */
 void tox_callback_read_receipt(void *tox, void (*function)(Messenger *tox, int, uint32_t, void *), void *userdata)
 {
     Messenger *m = tox;
     m_callback_read_receipt(m, function, userdata);
 }
 
-/* set the callback for connection status changes
-    function(int friendnumber, uint8_t status)
-    status:
-      0 -- friend went offline after being previously online
-      1 -- friend went online
-    note that this callback is not called when adding friends, thus the "after
-    being previously online" part. it's assumed that when adding friends,
-    their connection status is offline. */
+/* Set the callback for connection status changes.
+ *  function(int friendnumber, uint8_t status)
+ *  Status:
+ *    0 -- friend went offline after being previously online
+ *    1 -- friend went online
+ *
+ *  NOTE: this callback is not called when adding friends, thus the "after
+ *  being previously online" part. It's assumed that when adding friends,
+ *  their connection status is offline.
+ */
 void tox_callback_connectionstatus(void *tox, void (*function)(Messenger *tox, int, uint8_t, void *), void *userdata)
 {
     Messenger *m = tox;
     m_callback_connectionstatus(m, function, userdata);
 }
 
-/* Use this function to bootstrap the client
-    Sends a get nodes request to the given node with ip port and public_key */
+/* Use this function to bootstrap the client.
+ *  Sends a get nodes request to the given node with ip port and public_key.
+ */
 void tox_bootstrap(void *tox, IP_Port ip_port, uint8_t *public_key)
 {
     Messenger *m = tox;
     DHT_bootstrap(m->dht, ip_port, public_key);
 }
 
-/* returns 0 if we are not connected to the DHT
-    returns 1 if we are */
+/* returns 0 if we are not connected to the DHT.
+ * returns 1 if we are.
+ */
 int tox_isconnected(void *tox)
 {
     Messenger *m = tox;
     return DHT_isconnected(m->dht);
 }
 
-/* run this at startup
- *  returns allocated instance of tox on success
- *  returns 0 if there are problems */
+/* Run this at startup.
+ *  returns allocated instance of tox on success.
+ *  returns 0 if there are problems.
+ */
 void *tox_new(void)
 {
     return initMessenger();
 }
 
-/* run this before closing shop
- * free all datastructures */
+/* Run this before closing shop.
+ * Free all datastructures.
+ */
 void tox_kill(void *tox)
 {
     Messenger *m = tox;
     cleanupMessenger(m);
 }
 
-/* the main loop that needs to be run at least 20 times per second */
+/* The main loop that needs to be run at least 20 times per second. */
 void tox_do(void *tox)
 {
     Messenger *m = tox;
@@ -351,21 +376,21 @@ void tox_do(void *tox)
 
 /* SAVING AND LOADING FUNCTIONS: */
 
-/* returns the size of the messenger data (for saving) */
+/* returns the size of the messenger data (for saving). */
 uint32_t tox_size(void *tox)
 {
     Messenger *m = tox;
     return Messenger_size(m);
 }
 
-/* save the messenger in data (must be allocated memory of size Messenger_size()) */
+/* Save the messenger in data (must be allocated memory of size Messenger_size()). */
 void tox_save(void *tox, uint8_t *data)
 {
     Messenger *m = tox;
     Messenger_save(m, data);
 }
 
-/* load the messenger from data of size length */
+/* Load the messenger from data of size length. */
 int tox_load(void *tox, uint8_t *data, uint32_t length)
 {
     Messenger *m = tox;