4 files changed, 136 insertions, 74 deletions

diff --git a/other/apidsl/tox.in.h b/other/apidsl/tox.in.h
index dd47df23..30c78e44 100644
--- a/other/apidsl/tox.in.h
+++ b/other/apidsl/tox.in.h
@@ -340,6 +340,24 @@ enum class PROXY_TYPE {
   SOCKS5,
 }
 
+/**
+ * Type of savedata to create the Tox instance from.
+ */
+enum class SAVEDATA_TYPE {
+  /**
+   * No savedata.
+   */
+  NONE,
+  /**
+   * Savedata is one that was obtained from ${savedata.get}
+   */
+  TOX_SAVE,
+  /**
+   * Savedata is a secret key of length ${SECRET_KEY_SIZE}
+   */
+  SECRET_KEY,
+}
+
 
 static class options {
   /**
@@ -416,6 +434,23 @@ static class options {
      * The port to use for the TCP server. If 0, the tcp server is disabled.
      */
     uint16_t tcp_port;
+
+    namespace savedata {
+      /**
+       * The type of savedata to load from.
+       */
+      SAVEDATA_TYPE type;
+
+      /**
+       * The savedata.
+       */
+      const uint8_t[length] data;
+
+      /**
+       * The length of the savedata.
+       */
+      size_t length;
+    }
   }
 
 
@@ -474,21 +509,17 @@ static class options {
  * 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.
+ *
+ * @return A new Tox instance pointer on success or NULL on failure.
  */
-static this new(const options_t *options, const uint8_t[length] data) {
+static this new(const options_t *options) {
   NULL,
   /**
    * The function was unable to allocate enough memory to store the internal
@@ -580,13 +611,8 @@ uint8_t[size] savedata {
  * 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.
+ * This function will attempt to connect to the node using UDP. You must use 
+ * this function even if ${options.this.udp_enabled} was set to false.
  *
  * @param address The hostname or IP address (IPv4 or IPv6) of the node.
  * @param port The port on the host on which the bootstrap Tox instance is
@@ -1481,7 +1507,7 @@ namespace file {
      */
     DATA,
     /**
-     * Avatar filename. This consists of $hash(image).
+     * Avatar file_id. 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
@@ -1625,6 +1651,7 @@ namespace file {
 
 
   error for get {
+    NULL,
     /**
      * The friend_number passed did not designate a valid friend.
      */
diff --git a/other/apidsl/toxav.in.h b/other/apidsl/toxav.in.h
index bcf554ac..0631c827 100644
--- a/other/apidsl/toxav.in.h
+++ b/other/apidsl/toxav.in.h
@@ -562,10 +562,9 @@ namespace video {
    * @param y Y (Luminance) plane data.
    * @param u U (Chroma) plane data.
    * @param v V (Chroma) plane data.
-   * @param a A (Alpha) plane data.
    */
   bool send_frame(uint32_t friend_number, uint16_t width, uint16_t height,
-                  const uint8_t *y, const uint8_t *u, const uint8_t *v, const uint8_t *a) with error for send_frame;
+                  const uint8_t *y, const uint8_t *u, const uint8_t *v) with error for send_frame;
 }
 /*******************************************************************************
  * 
@@ -603,19 +602,17 @@ namespace video {
      *          Y = MAX(width, abs(ystride)) * height, 
      *          U = MAX(width/2, abs(ustride)) * (height/2) and 
      *          V = MAX(width/2, abs(vstride)) * (height/2).
-     *          A = MAX(width, abs(astride)) * height.
      * @param ystride
      * @param ustride
-     * @param vstride
-     * @param astride Strides data. Strides represent padding for each plane
+     * @param vstride Strides data. Strides represent padding for each plane
      *                that may or may not be present. You must handle strides in
      *                your image processing code. Strides are negative if the 
      *                image is bottom-up hence why you MUST abs() it when
      *                calculating plane buffer size.
      */
     typedef void(uint32_t friend_number, uint16_t width, uint16_t height,
-                 const uint8_t *y, const uint8_t *u, const uint8_t *v, const uint8_t *a, 
-                 int32_t ystride, int32_t ustride, int32_t vstride, int32_t astride);
+                 const uint8_t *y, const uint8_t *u, const uint8_t *v,
+                 int32_t ystride, int32_t ustride, int32_t vstride);
   }
 }
 
diff --git a/other/bootstrap_daemon/README.md b/other/bootstrap_daemon/README.md
index d0c16eb1..e77e3ae0 100644
--- a/other/bootstrap_daemon/README.md
+++ b/other/bootstrap_daemon/README.md
@@ -1,6 +1,17 @@
-##Instructions 
+#Instructions
 
-This instruction primarily tested on Linux but, may be, will work on other POSIX-compliant systems.
+- [For `systemd` users](#systemd)
+  - [Troubleshooting](#systemd-troubleshooting)
+<br>
+- [For `init.d` users](#initd)
+  - [Troubleshooting](#initd-troubleshooting)
+
+
+These instructions are primarily tested on Debian Linux, Wheezy for init.d and Jessie for systemd, but they should work on other POSIX-compliant systems too.
+
+
+<a name="systemd" />
+##For `systemd` users:
 
 For security reasons we run the daemon under its own user.
 
@@ -9,100 +20,129 @@ Create a new user by executing the following:
 sudo useradd --home-dir /var/lib/tox-bootstrapd --create-home --system --shell /sbin/nologin --comment "Account to run Tox's DHT bootstrap daemon" --user-group tox-bootstrapd
 ```
 
-Copy `tox-bootstrapd.conf` file to where `CFGFILE` variable from `tox-bootstrapd.sh` tells (for `init.d` users) or `ExecStart=` from `tox-bootstrap.service` ( for `systemd` users). By default it's `/etc/tox-bootstrapd.conf`.
-
-Go over everything in `tox-bootstrapd.conf`. Make sure `pid_file_path` matches `PIDFILE` from `tox-bootstrapd.sh` (`init.d`) or `PIDFile=` from `tox-bootstrap.service` AND file in `ExecStartPre`(`systemd`).
-
-
 Restrict access to home directory:
 ```sh
 sudo chmod 700 /var/lib/tox-bootstrapd
 ```
 
-##For `init.d` users:
+Copy `tox-bootstrapd.conf` file to where `ExecStart=` from `tox-bootstrapd.service` points to. By default it's `/etc/tox-bootstrapd.conf`.
+```sh
+sudo cp tox-bootstrapd.conf /etc/tox-bootstrapd.conf
+```
 
-Look at the variable declarations in the beginning of `tox-bootstrapd.sh` init script to see if you need to change anything for it to work for you. The default values must be fine for most users and we assume that you use those next.
+Go over everything in the copied `tox-bootstrapd.conf` file. Set options you want and add actual working nodes to the `bootstrap_nodes` list, instead of the example ones, if you want your node to connect to the Tox network. Make sure `pid_file_path` matches `PIDFile=` from `tox-bootstrapd.service`.
 
-Copy `tox-bootstrapd.sh` init file to `/etc/init.d/tox-bootstrapd` (note the disappearance of ".sh" ending).
+Copy `tox-bootstrapd.service` to `/etc/systemd/system/`:
 ```sh
-sudo cp tox-bootstrapd.sh /etc/init.d/tox-bootstrapd
+sudo cp tox-bootstrapd.service /etc/systemd/system/
 ```
 
-Set permissions for the init system to run the script:
+You must uncomment the next line in tox-bootstrapd.service, if you want to use port number < 1024 
+
+    #CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+
+and, possibly, install `libcap2-bin` or `libcap2` package, depending of your distribution.
+
+Reload systemd units definitions, enable service for automatic start (if needed), start it and verify it's running: 
 ```sh
-sudo chmod 755 /etc/init.d/tox-bootstrapd
+sudo systemctl daemon-reload
+sudo systemctl enable tox-bootstrapd.service
+sudo systemctl start tox-bootstrapd.service
+sudo systemctl status tox-bootstrapd.service
 ```
 
-Make the init system aware of the script:
+Get your public key and check that the daemon initialized correctly:
 ```sh
-sudo update-rc.d tox-bootstrapd defaults
+sudo grep "tox-bootstrapd" /var/log/syslog
 ```
 
-Start the daemon:
+<a name="systemd-troubleshooting" />
+###Troubleshooting:
+
+- Check daemon's status:
 ```sh
-sudo service tox-bootstrapd start
+sudo systemctl status tox-bootstrapd.service
 ```
 
-Verify it's running:
+- Check the log for errors:
 ```sh
-sudo service tox-bootstrapd status
+sudo grep "tox-bootstrapd" /var/log/syslog
+# or
+sudo journalctl --pager-end
+# or
+sudo journalctl -f _SYSTEMD_UNIT=tox-bootstrapd.service
 ```
 
-Get your public key and check that the daemon initialized correctly:
+- Make sure tox-bootstrapd user has write permission for keys and pid files.
+
+- Make sure tox-bootstrapd has read permission for the config file.
+
+- Make sure tox-bootstrapd location matches its path in tox-bootstrapd.service file.
+
+
+<a name="initd" />
+##For `init.d` users
+
+For security reasons we run the daemon under its own user.
+
+Create a new user by executing the following:
 ```sh
-sudo grep "tox-bootstrapd" /var/log/syslog
+sudo useradd --home-dir /var/lib/tox-bootstrapd --create-home --system --shell /sbin/nologin --comment "Account to run Tox's DHT bootstrap daemon" --user-group tox-bootstrapd
 ```
 
-##For `systemd` users:
+Restrict access to home directory:
+```sh
+sudo chmod 700 /var/lib/tox-bootstrapd
+```
 
-Copy tox-bootstrap.service to /etc/systemd/system/:
+Copy `tox-bootstrapd.conf` file to where `CFGFILE` variable from `tox-bootstrapd.sh` points to. By default it's `/etc/tox-bootstrapd.conf`.
 ```sh
-sudo cp tox-bootstrap.service /etc/systemd/system/
+sudo cp tox-bootstrapd.conf /etc/tox-bootstrapd.conf
 ```
 
-Make sure, that path to `chown` and `mkdir` is correct in `tox-bootstrap.service` (they may be different in some distributions, by default  `/bin/chown` and `/bin/mkdir`) 
+Go over everything in the copied `tox-bootstrapd.conf` file. Set options you want and add actual working nodes to the `bootstrap_nodes` list, instead of the example ones, if you want your node to connect to the Tox network. Make sure `pid_file_path` matches `PIDFILE` from `tox-bootstrapd.sh`.
 
-You must uncomment the next line in tox-bootstrap.service, if you want to use port number <1024 
-        
-        #CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+Look at the variable declarations in the beginning of `tox-bootstrapd.sh` init script to see if you need to change anything for it to work on your system. The default values must be fine for most users and we assume that you use those next.
 
-and, possibly, install `libcap2-bin` or `libcap2` package, depending of your distribution.
+Copy `tox-bootstrapd.sh` init script to `/etc/init.d/tox-bootstrapd` (note the disappearance of ".sh" ending):
+```sh
+sudo cp tox-bootstrapd.sh /etc/init.d/tox-bootstrapd
+```
 
+Set permissions for the init system to run the script:
+```sh
+sudo chmod 755 /etc/init.d/tox-bootstrapd
+```
 
-Reload systemd units definitions, enable service for automatic start (if needed), and start it: 
+Make the init system aware of the script, start the daemon and verify it's running:
 ```sh
-sudo systemctl daemon-reload
-sudo systemctl enable tox-bootstrap.service
-sudo systemctl start tox-bootstrap.service
+sudo update-rc.d tox-bootstrapd defaults
+sudo service tox-bootstrapd start
+sudo service tox-bootstrapd status
+```
+
+Get your public key and check that the daemon initialized correctly:
+```sh
+sudo grep "tox-bootstrapd" /var/log/syslog
 ```
+
+<a name="initd-troubleshooting" />
 ###Troubleshooting:
 
 - Check daemon's status:
 ```sh
-#init.d
 sudo service tox-bootstrapd status
-
-#systemd
-sudo systemctl status tox-bootstrap.service 
 ```
 
 - Check the log for errors: 
 ```sh
-#init.d
 sudo grep "tox-bootstrapd" /var/log/syslog
-
-#systemd
-sudo journalctl -f _SYSTEMD_UNIT=tox-bootstrap.service
 ```
 
-`init.d`:
 - Check that variables in the beginning of `/etc/init.d/tox-bootstrapd` are valid.
 
-
-Common:
-
-- Make sure tox-bootstrapd user has write permission for keys and pid files (in systemd pid file insured by unit definition).
+- Make sure tox-bootstrapd user has write permission for keys and pid files.
 
 - Make sure tox-bootstrapd has read permission for the config file.
 
-- Make sure tox-bootstrapd location matches its path in init scripts, if you specified non-default `--prefix`, when building. 
+- Make sure tox-bootstrapd location matches its path in the `/etc/init.d/tox-bootstrapd` init script.
diff --git a/other/bootstrap_daemon/tox-bootstrapd.service b/other/bootstrap_daemon/tox-bootstrapd.service
index 4b499311..db54cc41 100644
--- a/other/bootstrap_daemon/tox-bootstrapd.service
+++ b/other/bootstrap_daemon/tox-bootstrapd.service
@@ -4,16 +4,14 @@ After=network.target
 
 [Service]
 Type=forking
-PermissionsStartOnly=true
-ExecStartPre=-/bin/mkdir /var/run/tox-bootstrapd -p
-ExecStartPre=/bin/chown tox-bootstrapd:tox-bootstrapd -R /var/run/tox-bootstrapd
+RuntimeDirectory=tox-bootstrapd
+RuntimeDirectoryMode=750
+PIDFile=/var/run/tox-bootstrapd/tox-bootstrapd.pid
 WorkingDirectory=/var/lib/tox-bootstrapd
 ExecStart=/usr/local/bin/tox-bootstrapd /etc/tox-bootstrapd.conf
 User=tox-bootstrapd
 Group=tox-bootstrapd
-PIDFile=/var/run/tox-bootstrapd/tox-bootstrapd.pid
 #CapabilityBoundingSet=CAP_NET_BIND_SERVICE
 
 [Install]
 WantedBy=multi-user.target
-