1 files changed, 60 insertions, 58 deletions

diff --git a/toxcore/tox.h b/toxcore/tox.h
index afa502f5..d931b9be 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -82,7 +82,7 @@ typedef struct Tox Tox;
 /*  return TOX_FRIEND_ADDRESS_SIZE byte address to give to others.
  * format: [client_id (32 bytes)][nospam number (4 bytes)][checksum (2 bytes)]
  */
-void tox_get_address(Tox *tox, uint8_t *address);
+void tox_get_address(const Tox *tox, uint8_t *address);
 
 /* Add a friend.
  * Set the data that will be sent along with friend request.
@@ -90,7 +90,7 @@ void tox_get_address(Tox *tox, uint8_t *address);
  * data is the data and length is the length.
  *
  *  return the friend number if success.
- *  return TOX_FA_TOOLONG if message length is too long.
+ *  return TOX_FAERR_TOOLONG if message length is too long.
  *  return TOX_FAERR_NOMESSAGE if no message (message length must be >= 1 byte).
  *  return TOX_FAERR_OWNKEY if user's own key.
  *  return TOX_FAERR_ALREADYSENT if friend request already sent or already a friend.
@@ -100,7 +100,7 @@ void tox_get_address(Tox *tox, uint8_t *address);
  *  (the nospam for that friend was set to the new one).
  *  return TOX_FAERR_NOMEM if increasing the friend list size fails.
  */
-int32_t tox_add_friend(Tox *tox, uint8_t *address, uint8_t *data, uint16_t length);
+int32_t tox_add_friend(Tox *tox, const uint8_t *address, const uint8_t *data, uint16_t length);
 
 
 /* Add a friend without sending a friendrequest.
@@ -111,14 +111,14 @@ int32_t tox_add_friend_norequest(Tox *tox, const uint8_t *client_id);
 
 /*  return the friend number associated to that client id.
     return -1 if no such friend */
-int32_t tox_get_friend_number(Tox *tox, uint8_t *client_id);
+int32_t tox_get_friend_number(const Tox *tox, const uint8_t *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.
  */
-int tox_get_client_id(Tox *tox, int32_t friendnumber, uint8_t *client_id);
+int tox_get_client_id(const Tox *tox, int32_t friendnumber, uint8_t *client_id);
 
 /* Remove a friend.
  *
@@ -133,14 +133,14 @@ int tox_del_friend(Tox *tox, int32_t friendnumber);
  *  return 0 if friend is not connected to us (Offline).
  *  return -1 on failure.
  */
-int tox_get_friend_connection_status(Tox *tox, int32_t friendnumber);
+int tox_get_friend_connection_status(const Tox *tox, int32_t friendnumber);
 
 /* Checks if there exists a friend with given friendnumber.
  *
  *  return 1 if friend exists.
  *  return 0 if friend doesn't exist.
  */
-int tox_friend_exists(Tox *tox, int32_t friendnumber);
+int tox_friend_exists(const Tox *tox, int32_t friendnumber);
 
 /* Send a text chat message to an online friend.
  *
@@ -157,7 +157,8 @@ int tox_friend_exists(Tox *tox, int32_t friendnumber);
  * however we can generate an id for you by calling plain m_sendmessage.
  */
 uint32_t tox_send_message(Tox *tox, int32_t friendnumber, const uint8_t *message, uint32_t length);
-uint32_t tox_send_message_withid(Tox *tox, int32_t friendnumber, uint32_t theid, uint8_t *message, uint32_t length);
+uint32_t tox_send_message_withid(Tox *tox, int32_t friendnumber, uint32_t theid, const uint8_t *message,
+                                 uint32_t length);
 
 /* Send an action to an online friend.
  *
@@ -173,8 +174,8 @@ uint32_t tox_send_message_withid(Tox *tox, int32_t friendnumber, uint32_t theid,
  *  m_sendaction_withid will send an action message with the id of your choosing,
  *  however we can generate an id for you by calling plain m_sendaction.
  */
-uint32_t tox_send_action(Tox *tox, int32_t friendnumber, uint8_t *action, uint32_t length);
-uint32_t tox_send_action_withid(Tox *tox, int32_t friendnumber, uint32_t theid, uint8_t *action, uint32_t length);
+uint32_t tox_send_action(Tox *tox, int32_t friendnumber, const uint8_t *action, uint32_t length);
+uint32_t tox_send_action_withid(Tox *tox, int32_t friendnumber, uint32_t theid, const uint8_t *action, uint32_t length);
 
 /* Set our nickname.
  * name must be a string of maximum MAX_NAME_LENGTH length.
@@ -184,7 +185,7 @@ uint32_t tox_send_action_withid(Tox *tox, int32_t friendnumber, uint32_t theid,
  *  return 0 if success.
  *  return -1 if failure.
  */
-int tox_set_name(Tox *tox, uint8_t *name, uint16_t length);
+int tox_set_name(Tox *tox, const uint8_t *name, uint16_t length);
 
 /*
  * Get your nickname.
@@ -194,7 +195,7 @@ int tox_set_name(Tox *tox, uint8_t *name, uint16_t length);
  *  return length of name.
  *  return 0 on error.
  */
-uint16_t tox_get_self_name(Tox *tox, uint8_t *name);
+uint16_t tox_get_self_name(const Tox *tox, uint8_t *name);
 
 /* 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.
@@ -202,13 +203,13 @@ uint16_t tox_get_self_name(Tox *tox, uint8_t *name);
  *  return length of name if success.
  *  return -1 if failure.
  */
-int tox_get_name(Tox *tox, int32_t friendnumber, uint8_t *name);
+int tox_get_name(const Tox *tox, int32_t friendnumber, uint8_t *name);
 
 /*  returns the length of name on success.
  *  returns -1 on failure.
  */
-int tox_get_name_size(Tox *tox, int32_t friendnumber);
-int tox_get_self_name_size(Tox *tox);
+int tox_get_name_size(const Tox *tox, int32_t friendnumber);
+int tox_get_self_name_size(const Tox *tox);
 
 /* Set our user status.
  *
@@ -218,14 +219,14 @@ int tox_get_self_name_size(Tox *tox);
  *  returns 0 on success.
  *  returns -1 on failure.
  */
-int tox_set_status_message(Tox *tox, uint8_t *status, uint16_t length);
+int tox_set_status_message(Tox *tox, const uint8_t *status, uint16_t length);
 int tox_set_user_status(Tox *tox, uint8_t userstatus);
 
 /*  returns the length of status message on success.
  *  returns -1 on failure.
  */
-int tox_get_status_message_size(Tox *tox, int32_t friendnumber);
-int tox_get_self_status_message_size(Tox *tox);
+int tox_get_status_message_size(const Tox *tox, int32_t friendnumber);
+int tox_get_self_status_message_size(const Tox *tox);
 
 /* 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.
@@ -234,22 +235,22 @@ int tox_get_self_status_message_size(Tox *tox);
  * returns the length of the copied data on success
  * retruns -1 on failure.
  */
-int tox_get_status_message(Tox *tox, int32_t friendnumber, uint8_t *buf, uint32_t maxlen);
-int tox_get_self_status_message(Tox *tox, uint8_t *buf, uint32_t maxlen);
+int tox_get_status_message(const Tox *tox, int32_t friendnumber, uint8_t *buf, uint32_t maxlen);
+int tox_get_self_status_message(const Tox *tox, uint8_t *buf, uint32_t maxlen);
 
 /*  return one of TOX_USERSTATUS values.
  *  Values unknown to your application should be represented as TOX_USERSTATUS_NONE.
  *  As above, the self variant will return our own TOX_USERSTATUS.
  *  If friendnumber is invalid, this shall return TOX_USERSTATUS_INVALID.
  */
-uint8_t tox_get_user_status(Tox *tox, int32_t friendnumber);
-uint8_t tox_get_self_user_status(Tox *tox);
+uint8_t tox_get_user_status(const Tox *tox, int32_t friendnumber);
+uint8_t tox_get_self_user_status(const Tox *tox);
 
 
 /* returns timestamp of last time friendnumber was seen online, or 0 if never seen.
  * returns -1 on error.
  */
-uint64_t tox_get_last_online(Tox *tox, int32_t friendnumber);
+uint64_t tox_get_last_online(const Tox *tox, int32_t friendnumber);
 
 /* Set our typing status for a friend.
  * You are responsible for turning it on or off.
@@ -264,7 +265,7 @@ int tox_set_user_is_typing(Tox *tox, int32_t friendnumber, uint8_t is_typing);
  * returns 0 if friend is not typing.
  * returns 1 if friend is typing.
  */
-uint8_t tox_get_is_typing(Tox *tox, int32_t friendnumber);
+uint8_t tox_get_is_typing(const Tox *tox, int32_t friendnumber);
 
 /* Sets whether we send read receipts for friendnumber.
  * This function is not lazy, and it will fail if yesno is not (0 or 1).
@@ -274,17 +275,17 @@ void tox_set_sends_receipts(Tox *tox, int32_t friendnumber, int yesno);
 /* Return the number of friends in the instance m.
  * You should use this to determine how much memory to allocate
  * for copy_friendlist. */
-uint32_t tox_count_friendlist(Tox *tox);
+uint32_t tox_count_friendlist(const Tox *tox);
 
 /* Return the number of online friends in the instance m. */
-uint32_t tox_get_num_online_friends(Tox *tox);
+uint32_t tox_get_num_online_friends(const Tox *tox);
 
 /* Copy a list of valid friend IDs into the array out_list.
  * If out_list is NULL, returns 0.
  * Otherwise, returns the number of elements copied.
  * If the array was too small, the contents
  * of out_list will be truncated to list_size. */
-uint32_t tox_get_friendlist(Tox *tox, int32_t *out_list, uint32_t list_size);
+uint32_t tox_get_friendlist(const Tox *tox, int32_t *out_list, uint32_t list_size);
 
 /* Set the function that will be executed when a friend request is received.
  *  Function format is function(Tox *tox, uint8_t * public_key, uint8_t * data, uint16_t length, void *userdata)
@@ -295,27 +296,27 @@ void tox_callback_friend_request(Tox *tox, void (*function)(Tox *tox, const uint
 /* Set the function that will be executed when a message from a friend is received.
  *  Function format is: function(Tox *tox, int32_t friendnumber, uint8_t * message, uint32_t length, void *userdata)
  */
-void tox_callback_friend_message(Tox *tox, void (*function)(Tox *tox, int32_t, uint8_t *, uint16_t, void *),
+void tox_callback_friend_message(Tox *tox, void (*function)(Tox *tox, int32_t, const uint8_t *, uint16_t, void *),
                                  void *userdata);
 
 /* Set the function that will be executed when an action from a friend is received.
  *  Function format is: function(Tox *tox, int32_t friendnumber, uint8_t * action, uint32_t length, void *userdata)
  */
-void tox_callback_friend_action(Tox *tox, void (*function)(Tox *tox, int32_t, uint8_t *, uint16_t, void *),
+void tox_callback_friend_action(Tox *tox, void (*function)(Tox *tox, int32_t, const uint8_t *, uint16_t, void *),
                                 void *userdata);
 
 /* Set the callback for name changes.
  *  function(Tox *tox, int32_t friendnumber, uint8_t *newname, uint16_t length, void *userdata)
  *  You are not responsible for freeing newname
  */
-void tox_callback_name_change(Tox *tox, void (*function)(Tox *tox, int32_t, uint8_t *, uint16_t, void *),
+void tox_callback_name_change(Tox *tox, void (*function)(Tox *tox, int32_t, const uint8_t *, uint16_t, void *),
                               void *userdata);
 
 /* Set the callback for status message changes.
  *  function(Tox *tox, int32_t friendnumber, uint8_t *newstatus, uint16_t length, void *userdata)
  *  You are not responsible for freeing newstatus.
  */
-void tox_callback_status_message(Tox *tox, void (*function)(Tox *tox, int32_t, uint8_t *, uint16_t, void *),
+void tox_callback_status_message(Tox *tox, void (*function)(Tox *tox, int32_t, const uint8_t *, uint16_t, void *),
                                  void *userdata);
 
 /* Set the callback for status type changes.
@@ -357,7 +358,7 @@ void tox_callback_connection_status(Tox *tox, void (*function)(Tox *tox, int32_t
 
 /* Functions to get/set the nospam part of the id.
  */
-uint32_t tox_get_nospam(Tox *tox);
+uint32_t tox_get_nospam(const Tox *tox);
 void tox_set_nospam(Tox *tox, uint32_t nospam);
 
 
@@ -367,20 +368,20 @@ void tox_set_nospam(Tox *tox, uint32_t nospam);
  *
  *  Function(Tox *tox, int friendnumber, uint8_t *group_public_key, void *userdata)
  */
-void tox_callback_group_invite(Tox *tox, void (*function)(Tox *tox, int32_t, uint8_t *, void *), void *userdata);
+void tox_callback_group_invite(Tox *tox, void (*function)(Tox *tox, int32_t, const uint8_t *, void *), void *userdata);
 
 /* Set the callback for group messages.
  *
  *  Function(Tox *tox, int groupnumber, int friendgroupnumber, uint8_t * message, uint16_t length, void *userdata)
  */
-void tox_callback_group_message(Tox *tox, void (*function)(Tox *tox, int, int, uint8_t *, uint16_t, void *),
+void tox_callback_group_message(Tox *tox, void (*function)(Tox *tox, int, int, const uint8_t *, uint16_t, void *),
                                 void *userdata);
 
 /* Set the callback for group actions.
  *
  *  Function(Tox *tox, int groupnumber, int friendgroupnumber, uint8_t * action, uint16_t length, void *userdata)
  */
-void tox_callback_group_action(Tox *tox, void (*function)(Tox *tox, int, int, uint8_t *, uint16_t, void *),
+void tox_callback_group_action(Tox *tox, void (*function)(Tox *tox, int, int, const uint8_t *, uint16_t, void *),
                                void *userdata);
 
 /* Set callback function for peer name list changes.
@@ -417,7 +418,7 @@ int tox_del_groupchat(Tox *tox, int groupnumber);
  * return length of name if success
  * return -1 if failure
  */
-int tox_group_peername(Tox *tox, int groupnumber, int peernumber, uint8_t *name);
+int tox_group_peername(const Tox *tox, int groupnumber, int peernumber, uint8_t *name);
 
 /* invite friendnumber to groupnumber
  * return 0 on success
@@ -430,24 +431,24 @@ int tox_invite_friend(Tox *tox, int32_t friendnumber, int groupnumber);
  * returns group number on success
  * returns -1 on failure.
  */
-int tox_join_groupchat(Tox *tox, int32_t friendnumber, uint8_t *friend_group_public_key);
+int tox_join_groupchat(Tox *tox, int32_t friendnumber, const uint8_t *friend_group_public_key);
 
 /* send a group message
  * return 0 on success
  * return -1 on failure
  */
-int tox_group_message_send(Tox *tox, int groupnumber, uint8_t *message, uint32_t length);
+int tox_group_message_send(Tox *tox, int groupnumber, const uint8_t *message, uint32_t length);
 
 /* send a group action
  * return 0 on success
  * return -1 on failure
  */
-int tox_group_action_send(Tox *tox, int groupnumber, uint8_t *action, uint32_t length);
+int tox_group_action_send(Tox *tox, int groupnumber, const uint8_t *action, uint32_t length);
 
 /* Return the number of peers in the group chat on success.
  * return -1 on failure
  */
-int tox_group_number_peers(Tox *tox, int groupnumber);
+int tox_group_number_peers(const Tox *tox, int groupnumber);
 
 /* List all the peers in the group chat.
  *
@@ -459,20 +460,20 @@ int tox_group_number_peers(Tox *tox, int groupnumber);
  *
  * return -1 on failure.
  */
-int tox_group_get_names(Tox *tox, int groupnumber, uint8_t names[][TOX_MAX_NAME_LENGTH], uint16_t lengths[],
+int tox_group_get_names(const Tox *tox, int groupnumber, uint8_t names[][TOX_MAX_NAME_LENGTH], uint16_t lengths[],
                         uint16_t length);
 
 /* Return the number of chats in the instance m.
  * You should use this to determine how much memory to allocate
  * for copy_chatlist. */
-uint32_t tox_count_chatlist(Tox *tox);
+uint32_t tox_count_chatlist(const Tox *tox);
 
 /* Copy a list of valid chat IDs into the array out_list.
  * If out_list is NULL, returns 0.
  * Otherwise, returns the number of elements copied.
  * If the array was too small, the contents
  * of out_list will be truncated to list_size. */
-uint32_t tox_get_chatlist(Tox *tox, int *out_list, uint32_t list_size);
+uint32_t tox_get_chatlist(const Tox *tox, int *out_list, uint32_t list_size);
 
 
 /****************FILE SENDING FUNCTIONS*****************/
@@ -523,8 +524,8 @@ enum {
  *
  *  Function(Tox *tox, int32_t friendnumber, uint8_t filenumber, uint64_t filesize, uint8_t *filename, uint16_t filename_length, void *userdata)
  */
-void tox_callback_file_send_request(Tox *tox, void (*function)(Tox *m, int32_t, uint8_t, uint64_t, uint8_t *, uint16_t,
-                                    void *), void *userdata);
+void tox_callback_file_send_request(Tox *tox, void (*function)(Tox *m, int32_t, uint8_t, uint64_t, const uint8_t *,
+                                    uint16_t, void *), void *userdata);
 
 /* Set the callback for file control requests.
  *
@@ -534,7 +535,7 @@ void tox_callback_file_send_request(Tox *tox, void (*function)(Tox *m, int32_t,
  *  Function(Tox *tox, int32_t friendnumber, uint8_t receive_send, uint8_t filenumber, uint8_t control_type, uint8_t *data, uint16_t length, void *userdata)
  *
  */
-void tox_callback_file_control(Tox *tox, void (*function)(Tox *m, int32_t, uint8_t, uint8_t, uint8_t, uint8_t *,
+void tox_callback_file_control(Tox *tox, void (*function)(Tox *m, int32_t, uint8_t, uint8_t, uint8_t, const uint8_t *,
                                uint16_t, void *), void *userdata);
 
 /* Set the callback for file data.
@@ -542,8 +543,8 @@ void tox_callback_file_control(Tox *tox, void (*function)(Tox *m, int32_t, uint8
  *  Function(Tox *tox, int32_t friendnumber, uint8_t filenumber, uint8_t *data, uint16_t length, void *userdata)
  *
  */
-void tox_callback_file_data(Tox *tox, void (*function)(Tox *m, int32_t, uint8_t, uint8_t *, uint16_t length, void *),
-                            void *userdata);
+void tox_callback_file_data(Tox *tox, void (*function)(Tox *m, int32_t, uint8_t, const uint8_t *, uint16_t length,
+                            void *), void *userdata);
 
 
 /* Send a file send request.
@@ -551,7 +552,8 @@ void tox_callback_file_data(Tox *tox, void (*function)(Tox *m, int32_t, uint8_t,
  *  return file number on success
  *  return -1 on failure
  */
-int tox_new_file_sender(Tox *tox, int32_t friendnumber, uint64_t filesize, uint8_t *filename, uint16_t filename_length);
+int tox_new_file_sender(Tox *tox, int32_t friendnumber, uint64_t filesize, const uint8_t *filename,
+                        uint16_t filename_length);
 
 /* Send a file control request.
  *
@@ -562,21 +564,21 @@ int tox_new_file_sender(Tox *tox, int32_t friendnumber, uint64_t filesize, uint8
  *  return -1 on failure
  */
 int tox_file_send_control(Tox *tox, int32_t friendnumber, uint8_t send_receive, uint8_t filenumber, uint8_t message_id,
-                          uint8_t *data, uint16_t length);
+                          const uint8_t *data, uint16_t length);
 
 /* Send file data.
  *
  *  return 0 on success
  *  return -1 on failure
  */
-int tox_file_send_data(Tox *tox, int32_t friendnumber, uint8_t filenumber, uint8_t *data, uint16_t length);
+int tox_file_send_data(Tox *tox, int32_t friendnumber, uint8_t filenumber, const uint8_t *data, uint16_t length);
 
 /* Returns the recommended/maximum size of the filedata you send with tox_file_send_data()
  *
  *  return size on success
  *  return -1 on failure (currently will never return -1)
  */
-int tox_file_data_size(Tox *tox, int32_t friendnumber);
+int tox_file_data_size(const Tox *tox, int32_t friendnumber);
 
 /* Give the number of bytes left to be sent/received.
  *
@@ -585,7 +587,7 @@ int tox_file_data_size(Tox *tox, int32_t friendnumber);
  *  return number of bytes remaining to be sent/received on success
  *  return 0 on failure
  */
-uint64_t tox_file_data_remaining(Tox *tox, int32_t friendnumber, uint8_t filenumber, uint8_t send_receive);
+uint64_t tox_file_data_remaining(const Tox *tox, int32_t friendnumber, uint8_t filenumber, uint8_t send_receive);
 
 /***************END OF FILE SENDING FUNCTIONS******************/
 
@@ -606,12 +608,12 @@ uint64_t tox_file_data_remaining(Tox *tox, int32_t friendnumber, uint8_t filenum
  *  returns 0 otherwise
  */
 int tox_bootstrap_from_address(Tox *tox, const char *address, uint8_t ipv6enabled,
-                               uint16_t port, uint8_t *public_key);
+                               uint16_t port, const uint8_t *public_key);
 
 /*  return 0 if we are not connected to the DHT.
  *  return 1 if we are.
  */
-int tox_isconnected(Tox *tox);
+int tox_isconnected(const Tox *tox);
 
 /*
  *  Run this function at startup.
@@ -645,17 +647,17 @@ void tox_do(Tox *tox);
 /* SAVING AND LOADING FUNCTIONS: */
 
 /*  return size of messenger data (for saving). */
-uint32_t tox_size(Tox *tox);
+uint32_t tox_size(const Tox *tox);
 
 /* Save the messenger in data (must be allocated memory of size Messenger_size()). */
-void tox_save(Tox *tox, uint8_t *data);
+void tox_save(const Tox *tox, uint8_t *data);
 
 /* Load the messenger from data of size length.
  *
  *  returns 0 on success
  *  returns -1 on failure
  */
-int tox_load(Tox *tox, uint8_t *data, uint32_t length);
+int tox_load(Tox *tox, const uint8_t *data, uint32_t length);
 
 #ifdef __cplusplus
 }