libtox moved to tox folder instead of libs

86 files changed, 17 insertions, 3733 deletions

diff --git a/bin15/mir_full.sln b/bin15/mir_full.sln
index a43a8ec99c..f5d1a194f1 100644
--- a/bin15/mir_full.sln
+++ b/bin15/mir_full.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2010
+VisualStudioVersion = 15.0.27004.2006
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32\miranda32.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -430,7 +430,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsodium", "..\libs\libsod
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthreads", "..\libs\pthreads\pthreads.vcxproj", "{E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtox", "..\libs\libtox\libtox.vcxproj", "{A21C50CD-28A6-481A-A12B-47189FE66641}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtox", "..\protocols\Tox\libtox\libtox.vcxproj", "{A21C50CD-28A6-481A-A12B-47189FE66641}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/libs/libtox/libtox.vcxproj.filters b/libs/libtox/libtox.vcxproj.filters
deleted file mode 100644
index 541f75ffb0..0000000000
--- a/libs/libtox/libtox.vcxproj.filters
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
-  <ItemGroup>
-    <ClCompile Include="src\stdafx.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxcore\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\toxencryptsave\*.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\toxcore\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/protocols/Tox/Tox.vcxproj b/protocols/Tox/Tox.vcxproj
index f786bfae1a..bc607b076a 100644
--- a/protocols/Tox/Tox.vcxproj
+++ b/protocols/Tox/Tox.vcxproj
@@ -27,14 +27,13 @@
   </ImportGroup>

   <ItemDefinitionGroup>

     <ClCompile>

-      <AdditionalIncludeDirectories>include;..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\include;libtox\src\toxcore;libtox\src\toxdns;libtox\src\toxencryptsave;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

     </ClCompile>

     <Link>

       <AdditionalDependencies>Winmm.lib;dnsapi.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <None Include="include\*.h" />

     <None Include="res\Icons\*.ico" />

   </ItemGroup>

   <ItemDefinitionGroup>

@@ -46,7 +45,7 @@
     <ProjectReference Include="..\..\libs\libjson\libjson.vcxproj">

       <Project>{f6a9340e-b8d9-4c75-be30-47dc66d0abc7}</Project>

     </ProjectReference>

-    <ProjectReference Include="..\..\libs\libtox\libtox.vcxproj">

+    <ProjectReference Include="libtox\libtox.vcxproj">

       <Project>{a21c50cd-28a6-481a-a12b-47189fe66641}</Project>

     </ProjectReference>

   </ItemGroup>

diff --git a/protocols/Tox/include/tox.h b/protocols/Tox/include/tox.h
deleted file mode 100644
index 373138c4eb..0000000000
--- a/protocols/Tox/include/tox.h
+++ /dev/null
@@ -1,2947 +0,0 @@
-/*
- * The Tox public API.
- */
-
-/*
- * Copyright © 2016-2017 The TokTok team.
- * Copyright © 2013 Tox project.
- *
- * This file is part of Tox, the free peer to peer instant messenger.
- *
- * 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 <msapi/stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/*******************************************************************************
- * `tox.h` SHOULD *NOT* BE EDITED MANUALLY – any changes should be made to   *
- * `tox.api.h`, located in `toxcore/`. For instructions on how to            *
- * generate `tox.h` from `tox.api.h` please refer to `docs/apidsl.md`        *
- ******************************************************************************/
-
-
-
-/** \page core Public core API for Tox clients.
- *
- * Every function that can fail takes a function-specific error code pointer
- * that can be used to diagnose problems with the Tox state or the function
- * arguments. The error code pointer can be NULL, which does not influence the
- * function's behaviour, but can be done if the reason for failure is irrelevant
- * to the client.
- *
- * The exception to this rule are simple allocation functions whose only failure
- * mode is allocation failure. They return NULL in that case, and do not set an
- * error code.
- *
- * Every error code type has an OK value to which functions will set their error
- * code value on success. Clients can keep their error code uninitialised before
- * passing it to a function. The library guarantees that after returning, the
- * value pointed to by the error code pointer has been initialised.
- *
- * Functions with pointer parameters often have a NULL error code, meaning they
- * could not perform any operation, because one of the required parameters was
- * NULL. Some functions operate correctly or are defined as effectless on NULL.
- *
- * Some functions additionally return a value outside their
- * return type domain, or a bool containing true on success and false on
- * failure.
- *
- * All functions that take a Tox instance pointer will cause undefined behaviour
- * when passed a NULL Tox pointer.
- *
- * All integer values are expected in host byte order.
- *
- * Functions with parameters with enum types cause unspecified behaviour if the
- * enumeration value is outside the valid range of the type. If possible, the
- * function will try to use a sane default, but there will be no error code,
- * and one possible action for the function to take is to have no effect.
- *
- * Integer constants and the memory layout of publicly exposed structs are not
- * part of the ABI.
- */
-/** \subsection events Events and callbacks
- *
- * Events are handled by callbacks. One callback can be registered per event.
- * All events have a callback function type named `tox_{event}_cb` and a
- * function to register it named `tox_callback_{event}`. Passing a NULL
- * callback will result in no callback being registered for that event. Only
- * one callback per event can be registered, so if a client needs multiple
- * event listeners, it needs to implement the dispatch functionality itself.
- *
- * The last argument to a callback is the user data pointer. It is passed from
- * tox_iterate to each callback in sequence.
- *
- * The user data pointer is never stored or dereferenced by any library code, so
- * can be any pointer, including NULL. Callbacks must all operate on the same
- * object type. In the apidsl code (tox.in.h), this is denoted with `any`. The
- * `any` in tox_iterate must be the same `any` as in all callbacks. In C,
- * lacking parametric polymorphism, this is a pointer to void.
- *
- * Old style callbacks that are registered together with a user data pointer
- * receive that pointer as argument when they are called. They can each have
- * their own user data pointer of their own type.
- */
-/** \subsection threading Threading implications
- *
- * It is possible to run multiple concurrent threads with a Tox instance for
- * each thread. It is also possible to run all Tox instances in the same thread.
- * A common way to run Tox (multiple or single instance) is to have one thread
- * running a simple tox_iterate loop, sleeping for tox_iteration_interval
- * milliseconds on each iteration.
- *
- * If you want to access a single Tox instance from multiple threads, access
- * to the instance must be synchronised. While multiple threads can concurrently
- * access multiple different Tox instances, no more than one API function can
- * operate on a single instance at any given time.
- *
- * Functions that write to variable length byte arrays will always have a size
- * function associated with them. The result of this size function is only valid
- * until another mutating function (one that takes a pointer to non-const Tox)
- * is called. Thus, clients must ensure that no other thread calls a mutating
- * function between the call to the size function and the call to the retrieval
- * function.
- *
- * E.g. to get the current nickname, one would write
- *
- * \code
- * size_t length = tox_self_get_name_size(tox);
- * uint8_t *name = malloc(length);
- * if (!name) abort();
- * tox_self_get_name(tox, name);
- * \endcode
- *
- * If any other thread calls tox_self_set_name while this thread is allocating
- * memory, the length may have become invalid, and the call to
- * tox_self_get_name may cause undefined behaviour.
- */
-/**
- * The Tox instance type. All the state associated with a connection is held
- * within the instance. Multiple instances can exist and operate concurrently.
- * The maximum number of Tox instances that can exist on a single network
- * device is limited. Note that this is not just a per-process limit, since the
- * limiting factor is the number of usable ports on a device.
- */
-#ifndef TOX_DEFINED
-#define TOX_DEFINED
-typedef struct Tox Tox;
-#endif /* TOX_DEFINED */
-
-
-/*******************************************************************************
- *
- * :: API version
- *
- ******************************************************************************/
-
-
-
-/**
- * The major version number. Incremented when the API or ABI changes in an
- * incompatible way.
- *
- * The function variants of these constants return the version number of the
- * library. They can be used to display the Tox library version or to check
- * whether the client is compatible with the dynamically linked version of Tox.
- */
-#define TOX_VERSION_MAJOR              0
-
-uint32_t tox_version_major(void);
-
-/**
- * The minor version number. Incremented when functionality is added without
- * breaking the API or ABI. Set to 0 when the major version number is
- * incremented.
- */
-#define TOX_VERSION_MINOR              1
-
-uint32_t tox_version_minor(void);
-
-/**
- * The patch or revision number. Incremented when bugfixes are applied without
- * changing any functionality or API or ABI.
- */
-#define TOX_VERSION_PATCH              10
-
-uint32_t tox_version_patch(void);
-
-/**
- * A macro to check at preprocessing time whether the client code is compatible
- * with the installed version of Tox. Leading zeros in the version number are
- * ignored. E.g. 0.1.5 is to 0.1.4 what 1.5 is to 1.4, that is: it can add new
- * features, but can't break the API.
- */
-#define TOX_VERSION_IS_API_COMPATIBLE(MAJOR, MINOR, PATCH)              \
-  (TOX_VERSION_MAJOR > 0 && TOX_VERSION_MAJOR == MAJOR) && (            \
-    /* 1.x.x, 2.x.x, etc. with matching major version. */               \
-    TOX_VERSION_MINOR > MINOR ||                                        \
-    TOX_VERSION_MINOR == MINOR && TOX_VERSION_PATCH >= PATCH            \
-  ) || (TOX_VERSION_MAJOR == 0 && MAJOR == 0) && (                      \
-    /* 0.x.x makes minor behave like major above. */                    \
-    (TOX_VERSION_MINOR > 0 && TOX_VERSION_MINOR == MINOR) && (          \
-      TOX_VERSION_PATCH >= PATCH                                        \
-    ) || (TOX_VERSION_MINOR == 0 && MINOR == 0) && (                    \
-      /* 0.0.x and 0.0.y are only compatible if x == y. */              \
-      TOX_VERSION_PATCH == PATCH                                        \
-    )                                                                   \
-  )
-
-/**
- * Return whether the compiled library version is compatible with the passed
- * version numbers.
- */
-bool tox_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch);
-
-/**
- * A convenience macro to call tox_version_is_compatible with the currently
- * compiling API version.
- */
-#define TOX_VERSION_IS_ABI_COMPATIBLE()                         \
-  tox_version_is_compatible(TOX_VERSION_MAJOR, TOX_VERSION_MINOR, TOX_VERSION_PATCH)
-
-
-/*******************************************************************************
- *
- * :: Numeric constants
- *
- * The values of these are not part of the ABI. Prefer to use the function
- * versions of them for code that should remain compatible with future versions
- * of toxcore.
- *
- ******************************************************************************/
-
-
-
-/**
- * The size of a Tox Public Key in bytes.
- */
-#define TOX_PUBLIC_KEY_SIZE            32
-
-uint32_t tox_public_key_size(void);
-
-/**
- * The size of a Tox Secret Key in bytes.
- */
-#define TOX_SECRET_KEY_SIZE            32
-
-uint32_t tox_secret_key_size(void);
-
-/**
- * The size of the nospam in bytes when written in a Tox address.
- */
-#define TOX_NOSPAM_SIZE                (sizeof(uint32_t))
-
-uint32_t tox_nospam_size(void);
-
-/**
- * The size of a Tox address in bytes. Tox addresses are in the format
- * [Public Key (TOX_PUBLIC_KEY_SIZE bytes)][nospam (4 bytes)][checksum (2 bytes)].
- *
- * The checksum is computed over the Public Key and the nospam value. The first
- * byte is an XOR of all the even bytes (0, 2, 4, ...), the second byte is an
- * XOR of all the odd bytes (1, 3, 5, ...) of the Public Key and nospam.
- */
-#define TOX_ADDRESS_SIZE               (TOX_PUBLIC_KEY_SIZE + TOX_NOSPAM_SIZE + sizeof(uint16_t))
-
-uint32_t tox_address_size(void);
-
-/**
- * Maximum length of a nickname in bytes.
- */
-#define TOX_MAX_NAME_LENGTH            128
-
-uint32_t tox_max_name_length(void);
-
-/**
- * Maximum length of a status message in bytes.
- */
-#define TOX_MAX_STATUS_MESSAGE_LENGTH  1007
-
-uint32_t tox_max_status_message_length(void);
-
-/**
- * Maximum length of a friend request message in bytes.
- */
-#define TOX_MAX_FRIEND_REQUEST_LENGTH  1016
-
-uint32_t tox_max_friend_request_length(void);
-
-/**
- * Maximum length of a single message after which it should be split.
- */
-#define TOX_MAX_MESSAGE_LENGTH         1372
-
-uint32_t tox_max_message_length(void);
-
-/**
- * Maximum size of custom packets. TODO(iphydf): should be LENGTH?
- */
-#define TOX_MAX_CUSTOM_PACKET_SIZE     1373
-
-uint32_t tox_max_custom_packet_size(void);
-
-/**
- * The number of bytes in a hash generated by tox_hash.
- */
-#define TOX_HASH_LENGTH                32
-
-uint32_t tox_hash_length(void);
-
-/**
- * The number of bytes in a file id.
- */
-#define TOX_FILE_ID_LENGTH             32
-
-uint32_t tox_file_id_length(void);
-
-/**
- * Maximum file name length for file transfers.
- */
-#define TOX_MAX_FILENAME_LENGTH        255
-
-uint32_t tox_max_filename_length(void);
-
-
-/*******************************************************************************
- *
- * :: Global enumerations
- *
- ******************************************************************************/
-
-
-
-/**
- * Represents the possible statuses a client can have.
- */
-typedef enum TOX_USER_STATUS {
-
-    /**
-     * User is online and available.
-     */
-    TOX_USER_STATUS_NONE,
-
-    /**
-     * User is away. Clients can set this e.g. after a user defined
-     * inactivity time.
-     */
-    TOX_USER_STATUS_AWAY,
-
-    /**
-     * User is busy. Signals to other clients that this client does not
-     * currently wish to communicate.
-     */
-    TOX_USER_STATUS_BUSY,
-
-} TOX_USER_STATUS;
-
-
-/**
- * Represents message types for tox_friend_send_message and conference
- * messages.
- */
-typedef enum TOX_MESSAGE_TYPE {
-
-    /**
-     * Normal text message. Similar to PRIVMSG on IRC.
-     */
-    TOX_MESSAGE_TYPE_NORMAL,
-
-    /**
-     * A message describing an user action. This is similar to /me (CTCP ACTION)
-     * on IRC.
-     */
-    TOX_MESSAGE_TYPE_ACTION,
-
-} TOX_MESSAGE_TYPE;
-
-
-
-/*******************************************************************************
- *
- * :: Startup options
- *
- ******************************************************************************/
-
-
-
-/**
- * Type of proxy used to connect to TCP relays.
- */
-typedef enum TOX_PROXY_TYPE {
-
-    /**
-     * Don't use a proxy.
-     */
-    TOX_PROXY_TYPE_NONE,
-
-    /**
-     * HTTP proxy using CONNECT.
-     */
-    TOX_PROXY_TYPE_HTTP,
-
-    /**
-     * SOCKS proxy for simple socket pipes.
-     */
-    TOX_PROXY_TYPE_SOCKS5,
-
-} TOX_PROXY_TYPE;
-
-
-/**
- * Type of savedata to create the Tox instance from.
- */
-typedef enum TOX_SAVEDATA_TYPE {
-
-    /**
-     * No savedata.
-     */
-    TOX_SAVEDATA_TYPE_NONE,
-
-    /**
-     * Savedata is one that was obtained from tox_get_savedata.
-     */
-    TOX_SAVEDATA_TYPE_TOX_SAVE,
-
-    /**
-     * Savedata is a secret key of length TOX_SECRET_KEY_SIZE.
-     */
-    TOX_SAVEDATA_TYPE_SECRET_KEY,
-
-} TOX_SAVEDATA_TYPE;
-
-
-/**
- * Severity level of log messages.
- */
-typedef enum TOX_LOG_LEVEL {
-
-    /**
-     * Very detailed traces including all network activity.
-     */
-    TOX_LOG_LEVEL_TRACE,
-
-    /**
-     * Debug messages such as which port we bind to.
-     */
-    TOX_LOG_LEVEL_DEBUG,
-
-    /**
-     * Informational log messages such as video call status changes.
-     */
-    TOX_LOG_LEVEL_INFO,
-
-    /**
-     * Warnings about internal inconsistency or logic errors.
-     */
-    TOX_LOG_LEVEL_WARNING,
-
-    /**
-     * Severe unexpected errors caused by external or internal inconsistency.
-     */
-    TOX_LOG_LEVEL_ERROR,
-
-} TOX_LOG_LEVEL;
-
-
-/**
- * This event is triggered when the toxcore library logs an internal message.
- * This is mostly useful for debugging. This callback can be called from any
- * function, not just tox_iterate. This means the user data lifetime must at
- * least extend between registering and unregistering it or tox_kill.
- *
- * Other toxcore modules such as toxav may concurrently call this callback at
- * any time. Thus, user code must make sure it is equipped to handle concurrent
- * execution, e.g. by employing appropriate mutex locking.
- *
- * @param level The severity of the log message.
- * @param file The source file from which the message originated.
- * @param line The source line from which the message originated.
- * @param func The function from which the message originated.
- * @param message The log message.
- * @param user_data The user data pointer passed to tox_new in options.
- */
-typedef void tox_log_cb(Tox *tox, TOX_LOG_LEVEL level, const char *file, uint32_t line, const char *func,
-                        const char *message, void *user_data);
-
-
-/**
- * This struct contains all the startup options for Tox. You must tox_options_new to
- * allocate an object of this type.
- *
- * WARNING: Although this struct happens to be visible in the API, it is
- * effectively private. Do not allocate this yourself or access members
- * directly, as it *will* break binary compatibility frequently.
- *
- * @deprecated The memory layout of this struct (size, alignment, and field
- * order) is not part of the ABI. To remain compatible, prefer to use tox_options_new to
- * allocate the object and accessor functions to set the members. The struct
- * will become opaque (i.e. the definition will become private) in v0.2.0.
- */
-struct Tox_Options {
-
-    /**
-     * The type of socket to create.
-     *
-     * If this is set to false, an IPv4 socket is created, which subsequently
-     * only allows IPv4 communication.
-     * If it is set to true, an IPv6 socket is created, allowing both IPv4 and
-     * IPv6 communication.
-     */
-    bool ipv6_enabled;
-
-
-    /**
-     * Enable the use of UDP communication when available.
-     *
-     * Setting this to false will force Tox to use TCP only. Communications will
-     * need to be relayed through a TCP relay node, potentially slowing them down.
-     * Disabling UDP support is necessary when using anonymous proxies or Tor.
-     */
-    bool udp_enabled;
-
-
-    /**
-     * Enable local network peer discovery.
-     *
-     * Disabling this will cause Tox to not look for peers on the local network.
-     */
-    bool local_discovery_enabled;
-
-
-    /**
-     * Pass communications through a proxy.
-     */
-    TOX_PROXY_TYPE proxy_type;
-
-
-    /**
-     * The IP address or DNS name of the proxy to be used.
-     *
-     * If used, this must be non-NULL and be a valid DNS name. The name must not
-     * exceed 255 characters, and be in a NUL-terminated C string format
-     * (255 chars + 1 NUL byte).
-     *
-     * This member is ignored (it can be NULL) if proxy_type is TOX_PROXY_TYPE_NONE.
-     *
-     * The data pointed at by this member is owned by the user, so must
-     * outlive the options object.
-     */
-    const char *proxy_host;
-
-
-    /**
-     * The port to use to connect to the proxy server.
-     *
-     * Ports must be in the range (1, 65535). The value is ignored if
-     * proxy_type is TOX_PROXY_TYPE_NONE.
-     */
-    uint16_t proxy_port;
-
-
-    /**
-     * The start port of the inclusive port range to attempt to use.
-     *
-     * If both start_port and end_port are 0, the default port range will be
-     * used: [33445, 33545].
-     *
-     * If either start_port or end_port is 0 while the other is non-zero, the
-     * non-zero port will be the only port in the range.
-     *
-     * Having start_port > end_port will yield the same behavior as if start_port
-     * and end_port were swapped.
-     */
-    uint16_t start_port;
-
-
-    /**
-     * The end port of the inclusive port range to attempt to use.
-     */
-    uint16_t end_port;
-
-
-    /**
-     * The port to use for the TCP server (relay). If 0, the TCP server is
-     * disabled.
-     *
-     * Enabling it is not required for Tox to function properly.
-     *
-     * When enabled, your Tox instance can act as a TCP relay for other Tox
-     * instance. This leads to increased traffic, thus when writing a client
-     * it is recommended to enable TCP server only if the user has an option
-     * to disable it.
-     */
-    uint16_t tcp_port;
-
-
-    /**
-     * Enables or disables UDP hole-punching in toxcore. (Default: enabled).
-     */
-    bool hole_punching_enabled;
-
-
-    /**
-     * The type of savedata to load from.
-     */
-    TOX_SAVEDATA_TYPE savedata_type;
-
-
-    /**
-     * The savedata.
-     *
-     * The data pointed at by this member is owned by the user, so must
-     * outlive the options object.
-     */
-    const uint8_t *savedata_data;
-
-
-    /**
-     * The length of the savedata.
-     */
-    size_t savedata_length;
-
-
-    /**
-     * Logging callback for the new tox instance.
-     */
-    tox_log_cb *log_callback;
-
-
-    /**
-     * User data pointer passed to the logging callback.
-     */
-    void *log_user_data;
-
-};
-
-
-bool tox_options_get_ipv6_enabled(const struct Tox_Options *options);
-
-void tox_options_set_ipv6_enabled(struct Tox_Options *options, bool ipv6_enabled);
-
-bool tox_options_get_udp_enabled(const struct Tox_Options *options);
-
-void tox_options_set_udp_enabled(struct Tox_Options *options, bool udp_enabled);
-
-bool tox_options_get_local_discovery_enabled(const struct Tox_Options *options);
-
-void tox_options_set_local_discovery_enabled(struct Tox_Options *options, bool local_discovery_enabled);
-
-TOX_PROXY_TYPE tox_options_get_proxy_type(const struct Tox_Options *options);
-
-void tox_options_set_proxy_type(struct Tox_Options *options, TOX_PROXY_TYPE type);
-
-const char *tox_options_get_proxy_host(const struct Tox_Options *options);
-
-void tox_options_set_proxy_host(struct Tox_Options *options, const char *host);
-
-uint16_t tox_options_get_proxy_port(const struct Tox_Options *options);
-
-void tox_options_set_proxy_port(struct Tox_Options *options, uint16_t port);
-
-uint16_t tox_options_get_start_port(const struct Tox_Options *options);
-
-void tox_options_set_start_port(struct Tox_Options *options, uint16_t start_port);
-
-uint16_t tox_options_get_end_port(const struct Tox_Options *options);
-
-void tox_options_set_end_port(struct Tox_Options *options, uint16_t end_port);
-
-uint16_t tox_options_get_tcp_port(const struct Tox_Options *options);
-
-void tox_options_set_tcp_port(struct Tox_Options *options, uint16_t tcp_port);
-
-bool tox_options_get_hole_punching_enabled(const struct Tox_Options *options);
-
-void tox_options_set_hole_punching_enabled(struct Tox_Options *options, bool hole_punching_enabled);
-
-TOX_SAVEDATA_TYPE tox_options_get_savedata_type(const struct Tox_Options *options);
-
-void tox_options_set_savedata_type(struct Tox_Options *options, TOX_SAVEDATA_TYPE type);
-
-const uint8_t *tox_options_get_savedata_data(const struct Tox_Options *options);
-
-void tox_options_set_savedata_data(struct Tox_Options *options, const uint8_t *data, size_t length);
-
-size_t tox_options_get_savedata_length(const struct Tox_Options *options);
-
-void tox_options_set_savedata_length(struct Tox_Options *options, size_t length);
-
-tox_log_cb *tox_options_get_log_callback(const struct Tox_Options *options);
-
-void tox_options_set_log_callback(struct Tox_Options *options, tox_log_cb *callback);
-
-void *tox_options_get_log_user_data(const struct Tox_Options *options);
-
-void tox_options_set_log_user_data(struct Tox_Options *options, void *user_data);
-
-/**
- * Initialises a Tox_Options object with the default options.
- *
- * The result of this function is independent of the original options. All
- * values will be overwritten, no values will be read (so it is permissible
- * to pass an uninitialised object).
- *
- * If options is NULL, this function has no effect.
- *
- * @param options An options object to be filled with default options.
- */
-void tox_options_default(struct Tox_Options *options);
-
-typedef enum TOX_ERR_OPTIONS_NEW {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_OPTIONS_NEW_OK,
-
-    /**
-     * The function failed to allocate enough memory for the options struct.
-     */
-    TOX_ERR_OPTIONS_NEW_MALLOC,
-
-} TOX_ERR_OPTIONS_NEW;
-
-
-/**
- * Allocates a new Tox_Options object and initialises it with the default
- * options. This function can be used to preserve long term ABI compatibility by
- * giving the responsibility of allocation and deallocation to the Tox library.
- *
- * Objects returned from this function must be freed using the tox_options_free
- * function.
- *
- * @return A new Tox_Options object with default options or NULL on failure.
- */
-struct Tox_Options *tox_options_new(TOX_ERR_OPTIONS_NEW *error);
-
-/**
- * Releases all resources associated with an options objects.
- *
- * Passing a pointer that was not returned by tox_options_new results in
- * undefined behaviour.
- */
-void tox_options_free(struct Tox_Options *options);
-
-
-/*******************************************************************************
- *
- * :: Creation and destruction
- *
- ******************************************************************************/
-
-
-
-typedef enum TOX_ERR_NEW {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_NEW_OK,
-
-    /**
-     * One of the arguments to the function was NULL when it was not expected.
-     */
-    TOX_ERR_NEW_NULL,
-
-    /**
-     * The function was unable to allocate enough memory to store the internal
-     * structures for the Tox object.
-     */
-    TOX_ERR_NEW_MALLOC,
-
-    /**
-     * The function was unable to bind to a port. This may mean that all ports
-     * have already been bound, e.g. by other Tox instances, or it may mean
-     * a permission error. You may be able to gather more information from errno.
-     */
-    TOX_ERR_NEW_PORT_ALLOC,
-
-    /**
-     * proxy_type was invalid.
-     */
-    TOX_ERR_NEW_PROXY_BAD_TYPE,
-
-    /**
-     * proxy_type was valid but the proxy_host passed had an invalid format
-     * or was NULL.
-     */
-    TOX_ERR_NEW_PROXY_BAD_HOST,
-
-    /**
-     * proxy_type was valid, but the proxy_port was invalid.
-     */
-    TOX_ERR_NEW_PROXY_BAD_PORT,
-
-    /**
-     * The proxy address passed could not be resolved.
-     */
-    TOX_ERR_NEW_PROXY_NOT_FOUND,
-
-    /**
-     * The byte array to be loaded contained an encrypted save.
-     */
-    TOX_ERR_NEW_LOAD_ENCRYPTED,
-
-    /**
-     * The data format was invalid. This can happen when loading data that was
-     * saved by an older version of Tox, or when the data has been corrupted.
-     * When loading from badly formatted data, some data may have been loaded,
-     * and the rest is discarded. Passing an invalid length parameter also
-     * causes this error.
-     */
-    TOX_ERR_NEW_LOAD_BAD_FORMAT,
-
-} TOX_ERR_NEW;
-
-
-/**
- * @brief Creates and initialises a new Tox instance with the options passed.
- *
- * This function will bring the instance into a valid state. Running the event
- * loop with a new instance will operate correctly.
- *
- * If loading failed or succeeded only partially, the new or partially loaded
- * instance is returned and an error code is set.
- *
- * @param options An options object as described above. If this parameter is
- *   NULL, the default options are used.
- *
- * @see tox_iterate for the event loop.
- *
- * @return A new Tox instance pointer on success or NULL on failure.
- */
-Tox *tox_new(const struct Tox_Options *options, TOX_ERR_NEW *error);
-
-/**
- * Releases all resources associated with the Tox instance and disconnects from
- * the network.
- *
- * After calling this function, the Tox pointer becomes invalid. No other
- * functions can be called, and the pointer value can no longer be read.
- */
-void tox_kill(Tox *tox);
-
-/**
- * Calculates the number of bytes required to store the tox instance with
- * tox_get_savedata. This function cannot fail. The result is always greater than 0.
- *
- * @see threading for concurrency implications.
- */
-size_t tox_get_savedata_size(const Tox *tox);
-
-/**
- * Store all information associated with the tox instance to a byte array.
- *
- * @param savedata A memory region large enough to store the tox instance
- *   data. Call tox_get_savedata_size to find the number of bytes required. If this parameter
- *   is NULL, this function has no effect.
- */
-void tox_get_savedata(const Tox *tox, uint8_t *savedata);
-
-
-/*******************************************************************************
- *
- * :: Connection lifecycle and event loop
- *
- ******************************************************************************/
-
-
-
-typedef enum TOX_ERR_BOOTSTRAP {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_BOOTSTRAP_OK,
-
-    /**
-     * One of the arguments to the function was NULL when it was not expected.
-     */
-    TOX_ERR_BOOTSTRAP_NULL,
-
-    /**
-     * The address could not be resolved to an IP address, or the IP address
-     * passed was invalid.
-     */
-    TOX_ERR_BOOTSTRAP_BAD_HOST,
-
-    /**
-     * The port passed was invalid. The valid port range is (1, 65535).
-     */
-    TOX_ERR_BOOTSTRAP_BAD_PORT,
-
-} TOX_ERR_BOOTSTRAP;
-
-
-/**
- * Sends a "get nodes" request to the given bootstrap node with IP, port, and
- * public key to setup connections.
- *
- * This function will attempt to connect to the node using UDP. You must use
- * this function even if Tox_Options.udp_enabled was set to false.
- *
- * @param address The hostname or IP address (IPv4 or IPv6) of the node.
- * @param port The port on the host on which the bootstrap Tox instance is
- *   listening.
- * @param public_key The long term public key of the bootstrap node
- *   (TOX_PUBLIC_KEY_SIZE bytes).
- * @return true on success.
- */
-bool tox_bootstrap(Tox *tox, const char *address, uint16_t port, const uint8_t *public_key, TOX_ERR_BOOTSTRAP *error);
-
-/**
- * Adds additional host:port pair as TCP relay.
- *
- * This function can be used to initiate TCP connections to different ports on
- * the same bootstrap node, or to add TCP relays without using them as
- * bootstrap nodes.
- *
- * @param address The hostname or IP address (IPv4 or IPv6) of the TCP relay.
- * @param port The port on the host on which the TCP relay is listening.
- * @param public_key The long term public key of the TCP relay
- *   (TOX_PUBLIC_KEY_SIZE bytes).
- * @return true on success.
- */
-bool tox_add_tcp_relay(Tox *tox, const char *address, uint16_t port, const uint8_t *public_key,
-                       TOX_ERR_BOOTSTRAP *error);
-
-/**
- * Protocols that can be used to connect to the network or friends.
- */
-typedef enum TOX_CONNECTION {
-
-    /**
-     * There is no connection. This instance, or the friend the state change is
-     * about, is now offline.
-     */
-    TOX_CONNECTION_NONE,
-
-    /**
-     * A TCP connection has been established. For the own instance, this means it
-     * is connected through a TCP relay, only. For a friend, this means that the
-     * connection to that particular friend goes through a TCP relay.
-     */
-    TOX_CONNECTION_TCP,
-
-    /**
-     * A UDP connection has been established. For the own instance, this means it
-     * is able to send UDP packets to DHT nodes, but may still be connected to
-     * a TCP relay. For a friend, this means that the connection to that
-     * particular friend was built using direct UDP packets.
-     */
-    TOX_CONNECTION_UDP,
-
-} TOX_CONNECTION;
-
-
-/**
- * Return whether we are connected to the DHT. The return value is equal to the
- * last value received through the `self_connection_status` callback.
- */
-TOX_CONNECTION tox_self_get_connection_status(const Tox *tox);
-
-/**
- * @param connection_status Whether we are connected to the DHT.
- */
-typedef void tox_self_connection_status_cb(Tox *tox, TOX_CONNECTION connection_status, void *user_data);
-
-
-/**
- * Set the callback for the `self_connection_status` event. Pass NULL to unset.
- *
- * This event is triggered whenever there is a change in the DHT connection
- * state. When disconnected, a client may choose to call tox_bootstrap again, to
- * reconnect to the DHT. Note that this state may frequently change for short
- * amounts of time. Clients should therefore not immediately bootstrap on
- * receiving a disconnect.
- *
- * TODO(iphydf): how long should a client wait before bootstrapping again?
- */
-void tox_callback_self_connection_status(Tox *tox, tox_self_connection_status_cb *callback);
-
-/**
- * Return the time in milliseconds before tox_iterate() should be called again
- * for optimal performance.
- */
-uint32_t tox_iteration_interval(const Tox *tox);
-
-/**
- * The main loop that needs to be run in intervals of tox_iteration_interval()
- * milliseconds.
- */
-void tox_iterate(Tox *tox, void *user_data);
-
-
-/*******************************************************************************
- *
- * :: Internal client information (Tox address/id)
- *
- ******************************************************************************/
-
-
-
-/**
- * Writes the Tox friend address of the client to a byte array. The address is
- * not in human-readable format. If a client wants to display the address,
- * formatting is required.
- *
- * @param address A memory region of at least TOX_ADDRESS_SIZE bytes. If this
- *   parameter is NULL, this function has no effect.
- * @see TOX_ADDRESS_SIZE for the address format.
- */
-void tox_self_get_address(const Tox *tox, uint8_t *address);
-
-/**
- * Set the 4-byte nospam part of the address. This value is expected in host
- * byte order. I.e. 0x12345678 will form the bytes [12, 34, 56, 78] in the
- * nospam part of the Tox friend address.
- *
- * @param nospam Any 32 bit unsigned integer.
- */
-void tox_self_set_nospam(Tox *tox, uint32_t nospam);
-
-/**
- * Get the 4-byte nospam part of the address. This value is returned in host
- * byte order.
- */
-uint32_t tox_self_get_nospam(const Tox *tox);
-
-/**
- * Copy the Tox Public Key (long term) from the Tox object.
- *
- * @param public_key A memory region of at least TOX_PUBLIC_KEY_SIZE bytes. If
- *   this parameter is NULL, this function has no effect.
- */
-void tox_self_get_public_key(const Tox *tox, uint8_t *public_key);
-
-/**
- * Copy the Tox Secret Key from the Tox object.
- *
- * @param secret_key A memory region of at least TOX_SECRET_KEY_SIZE bytes. If
- *   this parameter is NULL, this function has no effect.
- */
-void tox_self_get_secret_key(const Tox *tox, uint8_t *secret_key);
-
-
-/*******************************************************************************
- *
- * :: User-visible client information (nickname/status)
- *
- ******************************************************************************/
-
-
-
-/**
- * Common error codes for all functions that set a piece of user-visible
- * client information.
- */
-typedef enum TOX_ERR_SET_INFO {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_SET_INFO_OK,
-
-    /**
-     * One of the arguments to the function was NULL when it was not expected.
-     */
-    TOX_ERR_SET_INFO_NULL,
-
-    /**
-     * Information length exceeded maximum permissible size.
-     */
-    TOX_ERR_SET_INFO_TOO_LONG,
-
-} TOX_ERR_SET_INFO;
-
-
-/**
- * Set the nickname for the Tox client.
- *
- * Nickname length cannot exceed TOX_MAX_NAME_LENGTH. If length is 0, the name
- * parameter is ignored (it can be NULL), and the nickname is set back to empty.
- *
- * @param name A byte array containing the new nickname.
- * @param length The size of the name byte array.
- *
- * @return true on success.
- */
-bool tox_self_set_name(Tox *tox, const uint8_t *name, size_t length, TOX_ERR_SET_INFO *error);
-
-/**
- * Return the length of the current nickname as passed to tox_self_set_name.
- *
- * If no nickname was set before calling this function, the name is empty,
- * and this function returns 0.
- *
- * @see threading for concurrency implications.
- */
-size_t tox_self_get_name_size(const Tox *tox);
-
-/**
- * Write the nickname set by tox_self_set_name to a byte array.
- *
- * If no nickname was set before calling this function, the name is empty,
- * and this function has no effect.
- *
- * Call tox_self_get_name_size to find out how much memory to allocate for
- * the result.
- *
- * @param name A valid memory location large enough to hold the nickname.
- *   If this parameter is NULL, the function has no effect.
- */
-void tox_self_get_name(const Tox *tox, uint8_t *name);
-
-/**
- * Set the client's status message.
- *
- * Status message length cannot exceed TOX_MAX_STATUS_MESSAGE_LENGTH. If
- * length is 0, the status parameter is ignored (it can be NULL), and the
- * user status is set back to empty.
- */
-bool tox_self_set_status_message(Tox *tox, const uint8_t *status_message, size_t length, TOX_ERR_SET_INFO *error);
-
-/**
- * Return the length of the current status message as passed to tox_self_set_status_message.
- *
- * If no status message was set before calling this function, the status
- * is empty, and this function returns 0.
- *
- * @see threading for concurrency implications.
- */
-size_t tox_self_get_status_message_size(const Tox *tox);
-
-/**
- * Write the status message set by tox_self_set_status_message to a byte array.
- *
- * If no status message was set before calling this function, the status is
- * empty, and this function has no effect.
- *
- * Call tox_self_get_status_message_size to find out how much memory to allocate for
- * the result.
- *
- * @param status_message A valid memory location large enough to hold the
- *   status message. If this parameter is NULL, the function has no effect.
- */
-void tox_self_get_status_message(const Tox *tox, uint8_t *status_message);
-
-/**
- * Set the client's user status.
- *
- * @param status One of the user statuses listed in the enumeration above.
- */
-void tox_self_set_status(Tox *tox, TOX_USER_STATUS status);
-
-/**
- * Returns the client's user status.
- */
-TOX_USER_STATUS tox_self_get_status(const Tox *tox);
-
-
-/*******************************************************************************
- *
- * :: Friend list management
- *
- ******************************************************************************/
-
-
-
-typedef enum TOX_ERR_FRIEND_ADD {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_FRIEND_ADD_OK,
-
-    /**
-     * One of the arguments to the function was NULL when it was not expected.
-     */
-    TOX_ERR_FRIEND_ADD_NULL,
-
-    /**
-     * The length of the friend request message exceeded
-     * TOX_MAX_FRIEND_REQUEST_LENGTH.
-     */
-    TOX_ERR_FRIEND_ADD_TOO_LONG,
-
-    /**
-     * The friend request message was empty. This, and the TOO_LONG code will
-     * never be returned from tox_friend_add_norequest.
-     */
-    TOX_ERR_FRIEND_ADD_NO_MESSAGE,
-
-    /**
-     * The friend address belongs to the sending client.
-     */
-    TOX_ERR_FRIEND_ADD_OWN_KEY,
-
-    /**
-     * A friend request has already been sent, or the address belongs to a friend
-     * that is already on the friend list.
-     */
-    TOX_ERR_FRIEND_ADD_ALREADY_SENT,
-
-    /**
-     * The friend address checksum failed.
-     */
-    TOX_ERR_FRIEND_ADD_BAD_CHECKSUM,
-
-    /**
-     * The friend was already there, but the nospam value was different.
-     */
-    TOX_ERR_FRIEND_ADD_SET_NEW_NOSPAM,
-
-    /**
-     * A memory allocation failed when trying to increase the friend list size.
-     */
-    TOX_ERR_FRIEND_ADD_MALLOC,
-
-} TOX_ERR_FRIEND_ADD;
-
-
-/**
- * Add a friend to the friend list and send a friend request.
- *
- * A friend request message must be at least 1 byte long and at most
- * TOX_MAX_FRIEND_REQUEST_LENGTH.
- *
- * Friend numbers are unique identifiers used in all functions that operate on
- * friends. Once added, a friend number is stable for the lifetime of the Tox
- * object. After saving the state and reloading it, the friend numbers may not
- * be the same as before. Deleting a friend creates a gap in the friend number
- * set, which is filled by the next adding of a friend. Any pattern in friend
- * numbers should not be relied on.
- *
- * If more than INT32_MAX friends are added, this function causes undefined
- * behaviour.
- *
- * @param address The address of the friend (returned by tox_self_get_address of
- *   the friend you wish to add) it must be TOX_ADDRESS_SIZE bytes.
- * @param message The message that will be sent along with the friend request.
- * @param length The length of the data byte array.
- *
- * @return the friend number on success, UINT32_MAX on failure.
- */
-uint32_t tox_friend_add(Tox *tox, const uint8_t *address, const uint8_t *message, size_t length,
-                        TOX_ERR_FRIEND_ADD *error);
-
-/**
- * Add a friend without sending a friend request.
- *
- * This function is used to add a friend in response to a friend request. If the
- * client receives a friend request, it can be reasonably sure that the other
- * client added this client as a friend, eliminating the need for a friend
- * request.
- *
- * This function is also useful in a situation where both instances are
- * controlled by the same entity, so that this entity can perform the mutual
- * friend adding. In this case, there is no need for a friend request, either.
- *
- * @param public_key A byte array of length TOX_PUBLIC_KEY_SIZE containing the
- *   Public Key (not the Address) of the friend to add.
- *
- * @return the friend number on success, UINT32_MAX on failure.
- * @see tox_friend_add for a more detailed description of friend numbers.
- */
-uint32_t tox_friend_add_norequest(Tox *tox, const uint8_t *public_key, TOX_ERR_FRIEND_ADD *error);
-
-typedef enum TOX_ERR_FRIEND_DELETE {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_FRIEND_DELETE_OK,
-
-    /**
-     * There was no friend with the given friend number. No friends were deleted.
-     */
-    TOX_ERR_FRIEND_DELETE_FRIEND_NOT_FOUND,
-
-} TOX_ERR_FRIEND_DELETE;
-
-
-/**
- * Remove a friend from the friend list.
- *
- * This does not notify the friend of their deletion. After calling this
- * function, this client will appear offline to the friend and no communication
- * can occur between the two.
- *
- * @param friend_number Friend number for the friend to be deleted.
- *
- * @return true on success.
- */
-bool tox_friend_delete(Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_DELETE *error);
-
-
-/*******************************************************************************
- *
- * :: Friend list queries
- *
- ******************************************************************************/
-
-
-
-typedef enum TOX_ERR_FRIEND_BY_PUBLIC_KEY {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_FRIEND_BY_PUBLIC_KEY_OK,
-
-    /**
-     * One of the arguments to the function was NULL when it was not expected.
-     */
-    TOX_ERR_FRIEND_BY_PUBLIC_KEY_NULL,
-
-    /**
-     * No friend with the given Public Key exists on the friend list.
-     */
-    TOX_ERR_FRIEND_BY_PUBLIC_KEY_NOT_FOUND,
-
-} TOX_ERR_FRIEND_BY_PUBLIC_KEY;
-
-
-/**
- * Return the friend number associated with that Public Key.
- *
- * @return the friend number on success, UINT32_MAX on failure.
- * @param public_key A byte array containing the Public Key.
- */
-uint32_t tox_friend_by_public_key(const Tox *tox, const uint8_t *public_key, TOX_ERR_FRIEND_BY_PUBLIC_KEY *error);
-
-/**
- * Checks if a friend with the given friend number exists and returns true if
- * it does.
- */
-bool tox_friend_exists(const Tox *tox, uint32_t friend_number);
-
-/**
- * Return the number of friends on the friend list.
- *
- * This function can be used to determine how much memory to allocate for
- * tox_self_get_friend_list.
- */
-size_t tox_self_get_friend_list_size(const Tox *tox);
-
-/**
- * Copy a list of valid friend numbers into an array.
- *
- * Call tox_self_get_friend_list_size to determine the number of elements to allocate.
- *
- * @param friend_list A memory region with enough space to hold the friend
- *   list. If this parameter is NULL, this function has no effect.
- */
-void tox_self_get_friend_list(const Tox *tox, uint32_t *friend_list);
-
-typedef enum TOX_ERR_FRIEND_GET_PUBLIC_KEY {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_FRIEND_GET_PUBLIC_KEY_OK,
-
-    /**
-     * No friend with the given number exists on the friend list.
-     */
-    TOX_ERR_FRIEND_GET_PUBLIC_KEY_FRIEND_NOT_FOUND,
-
-} TOX_ERR_FRIEND_GET_PUBLIC_KEY;
-
-
-/**
- * Copies the Public Key associated with a given friend number to a byte array.
- *
- * @param friend_number The friend number you want the Public Key of.
- * @param public_key A memory region of at least TOX_PUBLIC_KEY_SIZE bytes. If
- *   this parameter is NULL, this function has no effect.
- *
- * @return true on success.
- */
-bool tox_friend_get_public_key(const Tox *tox, uint32_t friend_number, uint8_t *public_key,
-                               TOX_ERR_FRIEND_GET_PUBLIC_KEY *error);
-
-typedef enum TOX_ERR_FRIEND_GET_LAST_ONLINE {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_FRIEND_GET_LAST_ONLINE_OK,
-
-    /**
-     * No friend with the given number exists on the friend list.
-     */
-    TOX_ERR_FRIEND_GET_LAST_ONLINE_FRIEND_NOT_FOUND,
-
-} TOX_ERR_FRIEND_GET_LAST_ONLINE;
-
-
-/**
- * Return a unix-time timestamp of the last time the friend associated with a given
- * friend number was seen online. This function will return UINT64_MAX on error.
- *
- * @param friend_number The friend number you want to query.
- */
-uint64_t tox_friend_get_last_online(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_GET_LAST_ONLINE *error);
-
-
-/*******************************************************************************
- *
- * :: Friend-specific state queries (can also be received through callbacks)
- *
- ******************************************************************************/
-
-
-
-/**
- * Common error codes for friend state query functions.
- */
-typedef enum TOX_ERR_FRIEND_QUERY {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_FRIEND_QUERY_OK,
-
-    /**
-     * The pointer parameter for storing the query result (name, message) was
-     * NULL. Unlike the `_self_` variants of these functions, which have no effect
-     * when a parameter is NULL, these functions return an error in that case.
-     */
-    TOX_ERR_FRIEND_QUERY_NULL,
-
-    /**
-     * The friend_number did not designate a valid friend.
-     */
-    TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND,
-
-} TOX_ERR_FRIEND_QUERY;
-
-
-/**
- * Return the length of the friend's name. If the friend number is invalid, the
- * return value is unspecified.
- *
- * The return value is equal to the `length` argument received by the last
- * `friend_name` callback.
- */
-size_t tox_friend_get_name_size(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error);
-
-/**
- * Write the name of the friend designated by the given friend number to a byte
- * array.
- *
- * Call tox_friend_get_name_size to determine the allocation size for the `name`
- * parameter.
- *
- * The data written to `name` is equal to the data received by the last
- * `friend_name` callback.
- *
- * @param name A valid memory region large enough to store the friend's name.
- *
- * @return true on success.
- */
-bool tox_friend_get_name(const Tox *tox, uint32_t friend_number, uint8_t *name, TOX_ERR_FRIEND_QUERY *error);
-
-/**
- * @param friend_number The friend number of the friend whose name changed.
- * @param name A byte array containing the same data as
- *   tox_friend_get_name would write to its `name` parameter.
- * @param length A value equal to the return value of
- *   tox_friend_get_name_size.
- */
-typedef void tox_friend_name_cb(Tox *tox, uint32_t friend_number, const uint8_t *name, size_t length, void *user_data);
-
-
-/**
- * Set the callback for the `friend_name` event. Pass NULL to unset.
- *
- * This event is triggered when a friend changes their name.
- */
-void tox_callback_friend_name(Tox *tox, tox_friend_name_cb *callback);
-
-/**
- * Return the length of the friend's status message. If the friend number is
- * invalid, the return value is SIZE_MAX.
- */
-size_t tox_friend_get_status_message_size(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error);
-
-/**
- * Write the status message of the friend designated by the given friend number to a byte
- * array.
- *
- * Call tox_friend_get_status_message_size to determine the allocation size for the `status_name`
- * parameter.
- *
- * The data written to `status_message` is equal to the data received by the last
- * `friend_status_message` callback.
- *
- * @param status_message A valid memory region large enough to store the friend's status message.
- */
-bool tox_friend_get_status_message(const Tox *tox, uint32_t friend_number, uint8_t *status_message,
-                                   TOX_ERR_FRIEND_QUERY *error);
-
-/**
- * @param friend_number The friend number of the friend whose status message
- *   changed.
- * @param message A byte array containing the same data as
- *   tox_friend_get_status_message would write to its `status_message` parameter.
- * @param length A value equal to the return value of
- *   tox_friend_get_status_message_size.
- */
-typedef void tox_friend_status_message_cb(Tox *tox, uint32_t friend_number, const uint8_t *message, size_t length,
-        void *user_data);
-
-
-/**
- * Set the callback for the `friend_status_message` event. Pass NULL to unset.
- *
- * This event is triggered when a friend changes their status message.
- */
-void tox_callback_friend_status_message(Tox *tox, tox_friend_status_message_cb *callback);
-
-/**
- * Return the friend's user status (away/busy/...). If the friend number is
- * invalid, the return value is unspecified.
- *
- * The status returned is equal to the last status received through the
- * `friend_status` callback.
- */
-TOX_USER_STATUS tox_friend_get_status(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error);
-
-/**
- * @param friend_number The friend number of the friend whose user status
- *   changed.
- * @param status The new user status.
- */
-typedef void tox_friend_status_cb(Tox *tox, uint32_t friend_number, TOX_USER_STATUS status, void *user_data);
-
-
-/**
- * Set the callback for the `friend_status` event. Pass NULL to unset.
- *
- * This event is triggered when a friend changes their user status.
- */
-void tox_callback_friend_status(Tox *tox, tox_friend_status_cb *callback);
-
-/**
- * Check whether a friend is currently connected to this client.
- *
- * The result of this function is equal to the last value received by the
- * `friend_connection_status` callback.
- *
- * @param friend_number The friend number for which to query the connection
- *   status.
- *
- * @return the friend's connection status as it was received through the
- *   `friend_connection_status` event.
- */
-TOX_CONNECTION tox_friend_get_connection_status(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error);
-
-/**
- * @param friend_number The friend number of the friend whose connection status
- *   changed.
- * @param connection_status The result of calling
- *   tox_friend_get_connection_status on the passed friend_number.
- */
-typedef void tox_friend_connection_status_cb(Tox *tox, uint32_t friend_number, TOX_CONNECTION connection_status,
-        void *user_data);
-
-
-/**
- * Set the callback for the `friend_connection_status` event. Pass NULL to unset.
- *
- * This event is triggered when a friend goes offline after having been online,
- * or when a friend goes online.
- *
- * This callback is not called when adding friends. It is assumed that when
- * adding friends, their connection status is initially offline.
- */
-void tox_callback_friend_connection_status(Tox *tox, tox_friend_connection_status_cb *callback);
-
-/**
- * Check whether a friend is currently typing a message.
- *
- * @param friend_number The friend number for which to query the typing status.
- *
- * @return true if the friend is typing.
- * @return false if the friend is not typing, or the friend number was
- *   invalid. Inspect the error code to determine which case it is.
- */
-bool tox_friend_get_typing(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error);
-
-/**
- * @param friend_number The friend number of the friend who started or stopped
- *   typing.
- * @param is_typing The result of calling tox_friend_get_typing on the passed
- *   friend_number.
- */
-typedef void tox_friend_typing_cb(Tox *tox, uint32_t friend_number, bool is_typing, void *user_data);
-
-
-/**
- * Set the callback for the `friend_typing` event. Pass NULL to unset.
- *
- * This event is triggered when a friend starts or stops typing.
- */
-void tox_callback_friend_typing(Tox *tox, tox_friend_typing_cb *callback);
-
-
-/*******************************************************************************
- *
- * :: Sending private messages
- *
- ******************************************************************************/
-
-
-
-typedef enum TOX_ERR_SET_TYPING {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_SET_TYPING_OK,
-
-    /**
-     * The friend number did not designate a valid friend.
-     */
-    TOX_ERR_SET_TYPING_FRIEND_NOT_FOUND,
-
-} TOX_ERR_SET_TYPING;
-
-
-/**
- * Set the client's typing status for a friend.
- *
- * The client is responsible for turning it on or off.
- *
- * @param friend_number The friend to which the client is typing a message.
- * @param typing The typing status. True means the client is typing.
- *
- * @return true on success.
- */
-bool tox_self_set_typing(Tox *tox, uint32_t friend_number, bool typing, TOX_ERR_SET_TYPING *error);
-
-typedef enum TOX_ERR_FRIEND_SEND_MESSAGE {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_FRIEND_SEND_MESSAGE_OK,
-
-    /**
-     * One of the arguments to the function was NULL when it was not expected.
-     */
-    TOX_ERR_FRIEND_SEND_MESSAGE_NULL,
-
-    /**
-     * The friend number did not designate a valid friend.
-     */
-    TOX_ERR_FRIEND_SEND_MESSAGE_FRIEND_NOT_FOUND,
-
-    /**
-     * This client is currently not connected to the friend.
-     */
-    TOX_ERR_FRIEND_SEND_MESSAGE_FRIEND_NOT_CONNECTED,
-
-    /**
-     * An allocation error occurred while increasing the send queue size.
-     */
-    TOX_ERR_FRIEND_SEND_MESSAGE_SENDQ,
-
-    /**
-     * Message length exceeded TOX_MAX_MESSAGE_LENGTH.
-     */
-    TOX_ERR_FRIEND_SEND_MESSAGE_TOO_LONG,
-
-    /**
-     * Attempted to send a zero-length message.
-     */
-    TOX_ERR_FRIEND_SEND_MESSAGE_EMPTY,
-
-} TOX_ERR_FRIEND_SEND_MESSAGE;
-
-
-/**
- * Send a text chat message to an online friend.
- *
- * This function creates a chat message packet and pushes it into the send
- * queue.
- *
- * The message length may not exceed TOX_MAX_MESSAGE_LENGTH. Larger messages
- * must be split by the client and sent as separate messages. Other clients can
- * then reassemble the fragments. Messages may not be empty.
- *
- * The return value of this function is the message ID. If a read receipt is
- * received, the triggered `friend_read_receipt` event will be passed this message ID.
- *
- * Message IDs are unique per friend. The first message ID is 0. Message IDs are
- * incremented by 1 each time a message is sent. If UINT32_MAX messages were
- * sent, the next message ID is 0.
- *
- * @param type Message type (normal, action, ...).
- * @param friend_number The friend number of the friend to send the message to.
- * @param message A non-NULL pointer to the first element of a byte array
- *   containing the message text.
- * @param length Length of the message to be sent.
- */
-uint32_t tox_friend_send_message(Tox *tox, uint32_t friend_number, TOX_MESSAGE_TYPE type, const uint8_t *message,
-                                 size_t length, TOX_ERR_FRIEND_SEND_MESSAGE *error);
-
-/**
- * @param friend_number The friend number of the friend who received the message.
- * @param message_id The message ID as returned from tox_friend_send_message
- *   corresponding to the message sent.
- */
-typedef void tox_friend_read_receipt_cb(Tox *tox, uint32_t friend_number, uint32_t message_id, void *user_data);
-
-
-/**
- * Set the callback for the `friend_read_receipt` event. Pass NULL to unset.
- *
- * This event is triggered when the friend receives the message sent with
- * tox_friend_send_message with the corresponding message ID.
- */
-void tox_callback_friend_read_receipt(Tox *tox, tox_friend_read_receipt_cb *callback);
-
-
-/*******************************************************************************
- *
- * :: Receiving private messages and friend requests
- *
- ******************************************************************************/
-
-
-
-/**
- * @param public_key The Public Key of the user who sent the friend request.
- * @param message The message they sent along with the request.
- * @param length The size of the message byte array.
- */
-typedef void tox_friend_request_cb(Tox *tox, const uint8_t *public_key, const uint8_t *message, size_t length,
-                                   void *user_data);
-
-
-/**
- * Set the callback for the `friend_request` event. Pass NULL to unset.
- *
- * This event is triggered when a friend request is received.
- */
-void tox_callback_friend_request(Tox *tox, tox_friend_request_cb *callback);
-
-/**
- * @param friend_number The friend number of the friend who sent the message.
- * @param message The message data they sent.
- * @param length The size of the message byte array.
- */
-typedef void tox_friend_message_cb(Tox *tox, uint32_t friend_number, TOX_MESSAGE_TYPE type, const uint8_t *message,
-                                   size_t length, void *user_data);
-
-
-/**
- * Set the callback for the `friend_message` event. Pass NULL to unset.
- *
- * This event is triggered when a message from a friend is received.
- */
-void tox_callback_friend_message(Tox *tox, tox_friend_message_cb *callback);
-
-
-/*******************************************************************************
- *
- * :: File transmission: common between sending and receiving
- *
- ******************************************************************************/
-
-
-
-/**
- * Generates a cryptographic hash of the given data.
- *
- * This function may be used by clients for any purpose, but is provided
- * primarily for validating cached avatars. This use is highly recommended to
- * avoid unnecessary avatar updates.
- *
- * If hash is NULL or data is NULL while length is not 0 the function returns false,
- * otherwise it returns true.
- *
- * This function is a wrapper to internal message-digest functions.
- *
- * @param hash A valid memory location the hash data. It must be at least
- *   TOX_HASH_LENGTH bytes in size.
- * @param data Data to be hashed or NULL.
- * @param length Size of the data array or 0.
- *
- * @return true if hash was not NULL.
- */
-bool tox_hash(uint8_t *hash, const uint8_t *data, size_t length);
-
-enum TOX_FILE_KIND {
-
-    /**
-     * Arbitrary file data. Clients can choose to handle it based on the file name
-     * or magic or any other way they choose.
-     */
-    TOX_FILE_KIND_DATA,
-
-    /**
-     * Avatar file_id. This consists of tox_hash(image).
-     * Avatar data. This consists of the image data.
-     *
-     * Avatars can be sent at any time the client wishes. Generally, a client will
-     * send the avatar to a friend when that friend comes online, and to all
-     * friends when the avatar changed. A client can save some traffic by
-     * remembering which friend received the updated avatar already and only send
-     * it if the friend has an out of date avatar.
-     *
-     * Clients who receive avatar send requests can reject it (by sending
-     * TOX_FILE_CONTROL_CANCEL before any other controls), or accept it (by
-     * sending TOX_FILE_CONTROL_RESUME). The file_id of length TOX_HASH_LENGTH bytes
-     * (same length as TOX_FILE_ID_LENGTH) will contain the hash. A client can compare
-     * this hash with a saved hash and send TOX_FILE_CONTROL_CANCEL to terminate the avatar
-     * transfer if it matches.
-     *
-     * When file_size is set to 0 in the transfer request it means that the client
-     * has no avatar.
-     */
-    TOX_FILE_KIND_AVATAR,
-
-};
-
-
-typedef enum TOX_FILE_CONTROL {
-
-    /**
-     * Sent by the receiving side to accept a file send request. Also sent after a
-     * TOX_FILE_CONTROL_PAUSE command to continue sending or receiving.
-     */
-    TOX_FILE_CONTROL_RESUME,
-
-    /**
-     * Sent by clients to pause the file transfer. The initial state of a file
-     * transfer is always paused on the receiving side and running on the sending
-     * side. If both the sending and receiving side pause the transfer, then both
-     * need to send TOX_FILE_CONTROL_RESUME for the transfer to resume.
-     */
-    TOX_FILE_CONTROL_PAUSE,
-
-    /**
-     * Sent by the receiving side to reject a file send request before any other
-     * commands are sent. Also sent by either side to terminate a file transfer.
-     */
-    TOX_FILE_CONTROL_CANCEL,
-
-} TOX_FILE_CONTROL;
-
-
-typedef enum TOX_ERR_FILE_CONTROL {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_FILE_CONTROL_OK,
-
-    /**
-     * The friend_number passed did not designate a valid friend.
-     */
-    TOX_ERR_FILE_CONTROL_FRIEND_NOT_FOUND,
-
-    /**
-     * This client is currently not connected to the friend.
-     */
-    TOX_ERR_FILE_CONTROL_FRIEND_NOT_CONNECTED,
-
-    /**
-     * No file transfer with the given file number was found for the given friend.
-     */
-    TOX_ERR_FILE_CONTROL_NOT_FOUND,
-
-    /**
-     * A RESUME control was sent, but the file transfer is running normally.
-     */
-    TOX_ERR_FILE_CONTROL_NOT_PAUSED,
-
-    /**
-     * A RESUME control was sent, but the file transfer was paused by the other
-     * party. Only the party that paused the transfer can resume it.
-     */
-    TOX_ERR_FILE_CONTROL_DENIED,
-
-    /**
-     * A PAUSE control was sent, but the file transfer was already paused.
-     */
-    TOX_ERR_FILE_CONTROL_ALREADY_PAUSED,
-
-    /**
-     * Packet queue is full.
-     */
-    TOX_ERR_FILE_CONTROL_SENDQ,
-
-} TOX_ERR_FILE_CONTROL;
-
-
-/**
- * Sends a file control command to a friend for a given file transfer.
- *
- * @param friend_number The friend number of the friend the file is being
- *   transferred to or received from.
- * @param file_number The friend-specific identifier for the file transfer.
- * @param control The control command to send.
- *
- * @return true on success.
- */
-bool tox_file_control(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_CONTROL control,
-                      TOX_ERR_FILE_CONTROL *error);
-
-/**
- * When receiving TOX_FILE_CONTROL_CANCEL, the client should release the
- * resources associated with the file number and consider the transfer failed.
- *
- * @param friend_number The friend number of the friend who is sending the file.
- * @param file_number The friend-specific file number the data received is
- *   associated with.
- * @param control The file control command received.
- */
-typedef void tox_file_recv_control_cb(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_CONTROL control,
-                                      void *user_data);
-
-
-/**
- * Set the callback for the `file_recv_control` event. Pass NULL to unset.
- *
- * This event is triggered when a file control command is received from a
- * friend.
- */
-void tox_callback_file_recv_control(Tox *tox, tox_file_recv_control_cb *callback);
-
-typedef enum TOX_ERR_FILE_SEEK {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_FILE_SEEK_OK,
-
-    /**
-     * The friend_number passed did not designate a valid friend.
-     */
-    TOX_ERR_FILE_SEEK_FRIEND_NOT_FOUND,
-
-    /**
-     * This client is currently not connected to the friend.
-     */
-    TOX_ERR_FILE_SEEK_FRIEND_NOT_CONNECTED,
-
-    /**
-     * No file transfer with the given file number was found for the given friend.
-     */
-    TOX_ERR_FILE_SEEK_NOT_FOUND,
-
-    /**
-     * File was not in a state where it could be seeked.
-     */
-    TOX_ERR_FILE_SEEK_DENIED,
-
-    /**
-     * Seek position was invalid
-     */
-    TOX_ERR_FILE_SEEK_INVALID_POSITION,
-
-    /**
-     * Packet queue is full.
-     */
-    TOX_ERR_FILE_SEEK_SENDQ,
-
-} TOX_ERR_FILE_SEEK;
-
-
-/**
- * Sends a file seek control command to a friend for a given file transfer.
- *
- * This function can only be called to resume a file transfer right before
- * TOX_FILE_CONTROL_RESUME is sent.
- *
- * @param friend_number The friend number of the friend the file is being
- *   received from.
- * @param file_number The friend-specific identifier for the file transfer.
- * @param position The position that the file should be seeked to.
- */
-bool tox_file_seek(Tox *tox, uint32_t friend_number, uint32_t file_number, uint64_t position, TOX_ERR_FILE_SEEK *error);
-
-typedef enum TOX_ERR_FILE_GET {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_FILE_GET_OK,
-
-    /**
-     * One of the arguments to the function was NULL when it was not expected.
-     */
-    TOX_ERR_FILE_GET_NULL,
-
-    /**
-     * The friend_number passed did not designate a valid friend.
-     */
-    TOX_ERR_FILE_GET_FRIEND_NOT_FOUND,
-
-    /**
-     * No file transfer with the given file number was found for the given friend.
-     */
-    TOX_ERR_FILE_GET_NOT_FOUND,
-
-} TOX_ERR_FILE_GET;
-
-
-/**
- * Copy the file id associated to the file transfer to a byte array.
- *
- * @param friend_number The friend number of the friend the file is being
- *   transferred to or received from.
- * @param file_number The friend-specific identifier for the file transfer.
- * @param file_id A memory region of at least TOX_FILE_ID_LENGTH bytes. If
- *   this parameter is NULL, this function has no effect.
- *
- * @return true on success.
- */
-bool tox_file_get_file_id(const Tox *tox, uint32_t friend_number, uint32_t file_number, uint8_t *file_id,
-                          TOX_ERR_FILE_GET *error);
-
-
-/*******************************************************************************
- *
- * :: File transmission: sending
- *
- ******************************************************************************/
-
-
-
-typedef enum TOX_ERR_FILE_SEND {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_FILE_SEND_OK,
-
-    /**
-     * One of the arguments to the function was NULL when it was not expected.
-     */
-    TOX_ERR_FILE_SEND_NULL,
-
-    /**
-     * The friend_number passed did not designate a valid friend.
-     */
-    TOX_ERR_FILE_SEND_FRIEND_NOT_FOUND,
-
-    /**
-     * This client is currently not connected to the friend.
-     */
-    TOX_ERR_FILE_SEND_FRIEND_NOT_CONNECTED,
-
-    /**
-     * Filename length exceeded TOX_MAX_FILENAME_LENGTH bytes.
-     */
-    TOX_ERR_FILE_SEND_NAME_TOO_LONG,
-
-    /**
-     * Too many ongoing transfers. The maximum number of concurrent file transfers
-     * is 256 per friend per direction (sending and receiving).
-     */
-    TOX_ERR_FILE_SEND_TOO_MANY,
-
-} TOX_ERR_FILE_SEND;
-
-
-/**
- * Send a file transmission request.
- *
- * Maximum filename length is TOX_MAX_FILENAME_LENGTH bytes. The filename
- * should generally just be a file name, not a path with directory names.
- *
- * If a non-UINT64_MAX file size is provided, it can be used by both sides to
- * determine the sending progress. File size can be set to UINT64_MAX for streaming
- * data of unknown size.
- *
- * File transmission occurs in chunks, which are requested through the
- * `file_chunk_request` event.
- *
- * When a friend goes offline, all file transfers associated with the friend are
- * purged from core.
- *
- * If the file contents change during a transfer, the behaviour is unspecified
- * in general. What will actually happen depends on the mode in which the file
- * was modified and how the client determines the file size.
- *
- * - If the file size was increased
- *   - and sending mode was streaming (file_size = UINT64_MAX), the behaviour
- *     will be as expected.
- *   - and sending mode was file (file_size != UINT64_MAX), the
- *     file_chunk_request callback will receive length = 0 when Core thinks
- *     the file transfer has finished. If the client remembers the file size as
- *     it was when sending the request, it will terminate the transfer normally.
- *     If the client re-reads the size, it will think the friend cancelled the
- *     transfer.
- * - If the file size was decreased
- *   - and sending mode was streaming, the behaviour is as expected.
- *   - and sending mode was file, the callback will return 0 at the new
- *     (earlier) end-of-file, signalling to the friend that the transfer was
- *     cancelled.
- * - If the file contents were modified
- *   - at a position before the current read, the two files (local and remote)
- *     will differ after the transfer terminates.
- *   - at a position after the current read, the file transfer will succeed as
- *     expected.
- *   - In either case, both sides will regard the transfer as complete and
- *     successful.
- *
- * @param friend_number The friend number of the friend the file send request
- *   should be sent to.
- * @param kind The meaning of the file to be sent.
- * @param file_size Size in bytes of the file the client wants to send, UINT64_MAX if
- *   unknown or streaming.
- * @param file_id A file identifier of length TOX_FILE_ID_LENGTH that can be used to
- *   uniquely identify file transfers across core restarts. If NULL, a random one will
- *   be generated by core. It can then be obtained by using tox_file_get_file_id().
- * @param filename Name of the file. Does not need to be the actual name. This
- *   name will be sent along with the file send request.
- * @param filename_length Size in bytes of the filename.
- *
- * @return A file number used as an identifier in subsequent callbacks. This
- *   number is per friend. File numbers are reused after a transfer terminates.
- *   On failure, this function returns UINT32_MAX. Any pattern in file numbers
- *   should not be relied on.
- */
-uint32_t tox_file_send(Tox *tox, uint32_t friend_number, uint32_t kind, uint64_t file_size, const uint8_t *file_id,
-                       const uint8_t *filename, size_t filename_length, TOX_ERR_FILE_SEND *error);
-
-typedef enum TOX_ERR_FILE_SEND_CHUNK {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_FILE_SEND_CHUNK_OK,
-
-    /**
-     * The length parameter was non-zero, but data was NULL.
-     */
-    TOX_ERR_FILE_SEND_CHUNK_NULL,
-
-    /**
-     * The friend_number passed did not designate a valid friend.
-     */
-    TOX_ERR_FILE_SEND_CHUNK_FRIEND_NOT_FOUND,
-
-    /**
-     * This client is currently not connected to the friend.
-     */
-    TOX_ERR_FILE_SEND_CHUNK_FRIEND_NOT_CONNECTED,
-
-    /**
-     * No file transfer with the given file number was found for the given friend.
-     */
-    TOX_ERR_FILE_SEND_CHUNK_NOT_FOUND,
-
-    /**
-     * File transfer was found but isn't in a transferring state: (paused, done,
-     * broken, etc...) (happens only when not called from the request chunk callback).
-     */
-    TOX_ERR_FILE_SEND_CHUNK_NOT_TRANSFERRING,
-
-    /**
-     * Attempted to send more or less data than requested. The requested data size is
-     * adjusted according to maximum transmission unit and the expected end of
-     * the file. Trying to send less or more than requested will return this error.
-     */
-    TOX_ERR_FILE_SEND_CHUNK_INVALID_LENGTH,
-
-    /**
-     * Packet queue is full.
-     */
-    TOX_ERR_FILE_SEND_CHUNK_SENDQ,
-
-    /**
-     * Position parameter was wrong.
-     */
-    TOX_ERR_FILE_SEND_CHUNK_WRONG_POSITION,
-
-} TOX_ERR_FILE_SEND_CHUNK;
-
-
-/**
- * Send a chunk of file data to a friend.
- *
- * This function is called in response to the `file_chunk_request` callback. The
- * length parameter should be equal to the one received though the callback.
- * If it is zero, the transfer is assumed complete. For files with known size,
- * Core will know that the transfer is complete after the last byte has been
- * received, so it is not necessary (though not harmful) to send a zero-length
- * chunk to terminate. For streams, core will know that the transfer is finished
- * if a chunk with length less than the length requested in the callback is sent.
- *
- * @param friend_number The friend number of the receiving friend for this file.
- * @param file_number The file transfer identifier returned by tox_file_send.
- * @param position The file or stream position from which to continue reading.
- * @return true on success.
- */
-bool tox_file_send_chunk(Tox *tox, uint32_t friend_number, uint32_t file_number, uint64_t position, const uint8_t *data,
-                         size_t length, TOX_ERR_FILE_SEND_CHUNK *error);
-
-/**
- * If the length parameter is 0, the file transfer is finished, and the client's
- * resources associated with the file number should be released. After a call
- * with zero length, the file number can be reused for future file transfers.
- *
- * If the requested position is not equal to the client's idea of the current
- * file or stream position, it will need to seek. In case of read-once streams,
- * the client should keep the last read chunk so that a seek back can be
- * supported. A seek-back only ever needs to read from the last requested chunk.
- * This happens when a chunk was requested, but the send failed. A seek-back
- * request can occur an arbitrary number of times for any given chunk.
- *
- * In response to receiving this callback, the client should call the function
- * `tox_file_send_chunk` with the requested chunk. If the number of bytes sent
- * through that function is zero, the file transfer is assumed complete. A
- * client must send the full length of data requested with this callback.
- *
- * @param friend_number The friend number of the receiving friend for this file.
- * @param file_number The file transfer identifier returned by tox_file_send.
- * @param position The file or stream position from which to continue reading.
- * @param length The number of bytes requested for the current chunk.
- */
-typedef void tox_file_chunk_request_cb(Tox *tox, uint32_t friend_number, uint32_t file_number, uint64_t position,
-                                       size_t length, void *user_data);
-
-
-/**
- * Set the callback for the `file_chunk_request` event. Pass NULL to unset.
- *
- * This event is triggered when Core is ready to send more file data.
- */
-void tox_callback_file_chunk_request(Tox *tox, tox_file_chunk_request_cb *callback);
-
-
-/*******************************************************************************
- *
- * :: File transmission: receiving
- *
- ******************************************************************************/
-
-
-
-/**
- * The client should acquire resources to be associated with the file transfer.
- * Incoming file transfers start in the PAUSED state. After this callback
- * returns, a transfer can be rejected by sending a TOX_FILE_CONTROL_CANCEL
- * control command before any other control commands. It can be accepted by
- * sending TOX_FILE_CONTROL_RESUME.
- *
- * @param friend_number The friend number of the friend who is sending the file
- *   transfer request.
- * @param file_number The friend-specific file number the data received is
- *   associated with.
- * @param kind The meaning of the file to be sent.
- * @param file_size Size in bytes of the file the client wants to send,
- *   UINT64_MAX if unknown or streaming.
- * @param filename Name of the file. Does not need to be the actual name. This
- *   name will be sent along with the file send request.
- * @param filename_length Size in bytes of the filename.
- */
-typedef void tox_file_recv_cb(Tox *tox, uint32_t friend_number, uint32_t file_number, uint32_t kind, uint64_t file_size,
-                              const uint8_t *filename, size_t filename_length, void *user_data);
-
-
-/**
- * Set the callback for the `file_recv` event. Pass NULL to unset.
- *
- * This event is triggered when a file transfer request is received.
- */
-void tox_callback_file_recv(Tox *tox, tox_file_recv_cb *callback);
-
-/**
- * When length is 0, the transfer is finished and the client should release the
- * resources it acquired for the transfer. After a call with length = 0, the
- * file number can be reused for new file transfers.
- *
- * If position is equal to file_size (received in the file_receive callback)
- * when the transfer finishes, the file was received completely. Otherwise, if
- * file_size was UINT64_MAX, streaming ended successfully when length is 0.
- *
- * @param friend_number The friend number of the friend who is sending the file.
- * @param file_number The friend-specific file number the data received is
- *   associated with.
- * @param position The file position of the first byte in data.
- * @param data A byte array containing the received chunk.
- * @param length The length of the received chunk.
- */
-typedef void tox_file_recv_chunk_cb(Tox *tox, uint32_t friend_number, uint32_t file_number, uint64_t position,
-                                    const uint8_t *data, size_t length, void *user_data);
-
-
-/**
- * Set the callback for the `file_recv_chunk` event. Pass NULL to unset.
- *
- * This event is first triggered when a file transfer request is received, and
- * subsequently when a chunk of file data for an accepted request was received.
- */
-void tox_callback_file_recv_chunk(Tox *tox, tox_file_recv_chunk_cb *callback);
-
-
-/*******************************************************************************
- *
- * :: Conference management
- *
- ******************************************************************************/
-
-
-
-/**
- * Conference types for the conference_invite event.
- */
-typedef enum TOX_CONFERENCE_TYPE {
-
-    /**
-     * Text-only conferences that must be accepted with the tox_conference_join function.
-     */
-    TOX_CONFERENCE_TYPE_TEXT,
-
-    /**
-     * Video conference. The function to accept these is in toxav.
-     */
-    TOX_CONFERENCE_TYPE_AV,
-
-} TOX_CONFERENCE_TYPE;
-
-
-/**
- * The invitation will remain valid until the inviting friend goes offline
- * or exits the conference.
- *
- * @param friend_number The friend who invited us.
- * @param type The conference type (text only or audio/video).
- * @param cookie A piece of data of variable length required to join the
- *   conference.
- * @param length The length of the cookie.
- */
-typedef void tox_conference_invite_cb(Tox *tox, uint32_t friend_number, TOX_CONFERENCE_TYPE type, const uint8_t *cookie,
-                                      size_t length, void *user_data);
-
-
-/**
- * Set the callback for the `conference_invite` event. Pass NULL to unset.
- *
- * This event is triggered when the client is invited to join a conference.
- */
-void tox_callback_conference_invite(Tox *tox, tox_conference_invite_cb *callback);
-
-/**
- * @param conference_number The conference number of the conference the message is intended for.
- * @param peer_number The ID of the peer who sent the message.
- * @param type The type of message (normal, action, ...).
- * @param message The message data.
- * @param length The length of the message.
- */
-typedef void tox_conference_message_cb(Tox *tox, uint32_t conference_number, uint32_t peer_number,
-                                       TOX_MESSAGE_TYPE type, const uint8_t *message, size_t length, void *user_data);
-
-
-/**
- * Set the callback for the `conference_message` event. Pass NULL to unset.
- *
- * This event is triggered when the client receives a conference message.
- */
-void tox_callback_conference_message(Tox *tox, tox_conference_message_cb *callback);
-
-/**
- * @param conference_number The conference number of the conference the title change is intended for.
- * @param peer_number The ID of the peer who changed the title.
- * @param title The title data.
- * @param length The title length.
- */
-typedef void tox_conference_title_cb(Tox *tox, uint32_t conference_number, uint32_t peer_number, const uint8_t *title,
-                                     size_t length, void *user_data);
-
-
-/**
- * Set the callback for the `conference_title` event. Pass NULL to unset.
- *
- * This event is triggered when a peer changes the conference title.
- *
- * If peer_number == UINT32_MAX, then author is unknown (e.g. initial joining the conference).
- */
-void tox_callback_conference_title(Tox *tox, tox_conference_title_cb *callback);
-
-/**
- * Peer list state change types.
- */
-typedef enum TOX_CONFERENCE_STATE_CHANGE {
-
-    /**
-     * A peer has joined the conference.
-     */
-    TOX_CONFERENCE_STATE_CHANGE_PEER_JOIN,
-
-    /**
-     * A peer has exited the conference.
-     */
-    TOX_CONFERENCE_STATE_CHANGE_PEER_EXIT,
-
-    /**
-     * A peer has changed their name.
-     */
-    TOX_CONFERENCE_STATE_CHANGE_PEER_NAME_CHANGE,
-
-} TOX_CONFERENCE_STATE_CHANGE;
-
-
-/**
- * @param conference_number The conference number of the conference the title change is intended for.
- * @param peer_number The ID of the peer who changed the title.
- * @param change The type of change (one of TOX_CONFERENCE_STATE_CHANGE).
- */
-typedef void tox_conference_namelist_change_cb(Tox *tox, uint32_t conference_number, uint32_t peer_number,
-        TOX_CONFERENCE_STATE_CHANGE change, void *user_data);
-
-
-/**
- * Set the callback for the `conference_namelist_change` event. Pass NULL to unset.
- *
- * This event is triggered when the peer list changes (name change, peer join, peer exit).
- */
-void tox_callback_conference_namelist_change(Tox *tox, tox_conference_namelist_change_cb *callback);
-
-typedef enum TOX_ERR_CONFERENCE_NEW {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_CONFERENCE_NEW_OK,
-
-    /**
-     * The conference instance failed to initialize.
-     */
-    TOX_ERR_CONFERENCE_NEW_INIT,
-
-} TOX_ERR_CONFERENCE_NEW;
-
-
-/**
- * Creates a new conference.
- *
- * This function creates a new text conference.
- *
- * @return conference number on success, or UINT32_MAX on failure.
- */
-uint32_t tox_conference_new(Tox *tox, TOX_ERR_CONFERENCE_NEW *error);
-
-typedef enum TOX_ERR_CONFERENCE_DELETE {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_CONFERENCE_DELETE_OK,
-
-    /**
-     * The conference number passed did not designate a valid conference.
-     */
-    TOX_ERR_CONFERENCE_DELETE_CONFERENCE_NOT_FOUND,
-
-} TOX_ERR_CONFERENCE_DELETE;
-
-
-/**
- * This function deletes a conference.
- *
- * @param conference_number The conference number of the conference to be deleted.
- *
- * @return true on success.
- */
-bool tox_conference_delete(Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_DELETE *error);
-
-/**
- * Error codes for peer info queries.
- */
-typedef enum TOX_ERR_CONFERENCE_PEER_QUERY {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_CONFERENCE_PEER_QUERY_OK,
-
-    /**
-     * The conference number passed did not designate a valid conference.
-     */
-    TOX_ERR_CONFERENCE_PEER_QUERY_CONFERENCE_NOT_FOUND,
-
-    /**
-     * The peer number passed did not designate a valid peer.
-     */
-    TOX_ERR_CONFERENCE_PEER_QUERY_PEER_NOT_FOUND,
-
-    /**
-     * The client is not connected to the conference.
-     */
-    TOX_ERR_CONFERENCE_PEER_QUERY_NO_CONNECTION,
-
-} TOX_ERR_CONFERENCE_PEER_QUERY;
-
-
-/**
- * Return the number of peers in the conference. Return value is unspecified on failure.
- */
-uint32_t tox_conference_peer_count(const Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_PEER_QUERY *error);
-
-/**
- * Return the length of the peer's name. Return value is unspecified on failure.
- */
-size_t tox_conference_peer_get_name_size(const Tox *tox, uint32_t conference_number, uint32_t peer_number,
-        TOX_ERR_CONFERENCE_PEER_QUERY *error);
-
-/**
- * Copy the name of peer_number who is in conference_number to name.
- * name must be at least TOX_MAX_NAME_LENGTH long.
- *
- * @return true on success.
- */
-bool tox_conference_peer_get_name(const Tox *tox, uint32_t conference_number, uint32_t peer_number, uint8_t *name,
-                                  TOX_ERR_CONFERENCE_PEER_QUERY *error);
-
-/**
- * Copy the public key of peer_number who is in conference_number to public_key.
- * public_key must be TOX_PUBLIC_KEY_SIZE long.
- *
- * @return true on success.
- */
-bool tox_conference_peer_get_public_key(const Tox *tox, uint32_t conference_number, uint32_t peer_number,
-                                        uint8_t *public_key, TOX_ERR_CONFERENCE_PEER_QUERY *error);
-
-/**
- * Return true if passed peer_number corresponds to our own.
- */
-bool tox_conference_peer_number_is_ours(const Tox *tox, uint32_t conference_number, uint32_t peer_number,
-                                        TOX_ERR_CONFERENCE_PEER_QUERY *error);
-
-typedef enum TOX_ERR_CONFERENCE_INVITE {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_CONFERENCE_INVITE_OK,
-
-    /**
-     * The conference number passed did not designate a valid conference.
-     */
-    TOX_ERR_CONFERENCE_INVITE_CONFERENCE_NOT_FOUND,
-
-    /**
-     * The invite packet failed to send.
-     */
-    TOX_ERR_CONFERENCE_INVITE_FAIL_SEND,
-
-} TOX_ERR_CONFERENCE_INVITE;
-
-
-/**
- * Invites a friend to a conference.
- *
- * @param friend_number The friend number of the friend we want to invite.
- * @param conference_number The conference number of the conference we want to invite the friend to.
- *
- * @return true on success.
- */
-bool tox_conference_invite(Tox *tox, uint32_t friend_number, uint32_t conference_number,
-                           TOX_ERR_CONFERENCE_INVITE *error);
-
-typedef enum TOX_ERR_CONFERENCE_JOIN {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_CONFERENCE_JOIN_OK,
-
-    /**
-     * The cookie passed has an invalid length.
-     */
-    TOX_ERR_CONFERENCE_JOIN_INVALID_LENGTH,
-
-    /**
-     * The conference is not the expected type. This indicates an invalid cookie.
-     */
-    TOX_ERR_CONFERENCE_JOIN_WRONG_TYPE,
-
-    /**
-     * The friend number passed does not designate a valid friend.
-     */
-    TOX_ERR_CONFERENCE_JOIN_FRIEND_NOT_FOUND,
-
-    /**
-     * Client is already in this conference.
-     */
-    TOX_ERR_CONFERENCE_JOIN_DUPLICATE,
-
-    /**
-     * Conference instance failed to initialize.
-     */
-    TOX_ERR_CONFERENCE_JOIN_INIT_FAIL,
-
-    /**
-     * The join packet failed to send.
-     */
-    TOX_ERR_CONFERENCE_JOIN_FAIL_SEND,
-
-} TOX_ERR_CONFERENCE_JOIN;
-
-
-/**
- * Joins a conference that the client has been invited to.
- *
- * @param friend_number The friend number of the friend who sent the invite.
- * @param cookie Received via the `conference_invite` event.
- * @param length The size of cookie.
- *
- * @return conference number on success, UINT32_MAX on failure.
- */
-uint32_t tox_conference_join(Tox *tox, uint32_t friend_number, const uint8_t *cookie, size_t length,
-                             TOX_ERR_CONFERENCE_JOIN *error);
-
-typedef enum TOX_ERR_CONFERENCE_SEND_MESSAGE {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_CONFERENCE_SEND_MESSAGE_OK,
-
-    /**
-     * The conference number passed did not designate a valid conference.
-     */
-    TOX_ERR_CONFERENCE_SEND_MESSAGE_CONFERENCE_NOT_FOUND,
-
-    /**
-     * The message is too long.
-     */
-    TOX_ERR_CONFERENCE_SEND_MESSAGE_TOO_LONG,
-
-    /**
-     * The client is not connected to the conference.
-     */
-    TOX_ERR_CONFERENCE_SEND_MESSAGE_NO_CONNECTION,
-
-    /**
-     * The message packet failed to send.
-     */
-    TOX_ERR_CONFERENCE_SEND_MESSAGE_FAIL_SEND,
-
-} TOX_ERR_CONFERENCE_SEND_MESSAGE;
-
-
-/**
- * Send a text chat message to the conference.
- *
- * This function creates a conference message packet and pushes it into the send
- * queue.
- *
- * The message length may not exceed TOX_MAX_MESSAGE_LENGTH. Larger messages
- * must be split by the client and sent as separate messages. Other clients can
- * then reassemble the fragments.
- *
- * @param conference_number The conference number of the conference the message is intended for.
- * @param type Message type (normal, action, ...).
- * @param message A non-NULL pointer to the first element of a byte array
- *   containing the message text.
- * @param length Length of the message to be sent.
- *
- * @return true on success.
- */
-bool tox_conference_send_message(Tox *tox, uint32_t conference_number, TOX_MESSAGE_TYPE type, const uint8_t *message,
-                                 size_t length, TOX_ERR_CONFERENCE_SEND_MESSAGE *error);
-
-typedef enum TOX_ERR_CONFERENCE_TITLE {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_CONFERENCE_TITLE_OK,
-
-    /**
-     * The conference number passed did not designate a valid conference.
-     */
-    TOX_ERR_CONFERENCE_TITLE_CONFERENCE_NOT_FOUND,
-
-    /**
-     * The title is too long or empty.
-     */
-    TOX_ERR_CONFERENCE_TITLE_INVALID_LENGTH,
-
-    /**
-     * The title packet failed to send.
-     */
-    TOX_ERR_CONFERENCE_TITLE_FAIL_SEND,
-
-} TOX_ERR_CONFERENCE_TITLE;
-
-
-/**
- * Return the length of the conference title. Return value is unspecified on failure.
- *
- * The return value is equal to the `length` argument received by the last
- * `conference_title` callback.
- */
-size_t tox_conference_get_title_size(const Tox *tox, uint32_t conference_number, TOX_ERR_CONFERENCE_TITLE *error);
-
-/**
- * Write the title designated by the given conference number to a byte array.
- *
- * Call tox_conference_get_title_size to determine the allocation size for the `title` parameter.
- *
- * The data written to `title` is equal to the data received by the last
- * `conference_title` callback.
- *
- * @param title A valid memory region large enough to store the title.
- *   If this parameter is NULL, this function has no effect.
- *
- * @return true on success.
- */
-bool tox_conference_get_title(const Tox *tox, uint32_t conference_number, uint8_t *title,
-                              TOX_ERR_CONFERENCE_TITLE *error);
-
-/**
- * Set the conference title and broadcast it to the rest of the conference.
- *
- * Title length cannot be longer than TOX_MAX_NAME_LENGTH.
- *
- * @return true on success.
- */
-bool tox_conference_set_title(Tox *tox, uint32_t conference_number, const uint8_t *title, size_t length,
-                              TOX_ERR_CONFERENCE_TITLE *error);
-
-/**
- * Return the number of conferences in the Tox instance.
- * This should be used to determine how much memory to allocate for `tox_conference_get_chatlist`.
- */
-size_t tox_conference_get_chatlist_size(const Tox *tox);
-
-/**
- * Copy a list of valid conference IDs into the array chatlist. Determine how much space
- * to allocate for the array with the `tox_conference_get_chatlist_size` function.
- */
-void tox_conference_get_chatlist(const Tox *tox, uint32_t *chatlist);
-
-/**
- * Returns the type of conference (TOX_CONFERENCE_TYPE) that conference_number is. Return value is
- * unspecified on failure.
- */
-typedef enum TOX_ERR_CONFERENCE_GET_TYPE {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_CONFERENCE_GET_TYPE_OK,
-
-    /**
-     * The conference number passed did not designate a valid conference.
-     */
-    TOX_ERR_CONFERENCE_GET_TYPE_CONFERENCE_NOT_FOUND,
-
-} TOX_ERR_CONFERENCE_GET_TYPE;
-
-
-TOX_CONFERENCE_TYPE tox_conference_get_type(const Tox *tox, uint32_t conference_number,
-        TOX_ERR_CONFERENCE_GET_TYPE *error);
-
-
-/*******************************************************************************
- *
- * :: Low-level custom packet sending and receiving
- *
- ******************************************************************************/
-
-
-
-typedef enum TOX_ERR_FRIEND_CUSTOM_PACKET {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_FRIEND_CUSTOM_PACKET_OK,
-
-    /**
-     * One of the arguments to the function was NULL when it was not expected.
-     */
-    TOX_ERR_FRIEND_CUSTOM_PACKET_NULL,
-
-    /**
-     * The friend number did not designate a valid friend.
-     */
-    TOX_ERR_FRIEND_CUSTOM_PACKET_FRIEND_NOT_FOUND,
-
-    /**
-     * This client is currently not connected to the friend.
-     */
-    TOX_ERR_FRIEND_CUSTOM_PACKET_FRIEND_NOT_CONNECTED,
-
-    /**
-     * The first byte of data was not in the specified range for the packet type.
-     * This range is 200-254 for lossy, and 160-191 for lossless packets.
-     */
-    TOX_ERR_FRIEND_CUSTOM_PACKET_INVALID,
-
-    /**
-     * Attempted to send an empty packet.
-     */
-    TOX_ERR_FRIEND_CUSTOM_PACKET_EMPTY,
-
-    /**
-     * Packet data length exceeded TOX_MAX_CUSTOM_PACKET_SIZE.
-     */
-    TOX_ERR_FRIEND_CUSTOM_PACKET_TOO_LONG,
-
-    /**
-     * Packet queue is full.
-     */
-    TOX_ERR_FRIEND_CUSTOM_PACKET_SENDQ,
-
-} TOX_ERR_FRIEND_CUSTOM_PACKET;
-
-
-/**
- * Send a custom lossy packet to a friend.
- *
- * The first byte of data must be in the range 200-254. Maximum length of a
- * custom packet is TOX_MAX_CUSTOM_PACKET_SIZE.
- *
- * Lossy packets behave like UDP packets, meaning they might never reach the
- * other side or might arrive more than once (if someone is messing with the
- * connection) or might arrive in the wrong order.
- *
- * Unless latency is an issue, it is recommended that you use lossless custom
- * packets instead.
- *
- * @param friend_number The friend number of the friend this lossy packet
- *   should be sent to.
- * @param data A byte array containing the packet data.
- * @param length The length of the packet data byte array.
- *
- * @return true on success.
- */
-bool tox_friend_send_lossy_packet(Tox *tox, uint32_t friend_number, const uint8_t *data, size_t length,
-                                  TOX_ERR_FRIEND_CUSTOM_PACKET *error);
-
-/**
- * Send a custom lossless packet to a friend.
- *
- * The first byte of data must be in the range 160-191. Maximum length of a
- * custom packet is TOX_MAX_CUSTOM_PACKET_SIZE.
- *
- * Lossless packet behaviour is comparable to TCP (reliability, arrive in order)
- * but with packets instead of a stream.
- *
- * @param friend_number The friend number of the friend this lossless packet
- *   should be sent to.
- * @param data A byte array containing the packet data.
- * @param length The length of the packet data byte array.
- *
- * @return true on success.
- */
-bool tox_friend_send_lossless_packet(Tox *tox, uint32_t friend_number, const uint8_t *data, size_t length,
-                                     TOX_ERR_FRIEND_CUSTOM_PACKET *error);
-
-/**
- * @param friend_number The friend number of the friend who sent a lossy packet.
- * @param data A byte array containing the received packet data.
- * @param length The length of the packet data byte array.
- */
-typedef void tox_friend_lossy_packet_cb(Tox *tox, uint32_t friend_number, const uint8_t *data, size_t length,
-                                        void *user_data);
-
-
-/**
- * Set the callback for the `friend_lossy_packet` event. Pass NULL to unset.
- *
- */
-void tox_callback_friend_lossy_packet(Tox *tox, tox_friend_lossy_packet_cb *callback);
-
-/**
- * @param friend_number The friend number of the friend who sent the packet.
- * @param data A byte array containing the received packet data.
- * @param length The length of the packet data byte array.
- */
-typedef void tox_friend_lossless_packet_cb(Tox *tox, uint32_t friend_number, const uint8_t *data, size_t length,
-        void *user_data);
-
-
-/**
- * Set the callback for the `friend_lossless_packet` event. Pass NULL to unset.
- *
- */
-void tox_callback_friend_lossless_packet(Tox *tox, tox_friend_lossless_packet_cb *callback);
-
-
-/*******************************************************************************
- *
- * :: Low-level network information
- *
- ******************************************************************************/
-
-
-
-/**
- * Writes the temporary DHT public key of this instance to a byte array.
- *
- * This can be used in combination with an externally accessible IP address and
- * the bound port (from tox_self_get_udp_port) to run a temporary bootstrap node.
- *
- * Be aware that every time a new instance is created, the DHT public key
- * changes, meaning this cannot be used to run a permanent bootstrap node.
- *
- * @param dht_id A memory region of at least TOX_PUBLIC_KEY_SIZE bytes. If this
- *   parameter is NULL, this function has no effect.
- */
-void tox_self_get_dht_id(const Tox *tox, uint8_t *dht_id);
-
-typedef enum TOX_ERR_GET_PORT {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_GET_PORT_OK,
-
-    /**
-     * The instance was not bound to any port.
-     */
-    TOX_ERR_GET_PORT_NOT_BOUND,
-
-} TOX_ERR_GET_PORT;
-
-
-/**
- * Return the UDP port this Tox instance is bound to.
- */
-uint16_t tox_self_get_udp_port(const Tox *tox, TOX_ERR_GET_PORT *error);
-
-/**
- * Return the TCP port this Tox instance is bound to. This is only relevant if
- * the instance is acting as a TCP relay.
- */
-uint16_t tox_self_get_tcp_port(const Tox *tox, TOX_ERR_GET_PORT *error);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/protocols/Tox/include/toxdns.h b/protocols/Tox/include/toxdns.h
deleted file mode 100644
index b280925eb1..0000000000
--- a/protocols/Tox/include/toxdns.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Tox secure username DNS toxid resolving functions.
- */
-
-/*
- * Copyright © 2016-2017 The TokTok team.
- * Copyright © 2014 Tox project.
- *
- * This file is part of Tox, the free peer to peer instant messenger.
- *
- * 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
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-
-/* Clients are encouraged to set this as the maximum length names can have. */
-#define TOXDNS_MAX_RECOMMENDED_NAME_LENGTH 32
-
-/* 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 success.
- * 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);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/protocols/Tox/include/toxencryptsave.h b/protocols/Tox/include/toxencryptsave.h
deleted file mode 100644
index 738d9757cb..0000000000
--- a/protocols/Tox/include/toxencryptsave.h
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * Batch encryption functions.
- */
-
-/*
- * Copyright © 2016-2017 The TokTok team.
- * Copyright © 2013-2016 Tox Developers.
- *
- * This file is part of Tox, the free peer to peer instant messenger.
- *
- * 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 TOXENCRYPTSAVE_H
-#define TOXENCRYPTSAVE_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <msapi/stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-
-/*******************************************************************************
- *
- * This module is organized into two parts.
- *
- * 1. A simple API operating on plain text/cipher text data and a password to
- *    encrypt or decrypt it.
- * 2. A more advanced API that splits key derivation and encryption into two
- *    separate function calls.
- *
- * The first part is implemented in terms of the second part and simply calls
- * the separate functions in sequence. Since key derivation is very expensive
- * compared to the actual encryption, clients that do a lot of crypto should
- * prefer the advanced API and reuse pass-key objects.
- *
- * To use the second part, first derive an encryption key from a password with
- * tox_pass_key_derive, then use the derived key to encrypt the data.
- *
- * The encrypted data is prepended with a magic number, to aid validity
- * checking (no guarantees are made of course). Any data to be decrypted must
- * start with the magic number.
- *
- * Clients should consider alerting their users that, unlike plain data, if
- * even one bit becomes corrupted, the data will be entirely unrecoverable.
- * Ditto if they forget their password, there is no way to recover the data.
- *
- ******************************************************************************/
-
-
-
-/**
- * The size of the salt part of a pass-key.
- */
-#define TOX_PASS_SALT_LENGTH           32
-
-uint32_t tox_pass_salt_length(void);
-
-/**
- * The size of the key part of a pass-key.
- */
-#define TOX_PASS_KEY_LENGTH            32
-
-uint32_t tox_pass_key_length(void);
-
-/**
- * The amount of additional data required to store any encrypted byte array.
- * Encrypting an array of N bytes requires N + TOX_PASS_ENCRYPTION_EXTRA_LENGTH
- * bytes in the encrypted byte array.
- */
-#define TOX_PASS_ENCRYPTION_EXTRA_LENGTH 80
-
-uint32_t tox_pass_encryption_extra_length(void);
-
-typedef enum TOX_ERR_KEY_DERIVATION {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_KEY_DERIVATION_OK,
-
-    /**
-     * One of the arguments to the function was NULL when it was not expected.
-     */
-    TOX_ERR_KEY_DERIVATION_NULL,
-
-    /**
-     * The crypto lib was unable to derive a key from the given passphrase,
-     * which is usually a lack of memory issue. The functions accepting keys
-     * do not produce this error.
-     */
-    TOX_ERR_KEY_DERIVATION_FAILED,
-
-} TOX_ERR_KEY_DERIVATION;
-
-
-typedef enum TOX_ERR_ENCRYPTION {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_ENCRYPTION_OK,
-
-    /**
-     * One of the arguments to the function was NULL when it was not expected.
-     */
-    TOX_ERR_ENCRYPTION_NULL,
-
-    /**
-     * The crypto lib was unable to derive a key from the given passphrase,
-     * which is usually a lack of memory issue. The functions accepting keys
-     * do not produce this error.
-     */
-    TOX_ERR_ENCRYPTION_KEY_DERIVATION_FAILED,
-
-    /**
-     * The encryption itself failed.
-     */
-    TOX_ERR_ENCRYPTION_FAILED,
-
-} TOX_ERR_ENCRYPTION;
-
-
-typedef enum TOX_ERR_DECRYPTION {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_DECRYPTION_OK,
-
-    /**
-     * One of the arguments to the function was NULL when it was not expected.
-     */
-    TOX_ERR_DECRYPTION_NULL,
-
-    /**
-     * The input data was shorter than TOX_PASS_ENCRYPTION_EXTRA_LENGTH bytes
-     */
-    TOX_ERR_DECRYPTION_INVALID_LENGTH,
-
-    /**
-     * The input data is missing the magic number (i.e. wasn't created by this
-     * module, or is corrupted).
-     */
-    TOX_ERR_DECRYPTION_BAD_FORMAT,
-
-    /**
-     * The crypto lib was unable to derive a key from the given passphrase,
-     * which is usually a lack of memory issue. The functions accepting keys
-     * do not produce this error.
-     */
-    TOX_ERR_DECRYPTION_KEY_DERIVATION_FAILED,
-
-    /**
-     * The encrypted byte array could not be decrypted. Either the data was
-     * corrupted or the password/key was incorrect.
-     */
-    TOX_ERR_DECRYPTION_FAILED,
-
-} TOX_ERR_DECRYPTION;
-
-
-
-/*******************************************************************************
- *
- *                                BEGIN PART 1
- *
- * The simple API is presented first. If your code spends too much time using
- * these functions, consider using the advanced functions instead and caching
- * the generated pass-key.
- *
- ******************************************************************************/
-
-
-
-/**
- * Encrypts the given data with the given passphrase.
- *
- * The output array must be at least `plaintext_len + TOX_PASS_ENCRYPTION_EXTRA_LENGTH`
- * bytes long. This delegates to tox_pass_key_derive and
- * tox_pass_key_encrypt.
- *
- * @param plaintext A byte array of length `plaintext_len`.
- * @param plaintext_len The length of the plain text array. Bigger than 0.
- * @param passphrase The user-provided password. Can be empty.
- * @param passphrase_len The length of the password.
- * @param ciphertext The cipher text array to write the encrypted data to.
- *
- * @return true on success.
- */
-bool tox_pass_encrypt(const uint8_t *plaintext, size_t plaintext_len, const uint8_t *passphrase, size_t passphrase_len,
-                      uint8_t *ciphertext, TOX_ERR_ENCRYPTION *error);
-
-/**
- * Decrypts the given data with the given passphrase.
- *
- * The output array must be at least `ciphertext_len - TOX_PASS_ENCRYPTION_EXTRA_LENGTH`
- * bytes long. This delegates to tox_pass_key_decrypt.
- *
- * @param ciphertext A byte array of length `ciphertext_len`.
- * @param ciphertext_len The length of the cipher text array. At least TOX_PASS_ENCRYPTION_EXTRA_LENGTH.
- * @param passphrase The user-provided password. Can be empty.
- * @param passphrase_len The length of the password.
- * @param plaintext The plain text array to write the decrypted data to.
- *
- * @return true on success.
- */
-bool tox_pass_decrypt(const uint8_t *ciphertext, size_t ciphertext_len, const uint8_t *passphrase,
-                      size_t passphrase_len, uint8_t *plaintext, TOX_ERR_DECRYPTION *error);
-
-
-/*******************************************************************************
- *
- *                                BEGIN PART 2
- *
- * And now part 2, which does the actual encryption, and can be used to write
- * less CPU intensive client code than part one.
- *
- ******************************************************************************/
-
-
-
-/**
- * This type represents a pass-key.
- *
- * A pass-key and a password are two different concepts: a password is given
- * by the user in plain text. A pass-key is the generated symmetric key used
- * for encryption and decryption. It is derived from a salt and the user-
- * provided password.
- *
- * The Tox_Pass_Key structure is hidden in the implementation. It can be allocated
- * using tox_pass_key_new and must be deallocated using tox_pass_key_free.
- */
-#ifndef TOX_PASS_KEY_DEFINED
-#define TOX_PASS_KEY_DEFINED
-typedef struct Tox_Pass_Key Tox_Pass_Key;
-#endif /* TOX_PASS_KEY_DEFINED */
-
-/**
- * Create a new Tox_Pass_Key. The initial value of it is indeterminate. To
- * initialise it, use one of the derive_* functions below.
- *
- * In case of failure, this function returns NULL. The only failure mode at
- * this time is memory allocation failure, so this function has no error code.
- */
-struct Tox_Pass_Key *tox_pass_key_new(void);
-
-/**
- * Deallocate a Tox_Pass_Key. This function behaves like free(), so NULL is an
- * acceptable argument value.
- */
-void tox_pass_key_free(struct Tox_Pass_Key *_key);
-
-/**
- * Generates a secret symmetric key from the given passphrase.
- *
- * Be sure to not compromise the key! Only keep it in memory, do not write
- * it to disk.
- *
- * Note that this function is not deterministic; to derive the same key from
- * a password, you also must know the random salt that was used. A
- * deterministic version of this function is tox_pass_key_derive_with_salt.
- *
- * @param passphrase The user-provided password. Can be empty.
- * @param passphrase_len The length of the password.
- *
- * @return true on success.
- */
-bool tox_pass_key_derive(struct Tox_Pass_Key *_key, const uint8_t *passphrase, size_t passphrase_len,
-                         TOX_ERR_KEY_DERIVATION *error);
-
-/**
- * Same as above, except use the given salt for deterministic key derivation.
- *
- * @param passphrase The user-provided password. Can be empty.
- * @param passphrase_len The length of the password.
- * @param salt An array of at least TOX_PASS_SALT_LENGTH bytes.
- *
- * @return true on success.
- */
-bool tox_pass_key_derive_with_salt(struct Tox_Pass_Key *_key, const uint8_t *passphrase, size_t passphrase_len,
-                                   const uint8_t *salt, TOX_ERR_KEY_DERIVATION *error);
-
-/**
- * Encrypt a plain text with a key produced by tox_pass_key_derive or tox_pass_key_derive_with_salt.
- *
- * The output array must be at least `plaintext_len + TOX_PASS_ENCRYPTION_EXTRA_LENGTH`
- * bytes long.
- *
- * @param plaintext A byte array of length `plaintext_len`.
- * @param plaintext_len The length of the plain text array. Bigger than 0.
- * @param ciphertext The cipher text array to write the encrypted data to.
- *
- * @return true on success.
- */
-bool tox_pass_key_encrypt(const struct Tox_Pass_Key *_key, const uint8_t *plaintext, size_t plaintext_len,
-                          uint8_t *ciphertext, TOX_ERR_ENCRYPTION *error);
-
-/**
- * This is the inverse of tox_pass_key_encrypt, also using only keys produced by
- * tox_pass_key_derive or tox_pass_key_derive_with_salt.
- *
- * @param ciphertext A byte array of length `ciphertext_len`.
- * @param ciphertext_len The length of the cipher text array. At least TOX_PASS_ENCRYPTION_EXTRA_LENGTH.
- * @param plaintext The plain text array to write the decrypted data to.
- *
- * @return true on success.
- */
-bool tox_pass_key_decrypt(const struct Tox_Pass_Key *_key, const uint8_t *ciphertext, size_t ciphertext_len,
-                          uint8_t *plaintext, TOX_ERR_DECRYPTION *error);
-
-typedef enum TOX_ERR_GET_SALT {
-
-    /**
-     * The function returned successfully.
-     */
-    TOX_ERR_GET_SALT_OK,
-
-    /**
-     * One of the arguments to the function was NULL when it was not expected.
-     */
-    TOX_ERR_GET_SALT_NULL,
-
-    /**
-     * The input data is missing the magic number (i.e. wasn't created by this
-     * module, or is corrupted).
-     */
-    TOX_ERR_GET_SALT_BAD_FORMAT,
-
-} TOX_ERR_GET_SALT;
-
-
-/**
- * Retrieves the salt used to encrypt the given data.
- *
- * The retrieved salt can then be passed to tox_pass_key_derive_with_salt to
- * produce the same key as was previously used. Any data encrypted with this
- * module can be used as input.
- *
- * The cipher text must be at least TOX_PASS_ENCRYPTION_EXTRA_LENGTH bytes in length.
- * The salt must be TOX_PASS_SALT_LENGTH bytes in length.
- * If the passed byte arrays are smaller than required, the behaviour is
- * undefined.
- *
- * If the cipher text pointer or the salt is NULL, this function returns false.
- *
- * Success does not say anything about the validity of the data, only that
- * data of the appropriate size was copied.
- *
- * @return true on success.
- */
-bool tox_get_salt(const uint8_t *ciphertext, uint8_t *salt, TOX_ERR_GET_SALT *error);
-
-/**
- * Determines whether or not the given data is encrypted by this module.
- *
- * It does this check by verifying that the magic number is the one put in
- * place by the encryption functions.
- *
- * The data must be at least TOX_PASS_ENCRYPTION_EXTRA_LENGTH bytes in length.
- * If the passed byte array is smaller than required, the behaviour is
- * undefined.
- *
- * If the data pointer is NULL, the behaviour is undefined
- *
- * @return true if the data is encrypted by this module.
- */
-bool tox_is_data_encrypted(const uint8_t *data);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/libs/libtox/docs/CHANGELOG.md b/protocols/Tox/libtox/docs/CHANGELOG.md
index e3275a16df..e3275a16df 100644
--- a/libs/libtox/docs/CHANGELOG.md
+++ b/protocols/Tox/libtox/docs/CHANGELOG.md
diff --git a/libs/libtox/docs/COPYING b/protocols/Tox/libtox/docs/COPYING
index 94a9ed024d..94a9ed024d 100644
--- a/libs/libtox/docs/COPYING
+++ b/protocols/Tox/libtox/docs/COPYING
diff --git a/libs/libtox/docs/DONATORS b/protocols/Tox/libtox/docs/DONATORS
index dcce32c869..dcce32c869 100644
--- a/libs/libtox/docs/DONATORS
+++ b/protocols/Tox/libtox/docs/DONATORS
diff --git a/libs/libtox/docs/README.md b/protocols/Tox/libtox/docs/README.md
index 7a1ffe7ffa..7a1ffe7ffa 100644
--- a/libs/libtox/docs/README.md
+++ b/protocols/Tox/libtox/docs/README.md
diff --git a/libs/libtox/libtox.vcxproj b/protocols/Tox/libtox/libtox.vcxproj
index b553c6194c..c4380e76d9 100644
--- a/libs/libtox/libtox.vcxproj
+++ b/protocols/Tox/libtox/libtox.vcxproj
@@ -21,11 +21,16 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{A21C50CD-28A6-481A-A12B-47189FE66641}</ProjectGuid>
     <ProjectName>libtox</ProjectName>
+    <GenerateManifest>false</GenerateManifest>
+    <EmbedManifest>false</EmbedManifest>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</OutDir>
+    <OutDir Condition="'$(Platform)'=='x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</OutDir>
   </PropertyGroup>
-  <Import Project="$(ProjectDir)..\..\build\vc.common\lib.props" />
+  <Import Project="..\..\..\build\vc.common\common.props" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\pthreads\src;$(ProjectDir)..\libsodium\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\libs\pthreads\src;..\..\..\libs\libsodium\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <ModuleDefinitionFile>src/libtox.def</ModuleDefinitionFile>
@@ -45,10 +50,10 @@
     <ClInclude Include="src\toxencryptsave*.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\libsodium\libsodium.vcxproj">
+    <ProjectReference Include="..\..\..\libs\libsodium\libsodium.vcxproj">
       <Project>{a185b162-6cb6-4502-b03f-b56f7699a8d9}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\pthreads\pthreads.vcxproj">
+    <ProjectReference Include="..\..\..\libs\pthreads\pthreads.vcxproj">
       <Project>{e0ebb8a5-b577-414c-a5f9-9b4e2a0a66e9}</Project>
     </ProjectReference>
   </ItemGroup>
diff --git a/protocols/Tox/libtox/libtox.vcxproj.filters b/protocols/Tox/libtox/libtox.vcxproj.filters
new file mode 100644
index 0000000000..5a8d37777a
--- /dev/null
+++ b/protocols/Tox/libtox/libtox.vcxproj.filters
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" /> 
+</Project>
diff --git a/libs/libtox/src/libtox.def b/protocols/Tox/libtox/src/libtox.def
index e1706ad3ae..e1706ad3ae 100644
--- a/libs/libtox/src/libtox.def
+++ b/protocols/Tox/libtox/src/libtox.def
diff --git a/libs/libtox/src/stdafx.cxx b/protocols/Tox/libtox/src/stdafx.cxx
index 1647228cd0..1647228cd0 100644
--- a/libs/libtox/src/stdafx.cxx
+++ b/protocols/Tox/libtox/src/stdafx.cxx
diff --git a/libs/libtox/src/stdafx.h b/protocols/Tox/libtox/src/stdafx.h
index e69de29bb2..e69de29bb2 100644
--- a/libs/libtox/src/stdafx.h
+++ b/protocols/Tox/libtox/src/stdafx.h
diff --git a/libs/libtox/src/toxcore/DHT.c b/protocols/Tox/libtox/src/toxcore/DHT.c
index 4ebe7f3344..4ebe7f3344 100644
--- a/libs/libtox/src/toxcore/DHT.c
+++ b/protocols/Tox/libtox/src/toxcore/DHT.c
diff --git a/libs/libtox/src/toxcore/DHT.h b/protocols/Tox/libtox/src/toxcore/DHT.h
index 510b3c5c92..510b3c5c92 100644
--- a/libs/libtox/src/toxcore/DHT.h
+++ b/protocols/Tox/libtox/src/toxcore/DHT.h
diff --git a/libs/libtox/src/toxcore/LAN_discovery.c b/protocols/Tox/libtox/src/toxcore/LAN_discovery.c
index b95e401d05..b95e401d05 100644
--- a/libs/libtox/src/toxcore/LAN_discovery.c
+++ b/protocols/Tox/libtox/src/toxcore/LAN_discovery.c
diff --git a/libs/libtox/src/toxcore/LAN_discovery.h b/protocols/Tox/libtox/src/toxcore/LAN_discovery.h
index 753de5249f..753de5249f 100644
--- a/libs/libtox/src/toxcore/LAN_discovery.h
+++ b/protocols/Tox/libtox/src/toxcore/LAN_discovery.h
diff --git a/libs/libtox/src/toxcore/Messenger.c b/protocols/Tox/libtox/src/toxcore/Messenger.c
index 4dd7d0c4a4..4dd7d0c4a4 100644
--- a/libs/libtox/src/toxcore/Messenger.c
+++ b/protocols/Tox/libtox/src/toxcore/Messenger.c
diff --git a/libs/libtox/src/toxcore/Messenger.h b/protocols/Tox/libtox/src/toxcore/Messenger.h
index e1dba69886..e1dba69886 100644
--- a/libs/libtox/src/toxcore/Messenger.h
+++ b/protocols/Tox/libtox/src/toxcore/Messenger.h
diff --git a/libs/libtox/src/toxcore/TCP_client.c b/protocols/Tox/libtox/src/toxcore/TCP_client.c
index 8a14c7cd70..8a14c7cd70 100644
--- a/libs/libtox/src/toxcore/TCP_client.c
+++ b/protocols/Tox/libtox/src/toxcore/TCP_client.c
diff --git a/libs/libtox/src/toxcore/TCP_client.h b/protocols/Tox/libtox/src/toxcore/TCP_client.h
index 212543147c..212543147c 100644
--- a/libs/libtox/src/toxcore/TCP_client.h
+++ b/protocols/Tox/libtox/src/toxcore/TCP_client.h
diff --git a/libs/libtox/src/toxcore/TCP_connection.c b/protocols/Tox/libtox/src/toxcore/TCP_connection.c
index 251594912a..251594912a 100644
--- a/libs/libtox/src/toxcore/TCP_connection.c
+++ b/protocols/Tox/libtox/src/toxcore/TCP_connection.c
diff --git a/libs/libtox/src/toxcore/TCP_connection.h b/protocols/Tox/libtox/src/toxcore/TCP_connection.h
index a45129a7e8..a45129a7e8 100644
--- a/libs/libtox/src/toxcore/TCP_connection.h
+++ b/protocols/Tox/libtox/src/toxcore/TCP_connection.h
diff --git a/libs/libtox/src/toxcore/TCP_server.c b/protocols/Tox/libtox/src/toxcore/TCP_server.c
index 9b94667aa1..9b94667aa1 100644
--- a/libs/libtox/src/toxcore/TCP_server.c
+++ b/protocols/Tox/libtox/src/toxcore/TCP_server.c
diff --git a/libs/libtox/src/toxcore/TCP_server.h b/protocols/Tox/libtox/src/toxcore/TCP_server.h
index f213c078e6..f213c078e6 100644
--- a/libs/libtox/src/toxcore/TCP_server.h
+++ b/protocols/Tox/libtox/src/toxcore/TCP_server.h
diff --git a/libs/libtox/src/toxcore/ccompat.h b/protocols/Tox/libtox/src/toxcore/ccompat.h
index e72e66ae58..e72e66ae58 100644
--- a/libs/libtox/src/toxcore/ccompat.h
+++ b/protocols/Tox/libtox/src/toxcore/ccompat.h
diff --git a/libs/libtox/src/toxcore/crypto_core.api.h b/protocols/Tox/libtox/src/toxcore/crypto_core.api.h
index cef1a52c14..cef1a52c14 100644
--- a/libs/libtox/src/toxcore/crypto_core.api.h
+++ b/protocols/Tox/libtox/src/toxcore/crypto_core.api.h
diff --git a/libs/libtox/src/toxcore/crypto_core.c b/protocols/Tox/libtox/src/toxcore/crypto_core.c
index 8e34b5876a..8e34b5876a 100644
--- a/libs/libtox/src/toxcore/crypto_core.c
+++ b/protocols/Tox/libtox/src/toxcore/crypto_core.c
diff --git a/libs/libtox/src/toxcore/crypto_core.h b/protocols/Tox/libtox/src/toxcore/crypto_core.h
index fc5756c1d2..fc5756c1d2 100644
--- a/libs/libtox/src/toxcore/crypto_core.h
+++ b/protocols/Tox/libtox/src/toxcore/crypto_core.h
diff --git a/libs/libtox/src/toxcore/crypto_core_mem.c b/protocols/Tox/libtox/src/toxcore/crypto_core_mem.c
index b8f4223e65..b8f4223e65 100644
--- a/libs/libtox/src/toxcore/crypto_core_mem.c
+++ b/protocols/Tox/libtox/src/toxcore/crypto_core_mem.c
diff --git a/libs/libtox/src/toxcore/friend_connection.c b/protocols/Tox/libtox/src/toxcore/friend_connection.c
index 9f0677b109..9f0677b109 100644
--- a/libs/libtox/src/toxcore/friend_connection.c
+++ b/protocols/Tox/libtox/src/toxcore/friend_connection.c
diff --git a/libs/libtox/src/toxcore/friend_connection.h b/protocols/Tox/libtox/src/toxcore/friend_connection.h
index e993a103d3..e993a103d3 100644
--- a/libs/libtox/src/toxcore/friend_connection.h
+++ b/protocols/Tox/libtox/src/toxcore/friend_connection.h
diff --git a/libs/libtox/src/toxcore/friend_requests.c b/protocols/Tox/libtox/src/toxcore/friend_requests.c
index ba782e2b01..ba782e2b01 100644
--- a/libs/libtox/src/toxcore/friend_requests.c
+++ b/protocols/Tox/libtox/src/toxcore/friend_requests.c
diff --git a/libs/libtox/src/toxcore/friend_requests.h b/protocols/Tox/libtox/src/toxcore/friend_requests.h
index 316e1c671f..316e1c671f 100644
--- a/libs/libtox/src/toxcore/friend_requests.h
+++ b/protocols/Tox/libtox/src/toxcore/friend_requests.h
diff --git a/libs/libtox/src/toxcore/group.c b/protocols/Tox/libtox/src/toxcore/group.c
index d3f068dfce..d3f068dfce 100644
--- a/libs/libtox/src/toxcore/group.c
+++ b/protocols/Tox/libtox/src/toxcore/group.c
diff --git a/libs/libtox/src/toxcore/group.h b/protocols/Tox/libtox/src/toxcore/group.h
index 2e014da36d..2e014da36d 100644
--- a/libs/libtox/src/toxcore/group.h
+++ b/protocols/Tox/libtox/src/toxcore/group.h
diff --git a/libs/libtox/src/toxcore/list.c b/protocols/Tox/libtox/src/toxcore/list.c
index 36d609fbd1..36d609fbd1 100644
--- a/libs/libtox/src/toxcore/list.c
+++ b/protocols/Tox/libtox/src/toxcore/list.c
diff --git a/libs/libtox/src/toxcore/list.h b/protocols/Tox/libtox/src/toxcore/list.h
index cb3b328c5a..cb3b328c5a 100644
--- a/libs/libtox/src/toxcore/list.h
+++ b/protocols/Tox/libtox/src/toxcore/list.h
diff --git a/libs/libtox/src/toxcore/logger.c b/protocols/Tox/libtox/src/toxcore/logger.c
index 18b765a385..18b765a385 100644
--- a/libs/libtox/src/toxcore/logger.c
+++ b/protocols/Tox/libtox/src/toxcore/logger.c
diff --git a/libs/libtox/src/toxcore/logger.h b/protocols/Tox/libtox/src/toxcore/logger.h
index 8c8a639bec..8c8a639bec 100644
--- a/libs/libtox/src/toxcore/logger.h
+++ b/protocols/Tox/libtox/src/toxcore/logger.h
diff --git a/libs/libtox/src/toxcore/net_crypto.c b/protocols/Tox/libtox/src/toxcore/net_crypto.c
index 37cbab188f..37cbab188f 100644
--- a/libs/libtox/src/toxcore/net_crypto.c
+++ b/protocols/Tox/libtox/src/toxcore/net_crypto.c
diff --git a/libs/libtox/src/toxcore/net_crypto.h b/protocols/Tox/libtox/src/toxcore/net_crypto.h
index 5ec5ca94fb..5ec5ca94fb 100644
--- a/libs/libtox/src/toxcore/net_crypto.h
+++ b/protocols/Tox/libtox/src/toxcore/net_crypto.h
diff --git a/libs/libtox/src/toxcore/network.c b/protocols/Tox/libtox/src/toxcore/network.c
index 5c43bf5779..5c43bf5779 100644
--- a/libs/libtox/src/toxcore/network.c
+++ b/protocols/Tox/libtox/src/toxcore/network.c
diff --git a/libs/libtox/src/toxcore/network.h b/protocols/Tox/libtox/src/toxcore/network.h
index 0b9da5a40f..0b9da5a40f 100644
--- a/libs/libtox/src/toxcore/network.h
+++ b/protocols/Tox/libtox/src/toxcore/network.h
diff --git a/libs/libtox/src/toxcore/onion.c b/protocols/Tox/libtox/src/toxcore/onion.c
index fbaf7205d9..fbaf7205d9 100644
--- a/libs/libtox/src/toxcore/onion.c
+++ b/protocols/Tox/libtox/src/toxcore/onion.c
diff --git a/libs/libtox/src/toxcore/onion.h b/protocols/Tox/libtox/src/toxcore/onion.h
index e81b3a52ae..e81b3a52ae 100644
--- a/libs/libtox/src/toxcore/onion.h
+++ b/protocols/Tox/libtox/src/toxcore/onion.h
diff --git a/libs/libtox/src/toxcore/onion_announce.c b/protocols/Tox/libtox/src/toxcore/onion_announce.c
index c093800719..c093800719 100644
--- a/libs/libtox/src/toxcore/onion_announce.c
+++ b/protocols/Tox/libtox/src/toxcore/onion_announce.c
diff --git a/libs/libtox/src/toxcore/onion_announce.h b/protocols/Tox/libtox/src/toxcore/onion_announce.h
index 548d4b798b..548d4b798b 100644
--- a/libs/libtox/src/toxcore/onion_announce.h
+++ b/protocols/Tox/libtox/src/toxcore/onion_announce.h
diff --git a/libs/libtox/src/toxcore/onion_client.c b/protocols/Tox/libtox/src/toxcore/onion_client.c
index 94e9c91652..94e9c91652 100644
--- a/libs/libtox/src/toxcore/onion_client.c
+++ b/protocols/Tox/libtox/src/toxcore/onion_client.c
diff --git a/libs/libtox/src/toxcore/onion_client.h b/protocols/Tox/libtox/src/toxcore/onion_client.h
index 216dbec050..216dbec050 100644
--- a/libs/libtox/src/toxcore/onion_client.h
+++ b/protocols/Tox/libtox/src/toxcore/onion_client.h
diff --git a/libs/libtox/src/toxcore/ping.c b/protocols/Tox/libtox/src/toxcore/ping.c
index 72b3fe6259..72b3fe6259 100644
--- a/libs/libtox/src/toxcore/ping.c
+++ b/protocols/Tox/libtox/src/toxcore/ping.c
diff --git a/libs/libtox/src/toxcore/ping.h b/protocols/Tox/libtox/src/toxcore/ping.h
index cc3428c548..cc3428c548 100644
--- a/libs/libtox/src/toxcore/ping.h
+++ b/protocols/Tox/libtox/src/toxcore/ping.h
diff --git a/libs/libtox/src/toxcore/ping_array.c b/protocols/Tox/libtox/src/toxcore/ping_array.c
index ea3e5101b1..ea3e5101b1 100644
--- a/libs/libtox/src/toxcore/ping_array.c
+++ b/protocols/Tox/libtox/src/toxcore/ping_array.c
diff --git a/libs/libtox/src/toxcore/ping_array.h b/protocols/Tox/libtox/src/toxcore/ping_array.h
index bdf3c6db3d..bdf3c6db3d 100644
--- a/libs/libtox/src/toxcore/ping_array.h
+++ b/protocols/Tox/libtox/src/toxcore/ping_array.h
diff --git a/libs/libtox/src/toxcore/tox.api.h b/protocols/Tox/libtox/src/toxcore/tox.api.h
index 0763c7789d..0763c7789d 100644
--- a/libs/libtox/src/toxcore/tox.api.h
+++ b/protocols/Tox/libtox/src/toxcore/tox.api.h
diff --git a/libs/libtox/src/toxcore/tox.c b/protocols/Tox/libtox/src/toxcore/tox.c
index 12f3762083..12f3762083 100644
--- a/libs/libtox/src/toxcore/tox.c
+++ b/protocols/Tox/libtox/src/toxcore/tox.c
diff --git a/libs/libtox/src/toxcore/tox.h b/protocols/Tox/libtox/src/toxcore/tox.h
index 30bc950964..30bc950964 100644
--- a/libs/libtox/src/toxcore/tox.h
+++ b/protocols/Tox/libtox/src/toxcore/tox.h
diff --git a/libs/libtox/src/toxcore/tox_api.c b/protocols/Tox/libtox/src/toxcore/tox_api.c
index b6c8c38618..b6c8c38618 100644
--- a/libs/libtox/src/toxcore/tox_api.c
+++ b/protocols/Tox/libtox/src/toxcore/tox_api.c
diff --git a/libs/libtox/src/toxcore/util.c b/protocols/Tox/libtox/src/toxcore/util.c
index 5202598518..5202598518 100644
--- a/libs/libtox/src/toxcore/util.c
+++ b/protocols/Tox/libtox/src/toxcore/util.c
diff --git a/libs/libtox/src/toxcore/util.h b/protocols/Tox/libtox/src/toxcore/util.h
index 6ef9a75f8c..6ef9a75f8c 100644
--- a/libs/libtox/src/toxcore/util.h
+++ b/protocols/Tox/libtox/src/toxcore/util.h
diff --git a/libs/libtox/src/toxdns/Makefile.inc b/protocols/Tox/libtox/src/toxdns/Makefile.inc
index 5b7c012320..5b7c012320 100644
--- a/libs/libtox/src/toxdns/Makefile.inc
+++ b/protocols/Tox/libtox/src/toxdns/Makefile.inc
diff --git a/libs/libtox/src/toxdns/toxdns.c b/protocols/Tox/libtox/src/toxdns/toxdns.c
index 96f3081f80..96f3081f80 100644
--- a/libs/libtox/src/toxdns/toxdns.c
+++ b/protocols/Tox/libtox/src/toxdns/toxdns.c
diff --git a/libs/libtox/src/toxdns/toxdns.h b/protocols/Tox/libtox/src/toxdns/toxdns.h
index b280925eb1..b280925eb1 100644
--- a/libs/libtox/src/toxdns/toxdns.h
+++ b/protocols/Tox/libtox/src/toxdns/toxdns.h
diff --git a/libs/libtox/src/toxencryptsave/Makefile.inc b/protocols/Tox/libtox/src/toxencryptsave/Makefile.inc
index bde026cdaf..bde026cdaf 100644
--- a/libs/libtox/src/toxencryptsave/Makefile.inc
+++ b/protocols/Tox/libtox/src/toxencryptsave/Makefile.inc
diff --git a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_pwhash_scryptsalsa208sha256.h b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_pwhash_scryptsalsa208sha256.h
index 5cb32f8dcf..5cb32f8dcf 100644
--- a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_pwhash_scryptsalsa208sha256.h
+++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_pwhash_scryptsalsa208sha256.h
diff --git a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_scrypt-common.c b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_scrypt-common.c
index 5a5c5525f3..5a5c5525f3 100644
--- a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_scrypt-common.c
+++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_scrypt-common.c
diff --git a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_scrypt.h b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_scrypt.h
index 3f0b7d72f5..3f0b7d72f5 100644
--- a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_scrypt.h
+++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/crypto_scrypt.h
diff --git a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/export.h b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/export.h
index ee5b30f7f1..ee5b30f7f1 100644
--- a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/export.h
+++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/export.h
diff --git a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c
index 97d9ba6878..97d9ba6878 100644
--- a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c
+++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c
diff --git a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/note_to_maintainers.txt b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/note_to_maintainers.txt
index 66bbfe2db9..66bbfe2db9 100644
--- a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/note_to_maintainers.txt
+++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/note_to_maintainers.txt
diff --git a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pbkdf2-sha256.c b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pbkdf2-sha256.c
index 3dfe54db5f..3dfe54db5f 100644
--- a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pbkdf2-sha256.c
+++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pbkdf2-sha256.c
diff --git a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pbkdf2-sha256.h b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pbkdf2-sha256.h
index b74bc6a340..b74bc6a340 100644
--- a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pbkdf2-sha256.h
+++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pbkdf2-sha256.h
diff --git a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c
index 52c51abc3b..52c51abc3b 100644
--- a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c
+++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c
diff --git a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/runtime.c b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/runtime.c
index 9b5c513193..9b5c513193 100644
--- a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/runtime.c
+++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/runtime.c
diff --git a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/runtime.h b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/runtime.h
index 874915ef42..874915ef42 100644
--- a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/runtime.h
+++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/runtime.h
diff --git a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/scrypt_platform.c b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/scrypt_platform.c
index 5819651454..5819651454 100644
--- a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/scrypt_platform.c
+++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/scrypt_platform.c
diff --git a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c
index 856a655e3f..856a655e3f 100644
--- a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c
+++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c
diff --git a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/sysendian.h b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/sysendian.h
index 04e5c1ed45..04e5c1ed45 100644
--- a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/sysendian.h
+++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/sysendian.h
diff --git a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/utils.c b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/utils.c
index e61ccf3ecf..e61ccf3ecf 100644
--- a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/utils.c
+++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/utils.c
diff --git a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/utils.h b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/utils.h
index fb2020c35d..fb2020c35d 100644
--- a/libs/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/utils.h
+++ b/protocols/Tox/libtox/src/toxencryptsave/crypto_pwhash_scryptsalsa208sha256/utils.h
diff --git a/libs/libtox/src/toxencryptsave/defines.h b/protocols/Tox/libtox/src/toxencryptsave/defines.h
index e3fca073e3..e3fca073e3 100644
--- a/libs/libtox/src/toxencryptsave/defines.h
+++ b/protocols/Tox/libtox/src/toxencryptsave/defines.h
diff --git a/libs/libtox/src/toxencryptsave/toxencryptsave.api.h b/protocols/Tox/libtox/src/toxencryptsave/toxencryptsave.api.h
index 61f685f86b..61f685f86b 100644
--- a/libs/libtox/src/toxencryptsave/toxencryptsave.api.h
+++ b/protocols/Tox/libtox/src/toxencryptsave/toxencryptsave.api.h
diff --git a/libs/libtox/src/toxencryptsave/toxencryptsave.c b/protocols/Tox/libtox/src/toxencryptsave/toxencryptsave.c
index 5640e82fc7..5640e82fc7 100644
--- a/libs/libtox/src/toxencryptsave/toxencryptsave.c
+++ b/protocols/Tox/libtox/src/toxencryptsave/toxencryptsave.c
diff --git a/libs/libtox/src/toxencryptsave/toxencryptsave.h b/protocols/Tox/libtox/src/toxencryptsave/toxencryptsave.h
index ef1ab15289..ef1ab15289 100644
--- a/libs/libtox/src/toxencryptsave/toxencryptsave.h
+++ b/protocols/Tox/libtox/src/toxencryptsave/toxencryptsave.h