25 files changed, 3537 insertions, 1163 deletions

diff --git a/INSTALL.md b/INSTALL.md
index c2a8c0d9..549a3a4f 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -171,15 +171,21 @@ Different: libvpx (webm) libopus pkgconfig gettext
 (the libintl, from gettext, built into OS X 10.5 is missing libintl_setlocale, but the Macports build has it)
 
 Verify where libintl is on your system: (MacPorts puts it in /opt/local)
-$ for d in /usr/local/lib /opt/local/lib /usr/lib /lib; do ls -l $d/libintl.*; done
+```
+for d in /usr/local/lib /opt/local/lib /usr/lib /lib; do ls -l $d/libintl.*; done
+```
 
 Check if that copy has libintl_setlocale:
+```
 nm /opt/local/lib/libintl.8.dylib | grep _libintl_setlocale
+```
 
 Certain other tools may not be installed, or outdated, and should also be installed from MacPorts for simplicity: git cmake
 
 If libsodium was installed with MacPorts, you may want to symlink the copy in /opt/local/lib to /usr/local/lib. That way you don't need special configure switches for toxcore to find libsodium, and every time MacPorts updates libsodium, the new version will be linked to toxcore every time you build:
+```
 ln -s /opt/local/lib/libsodium.dylib /usr/local/lib/libsodium.dylib
+```
 
 Much of the build can then be done as for other platforms: git clone, and so on. Differences will be noted with (OS X 10.5 specific)
 
@@ -217,7 +223,9 @@ There is also a shell script called "osx_build_script_toxcore.txt" which automat
 
 If after running ./configure you get an error about core being unable to find libsodium (and you have installed it) run the following in place of ./configure;
 
+```
 ./configure --with-libsodium-headers=/usr/local/include/ --with-libsodium-libs=/usr/local/lib
+```
 
 Ensure you set the locations correctly depending on where you installed libsodium on your computer.
 
diff --git a/README.md b/README.md
index 2a7945f9..67a877c1 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ We want Tox to be as simple as possible while remaining as secure as possible.
 The goal of this project is to create a configuration-free P2P Skype replacement. “Configuration-free” means that the user will simply have to open the program and will be capable of adding people and communicating with them without having to set up an account. There are many so-called Skype replacements, but all of them are either hard to configure for the normal user or suffer from being way too centralized.
 
 ## TODO:
-- [TODO](/docs/TODO)
+- [TODO](/docs/TODO.md)
 
 
 ## Documentation:
diff --git a/other/apidsl/README.md b/other/apidsl/README.md
new file mode 100644
index 00000000..c8241eb8
--- /dev/null
+++ b/other/apidsl/README.md
@@ -0,0 +1,11 @@
+This folder contains the input file that can be used to generate the tox.h api 
+with: https://github.com/iphydf/apidsl
+
+You can also use the following command if you can't install it:
+
+```
+cat tox.in.h | curl -X POST --data-binary @- https://criticism.herokuapp.com/apidsl > tox.h
+```
+
+Note that the output must be passed through astyle with the config in 
+other/astyle/astylerc to generate the exact same file.
diff --git a/other/apidsl/tox.in.h b/other/apidsl/tox.in.h
new file mode 100644
index 00000000..84a4a03e
--- /dev/null
+++ b/other/apidsl/tox.in.h
@@ -0,0 +1,2076 @@
+%{
+/* tox.h
+ *
+ * The Tox public API.
+ *
+ *  Copyright (C) 2013 Tox project All Rights Reserved.
+ *
+ *  This file is part of Tox.
+ *
+ *  Tox is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Tox is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef TOX_H
+#define TOX_H
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+%}
+
+/** \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.
+ */
+
+/** \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.
+ */
+
+/** \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.name.size}(tox);
+ * uint8_t *name = malloc(length);
+ * if (!name) abort();
+ * ${tox.self.name.get}(tox, name);
+ * \endcode
+ *
+ * If any other thread calls ${tox.self.name.set} while this thread is allocating
+ * memory, the length may have become invalid, and the call to
+ * ${tox.self.name.get} may cause undefined behaviour.
+ */
+
+// The rest of this file is in class tox.
+class tox {
+
+/**
+ * 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.
+ */
+struct this;
+
+
+/*******************************************************************************
+ *
+ * :: API version
+ *
+ ******************************************************************************/
+
+
+/**
+ * The major version number. Incremented when the API or ABI changes in an
+ * incompatible way.
+ */
+#define TOX_VERSION_MAJOR               0u
+/**
+ * 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               0u
+/**
+ * The patch or revision number. Incremented when bugfixes are applied without
+ * changing any functionality or API or ABI.
+ */
+#define TOX_VERSION_PATCH               0u
+
+/**
+ * A macro to check at preprocessing time whether the client code is compatible
+ * with the installed version of Tox.
+ */
+#define TOX_VERSION_IS_API_COMPATIBLE(MAJOR, MINOR, PATCH)      \
+  (TOX_VERSION_MAJOR == MAJOR &&                                \
+   (TOX_VERSION_MINOR > MINOR ||                                \
+    (TOX_VERSION_MINOR == MINOR &&                              \
+     TOX_VERSION_PATCH >= PATCH)))
+
+/**
+ * A macro to make compilation fail if the client code is not compatible with
+ * the installed version of Tox.
+ */
+#define TOX_VERSION_REQUIRE(MAJOR, MINOR, PATCH)                \
+  typedef char tox_required_version[TOX_IS_COMPATIBLE(MAJOR, MINOR, PATCH) ? 1 : -1]
+
+static namespace version {
+
+  /**
+   * Return the major version number of the library. Can be used to display the
+   * Tox library version or to check whether the client is compatible with the
+   * dynamically linked version of Tox.
+   */
+  uint32_t major();
+
+  /**
+   * Return the minor version number of the library.
+   */
+  uint32_t minor();
+
+  /**
+   * Return the patch number of the library.
+   */
+  uint32_t patch();
+
+  /**
+   * Return whether the compiled library version is compatible with the passed
+   * version numbers.
+   */
+  bool 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 size of a Tox Public Key in bytes.
+ */
+const PUBLIC_KEY_SIZE              = 32;
+
+/**
+ * The size of a Tox Secret Key in bytes.
+ */
+const SECRET_KEY_SIZE              = 32;
+
+/**
+ * The size of a Tox address in bytes. Tox addresses are in the format
+ * [Public Key ($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.
+ */
+const ADDRESS_SIZE                = PUBLIC_KEY_SIZE + sizeof(uint32_t) + sizeof(uint16_t);
+
+/**
+ * Maximum length of a nickname in bytes.
+ */
+const MAX_NAME_LENGTH             = 128;
+
+/**
+ * Maximum length of a status message in bytes.
+ */
+const MAX_STATUS_MESSAGE_LENGTH   = 1007;
+
+/**
+ * Maximum length of a friend request message in bytes.
+ */
+const MAX_FRIEND_REQUEST_LENGTH   = 1016;
+
+/**
+ * Maximum length of a single message after which it should be split.
+ */
+const MAX_MESSAGE_LENGTH          = 1372;
+
+/**
+ * Maximum size of custom packets. TODO: should be LENGTH?
+ */
+const MAX_CUSTOM_PACKET_SIZE      = 1373;
+
+/**
+ * The number of bytes in a hash generated by $hash.
+ */
+const HASH_LENGTH                 = 32;
+
+/**
+ * The number of bytes in a file id.
+ */
+const FILE_ID_LENGTH              = 32;
+
+/**
+ * Maximum file name length for file transfers.
+ */
+const MAX_FILENAME_LENGTH         = 255;
+
+
+/*******************************************************************************
+ *
+ * :: Global enumerations
+ *
+ ******************************************************************************/
+
+
+/**
+ * Represents the possible statuses a client can have.
+ */
+enum class USER_STATUS {
+  /**
+   * User is online and available.
+   */
+  NONE,
+  /**
+   * User is away. Clients can set this e.g. after a user defined
+   * inactivity time.
+   */
+  AWAY,
+  /**
+   * User is busy. Signals to other clients that this client does not
+   * currently wish to communicate.
+   */
+  BUSY,
+}
+
+
+/**
+ * Represents message types for ${tox.friend.send.message} and group chat
+ * messages.
+ */
+enum class MESSAGE_TYPE {
+  /**
+   * Normal text message. Similar to PRIVMSG on IRC.
+   */
+  NORMAL,
+  /**
+   * A message describing an user action. This is similar to /me (CTCP ACTION)
+   * on IRC.
+   */
+  ACTION,
+}
+
+
+/*******************************************************************************
+ *
+ * :: Startup options
+ *
+ ******************************************************************************/
+
+
+/**
+ * Type of proxy used to connect to TCP relays.
+ */
+enum class PROXY_TYPE {
+  /**
+   * Don't use a proxy.
+   */
+  NONE,
+  /**
+   * HTTP proxy using CONNECT.
+   */
+  HTTP,
+  /**
+   * SOCKS proxy for simple socket pipes.
+   */
+  SOCKS5,
+}
+
+
+static class options {
+  /**
+   * This struct contains all the startup options for Tox. You can either allocate
+   * this object yourself, and pass it to $default, or call
+   * $new to get a new default options object.
+   */
+  struct this {
+    /**
+     * 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;
+
+    namespace proxy {
+      /**
+       * Pass communications through a proxy.
+       */
+      PROXY_TYPE 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.
+       */
+      string 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 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;
+  }
+
+
+  /**
+   * Initialises a $this 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 default();
+
+
+  /**
+   * Allocates a new $this 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 $free
+   * function.
+   *
+   * @return A new $this object with default options or NULL on failure.
+   */
+  static this new() {
+    /**
+     * The function failed to allocate enough memory for the options struct.
+     */
+    MALLOC,
+  }
+
+
+  /**
+   * Releases all resources associated with an options objects.
+   *
+   * Passing a pointer that was not returned by $new results in
+   * undefined behaviour.
+   */
+  void free();
+}
+
+
+/*******************************************************************************
+ *
+ * :: Creation and destruction
+ *
+ ******************************************************************************/
+
+
+/**
+ * @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 the data parameter is not NULL, this function will load the Tox instance
+ * from a byte array previously filled by ${savedata.get}.
+ *
+ * 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.
+ * @param data A byte array containing data previously stored by ${savedata.get}.
+ * @param length The length of the byte array data. If this parameter is 0, the
+ *   data parameter is ignored.
+ *
+ * @see $iterate for the event loop.
+ */
+static this new(const options_t *options, const uint8_t[length] data) {
+  NULL,
+  /**
+   * The function was unable to allocate enough memory to store the internal
+   * structures for the Tox object.
+   */
+  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.
+   */
+  PORT_ALLOC,
+
+  namespace PROXY {
+    /**
+     * proxy_type was invalid.
+     */
+    BAD_TYPE,
+    /**
+     * proxy_type was valid but the proxy_host passed had an invalid format
+     * or was NULL.
+     */
+    BAD_HOST,
+    /**
+     * proxy_type was valid, but the proxy_port was invalid.
+     */
+    BAD_PORT,
+    /**
+     * The proxy address passed could not be resolved.
+     */
+    NOT_FOUND,
+  }
+
+  namespace LOAD {
+    /**
+     * The byte array to be loaded contained an encrypted save.
+     */
+    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.
+     */
+    BAD_FORMAT,
+  }
+}
+
+
+/**
+ * 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 kill();
+
+
+uint8_t[size] savedata {
+  /**
+   * Calculates the number of bytes required to store the tox instance with
+   * $get. This function cannot fail. The result is always greater than 0.
+   *
+   * @see threading for concurrency implications.
+   */
+  size();
+
+  /**
+   * Store all information associated with the tox instance to a byte array.
+   *
+   * @param data A memory region large enough to store the tox instance data.
+   *   Call $size to find the number of bytes required. If this parameter
+   *   is NULL, this function has no effect.
+   */
+  get();
+}
+
+
+/*******************************************************************************
+ *
+ * :: Connection lifecycle and event loop
+ *
+ ******************************************************************************/
+
+
+/**
+ * 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 and TCP at the
+ * same time.
+ *
+ * Tox will use the node as a TCP relay in case ${options.this.udp_enabled} was
+ * false, and also to connect to friends that are in TCP-only mode. Tox will
+ * also use the TCP connection when NAT hole punching is slow, and later switch
+ * to UDP if hole punching succeeds.
+ *
+ * @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
+ *   ($PUBLIC_KEY_SIZE bytes).
+ * @return true on success.
+ */
+bool bootstrap(string address, uint16_t port, const uint8_t[PUBLIC_KEY_SIZE] public_key) {
+  NULL,
+  /**
+   * The address could not be resolved to an IP address, or the IP address
+   * passed was invalid.
+   */
+  BAD_HOST,
+  /**
+   * The port passed was invalid. The valid port range is (1, 65535).
+   */
+  BAD_PORT,
+}
+
+
+/**
+ * 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
+ *   ($PUBLIC_KEY_SIZE bytes).
+ * @return true on success.
+ */
+bool add_tcp_relay(string address, uint16_t port, const uint8_t[PUBLIC_KEY_SIZE] public_key)
+    with error for bootstrap;
+
+
+/**
+ * Protocols that can be used to connect to the network or friends.
+ */
+enum class CONNECTION {
+  /**
+   * There is no connection. This instance, or the friend the state change is
+   * about, is now offline.
+   */
+  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.
+   */
+  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.
+   */
+  UDP,
+}
+
+
+inline namespace self {
+
+  CONNECTION connection_status {
+    /**
+     * Return whether we are connected to the DHT. The return value is equal to the
+     * last value received through the `${event connection_status}` callback.
+     */
+    get();
+  }
+
+
+  /**
+   * This event is triggered whenever there is a change in the DHT connection
+   * state. When disconnected, a client may choose to call $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: how long should a client wait before bootstrapping again?
+   */
+  event connection_status {
+    /**
+     * @param connection_status Whether we are connected to the DHT.
+     */
+    typedef void(CONNECTION connection_status);
+  }
+
+}
+
+
+/**
+ * Return the time in milliseconds before $iterate() should be called again
+ * for optimal performance.
+ */
+const uint32_t iteration_interval();
+
+
+/**
+ * The main loop that needs to be run in intervals of $iteration_interval()
+ * milliseconds.
+ */
+void iterate();
+
+
+/*******************************************************************************
+ *
+ * :: Internal client information (Tox address/id)
+ *
+ ******************************************************************************/
+
+
+inline namespace self {
+
+  uint8_t[ADDRESS_SIZE] address {
+    /**
+     * 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 $ADDRESS_SIZE bytes. If this
+     *   parameter is NULL, this function has no effect.
+     * @see $ADDRESS_SIZE for the address format.
+     */
+    get();
+  }
+
+
+  uint32_t nospam {
+    /**
+     * Set the 4-byte nospam part of the address.
+     *
+     * @param nospam Any 32 bit unsigned integer.
+     */
+    set();
+
+    /**
+     * Get the 4-byte nospam part of the address.
+     */
+    get();
+  }
+
+
+  uint8_t[PUBLIC_KEY_SIZE] public_key {
+    /**
+     * Copy the Tox Public Key (long term) from the Tox object.
+     *
+     * @param public_key A memory region of at least $PUBLIC_KEY_SIZE bytes. If
+     *   this parameter is NULL, this function has no effect.
+     */
+    get();
+  }
+
+
+  uint8_t[SECRET_KEY_SIZE] secret_key {
+    /**
+     * Copy the Tox Secret Key from the Tox object.
+     *
+     * @param secret_key A memory region of at least $SECRET_KEY_SIZE bytes. If
+     *   this parameter is NULL, this function has no effect.
+     */
+    get();
+  }
+
+}
+
+
+/*******************************************************************************
+ *
+ * :: User-visible client information (nickname/status)
+ *
+ ******************************************************************************/
+
+
+/**
+ * Common error codes for all functions that set a piece of user-visible
+ * client information.
+ */
+error for set_info {
+  NULL,
+  /**
+   * Information length exceeded maximum permissible size.
+   */
+  TOO_LONG,
+}
+
+
+inline namespace self {
+
+  uint8_t[length <= MAX_NAME_LENGTH] name {
+    /**
+     * Set the nickname for the Tox client.
+     *
+     * Nickname length cannot exceed $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.
+     */
+    set() with error for set_info;
+
+    /**
+     * Return the length of the current nickname as passed to $set.
+     *
+     * If no nickname was set before calling this function, the name is empty,
+     * and this function returns 0.
+     *
+     * @see threading for concurrency implications.
+     */
+    size();
+
+    /**
+     * Write the nickname set by $set to a byte array.
+     *
+     * If no nickname was set before calling this function, the name is empty,
+     * and this function has no effect.
+     *
+     * Call $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.
+     */
+    get();
+
+  }
+
+
+  uint8_t[length <= MAX_STATUS_MESSAGE_LENGTH] status_message {
+    /**
+     * Set the client's status message.
+     *
+     * Status message length cannot exceed $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.
+     */
+    set() with error for set_info;
+
+    /**
+     * Return the length of the current status message as passed to $set.
+     *
+     * 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();
+
+    /**
+     * Write the status message set by $set 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 $size to find out how much memory to allocate for
+     * the result.
+     *
+     * @param status A valid memory location large enough to hold the status message.
+     *   If this parameter is NULL, the function has no effect.
+     */
+    get();
+  }
+
+
+  USER_STATUS status {
+    /**
+     * Set the client's user status.
+     *
+     * @param user_status One of the user statuses listed in the enumeration above.
+     */
+    set();
+
+    /**
+     * Returns the client's user status.
+     */
+    get();
+  }
+
+}
+
+
+/*******************************************************************************
+ *
+ * :: Friend list management
+ *
+ ******************************************************************************/
+
+
+namespace friend {
+
+  /**
+   * 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
+   * $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 ${self.address.get} of
+   *   the friend you wish to add) it must be $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 add(
+      const uint8_t[ADDRESS_SIZE] address,
+      const uint8_t[length <= MAX_FRIEND_REQUEST_LENGTH] message
+  ) {
+    NULL,
+    /**
+     * The length of the friend request message exceeded
+     * $MAX_FRIEND_REQUEST_LENGTH.
+     */
+    TOO_LONG,
+    /**
+     * The friend request message was empty. This, and the TOO_LONG code will
+     * never be returned from $add_norequest.
+     */
+    NO_MESSAGE,
+    /**
+     * The friend address belongs to the sending client.
+     */
+    OWN_KEY,
+    /**
+     * A friend request has already been sent, or the address belongs to a friend
+     * that is already on the friend list.
+     */
+    ALREADY_SENT,
+    /**
+     * The friend address checksum failed.
+     */
+    BAD_CHECKSUM,
+    /**
+     * The friend was already there, but the nospam value was different.
+     */
+    SET_NEW_NOSPAM,
+    /**
+     * A memory allocation failed when trying to increase the friend list size.
+     */
+    MALLOC,
+  }
+
+
+  /**
+   * 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 $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 $add for a more detailed description of friend numbers.
+   */
+  uint32_t add_norequest(const uint8_t[PUBLIC_KEY_SIZE] public_key)
+      with error for add;
+
+
+  /**
+   * 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 delete(uint32_t friend_number) {
+    /**
+     * There was no friend with the given friend number. No friends were deleted.
+     */
+    FRIEND_NOT_FOUND,
+  }
+
+}
+
+
+/*******************************************************************************
+ *
+ * :: Friend list queries
+ *
+ ******************************************************************************/
+
+namespace friend {
+
+  /**
+   * 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.
+   */
+  const uint32_t by_public_key(const uint8_t[PUBLIC_KEY_SIZE] public_key) {
+    NULL,
+    /**
+     * No friend with the given Public Key exists on the friend list.
+     */
+    NOT_FOUND,
+  }
+
+
+  /**
+   * Checks if a friend with the given friend number exists and returns true if
+   * it does.
+   */
+  const bool exists(uint32_t friend_number);
+
+
+}
+
+inline namespace self {
+
+  uint32_t[size] friend_list {
+    /**
+     * Return the number of friends on the friend list.
+     *
+     * This function can be used to determine how much memory to allocate for
+     * $get.
+     */
+    size();
+
+
+    /**
+     * Copy a list of valid friend numbers into an array.
+     *
+     * Call $size to determine the number of elements to allocate.
+     *
+     * @param list A memory region with enough space to hold the friend list. If
+     *   this parameter is NULL, this function has no effect.
+     */
+    get();
+  }
+
+}
+
+
+
+namespace friend {
+
+  uint8_t[PUBLIC_KEY_SIZE] 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 $PUBLIC_KEY_SIZE bytes. If
+     *   this parameter is NULL, this function has no effect.
+     *
+     * @return true on success.
+     */
+    get(uint32_t friend_number) {
+      /**
+       * No friend with the given number exists on the friend list.
+       */
+      FRIEND_NOT_FOUND,
+    }
+  }
+
+}
+
+namespace friend {
+
+  uint64_t 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.
+    */
+    get(uint32_t friend_number) {
+      /**
+       * No friend with the given number exists on the friend list.
+       */
+      FRIEND_NOT_FOUND,
+    }
+  }
+
+}
+
+/*******************************************************************************
+ *
+ * :: Friend-specific state queries (can also be received through callbacks)
+ *
+ ******************************************************************************/
+
+
+namespace friend {
+
+  /**
+   * Common error codes for friend state query functions.
+   */
+  error for query {
+    /**
+     * 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.
+     */
+    NULL,
+    /**
+     * The friend_number did not designate a valid friend.
+     */
+    FRIEND_NOT_FOUND,
+  }
+
+
+  uint8_t[length <= MAX_NAME_LENGTH] name {
+    /**
+     * 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
+     * `${event name}` callback.
+     */
+    size(uint32_t friend_number)
+        with error for query;
+
+    /**
+     * Write the name of the friend designated by the given friend number to a byte
+     * array.
+     *
+     * Call $size to determine the allocation size for the `name`
+     * parameter.
+     *
+     * The data written to `name` is equal to the data received by the last
+     * `${event name}` callback.
+     *
+     * @param name A valid memory region large enough to store the friend's name.
+     *
+     * @return true on success.
+     */
+    get(uint32_t friend_number)
+        with error for query;
+  }
+
+
+  /**
+   * This event is triggered when a friend changes their name.
+   */
+  event name {
+    /**
+     * @param friend_number The friend number of the friend whose name changed.
+     * @param name A byte array containing the same data as
+     *   ${name.get} would write to its `name` parameter.
+     * @param length A value equal to the return value of
+     *   ${name.size}.
+     */
+    typedef void(uint32_t friend_number, const uint8_t[length <= MAX_NAME_LENGTH] name);
+  }
+
+
+  uint8_t[length <= MAX_STATUS_MESSAGE_LENGTH] status_message {
+    /**
+     * Return the length of the friend's status message. If the friend number is
+     * invalid, the return value is SIZE_MAX.
+     */
+    size(uint32_t friend_number)
+        with error for query;
+
+    /**
+     * Write the name of the friend designated by the given friend number to a byte
+     * array.
+     *
+     * Call $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
+     * `${event status_message}` callback.
+     *
+     * @param name A valid memory region large enough to store the friend's name.
+     */
+    get(uint32_t friend_number)
+        with error for query;
+
+  }
+
+
+  /**
+   * This event is triggered when a friend changes their status message.
+   */
+  event status_message {
+    /**
+     * @param friend_number The friend number of the friend whose status message
+     *   changed.
+     * @param message A byte array containing the same data as
+     *   ${status_message.get} would write to its `status_message` parameter.
+     * @param length A value equal to the return value of
+     *   ${status_message.size}.
+     */
+    typedef void(uint32_t friend_number, const uint8_t[length <= MAX_STATUS_MESSAGE_LENGTH] message);
+  }
+
+
+  USER_STATUS status {
+    /**
+     * 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
+     * `${event status}` callback.
+     */
+    get(uint32_t friend_number)
+        with error for query;
+  }
+
+
+  /**
+   * This event is triggered when a friend changes their user status.
+   */
+  event status {
+    /**
+     * @param friend_number The friend number of the friend whose user status
+     *   changed.
+     * @param status The new user status.
+     */
+    typedef void(uint32_t friend_number, USER_STATUS status);
+  }
+
+
+  CONNECTION connection_status {
+    /**
+     * Check whether a friend is currently connected to this client.
+     *
+     * The result of this function is equal to the last value received by the
+     * `${event 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
+     *   `${event connection_status}` event.
+     */
+    get(uint32_t friend_number)
+        with error for query;
+  }
+
+
+  /**
+   * 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.
+   */
+  event connection_status {
+    /**
+     * @param friend_number The friend number of the friend whose connection status
+     *   changed.
+     * @param connection_status The result of calling
+     *   ${connection_status.get} on the passed friend_number.
+     */
+    typedef void(uint32_t friend_number, CONNECTION connection_status);
+  }
+
+
+  bool typing {
+    /**
+     * 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.
+     */
+    get(uint32_t friend_number)
+        with error for query;
+  }
+
+
+  /**
+   * This event is triggered when a friend starts or stops typing.
+   */
+  event typing {
+    /**
+     * @param friend_number The friend number of the friend who started or stopped
+     *   typing.
+     * @param is_typing The result of calling ${typing.get} on the passed
+     *   friend_number.
+     */
+    typedef void(uint32_t friend_number, bool is_typing);
+  }
+
+}
+
+
+/*******************************************************************************
+ *
+ * :: Sending private messages
+ *
+ ******************************************************************************/
+
+
+inline namespace self {
+
+  bool 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.
+     */
+    set(uint32_t friend_number) {
+      /**
+       * The friend number did not designate a valid friend.
+       */
+      FRIEND_NOT_FOUND,
+    }
+  }
+
+}
+
+
+namespace friend {
+
+  namespace send {
+
+    /**
+     * 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 $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 `${event 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 message(uint32_t friend_number, MESSAGE_TYPE type, const uint8_t[length <= MAX_MESSAGE_LENGTH] message) {
+      NULL,
+      /**
+       * The friend number did not designate a valid friend.
+       */
+      FRIEND_NOT_FOUND,
+      /**
+       * This client is currently not connected to the friend.
+       */
+      FRIEND_NOT_CONNECTED,
+      /**
+       * An allocation error occurred while increasing the send queue size.
+       */
+      SENDQ,
+      /**
+       * Message length exceeded $MAX_MESSAGE_LENGTH.
+       */
+      TOO_LONG,
+      /**
+       * Attempted to send a zero-length message.
+       */
+      EMPTY,
+    }
+
+  }
+
+
+  /**
+   * This event is triggered when the friend receives the message sent with
+   * ${send.message} with the corresponding message ID.
+   */
+  event read_receipt {
+    /**
+     * @param friend_number The friend number of the friend who received the message.
+     * @param message_id The message ID as returned from ${send.message}
+     *   corresponding to the message sent.
+     */
+    typedef void(uint32_t friend_number, uint32_t message_id);
+  }
+
+}
+
+
+/*******************************************************************************
+ *
+ * :: Receiving private messages and friend requests
+ *
+ ******************************************************************************/
+
+
+namespace friend {
+
+  /**
+   * This event is triggered when a friend request is received.
+   */
+  event request {
+    /**
+     * @param public_key The Public Key of the user who sent the friend request.
+     * @param time_delta A delta in seconds between when the message was composed
+     *   and when it is being transmitted. For messages that are sent immediately,
+     *   it will be 0. If a message was written and couldn't be sent immediately
+     *   (due to a connection failure, for example), the time_delta is an
+     *   approximation of when it was composed.
+     * @param message The message they sent along with the request.
+     * @param length The size of the message byte array.
+     */
+    typedef void(const uint8_t[PUBLIC_KEY_SIZE] public_key
+        //, uint32_t time_delta
+        , const uint8_t[length <= MAX_MESSAGE_LENGTH] message);
+  }
+
+
+  /**
+   * This event is triggered when a message from a friend is received.
+   */
+  event message {
+    /**
+     * @param friend_number The friend number of the friend who sent the message.
+     * @param time_delta Time between composition and sending.
+     * @param message The message data they sent.
+     * @param length The size of the message byte array.
+     *
+     * @see ${event request} for more information on time_delta.
+     */
+    typedef void(uint32_t friend_number
+        //, uint32_t time_delta
+        , MESSAGE_TYPE type, const uint8_t[length <= MAX_MESSAGE_LENGTH] message);
+  }
+
+}
+
+
+/*******************************************************************************
+ *
+ * :: 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.
+ */
+static bool hash(uint8_t[HASH_LENGTH] hash, const uint8_t[length] data);
+
+
+namespace file {
+
+  enum KIND {
+    /**
+     * Arbitrary file data. Clients can choose to handle it based on the file name
+     * or magic or any other way they choose.
+     */
+    DATA,
+    /**
+     * Avatar filename. This consists of $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
+     * ${CONTROL.CANCEL} before any other controls), or accept it (by
+     * sending ${CONTROL.RESUME}). The file_id of length $HASH_LENGTH bytes
+     * (same length as $FILE_ID_LENGTH) will contain the hash. A client can compare
+     * this hash with a saved hash and send ${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.
+     */
+    AVATAR,
+  }
+
+
+  enum class CONTROL {
+    /**
+     * Sent by the receiving side to accept a file send request. Also sent after a
+     * $PAUSE command to continue sending or receiving.
+     */
+    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 $RESUME for the transfer to resume.
+     */
+    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.
+     */
+    CANCEL,
+  }
+
+
+  /**
+   * 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 control(uint32_t friend_number, uint32_t file_number, CONTROL control) {
+    /**
+     * The friend_number passed did not designate a valid friend.
+     */
+    FRIEND_NOT_FOUND,
+    /**
+     * This client is currently not connected to the friend.
+     */
+    FRIEND_NOT_CONNECTED,
+    /**
+     * No file transfer with the given file number was found for the given friend.
+     */
+    NOT_FOUND,
+    /**
+     * A RESUME control was sent, but the file transfer is running normally.
+     */
+    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.
+     */
+    DENIED,
+    /**
+     * A PAUSE control was sent, but the file transfer was already paused.
+     */
+    ALREADY_PAUSED,
+    /**
+     * Packet queue is full.
+     */
+    SENDQ,
+  }
+
+
+  /**
+   * This event is triggered when a file control command is received from a
+   * friend.
+   */
+  event recv_control {
+    /**
+     * When receiving ${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(uint32_t friend_number, uint32_t file_number, CONTROL control);
+  }
+
+  /**
+   * 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
+   * ${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 seek(uint32_t friend_number, uint32_t file_number, uint64_t position) {
+    /**
+     * The friend_number passed did not designate a valid friend.
+     */
+    FRIEND_NOT_FOUND,
+    /**
+     * This client is currently not connected to the friend.
+     */
+    FRIEND_NOT_CONNECTED,
+    /**
+     * No file transfer with the given file number was found for the given friend.
+     */
+    NOT_FOUND,
+    /**
+     * File was not in a state where it could be seeked.
+     */
+    DENIED,
+    /**
+     * Seek position was invalid
+     */
+    INVALID_POSITION,
+    /**
+     * Packet queue is full.
+     */
+    SENDQ,
+  }
+
+
+  error for get {
+    /**
+     * The friend_number passed did not designate a valid friend.
+     */
+    FRIEND_NOT_FOUND,
+    /**
+     * No file transfer with the given file number was found for the given friend.
+     */
+    NOT_FOUND,
+  }
+
+  /**
+   * 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 $FILE_ID_LENGTH bytes. If
+   *   this parameter is NULL, this function has no effect.
+   *
+   * @return true on success.
+   */
+  const bool get_file_id(uint32_t friend_number, uint32_t file_number, uint8_t[FILE_ID_LENGTH] file_id)
+      with error for get;
+
+}
+
+
+/*******************************************************************************
+ *
+ * :: File transmission: sending
+ *
+ ******************************************************************************/
+
+
+namespace file {
+
+  /**
+   * Send a file transmission request.
+   *
+   * Maximum filename length is $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
+   * `${event 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
+   *     ${event 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 $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 $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 send(uint32_t friend_number, uint32_t kind, uint64_t file_size, const uint8_t[FILE_ID_LENGTH] file_id, const uint8_t[filename_length <= MAX_FILENAME_LENGTH] filename) {
+    NULL,
+    /**
+     * The friend_number passed did not designate a valid friend.
+     */
+    FRIEND_NOT_FOUND,
+    /**
+     * This client is currently not connected to the friend.
+     */
+    FRIEND_NOT_CONNECTED,
+    /**
+     * Filename length exceeded $MAX_FILENAME_LENGTH bytes.
+     */
+    NAME_TOO_LONG,
+    /**
+     * Too many ongoing transfers. The maximum number of concurrent file transfers
+     * is 256 per friend per direction (sending and receiving).
+     */
+    TOO_MANY,
+  }
+
+
+  /**
+   * Send a chunk of file data to a friend.
+   *
+   * This function is called in response to the `${event 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 send_chunk(uint32_t friend_number, uint32_t file_number, uint64_t position, const uint8_t[length] data) {
+    /**
+     * The length parameter was non-zero, but data was NULL.
+     */
+    NULL,
+    /**
+     * The friend_number passed did not designate a valid friend.
+     */
+    FRIEND_NOT_FOUND,
+    /**
+     * This client is currently not connected to the friend.
+     */
+    FRIEND_NOT_CONNECTED,
+    /**
+     * No file transfer with the given file number was found for the given friend.
+     */
+    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).
+     */
+    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.
+     */
+    INVALID_LENGTH,
+    /**
+     * Packet queue is full.
+     */
+    SENDQ,
+    /**
+     * Position parameter was wrong.
+     */
+    WRONG_POSITION,
+  }
+
+
+  /**
+   * This event is triggered when Core is ready to send more file data.
+   */
+  event chunk_request {
+    /**
+     * 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
+     * `$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 $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(uint32_t friend_number, uint32_t file_number, uint64_t position, size_t length);
+  }
+
+}
+
+
+/*******************************************************************************
+ *
+ * :: File transmission: receiving
+ *
+ ******************************************************************************/
+
+
+namespace file {
+
+  /**
+   * This event is triggered when a file transfer request is received.
+   */
+  event recv {
+    /**
+     * 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 ${CONTROL.CANCEL}
+     * control command before any other control commands. It can be accepted by
+     * sending ${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(uint32_t friend_number, uint32_t file_number, uint32_t kind,
+        uint64_t file_size, const uint8_t[filename_length <= MAX_FILENAME_LENGTH] filename);
+  }
+
+
+  /**
+   * 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.
+   */
+  event recv_chunk {
+    /**
+     * 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(uint32_t friend_number, uint32_t file_number, uint64_t position,
+        const uint8_t[length] data);
+  }
+
+}
+
+
+/*******************************************************************************
+ *
+ * :: Group chat management
+ *
+ ******************************************************************************/
+
+
+/******************************************************************************
+ *
+ * :: Group chat message sending and receiving
+ *
+ ******************************************************************************/
+
+
+/*******************************************************************************
+ *
+ * :: Low-level custom packet sending and receiving
+ *
+ ******************************************************************************/
+
+
+namespace friend {
+
+  inline namespace send {
+
+    error for custom_packet {
+      NULL,
+      /**
+       * The friend number did not designate a valid friend.
+       */
+      FRIEND_NOT_FOUND,
+      /**
+       * This client is currently not connected to the friend.
+       */
+      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.
+       */
+      INVALID,
+      /**
+       * Attempted to send an empty packet.
+       */
+      EMPTY,
+      /**
+       * Packet data length exceeded $MAX_CUSTOM_PACKET_SIZE.
+       */
+      TOO_LONG,
+      /**
+       * Packet queue is full.
+       */
+      SENDQ,
+    }
+
+    /**
+     * 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 $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 lossy_packet(uint32_t friend_number, const uint8_t[length <= MAX_CUSTOM_PACKET_SIZE] data)
+        with error for custom_packet;
+
+
+    /**
+     * 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 $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 lossless_packet(uint32_t friend_number, const uint8_t[length <= MAX_CUSTOM_PACKET_SIZE] data)
+        with error for custom_packet;
+
+  }
+
+
+  event lossy_packet {
+    /**
+     * @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(uint32_t friend_number, const uint8_t[length <= MAX_CUSTOM_PACKET_SIZE] data);
+  }
+
+
+  event lossless_packet {
+    /**
+     * @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(uint32_t friend_number, const uint8_t[length <= MAX_CUSTOM_PACKET_SIZE] data);
+  }
+
+}
+
+
+
+/*******************************************************************************
+ *
+ * :: Low-level network information
+ *
+ ******************************************************************************/
+
+
+inline namespace self {
+
+  uint8_t[PUBLIC_KEY_SIZE] dht_id {
+    /**
+     * 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 ${udp_port.get}) 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 $PUBLIC_KEY_SIZE bytes. If this
+     *   parameter is NULL, this function has no effect.
+     */
+    get();
+  }
+
+
+  error for get_port {
+    /**
+     * The instance was not bound to any port.
+     */
+    NOT_BOUND,
+  }
+
+
+  uint16_t udp_port {
+    /**
+     * Return the UDP port this Tox instance is bound to.
+     */
+    get() with error for get_port;
+  }
+
+
+  uint16_t tcp_port {
+    /**
+     * Return the TCP port this Tox instance is bound to. This is only relevant if
+     * the instance is acting as a TCP relay.
+     */
+    get() with error for get_port;
+  }
+
+}
+
+} // class tox
+
+%{
+#include "tox_old.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+%}
diff --git a/tools/README b/other/astyle/README
index 26802ec7..26802ec7 100644
--- a/tools/README
+++ b/other/astyle/README
diff --git a/tools/astylerc b/other/astyle/astylerc
index dd738b74..dd738b74 100644
--- a/tools/astylerc
+++ b/other/astyle/astylerc
diff --git a/tools/pre-commit b/other/astyle/pre-commit
index 8f91779d..8f91779d 100644
--- a/tools/pre-commit
+++ b/other/astyle/pre-commit
diff --git a/toxcore/LAN_discovery.c b/toxcore/LAN_discovery.c
index bc020d87..dbce762e 100644
--- a/toxcore/LAN_discovery.c
+++ b/toxcore/LAN_discovery.c
@@ -336,3 +336,8 @@ void LANdiscovery_init(DHT *dht)
 {
     networking_registerhandler(dht->net, NET_PACKET_LAN_DISCOVERY, &handle_LANdiscovery, dht);
 }
+
+void LANdiscovery_kill(DHT *dht)
+{
+    networking_registerhandler(dht->net, NET_PACKET_LAN_DISCOVERY, NULL, NULL);
+}
diff --git a/toxcore/LAN_discovery.h b/toxcore/LAN_discovery.h
index 5dffc3ad..5243bd93 100644
--- a/toxcore/LAN_discovery.h
+++ b/toxcore/LAN_discovery.h
@@ -37,6 +37,9 @@ int send_LANdiscovery(uint16_t port, DHT *dht);
 /* Sets up packet handlers. */
 void LANdiscovery_init(DHT *dht);
 
+/* Clear packet handlers. */
+void LANdiscovery_kill(DHT *dht);
+
 /* checks if a given IP isn't routable
  *
  *  return 0 if ip is a LAN ip.
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index fefc3b17..a7e0a9fe 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -433,14 +433,19 @@ int m_get_friend_connectionstatus(const Messenger *m, int32_t friendnumber)
         return -1;
 
     if (m->friendlist[friendnumber].status == FRIEND_ONLINE) {
-        uint8_t direct_connected = 0;
+        _Bool direct_connected = 0;
+        unsigned int num_online_relays = 0;
         crypto_connection_status(m->net_crypto, friend_connection_crypt_connection_id(m->fr_c,
-                                 m->friendlist[friendnumber].friendcon_id), &direct_connected);
+                                 m->friendlist[friendnumber].friendcon_id), &direct_connected, &num_online_relays);
 
         if (direct_connected) {
             return CONNECTION_UDP;
         } else {
-            return CONNECTION_TCP;
+            if (num_online_relays) {
+                return CONNECTION_TCP;
+            } else {
+                return CONNECTION_UNKNOWN;
+            }
         }
     } else {
         return CONNECTION_NONE;
@@ -493,10 +498,6 @@ int m_send_message_generic(Messenger *m, int32_t friendnumber, uint8_t type, con
 
     uint32_t msg_id = ++m->friendlist[friendnumber].message_id;
 
-    if (msg_id == 0) {
-        msg_id = ++m->friendlist[friendnumber].message_id; // Otherwise, false error
-    }
-
     add_receipt(m, friendnumber, packet_num, msg_id);
 
     if (message_id)
@@ -753,25 +754,6 @@ static int send_user_istyping(const Messenger *m, int32_t friendnumber, uint8_t
     return write_cryptpacket_id(m, friendnumber, PACKET_ID_TYPING, &typing, sizeof(typing), 0);
 }
 
-static int send_relays(const Messenger *m, int32_t friendnumber)
-{
-    Node_format nodes[MAX_SHARED_RELAYS];
-    uint8_t data[1024];
-    int n, length;
-
-    n = copy_connected_tcp_relays(m->net_crypto, nodes, MAX_SHARED_RELAYS);
-    length = pack_nodes(data, sizeof(data), nodes, n);
-
-    int ret = write_cryptpacket_id(m, friendnumber, PACKET_ID_SHARE_RELAYS, data, length, 0);
-
-    if (ret == 1)
-        m->friendlist[friendnumber].share_relays_lastsent = unix_time();
-
-    return ret;
-}
-
-
-
 static int set_friend_statusmessage(const Messenger *m, int32_t friendnumber, const uint8_t *status, uint16_t length)
 {
     if (friend_not_valid(m, friendnumber))
@@ -874,6 +856,14 @@ static void check_friend_tcp_udp(Messenger *m, int32_t friendnumber)
     if (ret == -1)
         return;
 
+    if (ret == CONNECTION_UNKNOWN) {
+        if (last_connection_udp_tcp == CONNECTION_UDP) {
+            return;
+        } else {
+            ret = CONNECTION_TCP;
+        }
+    }
+
     if (last_connection_udp_tcp != ret) {
         if (m->friend_connectionstatuschange)
             m->friend_connectionstatuschange(m, friendnumber, ret, m->friend_connectionstatuschange_userdata);
@@ -1350,7 +1340,7 @@ int file_data(const Messenger *m, int32_t friendnumber, uint32_t filenumber, uin
     if (m->friendlist[friendnumber].status != FRIEND_ONLINE)
         return -2;
 
-    if (filenumber > MAX_CONCURRENT_FILE_PIPES)
+    if (filenumber >= MAX_CONCURRENT_FILE_PIPES)
         return -3;
 
     struct File_Transfers *ft = &m->friendlist[friendnumber].file_sending[filenumber];
@@ -1775,15 +1765,6 @@ static int friend_already_added(const uint8_t *real_pk, void *data)
     return -1;
 }
 
-/* Send a LAN discovery packet every LAN_DISCOVERY_INTERVAL seconds. */
-static void LANdiscovery(Messenger *m)
-{
-    if (m->last_LANdiscovery + LAN_DISCOVERY_INTERVAL < unix_time()) {
-        send_LANdiscovery(htons(TOX_PORT_DEFAULT), m->dht);
-        m->last_LANdiscovery = unix_time();
-    }
-}
-
 /* Run this at startup. */
 Messenger *new_messenger(Messenger_Options *options, unsigned int *error)
 {
@@ -1852,7 +1833,6 @@ Messenger *new_messenger(Messenger_Options *options, unsigned int *error)
 
     m->options = *options;
     friendreq_init(&(m->fr), m->fr_c);
-    LANdiscovery_init(m->dht);
     set_nospam(&(m->fr), random_int());
     set_filter_function(&(m->fr), &friend_already_added, m);
 
@@ -2178,22 +2158,6 @@ static int handle_packet(void *object, int i, uint8_t *temp, uint16_t len)
             break;
         }
 
-        case PACKET_ID_SHARE_RELAYS: {
-            Node_format nodes[MAX_SHARED_RELAYS];
-            int n;
-
-            if ((n = unpack_nodes(nodes, MAX_SHARED_RELAYS, NULL, data, data_length, 1)) == -1)
-                break;
-
-            int i;
-
-            for (i = 0; i < n; i++) {
-                add_tcp_relay(m->net_crypto, nodes[i].ip_port, nodes[i].public_key);
-            }
-
-            break;
-        }
-
         default: {
             handle_custom_lossless_packet(object, i, temp, len);
             break;
@@ -2251,10 +2215,6 @@ void do_friends(Messenger *m)
                     m->friendlist[i].user_istyping_sent = 1;
             }
 
-            if (m->friendlist[i].share_relays_lastsent + FRIEND_SHARE_RELAYS_INTERVAL < temp_time) {
-                send_relays(m, i);
-            }
-
             check_friend_tcp_udp(m, i);
             do_receipts(m, i);
             do_reqchunk_filecb(m, i);
@@ -2338,7 +2298,6 @@ void do_messenger(Messenger *m)
     do_onion_client(m->onion_c);
     do_friend_connections(m->fr_c);
     do_friends(m);
-    LANdiscovery(m);
     connection_status_cb(m);
 
 #ifdef LOGGING
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h
index 63fb2820..6943475f 100644
--- a/toxcore/Messenger.h
+++ b/toxcore/Messenger.h
@@ -42,8 +42,7 @@ enum {
     MESSAGE_ACTION
 };
 
-/* NOTE: Packet ids below 20 must never be used. */
-#define PACKET_ID_SHARE_RELAYS 23
+/* NOTE: Packet ids below 24 must never be used. */
 #define PACKET_ID_ONLINE 24
 #define PACKET_ID_OFFLINE 25
 #define PACKET_ID_NICKNAME 48
@@ -62,9 +61,6 @@ enum {
 #define PACKET_ID_MESSAGE_GROUPCHAT 99
 #define PACKET_ID_LOSSY_GROUPCHAT 199
 
-/* Max number of tcp relays sent to friends */
-#define MAX_SHARED_RELAYS 16
-
 /* All packets starting with a byte in this range can be used for anything. */
 #define PACKET_ID_LOSSLESS_RANGE_START 160
 #define PACKET_ID_LOSSLESS_RANGE_SIZE 32
@@ -110,13 +106,11 @@ enum {
 /* Default start timeout in seconds between friend requests. */
 #define FRIENDREQUEST_TIMEOUT 5;
 
-/* Interval between the sending of tcp relay information */
-#define FRIEND_SHARE_RELAYS_INTERVAL (5 * 60)
-
 enum {
     CONNECTION_NONE,
     CONNECTION_TCP,
-    CONNECTION_UDP
+    CONNECTION_UDP,
+    CONNECTION_UNKNOWN
 };
 
 /* USERSTATUS -
@@ -199,7 +193,6 @@ typedef struct {
     uint32_t message_id; // a semi-unique id used in read receipts.
     uint32_t friendrequest_nospam; // The nospam number used in the friend request.
     uint64_t last_seen_time;
-    uint64_t share_relays_lastsent;
     uint8_t last_connection_udp_tcp;
     struct File_Transfers file_sending[MAX_CONCURRENT_FILE_PIPES];
     unsigned int num_sending_files;
@@ -241,8 +234,6 @@ struct Messenger {
 
     uint32_t numonline_friends;
 
-    uint64_t last_LANdiscovery;
-
 #define NUM_SAVED_TCP_RELAYS 8
     uint8_t has_added_relays; // If the first connection has occurred in do_messenger
     Node_format loaded_relays[NUM_SAVED_TCP_RELAYS]; // Relays loaded from config
diff --git a/toxcore/TCP_client.c b/toxcore/TCP_client.c
index d89b157c..1bd11a1d 100644
--- a/toxcore/TCP_client.c
+++ b/toxcore/TCP_client.c
@@ -87,7 +87,7 @@ static int proxy_http_generate_connection_request(TCP_Client_Connection *TCP_con
     const int written = snprintf((char *)TCP_conn->last_packet, MAX_PACKET_SIZE, "%s%s:%hu%s%s:%hu%s", one, ip, port, two,
                                  ip, port, three);
 
-    if (written < 0) {
+    if (written < 0 || MAX_PACKET_SIZE < written) {
         return 0;
     }
 
diff --git a/toxcore/TCP_client.h b/toxcore/TCP_client.h
index d4d18a4b..722430e0 100644
--- a/toxcore/TCP_client.h
+++ b/toxcore/TCP_client.h
@@ -78,10 +78,6 @@ typedef struct  {
     uint64_t ping_response_id;
     uint64_t ping_request_id;
 
-    //TODO: remove
-    void *net_crypto_pointer;
-    uint32_t net_crypto_location;
-
     struct {
         uint8_t status; /* 0 if not used, 1 if other is offline, 2 if other is online. */
         uint8_t public_key[crypto_box_PUBLICKEYBYTES];
diff --git a/toxcore/TCP_connection.c b/toxcore/TCP_connection.c
index e11e1318..fe39dc52 100644
--- a/toxcore/TCP_connection.c
+++ b/toxcore/TCP_connection.c
@@ -26,6 +26,7 @@
 #endif
 
 #include "TCP_connection.h"
+#include "util.h"
 
 /* Set the size of the array to num.
  *
@@ -212,6 +213,8 @@ int send_packet_tcp_connection(TCP_Connections *tcp_c, int connections_number, c
     unsigned int i;
     int ret = -1;
 
+    _Bool limit_reached = 0;
+
     for (i = 0; i < MAX_FRIEND_TCP_CONNECTIONS; ++i) {
         uint32_t tcp_con_num = con_to->connections[i].tcp_connection;
         uint8_t status = con_to->connections[i].status;
@@ -227,6 +230,10 @@ int send_packet_tcp_connection(TCP_Connections *tcp_c, int connections_number, c
 
             ret = send_data(tcp_con->connection, connection_id, packet, length);
 
+            if (ret == 0) {
+                limit_reached = 1;
+            }
+
             if (ret == 1) {
                 break;
             }
@@ -235,7 +242,10 @@ int send_packet_tcp_connection(TCP_Connections *tcp_c, int connections_number, c
 
     if (ret == 1) {
         return 0;
-    } else {
+    } else if (!limit_reached) {
+        ret = 0;
+
+        /* Send oob packets to all relays tied to the connection. */
         for (i = 0; i < MAX_FRIEND_TCP_CONNECTIONS; ++i) {
             uint32_t tcp_con_num = con_to->connections[i].tcp_connection;
             uint8_t status = con_to->connections[i].status;
@@ -249,19 +259,19 @@ int send_packet_tcp_connection(TCP_Connections *tcp_c, int connections_number, c
                     continue;
                 }
 
-                ret = send_oob_packet(tcp_con->connection, con_to->public_key, packet, length);
-
-                if (ret == 1) {
-                    break;
+                if (send_oob_packet(tcp_con->connection, con_to->public_key, packet, length) == 1) {
+                    ret += 1;
                 }
             }
         }
 
-        if (ret == 1) {
+        if (ret >= 1) {
             return 0;
         } else {
             return -1;
         }
+    } else {
+        return -1;
     }
 }
 
@@ -273,13 +283,15 @@ int send_packet_tcp_connection(TCP_Connections *tcp_c, int connections_number, c
  * return TCP connection number on success.
  * return -1 on failure.
  */
-int get_random_tcp_conn_number(TCP_Connections *tcp_c)
+int get_random_tcp_onion_conn_number(TCP_Connections *tcp_c)
 {
     unsigned int i, r = rand();
 
     for (i = 0; i < tcp_c->tcp_connections_length; ++i) {
-        if (tcp_c->tcp_connections[(i + r) % tcp_c->tcp_connections_length].status == TCP_CONN_CONNECTED) {
-            return ((i + r) % tcp_c->tcp_connections_length);
+        unsigned int index = ((i + r) % tcp_c->tcp_connections_length);
+
+        if (tcp_c->tcp_connections[index].onion && tcp_c->tcp_connections[index].status == TCP_CONN_CONNECTED) {
+            return index;
         }
     }
 
@@ -321,6 +333,9 @@ int tcp_send_oob_packet(TCP_Connections *tcp_c, unsigned int tcp_connections_num
     if (!tcp_con)
         return -1;
 
+    if (tcp_con->status != TCP_CONN_CONNECTED)
+        return -1;
+
     int ret = send_oob_packet(tcp_con->connection, public_key, packet, length);
 
     if (ret == 1)
@@ -392,8 +407,14 @@ static int find_tcp_connection_relay(TCP_Connections *tcp_c, const uint8_t *rela
         TCP_con *tcp_con = get_tcp_connection(tcp_c, i);
 
         if (tcp_con) {
-            if (memcmp(tcp_con->connection->public_key, relay_pk, crypto_box_PUBLICKEYBYTES) == 0) {
-                return i;
+            if (tcp_con->status == TCP_CONN_SLEEPING) {
+                if (memcmp(tcp_con->relay_pk, relay_pk, crypto_box_PUBLICKEYBYTES) == 0) {
+                    return i;
+                }
+            } else {
+                if (memcmp(tcp_con->connection->public_key, relay_pk, crypto_box_PUBLICKEYBYTES) == 0) {
+                    return i;
+                }
             }
         }
     }
@@ -451,14 +472,86 @@ int kill_tcp_connection_to(TCP_Connections *tcp_c, int connections_number)
                 send_disconnect_request(tcp_con->connection, con_to->connections[i].connection_id);
             }
 
-            --tcp_con->lock_count;
+            if (con_to->connections[i].status == TCP_CONNECTIONS_STATUS_ONLINE) {
+                --tcp_con->lock_count;
+
+                if (con_to->status == TCP_CONN_SLEEPING) {
+                    --tcp_con->sleep_count;
+                }
+            }
         }
     }
 
     return wipe_connection(tcp_c, connections_number);
 }
 
-static _Bool tcp_connection_in_conn(TCP_Connection_to *con_to, int tcp_connections_number)
+/* Set connection status.
+ *
+ * status of 1 means we are using the connection.
+ * status of 0 means we are not using it.
+ *
+ * Unused tcp connections will be disconnected from but kept in case they are needed.
+ *
+ * return 0 on success.
+ * return -1 on failure.
+ */
+int set_tcp_connection_to_status(TCP_Connections *tcp_c, int connections_number, _Bool status)
+{
+    TCP_Connection_to *con_to = get_connection(tcp_c, connections_number);
+
+    if (!con_to)
+        return -1;
+
+    if (status) {
+        /* Conection is unsleeping. */
+        if (con_to->status != TCP_CONN_SLEEPING)
+            return -1;
+
+        unsigned int i;
+
+        for (i = 0; i < MAX_FRIEND_TCP_CONNECTIONS; ++i) {
+            if (con_to->connections[i].tcp_connection) {
+                unsigned int tcp_connections_number = con_to->connections[i].tcp_connection - 1;
+                TCP_con *tcp_con = get_tcp_connection(tcp_c, tcp_connections_number);
+
+                if (!tcp_con)
+                    continue;
+
+                if (tcp_con->status == TCP_CONN_SLEEPING) {
+                    tcp_con->unsleep = 1;
+                }
+            }
+        }
+
+        con_to->status = TCP_CONN_VALID;
+        return 0;
+    } else {
+        /* Conection is going to sleep. */
+        if (con_to->status != TCP_CONN_VALID)
+            return -1;
+
+        unsigned int i;
+
+        for (i = 0; i < MAX_FRIEND_TCP_CONNECTIONS; ++i) {
+            if (con_to->connections[i].tcp_connection) {
+                unsigned int tcp_connections_number = con_to->connections[i].tcp_connection - 1;
+                TCP_con *tcp_con = get_tcp_connection(tcp_c, tcp_connections_number);
+
+                if (!tcp_con)
+                    continue;
+
+                if (con_to->connections[i].status == TCP_CONNECTIONS_STATUS_ONLINE) {
+                    ++tcp_con->sleep_count;
+                }
+            }
+        }
+
+        con_to->status = TCP_CONN_SLEEPING;
+        return 0;
+    }
+}
+
+static _Bool tcp_connection_in_conn(TCP_Connection_to *con_to, unsigned int tcp_connections_number)
 {
     unsigned int i;
 
@@ -474,7 +567,7 @@ static _Bool tcp_connection_in_conn(TCP_Connection_to *con_to, int tcp_connectio
 /* return index on success.
  * return -1 on failure.
  */
-static int add_tcp_connection_to_conn(TCP_Connection_to *con_to, int tcp_connections_number)
+static int add_tcp_connection_to_conn(TCP_Connection_to *con_to, unsigned int tcp_connections_number)
 {
     unsigned int i;
 
@@ -496,7 +589,7 @@ static int add_tcp_connection_to_conn(TCP_Connection_to *con_to, int tcp_connect
 /* return index on success.
  * return -1 on failure.
  */
-static int rm_tcp_connection_from_conn(TCP_Connection_to *con_to, int tcp_connections_number)
+static int rm_tcp_connection_from_conn(TCP_Connection_to *con_to, unsigned int tcp_connections_number)
 {
     unsigned int i;
 
@@ -512,16 +605,39 @@ static int rm_tcp_connection_from_conn(TCP_Connection_to *con_to, int tcp_connec
     return -1;
 }
 
+/* return number of online connections on success.
+ * return -1 on failure.
+ */
+static unsigned int online_tcp_connection_from_conn(TCP_Connection_to *con_to)
+{
+    unsigned int i, count = 0;
+
+    for (i = 0; i < MAX_FRIEND_TCP_CONNECTIONS; ++i) {
+        if (con_to->connections[i].tcp_connection) {
+            if (con_to->connections[i].status == TCP_CONNECTIONS_STATUS_ONLINE) {
+                ++count;
+            }
+        }
+    }
+
+    return count;
+}
+
 /* return index on success.
  * return -1 on failure.
  */
-static int set_tcp_connection_status(TCP_Connection_to *con_to, int tcp_connections_number, unsigned int status,
-                                     uint8_t connection_id)
+static int set_tcp_connection_status(TCP_Connection_to *con_to, unsigned int tcp_connections_number,
+                                     unsigned int status, uint8_t connection_id)
 {
     unsigned int i;
 
     for (i = 0; i < MAX_FRIEND_TCP_CONNECTIONS; ++i) {
         if (con_to->connections[i].tcp_connection == (tcp_connections_number + 1)) {
+
+            if (con_to->connections[i].status == status) {
+                return -1;
+            }
+
             con_to->connections[i].status = status;
             con_to->connections[i].connection_id = connection_id;
             return i;
@@ -553,11 +669,130 @@ static int kill_tcp_relay_connection(TCP_Connections *tcp_c, int tcp_connections
         }
     }
 
+    if (tcp_con->onion) {
+        --tcp_c->onion_num_conns;
+    }
+
     kill_TCP_connection(tcp_con->connection);
 
     return wipe_tcp_connection(tcp_c, tcp_connections_number);
 }
 
+static int reconnect_tcp_relay_connection(TCP_Connections *tcp_c, int tcp_connections_number)
+{
+    TCP_con *tcp_con = get_tcp_connection(tcp_c, tcp_connections_number);
+
+    if (!tcp_con)
+        return -1;
+
+    if (tcp_con->status == TCP_CONN_SLEEPING)
+        return -1;
+
+    IP_Port ip_port = tcp_con->connection->ip_port;
+    uint8_t relay_pk[crypto_box_PUBLICKEYBYTES];
+    memcpy(relay_pk, tcp_con->connection->public_key, crypto_box_PUBLICKEYBYTES);
+    kill_TCP_connection(tcp_con->connection);
+    tcp_con->connection = new_TCP_connection(ip_port, relay_pk, tcp_c->dht->self_public_key, tcp_c->dht->self_secret_key,
+                          &tcp_c->proxy_info);
+
+    if (!tcp_con->connection) {
+        kill_tcp_relay_connection(tcp_c, tcp_connections_number);
+        return -1;
+    }
+
+    unsigned int i;
+
+    for (i = 0; i < tcp_c->connections_length; ++i) {
+        TCP_Connection_to *con_to = get_connection(tcp_c, i);
+
+        if (con_to) {
+            set_tcp_connection_status(con_to, tcp_connections_number, TCP_CONNECTIONS_STATUS_NONE, 0);
+        }
+    }
+
+    if (tcp_con->onion) {
+        --tcp_c->onion_num_conns;
+        tcp_con->onion = 0;
+    }
+
+    tcp_con->lock_count = 0;
+    tcp_con->sleep_count = 0;
+    tcp_con->connected_time = 0;
+    tcp_con->status = TCP_CONN_VALID;
+    tcp_con->unsleep = 0;
+
+    return 0;
+}
+
+static int sleep_tcp_relay_connection(TCP_Connections *tcp_c, int tcp_connections_number)
+{
+    TCP_con *tcp_con = get_tcp_connection(tcp_c, tcp_connections_number);
+
+    if (!tcp_con)
+        return -1;
+
+    if (tcp_con->status != TCP_CONN_CONNECTED)
+        return -1;
+
+    if (tcp_con->lock_count != tcp_con->sleep_count)
+        return -1;
+
+    tcp_con->ip_port = tcp_con->connection->ip_port;
+    memcpy(tcp_con->relay_pk, tcp_con->connection->public_key, crypto_box_PUBLICKEYBYTES);
+
+    kill_TCP_connection(tcp_con->connection);
+    tcp_con->connection = NULL;
+
+    unsigned int i;
+
+    for (i = 0; i < tcp_c->connections_length; ++i) {
+        TCP_Connection_to *con_to = get_connection(tcp_c, i);
+
+        if (con_to) {
+            set_tcp_connection_status(con_to, tcp_connections_number, TCP_CONNECTIONS_STATUS_NONE, 0);
+        }
+    }
+
+    if (tcp_con->onion) {
+        --tcp_c->onion_num_conns;
+        tcp_con->onion = 0;
+    }
+
+    tcp_con->lock_count = 0;
+    tcp_con->sleep_count = 0;
+    tcp_con->connected_time = 0;
+    tcp_con->status = TCP_CONN_SLEEPING;
+    tcp_con->unsleep = 0;
+
+    return 0;
+}
+
+static int unsleep_tcp_relay_connection(TCP_Connections *tcp_c, int tcp_connections_number)
+{
+    TCP_con *tcp_con = get_tcp_connection(tcp_c, tcp_connections_number);
+
+    if (!tcp_con)
+        return -1;
+
+    if (tcp_con->status != TCP_CONN_SLEEPING)
+        return -1;
+
+    tcp_con->connection = new_TCP_connection(tcp_con->ip_port, tcp_con->relay_pk, tcp_c->dht->self_public_key,
+                          tcp_c->dht->self_secret_key, &tcp_c->proxy_info);
+
+    if (!tcp_con->connection) {
+        kill_tcp_relay_connection(tcp_c, tcp_connections_number);
+        return -1;
+    }
+
+    tcp_con->lock_count = 0;
+    tcp_con->sleep_count = 0;
+    tcp_con->connected_time = 0;
+    tcp_con->status = TCP_CONN_VALID;
+    tcp_con->unsleep = 0;
+    return 0;
+}
+
 /* Send a TCP routing request.
  *
  * return 0 on success.
@@ -570,6 +805,9 @@ static int send_tcp_relay_routing_request(TCP_Connections *tcp_c, int tcp_connec
     if (!tcp_con)
         return -1;
 
+    if (tcp_con->status == TCP_CONN_SLEEPING)
+        return -1;
+
     if (send_routing_request(tcp_con->connection, public_key) != 1)
         return -1;
 
@@ -592,8 +830,6 @@ static int tcp_response_callback(void *object, uint8_t connection_id, const uint
     if (connections_number == -1)
         return -1;
 
-    set_tcp_connection_number(tcp_con->connection, connection_id, connections_number);
-
     TCP_Connection_to *con_to = get_connection(tcp_c, connections_number);
 
     if (con_to == NULL)
@@ -602,6 +838,8 @@ static int tcp_response_callback(void *object, uint8_t connection_id, const uint
     if (set_tcp_connection_status(con_to, tcp_connections_number, TCP_CONNECTIONS_STATUS_REGISTERED, connection_id) == -1)
         return -1;
 
+    set_tcp_connection_number(tcp_con->connection, connection_id, connections_number);
+
     return 0;
 }
 
@@ -621,10 +859,20 @@ static int tcp_status_callback(void *object, uint32_t number, uint8_t connection
         if (set_tcp_connection_status(con_to, tcp_connections_number, TCP_CONNECTIONS_STATUS_REGISTERED, connection_id) == -1)
             return -1;
 
+        --tcp_con->lock_count;
+
+        if (con_to->status == TCP_CONN_SLEEPING) {
+            --tcp_con->sleep_count;
+        }
     } else if (status == 2) {
         if (set_tcp_connection_status(con_to, tcp_connections_number, TCP_CONNECTIONS_STATUS_ONLINE, connection_id) == -1)
             return -1;
 
+        ++tcp_con->lock_count;
+
+        if (con_to->status == TCP_CONN_SLEEPING) {
+            ++tcp_con->sleep_count;
+        }
     }
 
     return 0;
@@ -673,11 +921,13 @@ static int tcp_oob_callback(void *object, const uint8_t *public_key, const uint8
     /* TODO: optimize */
     int connections_number = find_tcp_connection_to(tcp_c, public_key);
 
-    if (connections_number == -1) {
+    TCP_Connection_to *con_to = get_connection(tcp_c, connections_number);
+
+    if (con_to && tcp_connection_in_conn(con_to, tcp_connections_number)) {
+        return tcp_data_callback(object, connections_number, 0, data, length);
+    } else {
         if (tcp_c->tcp_oob_callback)
             tcp_c->tcp_oob_callback(tcp_c->tcp_oob_callback_object, public_key, tcp_connections_number, data, length);
-    } else {
-        return tcp_data_callback(object, connections_number, 0, data, length);
     }
 
     return 0;
@@ -725,20 +975,35 @@ static int tcp_relay_on_online(TCP_Connections *tcp_c, int tcp_connections_numbe
     if (!tcp_con)
         return -1;
 
-    unsigned int i;
+    unsigned int i, sent = 0;
 
     for (i = 0; i < tcp_c->connections_length; ++i) {
         TCP_Connection_to *con_to = get_connection(tcp_c, i);
 
         if (con_to) {
             if (tcp_connection_in_conn(con_to, tcp_connections_number)) {
-                send_tcp_relay_routing_request(tcp_c, tcp_connections_number, con_to->public_key);
+                if (send_tcp_relay_routing_request(tcp_c, tcp_connections_number, con_to->public_key) == 0) {
+                    ++sent;
+                }
             }
         }
     }
 
     tcp_relay_set_callbacks(tcp_c, tcp_connections_number);
     tcp_con->status = TCP_CONN_CONNECTED;
+
+    /* If this connection isn't used by any connection, we don't need to wait for them to come online. */
+    if (sent) {
+        tcp_con->connected_time = unix_time();
+    } else {
+        tcp_con->connected_time = 0;
+    }
+
+    if (tcp_c->onion_status && tcp_c->onion_num_conns < NUM_ONION_TCP_CONNECTIONS) {
+        tcp_con->onion = 1;
+        ++tcp_c->onion_num_conns;
+    }
+
     return 0;
 }
 
@@ -807,13 +1072,17 @@ int add_tcp_number_relay_connection(TCP_Connections *tcp_c, int connections_numb
     if (!tcp_con)
         return -1;
 
+    if (con_to->status != TCP_CONN_SLEEPING && tcp_con->status == TCP_CONN_SLEEPING) {
+        tcp_con->unsleep = 1;
+    }
+
     if (add_tcp_connection_to_conn(con_to, tcp_connections_number) == -1)
         return -1;
 
-    ++tcp_con->lock_count;
-
     if (tcp_con->status == TCP_CONN_CONNECTED) {
-        send_tcp_relay_routing_request(tcp_c, tcp_connections_number, con_to->public_key);
+        if (send_tcp_relay_routing_request(tcp_c, tcp_connections_number, con_to->public_key) == 0) {
+            tcp_con->connected_time = unix_time();
+        }
     }
 
     return 0;
@@ -836,22 +1105,38 @@ int add_tcp_relay_connection(TCP_Connections *tcp_c, int connections_number, IP_
     if (tcp_connections_number != -1) {
         return add_tcp_number_relay_connection(tcp_c, connections_number, tcp_connections_number);
     } else {
-        int tcp_connections_number = add_tcp_relay(tcp_c, ip_port, relay_pk);
-
-        if (add_tcp_connection_to_conn(con_to, tcp_connections_number) == -1) {
+        if (online_tcp_connection_from_conn(con_to) >= RECOMMENDED_FRIEND_TCP_CONNECTIONS) {
             return -1;
         }
 
+        int tcp_connections_number = add_tcp_relay(tcp_c, ip_port, relay_pk);
+
         TCP_con *tcp_con = get_tcp_connection(tcp_c, tcp_connections_number);
 
         if (!tcp_con)
             return -1;
 
-        ++tcp_con->lock_count;
+        if (add_tcp_connection_to_conn(con_to, tcp_connections_number) == -1) {
+            return -1;
+        }
+
         return 0;
     }
 }
 
+/* return number of online tcp relays tied to the connection on success.
+ * return 0 on failure.
+ */
+unsigned int tcp_connection_to_online_tcp_relays(TCP_Connections *tcp_c, int connections_number)
+{
+    TCP_Connection_to *con_to = get_connection(tcp_c, connections_number);
+
+    if (!con_to)
+        return 0;
+
+    return online_tcp_connection_from_conn(con_to);
+}
+
 /* Copy a maximum of max_num TCP relays we are connected to to tcp_relays.
  * NOTE that the family of the copied ip ports will be set to TCP_INET or TCP_INET6.
  *
@@ -860,10 +1145,10 @@ int add_tcp_relay_connection(TCP_Connections *tcp_c, int connections_number, IP_
  */
 unsigned int tcp_copy_connected_relays(TCP_Connections *tcp_c, Node_format *tcp_relays, uint16_t max_num)
 {
-    unsigned int i, copied = 0;
+    unsigned int i, copied = 0, r = rand();
 
     for (i = 0; (i < tcp_c->tcp_connections_length) && (copied < max_num); ++i) {
-        TCP_con *tcp_con = get_tcp_connection(tcp_c, i);
+        TCP_con *tcp_con = get_tcp_connection(tcp_c, (i + r) % tcp_c->tcp_connections_length);
 
         if (!tcp_con) {
             continue;
@@ -886,7 +1171,74 @@ unsigned int tcp_copy_connected_relays(TCP_Connections *tcp_c, Node_format *tcp_
     return copied;
 }
 
-TCP_Connections *new_tcp_connections(DHT *dht)
+/* Set if we want TCP_connection to allocate some connection for onion use.
+ *
+ * If status is 1, allocate some connections. if status is 0, don't.
+ *
+ * return 0 on success.
+ * return -1 on failure.
+ */
+int set_tcp_onion_status(TCP_Connections *tcp_c, _Bool status)
+{
+    if (tcp_c->onion_status == status)
+        return -1;
+
+    if (status) {
+        unsigned int i;
+
+        for (i = 0; i < tcp_c->tcp_connections_length; ++i) {
+            TCP_con *tcp_con = get_tcp_connection(tcp_c, i);
+
+            if (tcp_con) {
+                if (tcp_con->status == TCP_CONN_CONNECTED && !tcp_con->onion) {
+                    ++tcp_c->onion_num_conns;
+                    tcp_con->onion = 1;
+                }
+            }
+
+            if (tcp_c->onion_num_conns >= NUM_ONION_TCP_CONNECTIONS)
+                break;
+        }
+
+        if (tcp_c->onion_num_conns < NUM_ONION_TCP_CONNECTIONS) {
+            unsigned int wakeup = NUM_ONION_TCP_CONNECTIONS - tcp_c->onion_num_conns;
+
+            for (i = 0; i < tcp_c->tcp_connections_length; ++i) {
+                TCP_con *tcp_con = get_tcp_connection(tcp_c, i);
+
+                if (tcp_con) {
+                    if (tcp_con->status == TCP_CONN_SLEEPING) {
+                        tcp_con->unsleep = 1;
+                    }
+                }
+
+                if (!wakeup)
+                    break;
+            }
+        }
+
+        tcp_c->onion_status = 1;
+    } else {
+        unsigned int i;
+
+        for (i = 0; i < tcp_c->tcp_connections_length; ++i) {
+            TCP_con *tcp_con = get_tcp_connection(tcp_c, i);
+
+            if (tcp_con) {
+                if (tcp_con->onion) {
+                    --tcp_c->onion_num_conns;
+                    tcp_con->onion = 0;
+                }
+            }
+        }
+
+        tcp_c->onion_status = 0;
+    }
+
+    return 0;
+}
+
+TCP_Connections *new_tcp_connections(DHT *dht, TCP_Proxy_Info *proxy_info)
 {
     if (dht == NULL)
         return NULL;
@@ -897,6 +1249,8 @@ TCP_Connections *new_tcp_connections(DHT *dht)
         return NULL;
 
     temp->dht = dht;
+    temp->proxy_info = *proxy_info;
+
     return temp;
 }
 
@@ -908,18 +1262,35 @@ static void do_tcp_conns(TCP_Connections *tcp_c)
         TCP_con *tcp_con = get_tcp_connection(tcp_c, i);
 
         if (tcp_con) {
-            do_TCP_connection(tcp_con->connection);
+            if (tcp_con->status != TCP_CONN_SLEEPING) {
+                do_TCP_connection(tcp_con->connection);
 
-            /* callbacks can change TCP connection address. */
-            tcp_con = get_tcp_connection(tcp_c, i);
+                /* callbacks can change TCP connection address. */
+                tcp_con = get_tcp_connection(tcp_c, i);
 
-            if (tcp_con->connection->status == TCP_CLIENT_DISCONNECTED) {
-                kill_tcp_relay_connection(tcp_c, i);
-                continue;
+                if (tcp_con->connection->status == TCP_CLIENT_DISCONNECTED) {
+                    if (tcp_con->status == TCP_CONN_CONNECTED) {
+                        reconnect_tcp_relay_connection(tcp_c, i);
+                    } else {
+                        kill_tcp_relay_connection(tcp_c, i);
+                    }
+
+                    continue;
+                }
+
+                if (tcp_con->status == TCP_CONN_VALID && tcp_con->connection->status == TCP_CLIENT_CONFIRMED) {
+                    tcp_relay_on_online(tcp_c, i);
+                }
+
+                if (tcp_con->status == TCP_CONN_CONNECTED && !tcp_con->onion && tcp_con->lock_count
+                        && tcp_con->lock_count == tcp_con->sleep_count
+                        && is_timeout(tcp_con->connected_time, TCP_CONNECTION_ANNOUNCE_TIMEOUT)) {
+                    sleep_tcp_relay_connection(tcp_c, i);
+                }
             }
 
-            if (tcp_con->status == TCP_CONN_VALID && tcp_con->connection->status == TCP_CLIENT_CONFIRMED) {
-                tcp_relay_on_online(tcp_c, i);
+            if (tcp_con->status == TCP_CONN_SLEEPING && tcp_con->unsleep) {
+                unsleep_tcp_relay_connection(tcp_c, i);
             }
         }
     }
@@ -927,27 +1298,42 @@ static void do_tcp_conns(TCP_Connections *tcp_c)
 
 static void kill_nonused_tcp(TCP_Connections *tcp_c)
 {
-    unsigned int i, num_online = 0;
+    if (tcp_c->tcp_connections_length == 0)
+        return;
+
+    unsigned int i, num_online = 0, num_kill = 0, to_kill[tcp_c->tcp_connections_length];
 
     for (i = 0; i < tcp_c->tcp_connections_length; ++i) {
         TCP_con *tcp_con = get_tcp_connection(tcp_c, i);
 
         if (tcp_con) {
             if (tcp_con->status == TCP_CONN_CONNECTED) {
-                if (!tcp_con->lock_count && num_online >= MAX_FRIEND_TCP_CONNECTIONS) {
-                    kill_tcp_relay_connection(tcp_c, i);
-                    continue;
+                if (!tcp_con->onion && !tcp_con->lock_count && is_timeout(tcp_con->connected_time, TCP_CONNECTION_ANNOUNCE_TIMEOUT)) {
+                    to_kill[num_kill] = i;
+                    ++num_kill;
                 }
 
                 ++num_online;
             }
         }
     }
+
+    if (num_online <= RECOMMENDED_FRIEND_TCP_CONNECTIONS) {
+        return;
+    } else {
+        unsigned int n = num_online - RECOMMENDED_FRIEND_TCP_CONNECTIONS;
+
+        if (n < num_kill)
+            num_kill = n;
+    }
+
+    for (i = 0; i < num_kill; ++i) {
+        kill_tcp_relay_connection(tcp_c, to_kill[i]);
+    }
 }
 
 void do_tcp_connections(TCP_Connections *tcp_c)
 {
-    //TODO reconnect to TCP relays if disconnects happen.
     do_tcp_conns(tcp_c);
     kill_nonused_tcp(tcp_c);
 }
diff --git a/toxcore/TCP_connection.h b/toxcore/TCP_connection.h
index 2c86304f..29fbdee0 100644
--- a/toxcore/TCP_connection.h
+++ b/toxcore/TCP_connection.h
@@ -28,14 +28,28 @@
 
 #define TCP_CONN_NONE 0
 #define TCP_CONN_VALID 1
+
+/* NOTE: only used by TCP_con */
 #define TCP_CONN_CONNECTED 2
 
+/* Connection is not connected but can be quickly reconnected in case it is needed. */
+#define TCP_CONN_SLEEPING 3
+
 #define TCP_CONNECTIONS_STATUS_NONE 0
 #define TCP_CONNECTIONS_STATUS_REGISTERED 1
 #define TCP_CONNECTIONS_STATUS_ONLINE 2
 
-#define MAX_FRIEND_TCP_CONNECTIONS 4
+#define MAX_FRIEND_TCP_CONNECTIONS 6
+
+/* Time until connection to friend gets killed (if it doesn't get locked withing that time) */
+#define TCP_CONNECTION_ANNOUNCE_TIMEOUT (TCP_CONNECTION_TIMEOUT)
 
+/* The amount of recommended connections for each friend
+   NOTE: Must be at most (MAX_FRIEND_TCP_CONNECTIONS / 2) */
+#define RECOMMENDED_FRIEND_TCP_CONNECTIONS (MAX_FRIEND_TCP_CONNECTIONS / 2)
+
+/* Number of TCP connections used for onion purposes. */
+#define NUM_ONION_TCP_CONNECTIONS RECOMMENDED_FRIEND_TCP_CONNECTIONS
 
 typedef struct {
     uint8_t status;
@@ -53,7 +67,15 @@ typedef struct {
 typedef struct {
     uint8_t status;
     TCP_Client_Connection *connection;
+    uint64_t connected_time;
     uint32_t lock_count;
+    uint32_t sleep_count;
+    _Bool onion;
+
+    /* Only used when connection is sleeping. */
+    IP_Port ip_port;
+    uint8_t relay_pk[crypto_box_PUBLICKEYBYTES];
+    _Bool unsleep; /* set to 1 to unsleep connection. */
 } TCP_con;
 
 typedef struct {
@@ -76,6 +98,9 @@ typedef struct {
     void *tcp_onion_callback_object;
 
     TCP_Proxy_Info proxy_info;
+
+    _Bool onion_status;
+    uint16_t onion_num_conns;
 } TCP_Connections;
 
 /* Send a packet to the TCP connection.
@@ -93,7 +118,7 @@ int send_packet_tcp_connection(TCP_Connections *tcp_c, int connections_number, c
  * return TCP connection number on success.
  * return -1 on failure.
  */
-int get_random_tcp_conn_number(TCP_Connections *tcp_c);
+int get_random_tcp_onion_conn_number(TCP_Connections *tcp_c);
 
 /* Send an onion packet via the TCP relay corresponding to tcp_connections_number.
  *
@@ -103,6 +128,15 @@ int get_random_tcp_conn_number(TCP_Connections *tcp_c);
 int tcp_send_onion_request(TCP_Connections *tcp_c, unsigned int tcp_connections_number, const uint8_t *data,
                            uint16_t length);
 
+/* Set if we want TCP_connection to allocate some connection for onion use.
+ *
+ * If status is 1, allocate some connections. if status is 0, don't.
+ *
+ * return 0 on success.
+ * return -1 on failure.
+ */
+int set_tcp_onion_status(TCP_Connections *tcp_c, _Bool status);
+
 /* Send an oob packet via the TCP relay corresponding to tcp_connections_number.
  *
  * return 0 on success.
@@ -140,6 +174,23 @@ int new_tcp_connection_to(TCP_Connections *tcp_c, const uint8_t *public_key, int
  */
 int kill_tcp_connection_to(TCP_Connections *tcp_c, int connections_number);
 
+/* Set connection status.
+ *
+ * status of 1 means we are using the connection.
+ * status of 0 means we are not using it.
+ *
+ * Unused tcp connections will be disconnected from but kept in case they are needed.
+ *
+ * return 0 on success.
+ * return -1 on failure.
+ */
+int set_tcp_connection_to_status(TCP_Connections *tcp_c, int connections_number, _Bool status);
+
+/* return number of online tcp relays tied to the connection on success.
+ * return 0 on failure.
+ */
+unsigned int tcp_connection_to_online_tcp_relays(TCP_Connections *tcp_c, int connections_number);
+
 /* Add a TCP relay tied to a connection.
  *
  * NOTE: This can only be used during the tcp_oob_callback.
@@ -172,7 +223,7 @@ int add_tcp_relay_global(TCP_Connections *tcp_c, IP_Port ip_port, const uint8_t
  */
 unsigned int tcp_copy_connected_relays(TCP_Connections *tcp_c, Node_format *tcp_relays, uint16_t max_num);
 
-TCP_Connections *new_tcp_connections(DHT *dht);
+TCP_Connections *new_tcp_connections(DHT *dht, TCP_Proxy_Info *proxy_info);
 void do_tcp_connections(TCP_Connections *tcp_c);
 void kill_tcp_connections(TCP_Connections *tcp_c);
 
diff --git a/toxcore/crypto_core.c b/toxcore/crypto_core.c
index a364084a..418edcad 100644
--- a/toxcore/crypto_core.c
+++ b/toxcore/crypto_core.c
@@ -29,26 +29,16 @@
 
 #include "crypto_core.h"
 
+#if crypto_box_PUBLICKEYBYTES != 32
+#error crypto_box_PUBLICKEYBYTES is required to be 32 bytes for public_key_cmp to work,
+#endif
 
-/* Use this instead of memcmp; not vulnerable to timing attacks.
+/* compare 2 public keys of length crypto_box_PUBLICKEYBYTES, not vulnerable to timing attacks.
    returns 0 if both mem locations of length are equal,
    return -1 if they are not. */
-int crypto_cmp(const uint8_t *mem1, const uint8_t *mem2, size_t length)
+int public_key_cmp(const uint8_t *pk1, const uint8_t *pk2)
 {
-    if (length == 16) {
-        return crypto_verify_16(mem1, mem2);
-    } else if (length == 32) {
-        return crypto_verify_32(mem1, mem2);
-    }
-
-    unsigned int check = 0;
-    size_t i;
-
-    for (i = 0; i < length; ++i) {
-        check |= mem1[i] ^ mem2[i];
-    }
-
-    return (1 & ((check - 1) >> 8)) - 1;
+    return crypto_verify_32(pk1, pk2);
 }
 
 /*  return a random number.
diff --git a/toxcore/crypto_core.h b/toxcore/crypto_core.h
index decc7fb9..d7306a8a 100644
--- a/toxcore/crypto_core.h
+++ b/toxcore/crypto_core.h
@@ -40,10 +40,10 @@
 
 #define crypto_box_KEYBYTES (crypto_box_BEFORENMBYTES)
 
-/* Use this instead of memcmp; not vulnerable to timing attacks.
+/* compare 2 public keys of length crypto_box_PUBLICKEYBYTES, not vulnerable to timing attacks.
    returns 0 if both mem locations of length are equal,
    return -1 if they are not. */
-int crypto_cmp(const uint8_t *mem1, const uint8_t *mem2, size_t length);
+int public_key_cmp(const uint8_t *pk1, const uint8_t *pk2);
 
 /*  return a random number.
  *
diff --git a/toxcore/friend_connection.c b/toxcore/friend_connection.c
index 074021da..c13ca949 100644
--- a/toxcore/friend_connection.c
+++ b/toxcore/friend_connection.c
@@ -146,6 +146,95 @@ int getfriend_conn_id_pk(Friend_Connections *fr_c, const uint8_t *real_pk)
     return -1;
 }
 
+/* Add a TCP relay associated to the friend.
+ *
+ * return -1 on failure.
+ * return 0 on success.
+ */
+int friend_add_tcp_relay(Friend_Connections *fr_c, int friendcon_id, IP_Port ip_port, const uint8_t *public_key)
+{
+    Friend_Conn *friend_con = get_conn(fr_c, friendcon_id);
+
+    if (!friend_con)
+        return -1;
+
+    unsigned int i;
+
+    uint16_t index = friend_con->tcp_relay_counter % FRIEND_MAX_STORED_TCP_RELAYS;
+
+    for (i = 0; i < FRIEND_MAX_STORED_TCP_RELAYS; ++i) {
+        if (friend_con->tcp_relays[i].ip_port.ip.family != 0
+                && memcmp(friend_con->tcp_relays[i].public_key, public_key, crypto_box_PUBLICKEYBYTES) == 0) {
+            memset(&friend_con->tcp_relays[i], 0, sizeof(Node_format));
+        }
+    }
+
+    friend_con->tcp_relays[index].ip_port = ip_port;
+    memcpy(friend_con->tcp_relays[index].public_key, public_key, crypto_box_PUBLICKEYBYTES);
+    ++friend_con->tcp_relay_counter;
+
+    return add_tcp_relay_peer(fr_c->net_crypto, friend_con->crypt_connection_id, ip_port, public_key);
+}
+
+/* Connect to number saved relays for friend. */
+static void connect_to_saved_tcp_relays(Friend_Connections *fr_c, int friendcon_id, unsigned int number)
+{
+    Friend_Conn *friend_con = get_conn(fr_c, friendcon_id);
+
+    if (!friend_con)
+        return;
+
+    unsigned int i;
+
+    for (i = 0; (i < FRIEND_MAX_STORED_TCP_RELAYS) && (number != 0); ++i) {
+        uint16_t index = (friend_con->tcp_relay_counter - (i + 1)) % FRIEND_MAX_STORED_TCP_RELAYS;
+
+        if (friend_con->tcp_relays[index].ip_port.ip.family) {
+            if (add_tcp_relay_peer(fr_c->net_crypto, friend_con->crypt_connection_id, friend_con->tcp_relays[index].ip_port,
+                                   friend_con->tcp_relays[index].public_key) == 0) {
+                --number;
+            }
+        }
+    }
+}
+
+static unsigned int send_relays(Friend_Connections *fr_c, int friendcon_id)
+{
+    Friend_Conn *friend_con = get_conn(fr_c, friendcon_id);
+
+    if (!friend_con)
+        return 0;
+
+    Node_format nodes[MAX_SHARED_RELAYS];
+    uint8_t data[1024];
+    int n, length;
+
+    n = copy_connected_tcp_relays(fr_c->net_crypto, nodes, MAX_SHARED_RELAYS);
+
+    unsigned int i;
+
+    for (i = 0; i < n; ++i) {
+        /* Associated the relays being sent with this connection.
+           On receiving the peer will do the same which will establish the connection. */
+        friend_add_tcp_relay(fr_c, friendcon_id, nodes[i].ip_port, nodes[i].public_key);
+    }
+
+    length = pack_nodes(data + 1, sizeof(data) - 1, nodes, n);
+
+    if (length <= 0)
+        return 0;
+
+    data[0] = PACKET_ID_SHARE_RELAYS;
+    ++length;
+
+    if (write_cryptpacket(fr_c->net_crypto, friend_con->crypt_connection_id, data, length, 0) != -1) {
+        friend_con->share_relays_lastsent = unix_time();
+        return 1;
+    }
+
+    return 0;
+}
+
 /* callback for recv TCP relay nodes. */
 static int tcp_relay_node_callback(void *object, uint32_t number, IP_Port ip_port, const uint8_t *public_key)
 {
@@ -156,7 +245,7 @@ static int tcp_relay_node_callback(void *object, uint32_t number, IP_Port ip_por
         return -1;
 
     if (friend_con->crypt_connection_id != -1) {
-        return add_tcp_relay_peer(fr_c->net_crypto, friend_con->crypt_connection_id, ip_port, public_key);
+        return friend_add_tcp_relay(fr_c, number, ip_port, public_key);
     } else {
         return add_tcp_relay(fr_c->net_crypto, ip_port, public_key);
     }
@@ -181,19 +270,14 @@ static void dht_ip_callback(void *object, int32_t number, IP_Port ip_port)
     friend_con->dht_ip_port_lastrecv = unix_time();
 }
 
-/* Callback for dht public key changes. */
-static void dht_pk_callback(void *object, int32_t number, const uint8_t *dht_public_key)
+static void change_dht_pk(Friend_Connections *fr_c, int friendcon_id, const uint8_t *dht_public_key)
 {
-    Friend_Connections *fr_c = object;
-    Friend_Conn *friend_con = get_conn(fr_c, number);
+    Friend_Conn *friend_con = get_conn(fr_c, friendcon_id);
 
     if (!friend_con)
         return;
 
-    friend_con->dht_ping_lastrecv = unix_time();
-
-    if (memcmp(friend_con->dht_temp_pk, dht_public_key, crypto_box_PUBLICKEYBYTES) == 0)
-        return;
+    friend_con->dht_pk_lastrecv = unix_time();
 
     if (friend_con->dht_lock) {
         if (DHT_delfriend(fr_c->dht, friend_con->dht_temp_pk, friend_con->dht_lock) != 0) {
@@ -204,15 +288,7 @@ static void dht_pk_callback(void *object, int32_t number, const uint8_t *dht_pub
         friend_con->dht_lock = 0;
     }
 
-    DHT_addfriend(fr_c->dht, dht_public_key, dht_ip_callback, object, number, &friend_con->dht_lock);
-
-    if (friend_con->crypt_connection_id == -1) {
-        friend_new_connection(fr_c, number);
-    }
-
-    set_connection_dht_public_key(fr_c->net_crypto, friend_con->crypt_connection_id, dht_public_key);
-    onion_set_friend_DHT_pubkey(fr_c->onion_c, friend_con->onion_friendnum, dht_public_key);
-
+    DHT_addfriend(fr_c->dht, dht_public_key, dht_ip_callback, fr_c, friendcon_id, &friend_con->dht_lock);
     memcpy(friend_con->dht_temp_pk, dht_public_key, crypto_box_PUBLICKEYBYTES);
 }
 
@@ -230,11 +306,12 @@ static int handle_status(void *object, int number, uint8_t status)
         call_cb = 1;
         friend_con->status = FRIENDCONN_STATUS_CONNECTED;
         friend_con->ping_lastrecv = unix_time();
+        friend_con->share_relays_lastsent = 0;
         onion_set_friend_online(fr_c->onion_c, friend_con->onion_friendnum, status);
     } else {  /* Went offline. */
         if (friend_con->status != FRIENDCONN_STATUS_CONNECTING) {
             call_cb = 1;
-            friend_con->dht_ping_lastrecv = unix_time();
+            friend_con->dht_pk_lastrecv = unix_time();
             onion_set_friend_online(fr_c->onion_c, friend_con->onion_friendnum, status);
         }
 
@@ -255,6 +332,31 @@ static int handle_status(void *object, int number, uint8_t status)
     return 0;
 }
 
+/* Callback for dht public key changes. */
+static void dht_pk_callback(void *object, int32_t number, const uint8_t *dht_public_key)
+{
+    Friend_Connections *fr_c = object;
+    Friend_Conn *friend_con = get_conn(fr_c, number);
+
+    if (!friend_con)
+        return;
+
+    if (memcmp(friend_con->dht_temp_pk, dht_public_key, crypto_box_PUBLICKEYBYTES) == 0)
+        return;
+
+    change_dht_pk(fr_c, number, dht_public_key);
+
+    /* if pk changed, create a new connection.*/
+    if (friend_con->crypt_connection_id != -1) {
+        crypto_kill(fr_c->net_crypto, friend_con->crypt_connection_id);
+        friend_con->crypt_connection_id = -1;
+        handle_status(object, number, 0); /* Going offline. */
+    }
+
+    friend_new_connection(fr_c, number);
+    onion_set_friend_DHT_pubkey(fr_c->onion_c, friend_con->onion_friendnum, dht_public_key);
+}
+
 static int handle_packet(void *object, int number, uint8_t *data, uint16_t length)
 {
     if (length == 0)
@@ -263,18 +365,30 @@ static int handle_packet(void *object, int number, uint8_t *data, uint16_t lengt
     Friend_Connections *fr_c = object;
     Friend_Conn *friend_con = get_conn(fr_c, number);
 
+    if (!friend_con)
+        return -1;
+
     if (data[0] == PACKET_ID_FRIEND_REQUESTS) {
         if (fr_c->fr_request_callback)
             fr_c->fr_request_callback(fr_c->fr_request_object, friend_con->real_public_key, data, length);
 
         return 0;
-    }
+    } else if (data[0] == PACKET_ID_ALIVE) {
+        friend_con->ping_lastrecv = unix_time();
+        return 0;
+    } else if (data[0] == PACKET_ID_SHARE_RELAYS) {
+        Node_format nodes[MAX_SHARED_RELAYS];
+        int n;
 
-    if (!friend_con)
-        return -1;
+        if ((n = unpack_nodes(nodes, MAX_SHARED_RELAYS, NULL, data + 1, length - 1, 1)) == -1)
+            return -1;
+
+        int j;
+
+        for (j = 0; j < n; j++) {
+            friend_add_tcp_relay(fr_c, number, nodes[j].ip_port, nodes[j].public_key);
+        }
 
-    if (data[0] == PACKET_ID_ALIVE) {
-        friend_con->ping_lastrecv = unix_time();
         return 0;
     }
 
@@ -333,6 +447,11 @@ static int handle_new_connections(void *object, New_Connection *n_c)
             return -1;
 
         int id = accept_crypto_connection(fr_c->net_crypto, n_c);
+
+        if (id == -1) {
+            return -1;
+        }
+
         connection_status_handler(fr_c->net_crypto, id, &handle_status, fr_c, friendcon_id);
         connection_data_handler(fr_c->net_crypto, id, &handle_packet, fr_c, friendcon_id);
         connection_lossy_data_handler(fr_c->net_crypto, id, &handle_lossy_packet, fr_c, friendcon_id);
@@ -345,7 +464,9 @@ static int handle_new_connections(void *object, New_Connection *n_c)
             friend_con->dht_ip_port_lastrecv = unix_time();
         }
 
-        dht_pk_callback(fr_c, friendcon_id, n_c->dht_public_key);
+        if (memcmp(friend_con->dht_temp_pk, n_c->dht_public_key, crypto_box_PUBLICKEYBYTES) != 0) {
+            change_dht_pk(fr_c, friendcon_id, n_c->dht_public_key);
+        }
 
         nc_dht_pk_callback(fr_c->net_crypto, id, &dht_pk_callback, fr_c, friendcon_id);
         return 0;
@@ -365,7 +486,12 @@ static int friend_new_connection(Friend_Connections *fr_c, int friendcon_id)
         return -1;
     }
 
-    int id = new_crypto_connection(fr_c->net_crypto, friend_con->real_public_key);
+    /* If dht_temp_pk does not contains a pk. */
+    if (!friend_con->dht_lock) {
+        return -1;
+    }
+
+    int id = new_crypto_connection(fr_c->net_crypto, friend_con->real_public_key, friend_con->dht_temp_pk);
 
     if (id == -1)
         return -1;
@@ -632,10 +758,20 @@ Friend_Connections *new_friend_connections(Onion_Client *onion_c)
     temp->onion_c = onion_c;
 
     new_connection_handler(temp->net_crypto, &handle_new_connections, temp);
+    LANdiscovery_init(temp->dht);
 
     return temp;
 }
 
+/* Send a LAN discovery packet every LAN_DISCOVERY_INTERVAL seconds. */
+static void LANdiscovery(Friend_Connections *fr_c)
+{
+    if (fr_c->last_LANdiscovery + LAN_DISCOVERY_INTERVAL < unix_time()) {
+        send_LANdiscovery(htons(TOX_PORT_DEFAULT), fr_c->dht);
+        fr_c->last_LANdiscovery = unix_time();
+    }
+}
+
 /* main friend_connections loop. */
 void do_friend_connections(Friend_Connections *fr_c)
 {
@@ -647,7 +783,7 @@ void do_friend_connections(Friend_Connections *fr_c)
 
         if (friend_con) {
             if (friend_con->status == FRIENDCONN_STATUS_CONNECTING) {
-                if (friend_con->dht_ping_lastrecv + FRIEND_DHT_TIMEOUT < temp_time) {
+                if (friend_con->dht_pk_lastrecv + FRIEND_DHT_TIMEOUT < temp_time) {
                     if (friend_con->dht_lock) {
                         DHT_delfriend(fr_c->dht, friend_con->dht_temp_pk, friend_con->dht_lock);
                         friend_con->dht_lock = 0;
@@ -660,8 +796,8 @@ void do_friend_connections(Friend_Connections *fr_c)
 
                 if (friend_con->dht_lock) {
                     if (friend_new_connection(fr_c, i) == 0) {
-                        set_connection_dht_public_key(fr_c->net_crypto, friend_con->crypt_connection_id, friend_con->dht_temp_pk);
                         set_direct_ip_port(fr_c->net_crypto, friend_con->crypt_connection_id, friend_con->dht_ip_port);
+                        connect_to_saved_tcp_relays(fr_c, i, (MAX_FRIEND_TCP_CONNECTIONS / 2)); /* Only fill it half up. */
                     }
                 }
 
@@ -670,6 +806,10 @@ void do_friend_connections(Friend_Connections *fr_c)
                     send_ping(fr_c, i);
                 }
 
+                if (friend_con->share_relays_lastsent + SHARE_RELAYS_INTERVAL < temp_time) {
+                    send_relays(fr_c, i);
+                }
+
                 if (friend_con->ping_lastrecv + FRIEND_CONNECTION_TIMEOUT < temp_time) {
                     /* If we stopped receiving ping packets, kill it. */
                     crypto_kill(fr_c->net_crypto, friend_con->crypt_connection_id);
@@ -679,6 +819,8 @@ void do_friend_connections(Friend_Connections *fr_c)
             }
         }
     }
+
+    LANdiscovery(fr_c);
 }
 
 /* Free everything related with friend_connections. */
@@ -693,5 +835,6 @@ void kill_friend_connections(Friend_Connections *fr_c)
         kill_friend_connection(fr_c, i);
     }
 
+    LANdiscovery_kill(fr_c->dht);
     free(fr_c);
 }
diff --git a/toxcore/friend_connection.h b/toxcore/friend_connection.h
index b814eb0c..baca4b76 100644
--- a/toxcore/friend_connection.h
+++ b/toxcore/friend_connection.h
@@ -36,6 +36,7 @@
 #define GROUPCHAT_CALLBACK_INDEX 1
 
 #define PACKET_ID_ALIVE 16
+#define PACKET_ID_SHARE_RELAYS 17
 #define PACKET_ID_FRIEND_REQUESTS 18
 
 /* Interval between the sending of ping packets. */
@@ -47,6 +48,14 @@
 /* Time before friend is removed from the DHT after last hearing about him. */
 #define FRIEND_DHT_TIMEOUT BAD_NODE_TIMEOUT
 
+#define FRIEND_MAX_STORED_TCP_RELAYS (MAX_FRIEND_TCP_CONNECTIONS * 4)
+
+/* Max number of tcp relays sent to friends */
+#define MAX_SHARED_RELAYS (RECOMMENDED_FRIEND_TCP_CONNECTIONS)
+
+/* Interval between the sending of tcp relay information */
+#define SHARE_RELAYS_INTERVAL (5 * 60)
+
 
 enum {
     FRIENDCONN_STATUS_NONE,
@@ -61,12 +70,13 @@ typedef struct {
     uint8_t dht_temp_pk[crypto_box_PUBLICKEYBYTES];
     uint16_t dht_lock;
     IP_Port dht_ip_port;
-    uint64_t dht_ping_lastrecv, dht_ip_port_lastrecv;
+    uint64_t dht_pk_lastrecv, dht_ip_port_lastrecv;
 
     int onion_friendnum;
     int crypt_connection_id;
 
     uint64_t ping_lastrecv, ping_lastsent;
+    uint64_t share_relays_lastsent;
 
     struct {
         int (*status_callback)(void *object, int id, uint8_t status);
@@ -83,6 +93,9 @@ typedef struct {
     } callbacks[MAX_FRIEND_CONNECTION_CALLBACKS];
 
     uint16_t lock_count;
+
+    Node_format tcp_relays[FRIEND_MAX_STORED_TCP_RELAYS];
+    uint16_t tcp_relay_counter;
 } Friend_Conn;
 
 
@@ -96,6 +109,8 @@ typedef struct {
 
     int (*fr_request_callback)(void *object, const uint8_t *source_pubkey, const uint8_t *data, uint16_t len);
     void *fr_request_object;
+
+    uint64_t last_LANdiscovery;
 } Friend_Connections;
 
 /* return friendcon_id corresponding to the real public key on success.
@@ -127,6 +142,13 @@ int get_friendcon_public_keys(uint8_t *real_pk, uint8_t *dht_temp_pk, Friend_Con
  */
 void set_dht_temp_pk(Friend_Connections *fr_c, int friendcon_id, const uint8_t *dht_temp_pk);
 
+/* Add a TCP relay associated to the friend.
+ *
+ * return -1 on failure.
+ * return 0 on success.
+ */
+int friend_add_tcp_relay(Friend_Connections *fr_c, int friendcon_id, IP_Port ip_port, const uint8_t *public_key);
+
 /* Set the callbacks for the friend connection.
  * index is the index (0 to (MAX_FRIEND_CONNECTION_CALLBACKS - 1)) we want the callback to set in the array.
  *
diff --git a/toxcore/net_crypto.c b/toxcore/net_crypto.c
index 3e596a5f..0ed855bb 100644
--- a/toxcore/net_crypto.c
+++ b/toxcore/net_crypto.c
@@ -35,7 +35,16 @@
 
 static uint8_t crypt_connection_id_not_valid(const Net_Crypto *c, int crypt_connection_id)
 {
-    return (uint32_t)crypt_connection_id >= c->crypto_connections_length;
+    if ((uint32_t)crypt_connection_id >= c->crypto_connections_length)
+        return 1;
+
+    if (c->crypto_connections == NULL)
+        return 1;
+
+    if (c->crypto_connections[crypt_connection_id].status == CRYPTO_CONN_NO_CONNECTION)
+        return 1;
+
+    return 0;
 }
 
 /* cookie timeout in seconds */
@@ -206,8 +215,7 @@ static int udp_handle_cookie_request(void *object, IP_Port source, const uint8_t
 
 /* Handle the cookie request packet (for TCP)
  */
-static int tcp_handle_cookie_request(const Net_Crypto *c, TCP_Client_Connection *TCP_con, uint8_t conn_id,
-                                     const uint8_t *packet, uint16_t length)
+static int tcp_handle_cookie_request(Net_Crypto *c, int connections_number, const uint8_t *packet, uint16_t length)
 {
     uint8_t request_plain[COOKIE_REQUEST_PLAIN_LENGTH];
     uint8_t shared_key[crypto_box_BEFORENMBYTES];
@@ -221,15 +229,13 @@ static int tcp_handle_cookie_request(const Net_Crypto *c, TCP_Client_Connection
     if (create_cookie_response(c, data, request_plain, shared_key, dht_public_key) != sizeof(data))
         return -1;
 
-    if (send_data(TCP_con, conn_id, data, sizeof(data)) != 1)
-        return -1;
-
-    return 0;
+    int ret = send_packet_tcp_connection(c->tcp_c, connections_number, data, sizeof(data));
+    return ret;
 }
 
 /* Handle the cookie request packet (for TCP oob packets)
  */
-static int tcp_oob_handle_cookie_request(const Net_Crypto *c, TCP_Client_Connection *TCP_con,
+static int tcp_oob_handle_cookie_request(const Net_Crypto *c, unsigned int tcp_connections_number,
         const uint8_t *dht_public_key, const uint8_t *packet, uint16_t length)
 {
     uint8_t request_plain[COOKIE_REQUEST_PLAIN_LENGTH];
@@ -247,10 +253,8 @@ static int tcp_oob_handle_cookie_request(const Net_Crypto *c, TCP_Client_Connect
     if (create_cookie_response(c, data, request_plain, shared_key, dht_public_key) != sizeof(data))
         return -1;
 
-    if (send_oob_packet(TCP_con, dht_public_key, data, sizeof(data)) != 1)
-        return -1;
-
-    return 0;
+    int ret = tcp_send_oob_packet(c->tcp_c, tcp_connections_number, dht_public_key, data, sizeof(data));
+    return ret;
 }
 
 /* Handle a cookie response packet of length encrypted with shared_key.
@@ -346,7 +350,7 @@ static int handle_crypto_handshake(const Net_Crypto *c, uint8_t *nonce, uint8_t
         return -1;
 
     if (expected_real_pk)
-        if (crypto_cmp(cookie_plain, expected_real_pk, crypto_box_PUBLICKEYBYTES) != 0)
+        if (public_key_cmp(cookie_plain, expected_real_pk) != 0)
             return -1;
 
     uint8_t cookie_hash[crypto_hash_sha512_BYTES];
@@ -400,12 +404,17 @@ static int send_packet_to(Net_Crypto *c, int crypt_connection_id, const uint8_t
 
     //TODO: on bad networks, direct connections might not last indefinitely.
     if (conn->ip_port.ip.family != 0) {
-        uint8_t direct_connected = 0;
-        crypto_connection_status(c, crypt_connection_id, &direct_connected);
+        _Bool direct_connected = 0;
+        crypto_connection_status(c, crypt_connection_id, &direct_connected, NULL);
 
-        if (direct_connected && (uint32_t)sendpacket(c->dht->net, conn->ip_port, data, length) == length) {
-            pthread_mutex_unlock(&conn->mutex);
-            return 0;
+        if (direct_connected) {
+            if ((uint32_t)sendpacket(c->dht->net, conn->ip_port, data, length) == length) {
+                pthread_mutex_unlock(&conn->mutex);
+                return 0;
+            } else {
+                pthread_mutex_unlock(&conn->mutex);
+                return -1;
+            }
         }
 
         //TODO: a better way of sending packets directly to confirm the others ip.
@@ -413,61 +422,14 @@ static int send_packet_to(Net_Crypto *c, int crypt_connection_id, const uint8_t
             if ((uint32_t)sendpacket(c->dht->net, conn->ip_port, data, length) == length)
                 direct_send_attempt = 1;
         }
-
     }
 
     pthread_mutex_unlock(&conn->mutex);
+    pthread_mutex_lock(&c->tcp_mutex);
+    int ret = send_packet_tcp_connection(c->tcp_c, conn->connection_number_tcp, data, length);
+    pthread_mutex_unlock(&c->tcp_mutex);
 
-    //TODO: detect and kill bad relays.
-    uint32_t i;
-
-    unsigned int r;
-
-    if (!conn->last_relay_sentto) {
-        r = rand();
-    } else {
-        r = conn->last_relay_sentto - 1;
-    }
-
-    if (conn->num_tcp_online) {
-        for (i = 0; i < MAX_TCP_CONNECTIONS; ++i) {
-            pthread_mutex_lock(&c->tcp_mutex);
-
-            unsigned int tcp_index = (i + r) % MAX_TCP_CONNECTIONS;
-            int ret = 0;
-
-            if (conn->status_tcp[tcp_index] == STATUS_TCP_ONLINE) {/* friend is connected to this relay. */
-                ret = send_data(c->tcp_connections[tcp_index], conn->con_number_tcp[tcp_index], data, length);
-            }
-
-            pthread_mutex_unlock(&c->tcp_mutex);
-
-            if (ret == 1) {
-                conn->last_relay_sentto = tcp_index + 1;
-                return 0;
-            }
-        }
-    }
-
-    for (i = 0; i < MAX_TCP_CONNECTIONS; ++i) {
-        pthread_mutex_lock(&c->tcp_mutex);
-
-        unsigned int tcp_index = (i + r) % MAX_TCP_CONNECTIONS;
-        int ret = 0;
-
-        if (conn->status_tcp[tcp_index] == STATUS_TCP_INVISIBLE) {
-            ret = send_oob_packet(c->tcp_connections[tcp_index], conn->dht_public_key, data, length);
-        }
-
-        pthread_mutex_unlock(&c->tcp_mutex);
-
-        if (ret == 1) {
-            conn->last_relay_sentto = tcp_index + 1;
-            return 0;
-        }
-    }
-
-    if (direct_send_attempt) {
+    if (ret == 0 || direct_send_attempt) {
         return 0;
     }
 
@@ -1136,13 +1098,26 @@ static int send_kill_packet(Net_Crypto *c, int crypt_connection_id)
                                    &kill_packet, sizeof(kill_packet));
 }
 
+static void connection_kill(Net_Crypto *c, int crypt_connection_id)
+{
+    Crypto_Connection *conn = get_crypto_connection(c, crypt_connection_id);
+
+    if (conn == 0)
+        return;
+
+    if (conn->connection_status_callback) {
+        conn->connection_status_callback(conn->connection_status_callback_object, conn->connection_status_callback_id, 0);
+    }
+
+    crypto_kill(c, crypt_connection_id);
+}
+
 /* Handle a received data packet.
  *
  * return -1 on failure.
  * return 0 on success.
  */
-static int handle_data_packet_helper(const Net_Crypto *c, int crypt_connection_id, const uint8_t *packet,
-                                     uint16_t length)
+static int handle_data_packet_helper(Net_Crypto *c, int crypt_connection_id, const uint8_t *packet, uint16_t length)
 {
     if (length > MAX_CRYPTO_PACKET_SIZE || length <= CRYPTO_DATA_PACKET_MIN_SIZE)
         return -1;
@@ -1179,7 +1154,7 @@ static int handle_data_packet_helper(const Net_Crypto *c, int crypt_connection_i
     }
 
     if (real_data[0] == PACKET_ID_KILL) {
-        conn->killed = 1;
+        connection_kill(c, crypt_connection_id);
         return 0;
     }
 
@@ -1294,19 +1269,19 @@ static int handle_packet_connection(Net_Crypto *c, int crypt_connection_id, cons
                                             packet, length, conn->public_key) != 0)
                     return -1;
 
-                encrypt_precompute(conn->peersessionpublic_key, conn->sessionsecret_key, conn->shared_key);
-
-                if (conn->status == CRYPTO_CONN_COOKIE_REQUESTING) {
-                    if (create_send_handshake(c, crypt_connection_id, cookie, dht_public_key) != 0)
-                        return -1;
-                }
+                if (public_key_cmp(dht_public_key, conn->dht_public_key) == 0) {
+                    encrypt_precompute(conn->peersessionpublic_key, conn->sessionsecret_key, conn->shared_key);
 
-                conn->status = CRYPTO_CONN_NOT_CONFIRMED;
-                /* Status needs to be CRYPTO_CONN_NOT_CONFIRMED for this to work. */
-                set_connection_dht_public_key(c, crypt_connection_id, dht_public_key);
+                    if (conn->status == CRYPTO_CONN_COOKIE_REQUESTING) {
+                        if (create_send_handshake(c, crypt_connection_id, cookie, dht_public_key) != 0)
+                            return -1;
+                    }
 
-                if (conn->dht_pk_callback)
-                    conn->dht_pk_callback(conn->dht_pk_callback_object, conn->dht_pk_callback_number, dht_public_key);
+                    conn->status = CRYPTO_CONN_NOT_CONFIRMED;
+                } else {
+                    if (conn->dht_pk_callback)
+                        conn->dht_pk_callback(conn->dht_pk_callback_object, conn->dht_pk_callback_number, dht_public_key);
+                }
 
             } else {
                 return -1;
@@ -1448,31 +1423,12 @@ static int getcryptconnection_id(const Net_Crypto *c, const uint8_t *public_key)
     return -1;
 }
 
-/* Get crypto connection id from public key of peer.
- *
- *  return -1 if there are no connections like we are looking for.
- *  return id if it found it.
- */
-static int getcryptconnection_id_dht_pubkey(const Net_Crypto *c, const uint8_t *dht_public_key)
-{
-    uint32_t i;
-
-    for (i = 0; i < c->crypto_connections_length; ++i) {
-        if (c->crypto_connections[i].status != CRYPTO_CONN_NO_CONNECTION && c->crypto_connections[i].dht_public_key_set)
-            if (memcmp(dht_public_key, c->crypto_connections[i].dht_public_key, crypto_box_PUBLICKEYBYTES) == 0)
-                return i;
-    }
-
-    return -1;
-}
-
 /* Add a source to the crypto connection.
  * This is to be used only when we have received a packet from that source.
  *
  *  return -1 on failure.
  *  return positive number on success.
  *  0 if source was a direct UDP connection.
- *  TODO
  */
 static int crypto_connection_add_source(Net_Crypto *c, int crypt_connection_id, IP_Port source)
 {
@@ -1490,8 +1446,11 @@ static int crypto_connection_add_source(Net_Crypto *c, int crypt_connection_id,
             conn->ip_port = source;
         }
 
-        conn->direct_lastrecv_time = current_time_monotonic();
+        conn->direct_lastrecv_time = unix_time();
         return 0;
+    } else if (source.ip.family == TCP_FAMILY) {
+        if (add_tcp_number_relay_connection(c->tcp_c, conn->connection_number_tcp, source.ip.ip6.uint32[0]) == 0)
+            return 1;
     }
 
     return -1;
@@ -1537,30 +1496,29 @@ static int handle_new_connection_handshake(Net_Crypto *c, IP_Port source, const
     int crypt_connection_id = getcryptconnection_id(c, n_c.public_key);
 
     if (crypt_connection_id != -1) {
-        int ret = -1;
         Crypto_Connection *conn = get_crypto_connection(c, crypt_connection_id);
 
-        if (conn != 0 && (conn->status == CRYPTO_CONN_COOKIE_REQUESTING || conn->status == CRYPTO_CONN_HANDSHAKE_SENT)) {
-            memcpy(conn->recv_nonce, n_c.recv_nonce, crypto_box_NONCEBYTES);
-            memcpy(conn->peersessionpublic_key, n_c.peersessionpublic_key, crypto_box_PUBLICKEYBYTES);
-            encrypt_precompute(conn->peersessionpublic_key, conn->sessionsecret_key, conn->shared_key);
-
-            crypto_connection_add_source(c, crypt_connection_id, source);
+        if (public_key_cmp(n_c.dht_public_key, conn->dht_public_key) != 0) {
+            connection_kill(c, crypt_connection_id);
+        } else {
+            int ret = -1;
 
-            if (create_send_handshake(c, crypt_connection_id, n_c.cookie, n_c.dht_public_key) == 0) {
-                conn->status = CRYPTO_CONN_NOT_CONFIRMED;
-                /* Status needs to be CRYPTO_CONN_NOT_CONFIRMED for this to work. */
-                set_connection_dht_public_key(c, crypt_connection_id, n_c.dht_public_key);
+            if (conn && (conn->status == CRYPTO_CONN_COOKIE_REQUESTING || conn->status == CRYPTO_CONN_HANDSHAKE_SENT)) {
+                memcpy(conn->recv_nonce, n_c.recv_nonce, crypto_box_NONCEBYTES);
+                memcpy(conn->peersessionpublic_key, n_c.peersessionpublic_key, crypto_box_PUBLICKEYBYTES);
+                encrypt_precompute(conn->peersessionpublic_key, conn->sessionsecret_key, conn->shared_key);
 
-                if (conn->dht_pk_callback)
-                    conn->dht_pk_callback(conn->dht_pk_callback_object, conn->dht_pk_callback_number, n_c.dht_public_key);
+                crypto_connection_add_source(c, crypt_connection_id, source);
 
-                ret = 0;
+                if (create_send_handshake(c, crypt_connection_id, n_c.cookie, n_c.dht_public_key) == 0) {
+                    conn->status = CRYPTO_CONN_NOT_CONFIRMED;
+                    ret = 0;
+                }
             }
-        }
 
-        free(n_c.cookie);
-        return ret;
+            free(n_c.cookie);
+            return ret;
+        }
     }
 
     int ret = c->new_connection_callback(c->new_connection_callback_object, &n_c);
@@ -1583,9 +1541,16 @@ int accept_crypto_connection(Net_Crypto *c, New_Connection *n_c)
     if (crypt_connection_id == -1)
         return -1;
 
-    Crypto_Connection *conn = get_crypto_connection(c, crypt_connection_id);
+    Crypto_Connection *conn = &c->crypto_connections[crypt_connection_id];
 
-    if (conn == 0)
+    if (n_c->cookie_length != COOKIE_LENGTH)
+        return -1;
+
+    pthread_mutex_lock(&c->tcp_mutex);
+    conn->connection_number_tcp = new_tcp_connection_to(c->tcp_c, n_c->dht_public_key, crypt_connection_id);
+    pthread_mutex_unlock(&c->tcp_mutex);
+
+    if (conn->connection_number_tcp == -1)
         return -1;
 
     memcpy(conn->public_key, n_c->public_key, crypto_box_PUBLICKEYBYTES);
@@ -1594,16 +1559,17 @@ int accept_crypto_connection(Net_Crypto *c, New_Connection *n_c)
     random_nonce(conn->sent_nonce);
     crypto_box_keypair(conn->sessionpublic_key, conn->sessionsecret_key);
     encrypt_precompute(conn->peersessionpublic_key, conn->sessionsecret_key, conn->shared_key);
+    conn->status = CRYPTO_CONN_NOT_CONFIRMED;
 
-    if (n_c->cookie_length != COOKIE_LENGTH)
-        return -1;
-
-    if (create_send_handshake(c, crypt_connection_id, n_c->cookie, n_c->dht_public_key) != 0)
+    if (create_send_handshake(c, crypt_connection_id, n_c->cookie, n_c->dht_public_key) != 0) {
+        pthread_mutex_lock(&c->tcp_mutex);
+        kill_tcp_connection_to(c->tcp_c, conn->connection_number_tcp);
+        pthread_mutex_unlock(&c->tcp_mutex);
+        conn->status = CRYPTO_CONN_NO_CONNECTION;
         return -1;
+    }
 
-    conn->status = CRYPTO_CONN_NOT_CONFIRMED;
-    /* Status needs to be CRYPTO_CONN_NOT_CONFIRMED for this to work. */
-    set_connection_dht_public_key(c, crypt_connection_id, n_c->dht_public_key);
+    memcpy(conn->dht_public_key, n_c->dht_public_key, crypto_box_PUBLICKEYBYTES);
     conn->packet_send_rate = CRYPTO_PACKET_MIN_RATE;
     conn->packets_left = CRYPTO_MIN_QUEUE_LENGTH;
     crypto_connection_add_source(c, crypt_connection_id, n_c->source);
@@ -1616,7 +1582,7 @@ int accept_crypto_connection(Net_Crypto *c, New_Connection *n_c)
  * return -1 on failure.
  * return connection id on success.
  */
-int new_crypto_connection(Net_Crypto *c, const uint8_t *real_public_key)
+int new_crypto_connection(Net_Crypto *c, const uint8_t *real_public_key, const uint8_t *dht_public_key)
 {
     int crypt_connection_id = getcryptconnection_id(c, real_public_key);
 
@@ -1628,149 +1594,40 @@ int new_crypto_connection(Net_Crypto *c, const uint8_t *real_public_key)
     if (crypt_connection_id == -1)
         return -1;
 
-    Crypto_Connection *conn = get_crypto_connection(c, crypt_connection_id);
+    Crypto_Connection *conn = &c->crypto_connections[crypt_connection_id];
 
     if (conn == 0)
         return -1;
 
+    pthread_mutex_lock(&c->tcp_mutex);
+    conn->connection_number_tcp = new_tcp_connection_to(c->tcp_c, dht_public_key, crypt_connection_id);
+    pthread_mutex_unlock(&c->tcp_mutex);
+
+    if (conn->connection_number_tcp == -1)
+        return -1;
+
     memcpy(conn->public_key, real_public_key, crypto_box_PUBLICKEYBYTES);
     random_nonce(conn->sent_nonce);
     crypto_box_keypair(conn->sessionpublic_key, conn->sessionsecret_key);
     conn->status = CRYPTO_CONN_COOKIE_REQUESTING;
     conn->packet_send_rate = CRYPTO_PACKET_MIN_RATE;
     conn->packets_left = CRYPTO_MIN_QUEUE_LENGTH;
-    return crypt_connection_id;
-}
-
-/* Set the status for the TCP connection for conn in location to status.
- */
-static void set_conn_tcp_status(Crypto_Connection *conn, unsigned int location, unsigned int status)
-{
-    if (conn->status_tcp[location] == status) {
-        return;
-    }
-
-    if (conn->status_tcp[location] == STATUS_TCP_ONLINE) {
-        --conn->num_tcp_online;
-    }
-
-    if (status == STATUS_TCP_ONLINE) {
-        ++conn->num_tcp_online;
-    }
-
-    conn->status_tcp[location] = status;
-}
-
-/* Disconnect peer from all associated TCP connections.
- *
- * return -1 on failure.
- * return 0 on success.
- */
-static int disconnect_peer_tcp(Net_Crypto *c, int crypt_connection_id)
-{
-    Crypto_Connection *conn = get_crypto_connection(c, crypt_connection_id);
-
-    if (conn == 0)
-        return -1;
-
-    uint32_t i;
-
-    for (i = 0; i < MAX_TCP_CONNECTIONS; ++i) {
-        if (conn->status_tcp[i] != STATUS_TCP_NULL) {
-            pthread_mutex_lock(&c->tcp_mutex);
-            send_disconnect_request(c->tcp_connections[i], conn->con_number_tcp[i]);
-            set_conn_tcp_status(conn, i, STATUS_TCP_NULL);
-            conn->con_number_tcp[i] = 0;
-            pthread_mutex_unlock(&c->tcp_mutex);
-        }
-    }
-
-    return 0;
-}
-
-/* Connect peer to all associated TCP connections.
- *
- * return -1 on failure.
- * return 0 on success.
- */
-static int connect_peer_tcp(Net_Crypto *c, int crypt_connection_id)
-{
-    Crypto_Connection *conn = get_crypto_connection(c, crypt_connection_id);
-
-    if (conn == 0)
-        return -1;
-
-    uint32_t i;
+    memcpy(conn->dht_public_key, dht_public_key, crypto_box_PUBLICKEYBYTES);
 
-    for (i = 0; i < MAX_TCP_CONNECTIONS; ++i) {
-        if (c->tcp_connections[i] == NULL)
-            continue;
+    conn->cookie_request_number = random_64b();
+    uint8_t cookie_request[COOKIE_REQUEST_LENGTH];
 
+    if (create_cookie_request(c, cookie_request, conn->dht_public_key, conn->cookie_request_number,
+                              conn->shared_key) != sizeof(cookie_request)
+            || new_temp_packet(c, crypt_connection_id, cookie_request, sizeof(cookie_request)) != 0) {
         pthread_mutex_lock(&c->tcp_mutex);
-        //TODO check function return?
-        send_routing_request(c->tcp_connections[i], conn->dht_public_key);
+        kill_tcp_connection_to(c->tcp_c, conn->connection_number_tcp);
         pthread_mutex_unlock(&c->tcp_mutex);
-    }
-
-    return 0;
-}
-
-/* Copy friends DHT public key into dht_key.
- *
- * return 0 on failure (no key copied).
- * return 1 on success (key copied).
- */
-unsigned int get_connection_dht_key(const Net_Crypto *c, int crypt_connection_id, uint8_t *dht_public_key)
-{
-    Crypto_Connection *conn = get_crypto_connection(c, crypt_connection_id);
-
-    if (conn == 0)
-        return 0;
-
-    if (conn->dht_public_key_set == 0)
-        return 0;
-
-    memcpy(dht_public_key, conn->dht_public_key, crypto_box_PUBLICKEYBYTES);
-    return 1;
-}
-
-
-/* Set the DHT public key of the crypto connection.
- *
- * return -1 on failure.
- * return 0 on success.
- */
-int set_connection_dht_public_key(Net_Crypto *c, int crypt_connection_id, const uint8_t *dht_public_key)
-{
-    Crypto_Connection *conn = get_crypto_connection(c, crypt_connection_id);
-
-    if (conn == 0)
-        return -1;
-
-    if (conn->dht_public_key_set == 1 && memcmp(conn->dht_public_key, dht_public_key, crypto_box_PUBLICKEYBYTES) == 0)
+        conn->status = CRYPTO_CONN_NO_CONNECTION;
         return -1;
-
-    if (conn->dht_public_key_set == 1) {
-        disconnect_peer_tcp(c, crypt_connection_id);
     }
 
-    memcpy(conn->dht_public_key, dht_public_key, crypto_box_PUBLICKEYBYTES);
-    conn->dht_public_key_set = 1;
-
-    if (conn->status == CRYPTO_CONN_COOKIE_REQUESTING) {
-        conn->cookie_request_number = random_64b();
-        uint8_t cookie_request[COOKIE_REQUEST_LENGTH];
-
-        if (create_cookie_request(c, cookie_request, conn->dht_public_key, conn->cookie_request_number,
-                                  conn->shared_key) != sizeof(cookie_request))
-            return -1;
-
-        if (new_temp_packet(c, crypt_connection_id, cookie_request, sizeof(cookie_request)) != 0)
-            return -1;
-    }//TODO
-
-    connect_peer_tcp(c, crypt_connection_id);
-    return 0;
+    return crypt_connection_id;
 }
 
 /* Set the direct ip of the crypto connection.
@@ -1789,8 +1646,13 @@ int set_direct_ip_port(Net_Crypto *c, int crypt_connection_id, IP_Port ip_port)
         return -1;
 
     if (!ipport_equal(&ip_port, &conn->ip_port)) {
-        if ((UDP_DIRECT_TIMEOUT + conn->direct_lastrecv_time) > current_time_monotonic()) {
-            if (LAN_ip(ip_port.ip) == 0 && LAN_ip(conn->ip_port.ip) == 0 && conn->ip_port.port == ip_port.port)
+        if ((UDP_DIRECT_TIMEOUT + conn->direct_lastrecv_time) > unix_time()) {
+            /* We already know a LAN ip, no need to switch. */
+            if (LAN_ip(conn->ip_port.ip) == 0)
+                return -1;
+
+            /* Prefer ipv6. */
+            if (conn->ip_port.ip.family == AF_INET6 && ip_port.ip.family == AF_INET)
                 return -1;
         }
 
@@ -1805,93 +1667,25 @@ int set_direct_ip_port(Net_Crypto *c, int crypt_connection_id, IP_Port ip_port)
     return -1;
 }
 
-static int tcp_response_callback(void *object, uint8_t connection_id, const uint8_t *public_key)
-{
-    TCP_Client_Connection *TCP_con = object;
-    Net_Crypto *c = TCP_con->net_crypto_pointer;
-
-    int crypt_connection_id = getcryptconnection_id_dht_pubkey(c, public_key);
-
-    if (crypt_connection_id == -1)
-        return -1;
-
-    set_tcp_connection_number(TCP_con, connection_id, crypt_connection_id);
-
-    Crypto_Connection *conn = get_crypto_connection(c, crypt_connection_id);
-
-    if (conn == 0)
-        return -1;
 
-    uint32_t location = TCP_con->net_crypto_location;
-
-    if (location >= MAX_TCP_CONNECTIONS)
-        return -1;
-
-    if (c->tcp_connections[location] != TCP_con)
-        return -1;
-
-    conn->con_number_tcp[location] = connection_id;
-    uint32_t i;
-
-    for (i = 0; i < conn->num_tcp_relays; ++i) {
-        if (memcmp(TCP_con->public_key, conn->tcp_relays[i].public_key, crypto_box_PUBLICKEYBYTES) == 0) {
-            set_conn_tcp_status(conn, location, STATUS_TCP_INVISIBLE);
-            return 0;
-        }
-    }
-
-    set_conn_tcp_status(conn, location, STATUS_TCP_OFFLINE);
-    return 0;
-}
-
-static int tcp_status_callback(void *object, uint32_t number, uint8_t connection_id, uint8_t status)
+static int tcp_data_callback(void *object, int id, const uint8_t *data, uint16_t length)
 {
-    TCP_Client_Connection *TCP_con = object;
-    Net_Crypto *c = TCP_con->net_crypto_pointer;
-
-    Crypto_Connection *conn = get_crypto_connection(c, number);
-
-    if (conn == 0)
-        return -1;
-
-    uint32_t location = TCP_con->net_crypto_location;
-
-    if (location >= MAX_TCP_CONNECTIONS)
-        return -1;
-
-    if (c->tcp_connections[location] != TCP_con)
+    if (length == 0 || length > MAX_CRYPTO_PACKET_SIZE)
         return -1;
 
-    if (status == 1) {
-        set_conn_tcp_status(conn, location, STATUS_TCP_OFFLINE);
-    } else if (status == 2) {
-        set_conn_tcp_status(conn, location, STATUS_TCP_ONLINE);
-    }
-
-    conn->con_number_tcp[location] = connection_id;
-    return 0;
-}
+    Net_Crypto *c = object;
 
-static int tcp_data_callback(void *object, uint32_t number, uint8_t connection_id, const uint8_t *data, uint16_t length)
-{
+    Crypto_Connection *conn = get_crypto_connection(c, id);
 
-    if (length == 0)
+    if (conn == 0)
         return -1;
 
-    TCP_Client_Connection *TCP_con = object;
-    Net_Crypto *c = TCP_con->net_crypto_pointer;
-
     if (data[0] == NET_PACKET_COOKIE_REQUEST) {
-        return tcp_handle_cookie_request(c, TCP_con, connection_id, data, length);
+        return tcp_handle_cookie_request(c, conn->connection_number_tcp, data, length);
     }
 
-    Crypto_Connection *conn = get_crypto_connection(c, number);
-
-    if (conn == 0)
-        return -1;
-
     pthread_mutex_unlock(&c->tcp_mutex);
-    int ret = handle_packet_connection(c, number, data, length);
+    int ret = handle_packet_connection(c, id, data, length);
     pthread_mutex_lock(&c->tcp_mutex);
 
     if (ret != 0)
@@ -1901,92 +1695,29 @@ static int tcp_data_callback(void *object, uint32_t number, uint8_t connection_i
     return 0;
 }
 
-static int tcp_oob_callback(void *object, const uint8_t *public_key, const uint8_t *data, uint16_t length)
+static int tcp_oob_callback(void *object, const uint8_t *public_key, unsigned int tcp_connections_number,
+                            const uint8_t *data, uint16_t length)
 {
     if (length == 0 || length > MAX_CRYPTO_PACKET_SIZE)
         return -1;
 
-    TCP_Client_Connection *TCP_con = object;
-    Net_Crypto *c = TCP_con->net_crypto_pointer;
-    uint32_t location = TCP_con->net_crypto_location;
+    Net_Crypto *c = object;
 
     if (data[0] == NET_PACKET_COOKIE_REQUEST) {
-        return tcp_oob_handle_cookie_request(c, TCP_con, public_key, data, length);
-    }
-
-    int crypt_connection_id = getcryptconnection_id_dht_pubkey(c, public_key);
-
-    if (crypt_connection_id == -1) {
+        return tcp_oob_handle_cookie_request(c, tcp_connections_number, public_key, data, length);
+    } else if (data[0] == NET_PACKET_CRYPTO_HS) {
         IP_Port source;
         source.port = 0;
         source.ip.family = TCP_FAMILY;
-        source.ip.ip6.uint32[0] = location;
-
-        if (data[0] != NET_PACKET_CRYPTO_HS) {
-            LOGGER_DEBUG("tcp snhappen %u\n", data[0]);
-            return -1;
-        }
+        source.ip.ip6.uint32[0] = tcp_connections_number;
 
         if (handle_new_connection_handshake(c, source, data, length) != 0)
             return -1;
 
         return 0;
-    }
-
-    pthread_mutex_unlock(&c->tcp_mutex);
-    int ret = handle_packet_connection(c, crypt_connection_id, data, length);
-    pthread_mutex_lock(&c->tcp_mutex);
-
-    if (ret != 0)
+    } else {
         return -1;
-
-    return 0;
-}
-
-static int tcp_onion_callback(void *object, const uint8_t *data, uint16_t length)
-{
-    Net_Crypto *c = object;
-
-    if (c->tcp_onion_callback)
-        return c->tcp_onion_callback(c->tcp_onion_callback_object, data, length);
-
-    return 1;
-}
-
-
-/* Check if tcp connection to public key can be created.
- *
- * return -1 if it can't.
- * return 0 if it can.
- */
-static int tcp_connection_check(const Net_Crypto *c, const uint8_t *public_key)
-{
-    uint32_t i;
-
-    for (i = 0; i < MAX_TCP_CONNECTIONS; ++i) {
-        if (c->tcp_connections_new[i] == NULL)
-            continue;
-
-        if (memcmp(c->tcp_connections_new[i]->public_key, public_key, crypto_box_PUBLICKEYBYTES) == 0)
-            return -1;
-    }
-
-    uint32_t num = 0;
-
-    for (i = 0; i < MAX_TCP_CONNECTIONS; ++i) {
-        if (c->tcp_connections[i] == NULL)
-            continue;
-
-        if (memcmp(c->tcp_connections[i]->public_key, public_key, crypto_box_PUBLICKEYBYTES) == 0)
-            return -1;
-
-        ++num;
     }
-
-    if (num == MAX_TCP_CONNECTIONS)
-        return -1;
-
-    return 0;
 }
 
 /* Add a tcp relay, associating it to a crypt_connection_id.
@@ -2001,45 +1732,10 @@ int add_tcp_relay_peer(Net_Crypto *c, int crypt_connection_id, IP_Port ip_port,
     if (conn == 0)
         return -1;
 
-    if (ip_port.ip.family == TCP_INET) {
-        ip_port.ip.family = AF_INET;
-    } else if (ip_port.ip.family == TCP_INET6) {
-        ip_port.ip.family = AF_INET6;
-    }
-
-    if (ip_port.ip.family != AF_INET && ip_port.ip.family != AF_INET6)
-        return -1;
-
-    uint32_t i;
-
-    for (i = 0; i < conn->num_tcp_relays; ++i) {
-        if (memcmp(conn->tcp_relays[i].public_key, public_key, crypto_box_PUBLICKEYBYTES) == 0) {
-            conn->tcp_relays[i].ip_port = ip_port;
-            return 0;
-        }
-    }
-
-    if (conn->num_tcp_relays == MAX_TCP_RELAYS_PEER) {
-        uint16_t index = rand() % MAX_TCP_RELAYS_PEER;
-        conn->tcp_relays[index].ip_port = ip_port;
-        memcpy(conn->tcp_relays[index].public_key, public_key, crypto_box_PUBLICKEYBYTES);
-    } else {
-        conn->tcp_relays[conn->num_tcp_relays].ip_port = ip_port;
-        memcpy(conn->tcp_relays[conn->num_tcp_relays].public_key, public_key, crypto_box_PUBLICKEYBYTES);
-        ++conn->num_tcp_relays;
-    }
-
-    for (i = 0; i < MAX_TCP_CONNECTIONS; ++i) {
-        if (c->tcp_connections[i] == NULL)
-            continue;
-
-        if (memcmp(c->tcp_connections[i]->public_key, public_key, crypto_box_PUBLICKEYBYTES) == 0) {
-            if (conn->status_tcp[i] == STATUS_TCP_OFFLINE)
-                set_conn_tcp_status(conn, i, STATUS_TCP_INVISIBLE);
-        }
-    }
-
-    return add_tcp_relay(c, ip_port, public_key);
+    pthread_mutex_lock(&c->tcp_mutex);
+    int ret = add_tcp_relay_connection(c->tcp_c, conn->connection_number_tcp, ip_port, public_key);
+    pthread_mutex_unlock(&c->tcp_mutex);
+    return ret;
 }
 
 /* Add a tcp relay to the array.
@@ -2049,30 +1745,10 @@ int add_tcp_relay_peer(Net_Crypto *c, int crypt_connection_id, IP_Port ip_port,
  */
 int add_tcp_relay(Net_Crypto *c, IP_Port ip_port, const uint8_t *public_key)
 {
-    if (ip_port.ip.family == TCP_INET) {
-        ip_port.ip.family = AF_INET;
-    } else if (ip_port.ip.family == TCP_INET6) {
-        ip_port.ip.family = AF_INET6;
-    }
-
-    if (ip_port.ip.family != AF_INET && ip_port.ip.family != AF_INET6)
-        return -1;
-
-    if (tcp_connection_check(c, public_key) != 0)
-        return -1;
-
-    uint32_t i;
-
-    for (i = 0; i < MAX_TCP_CONNECTIONS; ++i) {
-        if (c->tcp_connections_new[i] == NULL) {
-            c->tcp_connections_new[i] = new_TCP_connection(ip_port, public_key, c->dht->self_public_key, c->dht->self_secret_key,
-                                        &c->proxy_info);
-
-            return 0;
-        }
-    }
-
-    return -1;
+    pthread_mutex_lock(&c->tcp_mutex);
+    int ret = add_tcp_relay_global(c->tcp_c, ip_port, public_key);
+    pthread_mutex_unlock(&c->tcp_mutex);
+    return ret;
 }
 
 /* Return a random TCP connection number for use in send_tcp_onion_request.
@@ -2085,47 +1761,25 @@ int add_tcp_relay(Net_Crypto *c, IP_Port ip_port, const uint8_t *public_key)
  */
 int get_random_tcp_con_number(Net_Crypto *c)
 {
-    unsigned int i, r = rand();
-
-    for (i = 0; i < MAX_TCP_CONNECTIONS; ++i) {
-        if (c->tcp_connections[(i + r) % MAX_TCP_CONNECTIONS]) {
-            return (i + r) % MAX_TCP_CONNECTIONS;
-        }
-    }
+    pthread_mutex_lock(&c->tcp_mutex);
+    int ret = get_random_tcp_onion_conn_number(c->tcp_c);
+    pthread_mutex_unlock(&c->tcp_mutex);
 
-    return -1;
+    return ret;
 }
 
-/* Send an onion packet via the TCP relay corresponding to TCP_conn_number.
+/* Send an onion packet via the TCP relay corresponding to tcp_connections_number.
  *
  * return 0 on success.
  * return -1 on failure.
  */
-int send_tcp_onion_request(Net_Crypto *c, unsigned int TCP_conn_number, const uint8_t *data, uint16_t length)
+int send_tcp_onion_request(Net_Crypto *c, unsigned int tcp_connections_number, const uint8_t *data, uint16_t length)
 {
-    if (TCP_conn_number > MAX_TCP_CONNECTIONS) {
-        return -1;
-    }
-
-    if (c->tcp_connections[TCP_conn_number]) {
-        pthread_mutex_lock(&c->tcp_mutex);
-        int ret = send_onion_request(c->tcp_connections[TCP_conn_number], data, length);
-        pthread_mutex_unlock(&c->tcp_mutex);
-
-        if (ret == 1)
-            return 0;
-    }
-
-    return -1;
-}
+    pthread_mutex_lock(&c->tcp_mutex);
+    int ret = tcp_send_onion_request(c->tcp_c, tcp_connections_number, data, length);
+    pthread_mutex_unlock(&c->tcp_mutex);
 
-/* Set the function to be called when an onion response packet is received by one of the TCP connections.
- */
-void tcp_onion_response_handler(Net_Crypto *c, int (*tcp_onion_callback)(void *object, const uint8_t *data,
-                                uint16_t length), void *object)
-{
-    c->tcp_onion_callback = tcp_onion_callback;
-    c->tcp_onion_callback_object = object;
+    return ret;
 }
 
 /* Copy a maximum of num TCP relays we are connected to to tcp_relays.
@@ -2134,173 +1788,47 @@ void tcp_onion_response_handler(Net_Crypto *c, int (*tcp_onion_callback)(void *o
  * return number of relays copied to tcp_relays on success.
  * return 0 on failure.
  */
-unsigned int copy_connected_tcp_relays(const Net_Crypto *c, Node_format *tcp_relays, uint16_t num)
+unsigned int copy_connected_tcp_relays(Net_Crypto *c, Node_format *tcp_relays, uint16_t num)
 {
     if (num == 0)
         return 0;
 
-    uint32_t i;
-    uint16_t copied = 0;
-
-    for (i = 0; i < MAX_TCP_CONNECTIONS; ++i) {
-        if (c->tcp_connections[i] != NULL) {
-            memcpy(tcp_relays[copied].public_key, c->tcp_connections[i]->public_key, crypto_box_PUBLICKEYBYTES);
-            tcp_relays[copied].ip_port = c->tcp_connections[i]->ip_port;
-
-            if (tcp_relays[copied].ip_port.ip.family == AF_INET) {
-                tcp_relays[copied].ip_port.ip.family = TCP_INET;
-            } else if (tcp_relays[copied].ip_port.ip.family == AF_INET6) {
-                tcp_relays[copied].ip_port.ip.family = TCP_INET6;
-            }
-
-            ++copied;
-
-            if (copied == num)
-                return copied;
-        }
-    }
+    pthread_mutex_lock(&c->tcp_mutex);
+    unsigned int ret = tcp_copy_connected_relays(c->tcp_c, tcp_relays, num);
+    pthread_mutex_unlock(&c->tcp_mutex);
 
-    return copied;
+    return ret;
 }
 
-/* Add a connected tcp connection to the tcp_connections array.
- *
- * return 0 if it was added.
- * return -1 if it wasn't.
- */
-static int add_tcp_connected(Net_Crypto *c, TCP_Client_Connection *tcp_con)
+static void do_tcp(Net_Crypto *c)
 {
-    uint32_t i;
-
-    for (i = 0; i < MAX_TCP_CONNECTIONS; ++i) {
-        if (c->tcp_connections[i] == NULL)
-            break;
-    }
-
-    if (i == MAX_TCP_CONNECTIONS)
-        return -1;
+    pthread_mutex_lock(&c->tcp_mutex);
+    do_tcp_connections(c->tcp_c);
+    pthread_mutex_unlock(&c->tcp_mutex);
 
-    uint32_t tcp_num = i;
+    uint32_t i;
 
     for (i = 0; i < c->crypto_connections_length; ++i) {
         Crypto_Connection *conn = get_crypto_connection(c, i);
 
         if (conn == 0)
-            return -1;
-
-        if (conn->status == CRYPTO_CONN_NO_CONNECTION)
-            continue;
-
-        if (conn->status == CRYPTO_CONN_TIMED_OUT)
-            continue;
-
-        if (conn->dht_public_key_set)
-            if (send_routing_request(tcp_con, conn->dht_public_key) != 1)
-                return -1;
-
-    }
-
-    tcp_con->net_crypto_pointer = c;
-    tcp_con->net_crypto_location = tcp_num;
-    routing_response_handler(tcp_con, tcp_response_callback, tcp_con);
-    routing_status_handler(tcp_con, tcp_status_callback, tcp_con);
-    routing_data_handler(tcp_con, tcp_data_callback, tcp_con);
-    oob_data_handler(tcp_con, tcp_oob_callback, tcp_con);
-    onion_response_handler(tcp_con, tcp_onion_callback, c);
-    c->tcp_connections[tcp_num] = tcp_con;
-    return 0;
-}
-
-static void do_tcp(Net_Crypto *c)
-{
-    uint32_t i;
-
-    for (i = 0; i < MAX_TCP_CONNECTIONS; ++i) {
-        if (c->tcp_connections_new[i] == NULL)
-            continue;
-
-        pthread_mutex_lock(&c->tcp_mutex);
-        do_TCP_connection(c->tcp_connections_new[i]);
-        pthread_mutex_unlock(&c->tcp_mutex);
+            return;
 
-        if (c->tcp_connections_new[i]->status == TCP_CLIENT_CONFIRMED) {
-            pthread_mutex_lock(&c->tcp_mutex);
-            int ret = add_tcp_connected(c, c->tcp_connections_new[i]);
-            pthread_mutex_unlock(&c->tcp_mutex);
+        if (conn->status == CRYPTO_CONN_ESTABLISHED) {
+            _Bool direct_connected = 0;
+            crypto_connection_status(c, i, &direct_connected, NULL);
 
-            if (ret == 0) {
-                c->tcp_connections_new[i] = NULL;
+            if (direct_connected) {
+                pthread_mutex_lock(&c->tcp_mutex);
+                set_tcp_connection_to_status(c->tcp_c, conn->connection_number_tcp, 0);
+                pthread_mutex_unlock(&c->tcp_mutex);
             } else {
-                kill_TCP_connection(c->tcp_connections_new[i]);
-                c->tcp_connections_new[i] = NULL;
+                pthread_mutex_lock(&c->tcp_mutex);
+                set_tcp_connection_to_status(c->tcp_c, conn->connection_number_tcp, 1);
+                pthread_mutex_unlock(&c->tcp_mutex);
             }
         }
     }
-
-    for (i = 0; i < MAX_TCP_CONNECTIONS; ++i) {
-        if (c->tcp_connections[i] == NULL)
-            continue;
-
-        pthread_mutex_lock(&c->tcp_mutex);
-        do_TCP_connection(c->tcp_connections[i]);
-        pthread_mutex_unlock(&c->tcp_mutex);
-    }
-}
-
-static void clear_disconnected_tcp_peer(Crypto_Connection *conn, uint32_t number)
-{
-    if (conn->status == CRYPTO_CONN_NO_CONNECTION)
-        return;
-
-    if (number >= MAX_TCP_CONNECTIONS)
-        return;
-
-    set_conn_tcp_status(conn, number, STATUS_TCP_NULL);
-    conn->con_number_tcp[number] = 0;
-}
-
-static void clear_disconnected_tcp(Net_Crypto *c)
-{
-    uint32_t i, j;
-
-    for (i = 0; i < MAX_TCP_CONNECTIONS; ++i) {
-        if (c->tcp_connections_new[i] == NULL)
-            continue;
-
-        if (c->tcp_connections_new[i]->status != TCP_CLIENT_DISCONNECTED)
-            continue;
-
-        kill_TCP_connection(c->tcp_connections_new[i]);
-        c->tcp_connections_new[i] = NULL;
-    }
-
-    for (i = 0; i < MAX_TCP_CONNECTIONS; ++i) {
-        if (c->tcp_connections[i] == NULL)
-            continue;
-
-        TCP_Client_Connection *tcp_con = c->tcp_connections[i];
-
-        if (tcp_con->status != TCP_CLIENT_DISCONNECTED)
-            continue;
-
-        /* Try reconnecting to relay on disconnect. */
-        add_tcp_relay(c, tcp_con->ip_port, tcp_con->public_key);
-
-        pthread_mutex_lock(&c->tcp_mutex);
-        c->tcp_connections[i] = NULL;
-        kill_TCP_connection(tcp_con);
-
-        for (j = 0; j < c->crypto_connections_length; ++j) {
-            Crypto_Connection *conn = get_crypto_connection(c, j);
-
-            if (conn == 0)
-                continue;
-
-            clear_disconnected_tcp_peer(conn, i);
-        }
-
-        pthread_mutex_unlock(&c->tcp_mutex);
-    }
 }
 
 /* Set function to be called when connection with crypt_connection_id goes connects/disconnects.
@@ -2372,8 +1900,10 @@ int connection_lossy_data_handler(Net_Crypto *c, int crypt_connection_id,
 }
 
 
-/* Set the function for this friend that will be callbacked with object and number
- * when that friend gives us his DHT temporary public key.
+/* Set the function for this friend that will be callbacked with object and number if
+ * the friend sends us a different dht public key than we have associated to him.
+ *
+ * If this function is called, the connection should be recreated with the new public key.
  *
  * object and number will be passed as argument to this function.
  *
@@ -2441,7 +1971,7 @@ static int udp_handle_packet(void *object, IP_Port source, const uint8_t *packet
         return -1;
 
     pthread_mutex_lock(&conn->mutex);
-    conn->direct_lastrecv_time = current_time_monotonic();
+    conn->direct_lastrecv_time = unix_time();
     pthread_mutex_unlock(&conn->mutex);
     return 0;
 }
@@ -2746,7 +2276,10 @@ int crypto_kill(Net_Crypto *c, int crypt_connection_id)
         if (conn->status == CRYPTO_CONN_ESTABLISHED)
             send_kill_packet(c, crypt_connection_id);
 
-        disconnect_peer_tcp(c, crypt_connection_id);
+        pthread_mutex_lock(&c->tcp_mutex);
+        kill_tcp_connection_to(c->tcp_c, conn->connection_number_tcp);
+        pthread_mutex_unlock(&c->tcp_mutex);
+
         bs_list_remove(&c->ip_port_list, &conn->ip_port, crypt_connection_id);
         clear_temp_packet(c, crypt_connection_id);
         clear_buffer(&conn->send_array);
@@ -2762,18 +2295,26 @@ int crypto_kill(Net_Crypto *c, int crypt_connection_id)
 /* return one of CRYPTO_CONN_* values indicating the state of the connection.
  *
  * sets direct_connected to 1 if connection connects directly to other, 0 if it isn't.
+ * sets online_tcp_relays to the number of connected tcp relays this connection has.
  */
-unsigned int crypto_connection_status(const Net_Crypto *c, int crypt_connection_id, uint8_t *direct_connected)
+unsigned int crypto_connection_status(const Net_Crypto *c, int crypt_connection_id, _Bool *direct_connected,
+                                      unsigned int *online_tcp_relays)
 {
     Crypto_Connection *conn = get_crypto_connection(c, crypt_connection_id);
 
     if (conn == 0)
         return CRYPTO_CONN_NO_CONNECTION;
 
-    *direct_connected = 0;
+    if (direct_connected) {
+        *direct_connected = 0;
 
-    if ((UDP_DIRECT_TIMEOUT + conn->direct_lastrecv_time) > current_time_monotonic())
-        *direct_connected = 1;
+        if ((UDP_DIRECT_TIMEOUT + conn->direct_lastrecv_time) > unix_time())
+            *direct_connected = 1;
+    }
+
+    if (online_tcp_relays) {
+        *online_tcp_relays = tcp_connection_to_online_tcp_relays(c->tcp_c, conn->connection_number_tcp);
+    }
 
     return conn->status;
 }
@@ -2816,8 +2357,19 @@ Net_Crypto *new_net_crypto(DHT *dht, TCP_Proxy_Info *proxy_info)
     if (temp == NULL)
         return NULL;
 
+    temp->tcp_c = new_tcp_connections(dht, proxy_info);
+
+    if (temp->tcp_c == NULL) {
+        free(temp);
+        return NULL;
+    }
+
+    set_packet_tcp_connection_callback(temp->tcp_c, &tcp_data_callback, temp);
+    set_oob_packet_tcp_connection_callback(temp->tcp_c, &tcp_oob_callback, temp);
+
     if (create_recursive_mutex(&temp->tcp_mutex) != 0 ||
             pthread_mutex_init(&temp->connections_mutex, NULL) != 0) {
+        kill_tcp_connections(temp->tcp_c);
         free(temp);
         return NULL;
     }
@@ -2836,8 +2388,6 @@ Net_Crypto *new_net_crypto(DHT *dht, TCP_Proxy_Info *proxy_info)
 
     bs_list_init(&temp->ip_port_list, sizeof(IP_Port), 8);
 
-    temp->proxy_info = *proxy_info;
-
     return temp;
 }
 
@@ -2852,7 +2402,7 @@ static void kill_timedout(Net_Crypto *c)
         if (conn == 0)
             return;
 
-        if (conn->status == CRYPTO_CONN_NO_CONNECTION || conn->status == CRYPTO_CONN_TIMED_OUT)
+        if (conn->status == CRYPTO_CONN_NO_CONNECTION)
             continue;
 
         if (conn->status == CRYPTO_CONN_COOKIE_REQUESTING || conn->status == CRYPTO_CONN_HANDSHAKE_SENT
@@ -2860,19 +2410,8 @@ static void kill_timedout(Net_Crypto *c)
             if (conn->temp_packet_num_sent < MAX_NUM_SENDPACKET_TRIES)
                 continue;
 
-            conn->killed = 1;
-
-        }
-
-        if (conn->killed) {
-            if (conn->connection_status_callback) {
-                conn->connection_status_callback(conn->connection_status_callback_object, conn->connection_status_callback_id, 0);
-                crypto_kill(c, i);
-                continue;
-            }
+            connection_kill(c, i);
 
-            conn->status = CRYPTO_CONN_TIMED_OUT;
-            continue;
         }
 
         if (conn->status == CRYPTO_CONN_ESTABLISHED) {
@@ -2894,7 +2433,6 @@ void do_net_crypto(Net_Crypto *c)
     unix_time_update();
     kill_timedout(c);
     do_tcp(c);
-    clear_disconnected_tcp(c);
     send_crypto_packets(c);
 }
 
@@ -2906,14 +2444,10 @@ void kill_net_crypto(Net_Crypto *c)
         crypto_kill(c, i);
     }
 
-    for (i = 0; i < MAX_TCP_CONNECTIONS; ++i) {
-        kill_TCP_connection(c->tcp_connections_new[i]);
-        kill_TCP_connection(c->tcp_connections[i]);
-    }
-
     pthread_mutex_destroy(&c->tcp_mutex);
     pthread_mutex_destroy(&c->connections_mutex);
 
+    kill_tcp_connections(c->tcp_c);
     bs_list_free(&c->ip_port_list);
     networking_registerhandler(c->dht->net, NET_PACKET_COOKIE_REQUEST, NULL, NULL);
     networking_registerhandler(c->dht->net, NET_PACKET_COOKIE_RESPONSE, NULL, NULL);
diff --git a/toxcore/net_crypto.h b/toxcore/net_crypto.h
index fab72cb3..9eb5e2d3 100644
--- a/toxcore/net_crypto.h
+++ b/toxcore/net_crypto.h
@@ -26,7 +26,7 @@
 
 #include "DHT.h"
 #include "LAN_discovery.h"
-#include "TCP_client.h"
+#include "TCP_connection.h"
 #include <pthread.h>
 
 #define CRYPTO_CONN_NO_CONNECTION 0
@@ -34,7 +34,6 @@
 #define CRYPTO_CONN_HANDSHAKE_SENT 2 //send handshake packets
 #define CRYPTO_CONN_NOT_CONFIRMED 3 //send handshake packets, we have received one from the other
 #define CRYPTO_CONN_ESTABLISHED 4
-#define CRYPTO_CONN_TIMED_OUT 5
 
 /* Maximum size of receiving and sending packet buffers. */
 #define CRYPTO_PACKET_BUFFER_SIZE 16384 /* Must be a power of 2 */
@@ -61,7 +60,7 @@
 #define MAX_NUM_SENDPACKET_TRIES 8
 
 /* The timeout of no received UDP packets before the direct UDP connection is considered dead. */
-#define UDP_DIRECT_TIMEOUT ((MAX_NUM_SENDPACKET_TRIES * CRYPTO_SEND_PACKET_INTERVAL) / 2)
+#define UDP_DIRECT_TIMEOUT ((MAX_NUM_SENDPACKET_TRIES * CRYPTO_SEND_PACKET_INTERVAL) / 1000)
 
 #define PACKET_ID_PADDING 0 /* Denotes padding */
 #define PACKET_ID_REQUEST 1 /* Used to request unreceived packets */
@@ -73,11 +72,6 @@
 #define MAX_TCP_CONNECTIONS 64
 #define MAX_TCP_RELAYS_PEER 4
 
-#define STATUS_TCP_NULL      0
-#define STATUS_TCP_OFFLINE   1
-#define STATUS_TCP_INVISIBLE 2 /* we know the other peer is connected to this relay but he isn't appearing online */
-#define STATUS_TCP_ONLINE    3
-
 /* All packets starting with a byte in this range are considered lossy packets. */
 #define PACKET_ID_LOSSY_RANGE_START 192
 #define PACKET_ID_LOSSY_RANGE_SIZE 63
@@ -112,11 +106,9 @@ typedef struct {
                      * 2 if we are sending handshake packets
                      * 3 if connection is not confirmed yet (we have received a handshake but no data packets yet),
                      * 4 if the connection is established.
-                     * 5 if the connection is timed out.
                      */
     uint64_t cookie_request_number; /* number used in the cookie request packets for this connection */
     uint8_t dht_public_key[crypto_box_PUBLICKEYBYTES]; /* The dht public key of the peer */
-    uint8_t dht_public_key_set; /* True if the dht public key is set, false if it isn't. */
 
     uint8_t *temp_packet; /* Where the cookie request/handshake packet is stored while it is being sent. */
     uint16_t temp_packet_length;
@@ -155,15 +147,8 @@ typedef struct {
     long signed int last_num_packets_sent[CONGESTION_QUEUE_ARRAY_SIZE];
     uint32_t packets_sent;
 
-    uint8_t killed; /* set to 1 to kill the connection. */
-
-    uint8_t status_tcp[MAX_TCP_CONNECTIONS]; /* set to one of STATUS_TCP_* */
-    uint8_t con_number_tcp[MAX_TCP_CONNECTIONS];
-    unsigned int last_relay_sentto;
-    unsigned int num_tcp_online;
-
-    Node_format tcp_relays[MAX_TCP_RELAYS_PEER];
-    uint16_t num_tcp_relays;
+    /* TCP_connection connection_number */
+    unsigned int connection_number_tcp;
 
     uint8_t maximum_speed_reached;
 
@@ -186,10 +171,9 @@ typedef struct {
 
 typedef struct {
     DHT *dht;
+    TCP_Connections *tcp_c;
 
     Crypto_Connection *crypto_connections;
-    TCP_Client_Connection *tcp_connections_new[MAX_TCP_CONNECTIONS];
-    TCP_Client_Connection *tcp_connections[MAX_TCP_CONNECTIONS];
     pthread_mutex_t tcp_mutex;
 
     pthread_mutex_t connections_mutex;
@@ -211,11 +195,6 @@ typedef struct {
     uint32_t current_sleep_time;
 
     BS_LIST ip_port_list;
-
-    int (*tcp_onion_callback)(void *object, const uint8_t *data, uint16_t length);
-    void *tcp_onion_callback_object;
-
-    TCP_Proxy_Info proxy_info;
 } Net_Crypto;
 
 
@@ -241,21 +220,7 @@ int accept_crypto_connection(Net_Crypto *c, New_Connection *n_c);
  * return -1 on failure.
  * return connection id on success.
  */
-int new_crypto_connection(Net_Crypto *c, const uint8_t *real_public_key);
-
-/* Copy friends DHT public key into dht_key.
- *
- * return 0 on failure (no key copied).
- * return 1 on success (key copied).
- */
-unsigned int get_connection_dht_key(const Net_Crypto *c, int crypt_connection_id, uint8_t *dht_public_key);
-
-/* Set the DHT public key of the crypto connection.
- *
- * return -1 on failure.
- * return 0 on success.
- */
-int set_connection_dht_public_key(Net_Crypto *c, int crypt_connection_id, const uint8_t *dht_public_key);
+int new_crypto_connection(Net_Crypto *c, const uint8_t *real_public_key, const uint8_t *dht_public_key);
 
 /* Set the direct ip of the crypto connection.
  *
@@ -301,8 +266,10 @@ int connection_lossy_data_handler(Net_Crypto *c, int crypt_connection_id,
                                   int (*connection_lossy_data_callback)(void *object, int id, const uint8_t *data, uint16_t length), void *object,
                                   int id);
 
-/* Set the function for this friend that will be callbacked with object and number
- * when that friend gives us his DHT temporary public key.
+/* Set the function for this friend that will be callbacked with object and number if
+ * the friend sends us a different dht public key than we have associated to him.
+ *
+ * If this function is called, the connection should be recreated with the new public key.
  *
  * object and number will be passed as argument to this function.
  *
@@ -364,11 +331,6 @@ int add_tcp_relay_peer(Net_Crypto *c, int crypt_connection_id, IP_Port ip_port,
  */
 int add_tcp_relay(Net_Crypto *c, IP_Port ip_port, const uint8_t *public_key);
 
-/* Set the function to be called when an onion response packet is received by one of the TCP connections.
- */
-void tcp_onion_response_handler(Net_Crypto *c, int (*tcp_onion_callback)(void *object, const uint8_t *data,
-                                uint16_t length), void *object);
-
 /* Return a random TCP connection number for use in send_tcp_onion_request.
  *
  * return TCP connection number on success.
@@ -389,7 +351,7 @@ int send_tcp_onion_request(Net_Crypto *c, unsigned int TCP_conn_number, const ui
  * return number of relays copied to tcp_relays on success.
  * return 0 on failure.
  */
-unsigned int copy_connected_tcp_relays(const Net_Crypto *c, Node_format *tcp_relays, uint16_t num);
+unsigned int copy_connected_tcp_relays(Net_Crypto *c, Node_format *tcp_relays, uint16_t num);
 
 /* Kill a crypto connection.
  *
@@ -398,13 +360,13 @@ unsigned int copy_connected_tcp_relays(const Net_Crypto *c, Node_format *tcp_rel
  */
 int crypto_kill(Net_Crypto *c, int crypt_connection_id);
 
-
 /* return one of CRYPTO_CONN_* values indicating the state of the connection.
  *
  * sets direct_connected to 1 if connection connects directly to other, 0 if it isn't.
+ * sets online_tcp_relays to the number of connected tcp relays this connection has.
  */
-unsigned int crypto_connection_status(const Net_Crypto *c, int crypt_connection_id, uint8_t *direct_connected);
-
+unsigned int crypto_connection_status(const Net_Crypto *c, int crypt_connection_id, _Bool *direct_connected,
+                                      unsigned int *online_tcp_relays);
 
 /* Generate our public and private keys.
  *  Only call this function the first time the program starts.
diff --git a/toxcore/onion.c b/toxcore/onion.c
index c6093f0c..48e4c769 100644
--- a/toxcore/onion.c
+++ b/toxcore/onion.c
@@ -35,8 +35,8 @@
 #define SEND_2 ONION_SEND_2
 #define SEND_1 ONION_SEND_1
 
-/* Change symmetric keys every hour to make paths expire eventually. */
-#define KEY_REFRESH_INTERVAL (60 * 60)
+/* Change symmetric keys every 2 hours to make paths expire eventually. */
+#define KEY_REFRESH_INTERVAL (2 * 60 * 60)
 static void change_symmetric_key(Onion *onion)
 {
     if (is_timeout(onion->timestamp, KEY_REFRESH_INTERVAL)) {
diff --git a/toxcore/onion_client.c b/toxcore/onion_client.c
index a9fc1643..ed328fb3 100644
--- a/toxcore/onion_client.c
+++ b/toxcore/onion_client.c
@@ -1425,7 +1425,6 @@ void do_onion_client(Onion_Client *onion_c)
             ++onion_c->onion_connected;
         }
 
-        onion_c->UDP_connected = DHT_non_lan_connected(onion_c->dht);
     } else {
         populate_path_nodes_tcp(onion_c);
 
@@ -1434,12 +1433,22 @@ void do_onion_client(Onion_Client *onion_c)
         }
     }
 
+    onion_c->UDP_connected = DHT_non_lan_connected(onion_c->dht);
+
+    if (is_timeout(onion_c->first_run, ONION_CONNECTION_SECONDS)) {
+        set_tcp_onion_status(onion_c->c->tcp_c, !onion_c->UDP_connected);
+    }
+
     if (onion_connection_status(onion_c)) {
         for (i = 0; i < onion_c->num_friends; ++i) {
             do_friend(onion_c, i);
         }
     }
 
+    if (onion_c->last_run == 0) {
+        onion_c->first_run = unix_time();
+    }
+
     onion_c->last_run = unix_time();
 }
 
@@ -1467,7 +1476,7 @@ Onion_Client *new_onion_client(Net_Crypto *c)
     networking_registerhandler(onion_c->net, NET_PACKET_ONION_DATA_RESPONSE, &handle_data_response, onion_c);
     oniondata_registerhandler(onion_c, ONION_DATA_DHTPK, &handle_dhtpk_announce, onion_c);
     cryptopacket_registerhandler(onion_c->dht, CRYPTO_PACKET_DHTPK, &handle_dht_dhtpk, onion_c);
-    tcp_onion_response_handler(onion_c->c, &handle_tcp_onion, onion_c);
+    set_onion_packet_tcp_connection_callback(onion_c->c->tcp_c, &handle_tcp_onion, onion_c);
 
     return onion_c;
 }
@@ -1483,7 +1492,7 @@ void kill_onion_client(Onion_Client *onion_c)
     networking_registerhandler(onion_c->net, NET_PACKET_ONION_DATA_RESPONSE, NULL, NULL);
     oniondata_registerhandler(onion_c, ONION_DATA_DHTPK, NULL, NULL);
     cryptopacket_registerhandler(onion_c->dht, CRYPTO_PACKET_DHTPK, NULL, NULL);
-    tcp_onion_response_handler(onion_c->c, NULL, NULL);
+    set_onion_packet_tcp_connection_callback(onion_c->c->tcp_c, NULL, NULL);
     memset(onion_c, 0, sizeof(Onion_Client));
     free(onion_c);
 }
diff --git a/toxcore/onion_client.h b/toxcore/onion_client.h
index e10a86c5..ad28ac51 100644
--- a/toxcore/onion_client.h
+++ b/toxcore/onion_client.h
@@ -136,7 +136,7 @@ typedef struct {
     Onion_Client_Paths onion_paths_friends;
 
     uint8_t secret_symmetric_key[crypto_box_KEYBYTES];
-    uint64_t last_run;
+    uint64_t last_run, first_run;
 
     uint8_t temp_public_key[crypto_box_PUBLICKEYBYTES];
     uint8_t temp_secret_key[crypto_box_SECRETKEYBYTES];
diff --git a/toxcore/tox.h b/toxcore/tox.h
index 8e368851..abd2f051 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -67,23 +67,21 @@ extern "C" {
  * 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.
  */
-
 /** \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
+ * 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.
  */
-
 /** \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_iteration loop, sleeping for tox_iteration_interval
+ * 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
@@ -108,12 +106,9 @@ extern "C" {
  * \endcode
  *
  * If any other thread calls tox_self_set_name while this thread is allocating
- * memory, the length will have become invalid, and the call to
+ * memory, the length may have become invalid, and the call to
  * tox_self_get_name may cause undefined behaviour.
  */
-
-#ifndef TOX_DEFINED
-#define TOX_DEFINED
 /**
  * The Tox instance type. All the state associated with a connection is held
  * within the instance. Multiple instances can exist and operate concurrently.
@@ -121,8 +116,10 @@ extern "C" {
  * 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
+#endif /* TOX_DEFINED */
 
 
 /*******************************************************************************
@@ -132,17 +129,20 @@ typedef struct Tox Tox;
  ******************************************************************************/
 
 
+
 /**
  * The major version number. Incremented when the API or ABI changes in an
  * incompatible way.
  */
 #define TOX_VERSION_MAJOR               0u
+
 /**
  * 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               0u
+
 /**
  * The patch or revision number. Incremented when bugfixes are applied without
  * changing any functionality or API or ABI.
@@ -166,7 +166,6 @@ typedef struct Tox Tox;
 #define TOX_VERSION_REQUIRE(MAJOR, MINOR, PATCH)                \
   typedef char tox_required_version[TOX_IS_COMPATIBLE(MAJOR, MINOR, PATCH) ? 1 : -1]
 
-
 /**
  * Return the major version number of the library. Can be used to display the
  * Tox library version or to check whether the client is compatible with the
@@ -205,15 +204,16 @@ bool tox_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch);
  ******************************************************************************/
 
 
+
 /**
  * The size of a Tox Public Key in bytes.
  */
-#define TOX_PUBLIC_KEY_SIZE              32
+#define TOX_PUBLIC_KEY_SIZE            32
 
 /**
  * The size of a Tox Secret Key in bytes.
  */
-#define TOX_SECRET_KEY_SIZE              32
+#define TOX_SECRET_KEY_SIZE            32
 
 /**
  * The size of a Tox address in bytes. Tox addresses are in the format
@@ -223,47 +223,48 @@ bool tox_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch);
  * 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 + sizeof(uint32_t) + sizeof(uint16_t))
+#define TOX_ADDRESS_SIZE               (TOX_PUBLIC_KEY_SIZE + sizeof(uint32_t) + sizeof(uint16_t))
 
 /**
  * Maximum length of a nickname in bytes.
  */
-#define TOX_MAX_NAME_LENGTH             128
+#define TOX_MAX_NAME_LENGTH            128
 
 /**
  * Maximum length of a status message in bytes.
  */
-#define TOX_MAX_STATUS_MESSAGE_LENGTH   1007
+#define TOX_MAX_STATUS_MESSAGE_LENGTH  1007
 
 /**
  * Maximum length of a friend request message in bytes.
  */
-#define TOX_MAX_FRIEND_REQUEST_LENGTH   1016
+#define TOX_MAX_FRIEND_REQUEST_LENGTH  1016
 
 /**
  * Maximum length of a single message after which it should be split.
  */
-#define TOX_MAX_MESSAGE_LENGTH          1372
+#define TOX_MAX_MESSAGE_LENGTH         1372
 
 /**
  * Maximum size of custom packets. TODO: should be LENGTH?
  */
-#define TOX_MAX_CUSTOM_PACKET_SIZE      1373
+#define TOX_MAX_CUSTOM_PACKET_SIZE     1373
 
 /**
  * The number of bytes in a hash generated by tox_hash.
  */
-#define TOX_HASH_LENGTH                 /*crypto_hash_sha256_BYTES*/ 32
+#define TOX_HASH_LENGTH                32
 
 /**
  * The number of bytes in a file id.
  */
-#define TOX_FILE_ID_LENGTH              32
+#define TOX_FILE_ID_LENGTH             32
 
 /**
- * Maximum file name length for file tran.
+ * Maximum file name length for file transfers.
  */
-#define TOX_MAX_FILENAME_LENGTH         255
+#define TOX_MAX_FILENAME_LENGTH        255
+
 
 /*******************************************************************************
  *
@@ -272,42 +273,53 @@ bool tox_version_is_compatible(uint32_t major, uint32_t minor, uint32_t patch);
  ******************************************************************************/
 
 
+
 /**
  * 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_BUSY,
+
 } TOX_USER_STATUS;
 
+
 /**
- * Represents message types for friend messages and group chat
+ * Represents message types for tox_friend_send_message and group chat
  * 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_ACTION,
+
 } TOX_MESSAGE_TYPE;
 
+
+
 /*******************************************************************************
  *
  * :: Startup options
@@ -315,19 +327,27 @@ typedef enum TOX_MESSAGE_TYPE {
  ******************************************************************************/
 
 
+
+/**
+ * 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_SOCKS5,
+
 } TOX_PROXY_TYPE;
 
 
@@ -337,6 +357,7 @@ typedef enum TOX_PROXY_TYPE {
  * tox_options_new to get a new default options object.
  */
 struct Tox_Options {
+
     /**
      * The type of socket to create.
      *
@@ -347,6 +368,7 @@ struct Tox_Options {
      */
     bool ipv6_enabled;
 
+
     /**
      * Enable the use of UDP communication when available.
      *
@@ -356,11 +378,13 @@ struct Tox_Options {
      */
     bool udp_enabled;
 
+
     /**
      * Pass communications through a proxy.
      */
     TOX_PROXY_TYPE proxy_type;
 
+
     /**
      * The IP address or DNS name of the proxy to be used.
      *
@@ -368,18 +392,20 @@ struct Tox_Options {
      * 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_enabled is false.
+     * This member is ignored (it can be NULL) if proxy_type is TOX_PROXY_TYPE_NONE.
      */
     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_enabled is false.
+     * proxy_type is TOX_PROXY_TYPE_NONE.
      */
     uint16_t proxy_port;
 
+
     /**
      * The start port of the inclusive port range to attempt to use.
      *
@@ -394,10 +420,12 @@ struct Tox_Options {
      */
     uint16_t start_port;
 
+
     /**
      * The end port of the inclusive port range to attempt to use.
      */
     uint16_t end_port;
+
 };
 
 
@@ -414,15 +442,21 @@ struct Tox_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_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
@@ -435,7 +469,6 @@ typedef enum TOX_ERR_OPTIONS_NEW {
  */
 struct Tox_Options *tox_options_new(TOX_ERR_OPTIONS_NEW *error);
 
-
 /**
  * Releases all resources associated with an options objects.
  *
@@ -452,41 +485,58 @@ void tox_options_free(struct Tox_Options *options);
  ******************************************************************************/
 
 
+
 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 host passed could not be resolved.
+     * 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.
@@ -494,7 +544,8 @@ typedef enum TOX_ERR_NEW {
      * and the rest is discarded. Passing an invalid length parameter also
      * causes this error.
      */
-    TOX_ERR_NEW_LOAD_BAD_FORMAT
+    TOX_ERR_NEW_LOAD_BAD_FORMAT,
+
 } TOX_ERR_NEW;
 
 
@@ -516,11 +567,10 @@ typedef enum TOX_ERR_NEW {
  * @param length The length of the byte array data. If this parameter is 0, the
  *   data parameter is ignored.
  *
- * @see tox_iteration for the event loop.
+ * @see tox_iterate for the event loop.
  */
 Tox *tox_new(const struct Tox_Options *options, const uint8_t *data, size_t length, TOX_ERR_NEW *error);
 
-
 /**
  * Releases all resources associated with the Tox instance and disconnects from
  * the network.
@@ -530,11 +580,9 @@ Tox *tox_new(const struct Tox_Options *options, const uint8_t *data, size_t leng
  */
 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.
+ * tox_get_savedata. This function cannot fail. The result is always greater than 0.
  *
  * @see threading for concurrency implications.
  */
@@ -547,7 +595,7 @@ size_t tox_get_savedata_size(const Tox *tox);
  *   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 *data);
+void tox_get_savedata(const Tox *tox, uint8_t *savedata);
 
 
 /*******************************************************************************
@@ -557,20 +605,33 @@ void tox_get_savedata(const Tox *tox, uint8_t *data);
  ******************************************************************************/
 
 
+
 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 host could not be resolved to an IP address, or the IP address
+     * 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_BAD_PORT,
+
 } TOX_ERR_BOOTSTRAP;
 
+
 /**
  * Sends a "get nodes" request to the given bootstrap node with IP, port, and
  * public key to setup connections.
@@ -583,15 +644,14 @@ typedef enum TOX_ERR_BOOTSTRAP {
  * also use the TCP connection when NAT hole punching is slow, and later switch
  * to UDP if hole punching succeeds.
  *
- * @param host The hostname or IP address (IPv4 or IPv6) of the node.
+ * @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 *host, uint16_t port, const uint8_t *public_key, TOX_ERR_BOOTSTRAP *error);
-
+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.
@@ -600,35 +660,41 @@ bool tox_bootstrap(Tox *tox, const char *host, uint16_t port, const uint8_t *pub
  * the same bootstrap node, or to add TCP relays without using them as
  * bootstrap nodes.
  *
- * @param host The hostname or IP address (IPv4 or IPv6) of the TCP relay.
+ * @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 *host, uint16_t port, const uint8_t *public_key,
+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_UDP,
+
 } TOX_CONNECTION;
 
 
@@ -639,13 +705,11 @@ typedef enum TOX_CONNECTION {
 TOX_CONNECTION tox_self_get_connection_status(const Tox *tox);
 
 /**
- * The function type for the `self_connection_status` callback.
- *
- * @param connection_status Equal to the return value of
- *   tox_self_get_connection_status.
+ * @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.
  *
@@ -657,16 +721,14 @@ typedef void tox_self_connection_status_cb(Tox *tox, TOX_CONNECTION connection_s
  *
  * TODO: how long should a client wait before bootstrapping again?
  */
-void tox_callback_self_connection_status(Tox *tox, tox_self_connection_status_cb *function, void *user_data);
-
+void tox_callback_self_connection_status(Tox *tox, tox_self_connection_status_cb *callback, void *user_data);
 
 /**
- * Return the time in milliseconds before tox_iteration() should be called again
+ * 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.
@@ -681,6 +743,7 @@ void tox_iterate(Tox *tox);
  ******************************************************************************/
 
 
+
 /**
  * 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,
@@ -692,7 +755,6 @@ void tox_iterate(Tox *tox);
  */
 void tox_self_get_address(const Tox *tox, uint8_t *address);
 
-
 /**
  * Set the 4-byte nospam part of the address.
  *
@@ -706,7 +768,7 @@ void tox_self_set_nospam(Tox *tox, uint32_t nospam);
 uint32_t tox_self_get_nospam(const Tox *tox);
 
 /**
- * Copy the Tox Public Key (long term public key) from the Tox object.
+ * 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.
@@ -714,7 +776,7 @@ uint32_t tox_self_get_nospam(const Tox *tox);
 void tox_self_get_public_key(const Tox *tox, uint8_t *public_key);
 
 /**
- * Copy the secret key from the Tox object.
+ * 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.
@@ -729,17 +791,28 @@ void tox_self_get_secret_key(const Tox *tox, uint8_t *secret_key);
  ******************************************************************************/
 
 
+
 /**
  * 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_TOO_LONG,
+
 } TOX_ERR_SET_INFO;
 
 
@@ -787,11 +860,10 @@ void tox_self_get_name(const Tox *tox, uint8_t *name);
  * 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, size_t length, TOX_ERR_SET_INFO *error);
+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.
+ * 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.
@@ -806,21 +878,20 @@ size_t tox_self_get_status_message_size(const Tox *tox);
  * If no status message was set before calling this function, the status is
  * empty, and this function has no effect.
  *
- * Call tox_self_status_message_size to find out how much memory to allocate for
+ * Call tox_self_get_status_message_size to find out how much memory to allocate for
  * the result.
  *
  * @param status 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);
-
+void tox_self_get_status_message(const Tox *tox, uint8_t *status_message);
 
 /**
  * Set the client's user status.
  *
  * @param user_status One of the user statuses listed in the enumeration above.
  */
-void tox_self_set_status(Tox *tox, TOX_USER_STATUS user_status);
+void tox_self_set_status(Tox *tox, TOX_USER_STATUS status);
 
 /**
  * Returns the client's user status.
@@ -835,42 +906,60 @@ TOX_USER_STATUS tox_self_get_status(const Tox *tox);
  ******************************************************************************/
 
 
+
 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_MALLOC,
+
 } TOX_ERR_FRIEND_ADD;
 
+
 /**
  * Add a friend to the friend list and send a friend request.
  *
@@ -897,7 +986,6 @@ typedef enum TOX_ERR_FRIEND_ADD {
 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.
  *
@@ -918,28 +1006,31 @@ uint32_t tox_friend_add(Tox *tox, const uint8_t *address, const uint8_t *message
  */
 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_FRIEND_NOT_FOUND,
+
 } TOX_ERR_FRIEND_DELETE;
 
+
 /**
  * Remove a friend from the friend list.
- * Other friend numbers are unchanged.
- * The friend_number can be reused by toxcore as a friend number for a new friend.
  *
  * 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.
  *
- * @friend_number Friend number for the friend to be deleted.
+ * @param friend_number Friend number for the friend to be deleted.
  *
  * @return true on success.
- * @see tox_friend_add for detailed description of friend numbers.
  */
 bool tox_friend_delete(Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_DELETE *error);
 
@@ -951,15 +1042,27 @@ bool tox_friend_delete(Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_DELETE *
  ******************************************************************************/
 
 
+
 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_NOT_FOUND,
+
 } TOX_ERR_FRIEND_BY_PUBLIC_KEY;
 
+
 /**
  * Return the friend number associated with that Public Key.
  *
@@ -968,15 +1071,45 @@ typedef enum TOX_ERR_FRIEND_BY_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 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_FRIEND_NOT_FOUND,
+
 } TOX_ERR_FRIEND_GET_PUBLIC_KEY;
 
+
 /**
  * Copies the Public Key associated with a given friend number to a byte array.
  *
@@ -989,21 +1122,21 @@ typedef enum TOX_ERR_FRIEND_GET_PUBLIC_KEY {
 bool tox_friend_get_public_key(const Tox *tox, uint32_t friend_number, uint8_t *public_key,
                                TOX_ERR_FRIEND_GET_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);
-
 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.
@@ -1012,26 +1145,6 @@ typedef enum TOX_ERR_FRIEND_GET_LAST_ONLINE {
  */
 uint64_t tox_friend_get_last_online(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_GET_LAST_ONLINE *error);
 
-/**
- * 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 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 *list);
-
-
 
 /*******************************************************************************
  *
@@ -1040,27 +1153,35 @@ void tox_self_get_friend_list(const Tox *tox, uint32_t *list);
  ******************************************************************************/
 
 
+
 /**
  * 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_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 SIZE_MAX.
+ * return value is unspecified.
  *
  * The return value is equal to the `length` argument received by the last
  * `friend_name` callback.
@@ -1084,8 +1205,6 @@ size_t tox_friend_get_name_size(const Tox *tox, uint32_t friend_number, TOX_ERR_
 bool tox_friend_get_name(const Tox *tox, uint32_t friend_number, uint8_t *name, TOX_ERR_FRIEND_QUERY *error);
 
 /**
- * The function type for the `friend_name` callback.
- *
  * @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.
@@ -1094,13 +1213,13 @@ bool tox_friend_get_name(const Tox *tox, uint32_t friend_number, uint8_t *name,
  */
 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 *function, void *user_data);
-
+void tox_callback_friend_name(Tox *tox, tox_friend_name_cb *callback, void *user_data);
 
 /**
  * Return the length of the friend's status message. If the friend number is
@@ -1112,37 +1231,35 @@ size_t tox_friend_get_status_message_size(const Tox *tox, uint32_t friend_number
  * 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`
+ * Call tox_friend_get_status_message_size to determine the allocation size for the `status_name`
  * parameter.
  *
- * The data written to `message` is equal to the data received by the last
+ * The data written to `status_message` is equal to the data received by the last
  * `friend_status_message` callback.
  *
  * @param name A valid memory region large enough to store the friend's name.
  */
-bool tox_friend_get_status_message(const Tox *tox, uint32_t friend_number, uint8_t *message,
+bool tox_friend_get_status_message(const Tox *tox, uint32_t friend_number, uint8_t *status_message,
                                    TOX_ERR_FRIEND_QUERY *error);
 
 /**
- * The function type for the `friend_status_message` callback.
- *
  * @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 `message` parameter.
+ *   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);
+        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 *function, void *user_data);
-
+void tox_callback_friend_status_message(Tox *tox, tox_friend_status_message_cb *callback, void *user_data);
 
 /**
  * Return the friend's user status (away/busy/...). If the friend number is
@@ -1154,21 +1271,19 @@ void tox_callback_friend_status_message(Tox *tox, tox_friend_status_message_cb *
 TOX_USER_STATUS tox_friend_get_status(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error);
 
 /**
- * The function type for the `friend_status` callback.
- *
  * @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 *function, void *user_data);
-
+void tox_callback_friend_status(Tox *tox, tox_friend_status_cb *callback, void *user_data);
 
 /**
  * Check whether a friend is currently connected to this client.
@@ -1185,28 +1300,25 @@ void tox_callback_friend_status(Tox *tox, tox_friend_status_cb *function, void *
 TOX_CONNECTION tox_friend_get_connection_status(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error);
 
 /**
- * The function type for the `friend_connection_status` callback.
- *
  * @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);
+        void *user_data);
+
 
 /**
- * Set the callback for the `friend_connection_status` event. Pass NULL to
- * unset.
+ * 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 offline.
+ * adding friends, their connection status is initially offline.
  */
-void tox_callback_friend_connection_status(Tox *tox, tox_friend_connection_status_cb *function, void *user_data);
-
+void tox_callback_friend_connection_status(Tox *tox, tox_friend_connection_status_cb *callback, void *user_data);
 
 /**
  * Check whether a friend is currently typing a message.
@@ -1220,8 +1332,6 @@ void tox_callback_friend_connection_status(Tox *tox, tox_friend_connection_statu
 bool tox_friend_get_typing(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEND_QUERY *error);
 
 /**
- * The function type for the `friend_typing` callback.
- *
  * @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
@@ -1229,12 +1339,13 @@ bool tox_friend_get_typing(const Tox *tox, uint32_t friend_number, TOX_ERR_FRIEN
  */
 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 *function, void *user_data);
+void tox_callback_friend_typing(Tox *tox, tox_friend_typing_cb *callback, void *user_data);
 
 
 /*******************************************************************************
@@ -1244,90 +1355,115 @@ void tox_callback_friend_typing(Tox *tox, tox_friend_typing_cb *function, void *
  ******************************************************************************/
 
 
+
 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_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 is_typing The typing status. True means the client is typing.
+ * @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 is_typing, TOX_ERR_SET_TYPING *error);
-
+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_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.
  *
- * Type corresponds to the message type, for a list of valid types see TOX_MESSAGE_TYPE.
- *
  * 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 `read_receipt` event will be passed this message ID.
+ * 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);
 
 /**
- * The function type for the `read_receipt` callback.
- *
  * @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 `read_receipt` event. Pass NULL to unset.
+ * 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 *function, void *user_data);
+void tox_callback_friend_read_receipt(Tox *tox, tox_friend_read_receipt_cb *callback, void *user_data);
 
 
 /*******************************************************************************
@@ -1337,41 +1473,46 @@ void tox_callback_friend_read_receipt(Tox *tox, tox_friend_read_receipt_cb *func
  ******************************************************************************/
 
 
+
 /**
- * The function type for the `friend_request` callback.
- *
  * @param public_key The Public Key of the user who sent the friend request.
+ * @param time_delta A delta in seconds between when the message was composed
+ *   and when it is being transmitted. For messages that are sent immediately,
+ *   it will be 0. If a message was written and couldn't be sent immediately
+ *   (due to a connection failure, for example), the time_delta is an
+ *   approximation of when it was composed.
  * @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 *function, void *user_data);
-
+void tox_callback_friend_request(Tox *tox, tox_friend_request_cb *callback, void *user_data);
 
 /**
- * The function type for the `friend_message` callback.
- *
  * @param friend_number The friend number of the friend who sent the message.
- * @param type The message type, for a list of valid types see TOX_MESSAGE_TYPE.
+ * @param time_delta Time between composition and sending.
  * @param message The message data they sent.
  * @param length The size of the message byte array.
+ *
+ * @see friend_request for more information on time_delta.
  */
 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 *function, void *user_data);
+void tox_callback_friend_message(Tox *tox, tox_friend_message_cb *callback, void *user_data);
 
 
 /*******************************************************************************
@@ -1381,12 +1522,36 @@ void tox_callback_friend_message(Tox *tox, tox_friend_message_cb *function, void
  ******************************************************************************/
 
 
+
+/**
+ * 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 filename. This consists of tox_hash(image).
      * Avatar data. This consists of the image data.
@@ -1404,41 +1569,22 @@ enum TOX_FILE_KIND {
      * 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.
+     * When file_size is set to 0 in the transfer request it means that the client
+     * has no avatar.
      */
-    TOX_FILE_KIND_AVATAR
-};
-
+    TOX_FILE_KIND_AVATAR,
 
-/**
- * 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);
+};
 
 
 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
@@ -1446,47 +1592,62 @@ typedef enum TOX_FILE_CONTROL {
      * 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_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_SENDQ,
+
 } TOX_ERR_FILE_CONTROL;
 
+
 /**
  * Sends a file control command to a friend for a given file transfer.
  *
@@ -1500,10 +1661,7 @@ typedef enum TOX_ERR_FILE_CONTROL {
 bool tox_file_control(Tox *tox, uint32_t friend_number, uint32_t file_number, TOX_FILE_CONTROL control,
                       TOX_ERR_FILE_CONTROL *error);
 
-
 /**
- * The function type for the `file_control` callback.
- *
  * When receiving TOX_FILE_CONTROL_CANCEL, the client should release the
  * resources associated with the file number and consider the transfer failed.
  *
@@ -1515,43 +1673,55 @@ bool tox_file_control(Tox *tox, uint32_t friend_number, uint32_t file_number, TO
 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_control` event. Pass NULL to unset.
+ * 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 *function, void *user_data);
-
+void tox_callback_file_recv_control(Tox *tox, tox_file_recv_control_cb *callback, void *user_data);
 
 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_SENDQ,
+
 } TOX_ERR_FILE_SEEK;
 
+
 /**
  * Sends a file seek control command to a friend for a given file transfer.
  *
@@ -1563,26 +1733,33 @@ typedef enum TOX_ERR_FILE_SEEK {
  * @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);
+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,
+
     /**
      * 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_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.
+ *   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.
@@ -1592,6 +1769,7 @@ typedef enum TOX_ERR_FILE_GET {
 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
@@ -1599,36 +1777,51 @@ bool tox_file_get_file_id(const Tox *tox, uint32_t friend_number, uint32_t file_
  ******************************************************************************/
 
 
+
 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_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.
+ * 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-zero file size is provided, this can be used by both sides to
- * determine the sending progress. File size can be set to zero for streaming
+ * 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
@@ -1642,13 +1835,14 @@ typedef enum TOX_ERR_FILE_SEND {
  * 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.
+ *   - 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
@@ -1676,52 +1870,65 @@ typedef enum TOX_ERR_FILE_SEND {
  *
  * @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
+ *   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_WRONG_POSITION,
+
 } TOX_ERR_FILE_SEND_CHUNK;
 
+
 /**
  * Send a chunk of file data to a friend.
  *
@@ -1741,10 +1948,7 @@ typedef enum TOX_ERR_FILE_SEND_CHUNK {
 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);
 
-
 /**
- * The function type for the `file_chunk_request` callback.
- *
  * 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.
@@ -1769,10 +1973,13 @@ bool tox_file_send_chunk(Tox *tox, uint32_t friend_number, uint32_t file_number,
 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 *function, void *user_data);
+void tox_callback_file_chunk_request(Tox *tox, tox_file_chunk_request_cb *callback, void *user_data);
 
 
 /*******************************************************************************
@@ -1782,12 +1989,8 @@ void tox_callback_file_chunk_request(Tox *tox, tox_file_chunk_request_cb *functi
  ******************************************************************************/
 
 
+
 /**
- * The function type for the `file_receive` callback.
- *
- * Maximum filename length is TOX_MAX_FILENAME_LENGTH bytes. The filename should generally just be
- * a file name, not a path with directory names.
- *
  * 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
@@ -1799,27 +2002,24 @@ void tox_callback_file_chunk_request(Tox *tox, tox_file_chunk_request_cb *functi
  * @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 about to be received from the client,
+ * @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);
+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_receive` event. Pass NULL to unset.
+ * 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 *function, void *user_data);
-
+void tox_callback_file_recv(Tox *tox, tox_file_recv_cb *callback, void *user_data);
 
 /**
- * The function type for the `file_receive_chunk` callback.
- *
- * This function is first called when a file transfer request is received, and
- * subsequently when a chunk of file data for an accepted request was received.
- *
  * 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.
@@ -1838,10 +2038,14 @@ void tox_callback_file_recv(Tox *tox, tox_file_recv_cb *function, void *user_dat
 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_receive_chunk` event. Pass NULL to unset.
+ * 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 *function, void *user_data);
+void tox_callback_file_recv_chunk(Tox *tox, tox_file_recv_chunk_cb *callback, void *user_data);
 
 
 /*******************************************************************************
@@ -1851,13 +2055,16 @@ void tox_callback_file_recv_chunk(Tox *tox, tox_file_recv_chunk_cb *function, vo
  ******************************************************************************/
 
 
-/******************************************************************************
+
+
+/*******************************************************************************
  *
  * :: Group chat message sending and receiving
  *
  ******************************************************************************/
 
-/* See: tox_old.h for now. */
+
+
 
 /*******************************************************************************
  *
@@ -1866,34 +2073,50 @@ void tox_callback_file_recv_chunk(Tox *tox, tox_file_recv_chunk_cb *function, vo
  ******************************************************************************/
 
 
+
 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,
+
     /**
-     * Send queue size exceeded.
+     * Packet queue is full.
      */
-    TOX_ERR_FRIEND_CUSTOM_PACKET_SENDQ
+    TOX_ERR_FRIEND_CUSTOM_PACKET_SENDQ,
+
 } TOX_ERR_FRIEND_CUSTOM_PACKET;
 
 
@@ -1921,22 +2144,6 @@ bool tox_friend_send_lossy_packet(Tox *tox, uint32_t friend_number, const uint8_
                                   TOX_ERR_FRIEND_CUSTOM_PACKET *error);
 
 /**
- * The function type for the `friend_lossy_packet` callback.
- *
- * @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 *function, void *user_data);
-
-
-/**
  * Send a custom lossless packet to a friend.
  *
  * The first byte of data must be in the range 160-191. Maximum length of a
@@ -1956,20 +2163,34 @@ bool tox_friend_send_lossless_packet(Tox *tox, uint32_t friend_number, const uin
                                      TOX_ERR_FRIEND_CUSTOM_PACKET *error);
 
 /**
- * The function type for the `friend_lossless_packet` callback.
+ * @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, void *user_data);
+
+/**
  * @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);
+        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 *function, void *user_data);
-
+void tox_callback_friend_lossless_packet(Tox *tox, tox_friend_lossless_packet_cb *callback, void *user_data);
 
 
 /*******************************************************************************
@@ -1979,11 +2200,12 @@ void tox_callback_friend_lossless_packet(Tox *tox, tox_friend_lossless_packet_cb
  ******************************************************************************/
 
 
+
 /**
  * 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_get_udp_port) to run a temporary bootstrap node.
+ * 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.
@@ -1993,15 +2215,21 @@ void tox_callback_friend_lossless_packet(Tox *tox, tox_friend_lossless_packet_cb
  */
 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_NOT_BOUND,
+
 } TOX_ERR_GET_PORT;
 
+
 /**
  * Return the UDP port this Tox instance is bound to.
  */