libtox update

added libtox x64
projects cleanup
added dll to lib converter


git-svn-id: http://svn.miranda-ng.org/main/trunk@10120 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 0 insertions, 1144 deletions

diff --git a/protocols/Tox/include/tox/tox.h b/protocols/Tox/include/tox/tox.h
deleted file mode 100644
index 14426f31cc..0000000000
--- a/protocols/Tox/include/tox/tox.h
+++ /dev/null
@@ -1,666 +0,0 @@
-/* tox.h
- *
- * The Tox public API.
- *
- *  Copyright (C) 2013 Tox project All Rights Reserved.
- *
- *  This file is part of Tox.
- *
- *  Tox is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Tox is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef TOX_H
-#define TOX_H
-
-#include <stdint.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define TOX_MAX_NAME_LENGTH 128
-
-/* Maximum length of single messages after which they should be split. */
-#define TOX_MAX_MESSAGE_LENGTH 1368
-#define TOX_MAX_STATUSMESSAGE_LENGTH 1007
-#define TOX_CLIENT_ID_SIZE 32
-
-#define TOX_FRIEND_ADDRESS_SIZE (TOX_CLIENT_ID_SIZE + sizeof(uint32_t) + sizeof(uint16_t))
-
-#define TOX_ENABLE_IPV6_DEFAULT 1
-
-/* Errors for m_addfriend
- * FAERR - Friend Add Error
- */
-enum {
-    TOX_FAERR_TOOLONG = -1,
-    TOX_FAERR_NOMESSAGE = -2,
-    TOX_FAERR_OWNKEY = -3,
-    TOX_FAERR_ALREADYSENT = -4,
-    TOX_FAERR_UNKNOWN = -5,
-    TOX_FAERR_BADCHECKSUM = -6,
-    TOX_FAERR_SETNEWNOSPAM = -7,
-    TOX_FAERR_NOMEM = -8
-};
-
-/* USERSTATUS -
- * Represents userstatuses someone can have.
- */
-typedef enum {
-    TOX_USERSTATUS_NONE,
-    TOX_USERSTATUS_AWAY,
-    TOX_USERSTATUS_BUSY,
-    TOX_USERSTATUS_INVALID
-}
-TOX_USERSTATUS;
-
-#ifndef __TOX_DEFINED__
-#define __TOX_DEFINED__
-typedef struct Tox Tox;
-#endif
-
-/* NOTE: Strings in Tox are all UTF-8, (This means that there is no terminating NULL character.)
- *
- * The exact buffer you send will be received at the other end without modification.
- *
- * Do not treat Tox strings as C strings.
- */
-
-/*  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(const Tox *tox, uint8_t *address);
-
-/* 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 TOX_FRIEND_ADDRESS_SIZE bytes. TODO: add checksum.
- * data is the data and length is the length.
- *
- *  return the friend number if success.
- *  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.
- *  return TOX_FAERR_UNKNOWN for unknown error.
- *  return TOX_FAERR_BADCHECKSUM if bad checksum in address.
- *  return TOX_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 TOX_FAERR_NOMEM if increasing the friend list size fails.
- */
-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.
- *  return the friend number if success.
- *  return -1 if failure.
- */
-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(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(const Tox *tox, int32_t friendnumber, uint8_t *client_id);
-
-/* Remove a friend.
- *
- *  return 0 if success.
- *  return -1 if failure.
- */
-int tox_del_friend(Tox *tox, int32_t friendnumber);
-
-/* Checks friend's connecting status.
- *
- *  return 1 if friend is connected to us (Online).
- *  return 0 if friend is not connected to us (Offline).
- *  return -1 on failure.
- */
-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(const Tox *tox, int32_t friendnumber);
-
-/* Send a text chat message to an online friend.
- *
- *  return the message id if packet was successfully put into the send queue.
- *  return 0 if it was not.
- *
- * maximum length of messages is TOX_MAX_MESSAGE_LENGTH, your client must split larger messages
- * or else sending them will not work. No the core will not split messages for you because that
- * requires me to parse UTF-8.
- *
- * 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_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, const uint8_t *message,
-                                 uint32_t length);
-
-/* Send an action to an online friend.
- *
- *  return the message id if packet was successfully put into the send queue.
- *  return 0 if it was not.
- *
- * maximum length of actions is TOX_MAX_MESSAGE_LENGTH, your client must split larger actions
- * or else sending them will not work. No the core will not split actions for you because that
- * requires me to parse UTF-8.
- *
- *  You will want to retain the return value, it will be passed to your read_receipt callback
- *  if one is received.
- *  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, 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.
- * 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_set_name(Tox *tox, const uint8_t *name, uint16_t length);
-
-/*
- * Get your nickname.
- * m - The messenger context to use.
- * name - needs to be a valid memory location with a size of at least MAX_NAME_LENGTH (128) bytes.
- *
- *  return length of name.
- *  return 0 on error.
- */
-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.
- *
- *  return length of name if success.
- *  return -1 if failure.
- */
-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(const Tox *tox, int32_t friendnumber);
-int tox_get_self_name_size(const Tox *tox);
-
-/* Set our user status.
- *
- * userstatus must be one of TOX_USERSTATUS values.
- * max length of the status is TOX_MAX_STATUSMESSAGE_LENGTH.
- *
- *  returns 0 on success.
- *  returns -1 on failure.
- */
-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(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.
- * The self variant will copy our own status message.
- *
- * returns the length of the copied data on success
- * retruns -1 on failure.
- */
-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(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(const Tox *tox, int32_t friendnumber);
-
-/* Set our typing status for a friend.
- * You are responsible for turning it on or off.
- *
- * returns 0 on success.
- * returns -1 on failure.
- */
-int tox_set_user_is_typing(Tox *tox, int32_t friendnumber, uint8_t is_typing);
-
-/* Get the typing status of a friend.
- *
- * returns 0 if friend is not typing.
- * returns 1 if friend is typing.
- */
-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).
- */
-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(const Tox *tox);
-
-/* Return the number of online friends in the instance m. */
-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(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)
- */
-void tox_callback_friend_request(Tox *tox, void (*function)(Tox *tox, const uint8_t *, const uint8_t *, uint16_t,
-                                 void *), void *userdata);
-
-/* 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, uint16_t length, void *userdata)
- */
-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, uint16_t length, void *userdata)
- */
-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, 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, const uint8_t *, uint16_t, void *),
-                                 void *userdata);
-
-/* Set the callback for status type changes.
- *  function(Tox *tox, int32_t friendnumber, uint8_t TOX_USERSTATUS, void *userdata)
- */
-void tox_callback_user_status(Tox *tox, void (*function)(Tox *tox, int32_t, uint8_t, void *), void *userdata);
-
-/* Set the callback for typing changes.
- *  function (Tox *tox, int32_t friendnumber, uint8_t is_typing, void *userdata)
- */
-void tox_callback_typing_change(Tox *tox, void (*function)(Tox *tox, int32_t, uint8_t, void *), void *userdata);
-
-/* Set the callback for read receipts.
- *  function(Tox *tox, int32_t friendnumber, uint32_t receipt, void *userdata)
- *
- *  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(Tox *tox, void (*function)(Tox *tox, int32_t, uint32_t, void *), void *userdata);
-
-/* Set the callback for connection status changes.
- *  function(Tox *tox, int32_t friendnumber, uint8_t status, void *userdata)
- *
- *  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_connection_status(Tox *tox, void (*function)(Tox *tox, int32_t, uint8_t, void *), void *userdata);
-
-
-/**********ADVANCED FUNCTIONS (If you don't know what they do you can safely ignore them.)  ************/
-
-/* Functions to get/set the nospam part of the id.
- */
-uint32_t tox_get_nospam(const Tox *tox);
-void tox_set_nospam(Tox *tox, uint32_t nospam);
-
-
-/**********GROUP CHAT FUNCTIONS: WARNING Group chats will be rewritten so this might change ************/
-
-/* Set the callback for group invites.
- *
- *  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, 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, 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, const uint8_t *, uint16_t, void *),
-                               void *userdata);
-
-/* Set callback function for peer name list changes.
- *
- * It gets called every time the name list changes(new peer/name, deleted peer)
- *  Function(Tox *tox, int groupnumber, int peernumber, TOX_CHAT_CHANGE change, void *userdata)
- */
-typedef enum {
-    TOX_CHAT_CHANGE_PEER_ADD,
-    TOX_CHAT_CHANGE_PEER_DEL,
-    TOX_CHAT_CHANGE_PEER_NAME,
-} TOX_CHAT_CHANGE;
-
-void tox_callback_group_namelist_change(Tox *tox, void (*function)(Tox *tox, int, int, uint8_t, void *),
-                                        void *userdata);
-
-/* Creates a new groupchat and puts it in the chats array.
- *
- * return group number on success.
- * return -1 on failure.
- */
-int tox_add_groupchat(Tox *tox);
-
-/* Delete a groupchat from the chats array.
- *
- * return 0 on success.
- * return -1 if failure.
- */
-int tox_del_groupchat(Tox *tox, int groupnumber);
-
-/* Copy the name of peernumber who is in groupnumber to name.
- * name must be at least TOX_MAX_NAME_LENGTH long.
- *
- * return length of name if success
- * return -1 if failure
- */
-int tox_group_peername(const Tox *tox, int groupnumber, int peernumber, uint8_t *name);
-
-/* invite friendnumber to groupnumber
- * return 0 on success
- * return -1 on failure
- */
-int tox_invite_friend(Tox *tox, int32_t friendnumber, int groupnumber);
-
-/* Join a group (you need to have been invited first.)
- *
- * returns group number on success
- * returns -1 on failure.
- */
-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, 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, 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(const Tox *tox, int groupnumber);
-
-/* List all the peers in the group chat.
- *
- * Copies the names of the peers to the name[length][TOX_MAX_NAME_LENGTH] array.
- *
- * Copies the lengths of the names to lengths[length]
- *
- * returns the number of peers on success.
- *
- * return -1 on failure.
- */
-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(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(const Tox *tox, int *out_list, uint32_t list_size);
-
-
-/****************FILE SENDING FUNCTIONS*****************/
-/* NOTE: This how to will be updated.
- *
- * HOW TO SEND FILES CORRECTLY:
- * 1. Use tox_new_file_sender(...) to create a new file sender.
- * 2. Wait for the callback set with tox_callback_file_control(...) to be called with receive_send == 1 and control_type == TOX_FILECONTROL_ACCEPT
- * 3. Send the data with tox_file_send_data(...) with chunk size tox_file_data_size(...)
- * 4. When sending is done, send a tox_file_send_control(...) with send_receive = 0 and message_id = TOX_FILECONTROL_FINISHED
- *
- * HOW TO RECEIVE FILES CORRECTLY:
- * 1. wait for the callback set with tox_callback_file_send_request(...)
- * 2. accept or refuse the connection with tox_file_send_control(...) with send_receive = 1 and message_id = TOX_FILECONTROL_ACCEPT or TOX_FILECONTROL_KILL
- * 3. save all the data received with the callback set with tox_callback_file_data(...) to a file.
- * 4. when the callback set with tox_callback_file_control(...) is called with receive_send == 0 and control_type == TOX_FILECONTROL_FINISHED
- * the file is done transferring.
- *
- * tox_file_data_remaining(...) can be used to know how many bytes are left to send/receive.
- *
- * If the connection breaks during file sending (The other person goes offline without pausing the sending and then comes back)
- * the receiver must send a control packet with send_receive == 1 message_id = TOX_FILECONTROL_RESUME_BROKEN and the data being
- * a uint64_t (in host byte order) containing the number of bytes received.
- *
- * If the sender receives this packet, he must send a control packet with send_receive == 0 and control_type == TOX_FILECONTROL_ACCEPT
- * then he must start sending file data from the position (data , uint64_t in host byte order) received in the TOX_FILECONTROL_RESUME_BROKEN packet.
- *
- * To pause a file transfer send a control packet with control_type == TOX_FILECONTROL_PAUSE.
- * To unpause a file transfer send a control packet with control_type == TOX_FILECONTROL_ACCEPT.
- *
- * If you receive a control packet with receive_send == 1 and control_type == TOX_FILECONTROL_PAUSE, you must stop sending filenumber until the other
- * person sends a control packet with send_receive == 0 and control_type == TOX_FILECONTROL_ACCEPT with the filenumber being a paused filenumber.
- *
- * If you receive a control packet with receive_send == 0 and control_type == TOX_FILECONTROL_PAUSE, it means the sender of filenumber has paused the
- * transfer and will resume it later with a control packet with send_receive == 1 and control_type == TOX_FILECONTROL_ACCEPT for that file number.
- *
- * More to come...
- */
-
-enum {
-    TOX_FILECONTROL_ACCEPT,
-    TOX_FILECONTROL_PAUSE,
-    TOX_FILECONTROL_KILL,
-    TOX_FILECONTROL_FINISHED,
-    TOX_FILECONTROL_RESUME_BROKEN
-};
-/* Set the callback for file send requests.
- *
- *  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, const uint8_t *,
-                                    uint16_t, void *), void *userdata);
-
-/* Set the callback for file control requests.
- *
- *  receive_send is 1 if the message is for a slot on which we are currently sending a file and 0 if the message
- *  is for a slot on which we are receiving the file
- *
- *  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, const uint8_t *,
-                               uint16_t, void *), void *userdata);
-
-/* Set the callback for file data.
- *
- *  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, const uint8_t *, uint16_t length,
-                            void *), void *userdata);
-
-
-/* Send a file send request.
- * Maximum filename length is 255 bytes.
- *  return file number on success
- *  return -1 on failure
- */
-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.
- *
- * send_receive is 0 if we want the control packet to target a file we are currently sending,
- * 1 if it targets a file we are currently receiving.
- *
- *  return 0 on success
- *  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,
-                          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, 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(const Tox *tox, int32_t friendnumber);
-
-/* Give the number of bytes left to be sent/received.
- *
- *  send_receive is 0 if we want the sending files, 1 if we want the receiving.
- *
- *  return number of bytes remaining to be sent/received on success
- *  return 0 on failure
- */
-uint64_t tox_file_data_remaining(const Tox *tox, int32_t friendnumber, uint8_t filenumber, uint8_t send_receive);
-
-/***************END OF FILE SENDING FUNCTIONS******************/
-
-/*
- * Use this function to bootstrap the client.
- */
-
-/* Resolves address into an IP address. If successful, sends a "get nodes"
- *   request to the given node with ip, port (in network byte order, HINT: use htons())
- *   and public_key to setup connections
- *
- * address can be a hostname or an IP address (IPv4 or IPv6).
- * if ipv6enabled is 0 (zero), the resolving sticks STRICTLY to IPv4 addresses
- * if ipv6enabled is not 0 (zero), the resolving looks for IPv6 addresses first,
- *   then IPv4 addresses.
- *
- *  returns 1 if the address could be converted into an IP address
- *  returns 0 otherwise
- */
-int tox_bootstrap_from_address(Tox *tox, const char *address, uint8_t ipv6enabled,
-                               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(const Tox *tox);
-
-/*
- *  Run this function at startup.
- *
- * Initializes a tox structure
- *  The type of communication socket depends on ipv6enabled:
- *  If set to 0 (zero), creates an IPv4 socket which subsequently only allows
- *    IPv4 communication
- *  If set to anything else, creates an IPv6 socket which allows both IPv4 AND
- *    IPv6 communication
- *
- *  return allocated instance of tox on success.
- *  return 0 if there are problems.
- */
-Tox *tox_new(uint8_t ipv6enabled);
-
-/* Run this before closing shop.
- * Free all datastructures. */
-void tox_kill(Tox *tox);
-
-/* Return the time in milliseconds before tox_do() should be called again
- * for optimal performance.
- *
- * returns time (in ms) before the next tox_do() needs to be run on success.
- */
-uint32_t tox_do_interval(Tox *tox);
-
-/* The main loop that needs to be run in intervals of tox_do_interval() ms. */
-void tox_do(Tox *tox);
-
-/* SAVING AND LOADING FUNCTIONS: */
-
-/*  return size of messenger data (for saving). */
-uint32_t tox_size(const Tox *tox);
-
-/* Save the messenger in data (must be allocated memory of size Messenger_size()). */
-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, const uint8_t *data, uint32_t length);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/protocols/Tox/include/tox/toxav.h b/protocols/Tox/include/tox/toxav.h
deleted file mode 100644
index 0ded42bd56..0000000000
--- a/protocols/Tox/include/tox/toxav.h
+++ /dev/null
@@ -1,393 +0,0 @@
-/**  toxav.h
- *
- *   Copyright (C) 2013 Tox project All Rights Reserved.
- *
- *   This file is part of Tox.
- *
- *   Tox is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Tox is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Tox. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-#ifndef __TOXAV
-#define __TOXAV
-#include <inttypes.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* vpx_image_t */
-#include <vpx/vpx_image.h>
-
-typedef void ( *ToxAVCallback ) ( int32_t, void *arg );
-typedef struct _ToxAv ToxAv;
-
-#ifndef __TOX_DEFINED__
-#define __TOX_DEFINED__
-typedef struct Tox Tox;
-#endif
-
-#define RTP_PAYLOAD_SIZE 65535
-
-
-/**
- * @brief Callbacks ids that handle the call states.
- */
-typedef enum {
-    /* Requests */
-    av_OnInvite,
-    av_OnStart,
-    av_OnCancel,
-    av_OnReject,
-    av_OnEnd,
-
-    /* Responses */
-    av_OnRinging,
-    av_OnStarting,
-    av_OnEnding,
-
-    /* Protocol */
-    av_OnError,
-    av_OnRequestTimeout,
-    av_OnPeerTimeout
-} ToxAvCallbackID;
-
-
-/**
- * @brief Call type identifier.
- */
-typedef enum {
-    TypeAudio = 192,
-    TypeVideo
-} ToxAvCallType;
-
-
-typedef enum {
-    av_CallNonExistant = -1,
-    av_CallInviting, /* when sending call invite */
-    av_CallStarting, /* when getting call invite */
-    av_CallActive,
-    av_CallHold,
-    av_CallHanged_up
-} ToxAvCallState;
-
-/**
- * @brief Error indicators.
- */
-typedef enum {
-    ErrorNone = 0,
-    ErrorInternal = -1, /* Internal error */
-    ErrorAlreadyInCall = -2, /* Already has an active call */
-    ErrorNoCall = -3, /* Trying to perform call action while not in a call */
-    ErrorInvalidState = -4, /* Trying to perform call action while in invalid state*/
-    ErrorNoRtpSession = -5, /* Trying to perform rtp action on invalid session */
-    ErrorAudioPacketLost = -6, /* Indicating packet loss */
-    ErrorStartingAudioRtp = -7, /* Error in toxav_prepare_transmission() */
-    ErrorStartingVideoRtp = -8 , /* Error in toxav_prepare_transmission() */
-    ErrorTerminatingAudioRtp = -9, /* Returned in toxav_kill_transmission() */
-    ErrorTerminatingVideoRtp = -10, /* Returned in toxav_kill_transmission() */
-    ErrorPacketTooLarge = -11, /* Buffer exceeds size while encoding */
-    ErrorInvalidCodecState = -12, /* Codec state not initialized */
-
-} ToxAvError;
-
-
-/**
- * @brief Locally supported capabilities.
- */
-typedef enum {
-    AudioEncoding = 1 << 0,
-    AudioDecoding = 1 << 1,
-    VideoEncoding = 1 << 2,
-    VideoDecoding = 1 << 3
-} ToxAvCapabilities;
-
-
-/**
- * @brief Encoding settings.
- */
-typedef struct _ToxAvCodecSettings {
-    uint32_t video_bitrate; /* In kbits/s */
-    uint16_t max_video_width; /* In px */
-    uint16_t max_video_height; /* In px */
-
-    uint32_t audio_bitrate; /* In bits/s */
-    uint16_t audio_frame_duration; /* In ms */
-    uint32_t audio_sample_rate; /* In Hz */
-    uint32_t audio_channels;
-    uint32_t audio_VAD_tolerance; /* In ms */
-
-    uint32_t jbuf_capacity; /* Size of jitter buffer */
-} ToxAvCodecSettings;
-
-extern const ToxAvCodecSettings av_DefaultSettings;
-
-/**
- * @brief Start new A/V session. There can only be one session at the time. If you register more
- *        it will result in undefined behaviour.
- *
- * @param messenger The messenger handle.
- * @param userdata The agent handling A/V session (i.e. phone).
- * @param video_width Width of video frame.
- * @param video_height Height of video frame.
- * @return ToxAv*
- * @retval NULL On error.
- */
-ToxAv *toxav_new(Tox *messenger, int32_t max_calls);
-
-/**
- * @brief Remove A/V session.
- *
- * @param av Handler.
- * @return void
- */
-void toxav_kill(ToxAv *av);
-
-/**
- * @brief Register callback for call state.
- *
- * @param callback The callback
- * @param id One of the ToxAvCallbackID values
- * @return void
- */
-void toxav_register_callstate_callback (ToxAVCallback callback, ToxAvCallbackID id, void *userdata);
-
-/**
- * @brief Register callback for recieving audio data
- *
- * @param callback The callback
- * @return void
- */
-void toxav_register_audio_recv_callback (ToxAv *av, void (*callback)(ToxAv *, int32_t, int16_t *, int));
-
-/**
- * @brief Register callback for recieving video data
- *
- * @param callback The callback
- * @return void
- */
-void toxav_register_video_recv_callback (ToxAv *av, void (*callback)(ToxAv *, int32_t, vpx_image_t *));
-
-/**
- * @brief Call user. Use its friend_id.
- *
- * @param av Handler.
- * @param user The user.
- * @param call_type Call type.
- * @param ringing_seconds Ringing timeout.
- * @return int
- * @retval 0 Success.
- * @retval ToxAvError On error.
- */
-int toxav_call(ToxAv *av, int32_t *call_index, int user, ToxAvCallType call_type, int ringing_seconds);
-
-/**
- * @brief Hangup active call.
- *
- * @param av Handler.
- * @return int
- * @retval 0 Success.
- * @retval ToxAvError On error.
- */
-int toxav_hangup(ToxAv *av, int32_t call_index);
-
-/**
- * @brief Answer incomming call.
- *
- * @param av Handler.
- * @param call_type Answer with...
- * @return int
- * @retval 0 Success.
- * @retval ToxAvError On error.
- */
-int toxav_answer(ToxAv *av, int32_t call_index, ToxAvCallType call_type );
-
-/**
- * @brief Reject incomming call.
- *
- * @param av Handler.
- * @param reason Optional reason. Set NULL if none.
- * @return int
- * @retval 0 Success.
- * @retval ToxAvError On error.
- */
-int toxav_reject(ToxAv *av, int32_t call_index, const char *reason);
-
-/**
- * @brief Cancel outgoing request.
- *
- * @param av Handler.
- * @param reason Optional reason.
- * @param peer_id peer friend_id
- * @return int
- * @retval 0 Success.
- * @retval ToxAvError On error.
- */
-int toxav_cancel(ToxAv *av, int32_t call_index, int peer_id, const char *reason);
-
-/**
- * @brief Terminate transmission. Note that transmission will be terminated without informing remote peer.
- *
- * @param av Handler.
- * @return int
- * @retval 0 Success.
- * @retval ToxAvError On error.
- */
-int toxav_stop_call(ToxAv *av, int32_t call_index);
-
-/**
- * @brief Must be call before any RTP transmission occurs.
- *
- * @param av Handler.
- * @param support_video Is video supported ? 1 : 0
- * @return int
- * @retval 0 Success.
- * @retval ToxAvError On error.
- */
-int toxav_prepare_transmission(ToxAv *av, int32_t call_index, ToxAvCodecSettings *codec_settings, int support_video);
-
-/**
- * @brief Call this at the end of the transmission.
- *
- * @param av Handler.
- * @return int
- * @retval 0 Success.
- * @retval ToxAvError On error.
- */
-int toxav_kill_transmission(ToxAv *av, int32_t call_index);
-
-/**
- * @brief Encode and send video packet.
- *
- * @param av Handler.
- * @param frame The encoded frame.
- * @param frame_size The size of the encoded frame.
- * @return int
- * @retval 0 Success.
- * @retval ToxAvError On error.
- */
-int toxav_send_video ( ToxAv *av, int32_t call_index, const uint8_t *frame, int frame_size);
-
-/**
- * @brief Send audio frame.
- *
- * @param av Handler.
- * @param frame The frame (raw 16 bit signed pcm with AUDIO_CHANNELS channels audio.)
- * @param frame_size Its size in number of frames/samples (one frame/sample is 16 bits or 2 bytes)
- *                   frame size should be AUDIO_FRAME_SIZE.
- * @return int
- * @retval 0 Success.
- * @retval ToxAvError On error.
- */
-int toxav_send_audio ( ToxAv *av, int32_t call_index, const uint8_t *frame, int frame_size);
-
-/**
- * @brief Encode video frame
- *
- * @param av Handler
- * @param dest Where to
- * @param dest_max Max size
- * @param input What to encode
- * @return int
- * @retval ToxAvError On error.
- * @retval >0 On success
- */
-int toxav_prepare_video_frame ( ToxAv *av, int32_t call_index, uint8_t *dest, int dest_max, vpx_image_t *input );
-
-/**
- * @brief Encode audio frame
- *
- * @param av Handler
- * @param dest dest
- * @param dest_max Max dest size
- * @param frame The frame
- * @param frame_size The frame size
- * @return int
- * @retval ToxAvError On error.
- * @retval >0 On success
- */
-int toxav_prepare_audio_frame ( ToxAv *av, int32_t call_index, uint8_t *dest, int dest_max, const int16_t *frame,
-                                int frame_size);
-
-/**
- * @brief Get peer transmission type. It can either be audio or video.
- *
- * @param av Handler.
- * @param peer The peer
- * @return int
- * @retval ToxAvCallType On success.
- * @retval ToxAvError On error.
- */
-int toxav_get_peer_transmission_type ( ToxAv *av, int32_t call_index, int peer );
-
-/**
- * @brief Get id of peer participating in conversation
- *
- * @param av Handler
- * @param peer peer index
- * @return int
- * @retval ToxAvError No peer id
- */
-int toxav_get_peer_id ( ToxAv *av, int32_t call_index, int peer );
-
-/**
- * @brief Get current call state
- *
- * @param av Handler
- * @param call_index What call
- * @return int
- * @retval ToxAvCallState State id
- */
-ToxAvCallState toxav_get_call_state ( ToxAv *av, int32_t call_index );
-/**
- * @brief Is certain capability supported
- *
- * @param av Handler
- * @return int
- * @retval 1 Yes.
- * @retval 0 No.
- */
-int toxav_capability_supported ( ToxAv *av, int32_t call_index, ToxAvCapabilities capability );
-
-/**
- * @brief Set queue limit
- *
- * @param av Handler
- * @param call_index index
- * @param limit the limit
- * @return void
- */
-int toxav_set_audio_queue_limit ( ToxAv *av, int32_t call_index, uint64_t limit );
-
-/**
- * @brief Set queue limit
- *
- * @param av Handler
- * @param call_index index
- * @param limit the limit
- * @return void
- */
-int toxav_set_video_queue_limit ( ToxAv *av, int32_t call_index, uint64_t limit );
-
-
-Tox *toxav_get_tox(ToxAv *av);
-
-int toxav_has_activity ( ToxAv *av, int32_t call_index, int16_t *PCM, uint16_t frame_size, float ref_energy );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TOXAV */
diff --git a/protocols/Tox/include/tox/toxdns.h b/protocols/Tox/include/tox/toxdns.h
deleted file mode 100644
index a0cc323b43..0000000000
--- a/protocols/Tox/include/tox/toxdns.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* toxdns.h
- *
- * Tox secure username DNS toxid resolving functions.
- *
- *  Copyright (C) 2014 Tox project All Rights Reserved.
- *
- *  This file is part of Tox.
- *
- *  Tox is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Tox is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef TOXDNS_H
-#define TOXDNS_H
-
-#include <stdint.h>
-
-/* How to use this api to make secure tox dns3 requests:
- *
- * 1. Get the public key of a server that supports tox dns3.
- * 2. use tox_dns3_new() to create a new object to create DNS requests
- * and handle responses for that server.
- * 3. Use tox_generate_dns3_string() to generate a string based on the name we want to query and a request_id
- * that must be stored somewhere for when we want to decrypt the response.
- * 4. take the string and use it for your DNS request like this:
- * _4haaaaipr1o3mz0bxweox541airydbovqlbju51mb4p0ebxq.rlqdj4kkisbep2ks3fj2nvtmk4daduqiueabmexqva1jc._tox.utox.org
- * 5. The TXT in the DNS you receive should look like this:
- * v=tox3;id=2vgcxuycbuctvauik3plsv3d3aadv4zfjfhi3thaizwxinelrvigchv0ah3qjcsx5qhmaksb2lv2hm5cwbtx0yp
- * 6. Take the id string and use it with tox_decrypt_dns3_TXT() and the request_id corresponding to the
- * request we stored earlier to get the Tox id returned by the DNS server.
- */
-
-/* Create a new tox_dns3 object for server with server_public_key of size TOX_CLIENT_ID_SIZE.
- *
- * return Null on failure.
- * return pointer object on success.
- */
-void *tox_dns3_new(uint8_t *server_public_key);
-
-/* Destroy the tox dns3 object.
- */
-void tox_dns3_kill(void *dns3_object);
-
-/* Generate a dns3 string of string_max_len used to query the dns server referred to by to
- * dns3_object for a tox id registered to user with name of name_len.
- *
- * the uint32_t pointed by request_id will be set to the request id which must be passed to
- * tox_decrypt_dns3_TXT() to correctly decode the response.
- *
- * This is what the string returned looks like:
- * 4haaaaipr1o3mz0bxweox541airydbovqlbju51mb4p0ebxq.rlqdj4kkisbep2ks3fj2nvtmk4daduqiueabmexqva1jc
- *
- * returns length of string on sucess.
- * returns -1 on failure.
- */
-int tox_generate_dns3_string(void *dns3_object, uint8_t *string, uint16_t string_max_len, uint32_t *request_id,
-                             uint8_t *name, uint8_t name_len);
-
-/* Decode and decrypt the id_record returned of length id_record_len into
- * tox_id (needs to be at least TOX_FRIEND_ADDRESS_SIZE).
- *
- * request_id is the request id given by tox_generate_dns3_string() when creating the request.
- *
- * the id_record passed to this function should look somewhat like this:
- * 2vgcxuycbuctvauik3plsv3d3aadv4zfjfhi3thaizwxinelrvigchv0ah3qjcsx5qhmaksb2lv2hm5cwbtx0yp
- *
- * returns -1 on failure.
- * returns 0 on success.
- *
- */
-int tox_decrypt_dns3_TXT(void *dns3_object, uint8_t *tox_id, uint8_t *id_record, uint32_t id_record_len,
-                         uint32_t request_id);
-
-#endif