8 files changed, 108 insertions, 26 deletions

diff --git a/INSTALL.md b/INSTALL.md
index 824cfb5f..14d2ef67 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -152,12 +152,34 @@ Grab the following packages:
   * https://gnu.org/software/automake/
   * https://github.com/jedisct1/libsodium
   * http://check.sourceforge.net/
-  * http://yasm.tortall.net/Download.html
+  * http://yasm.tortall.net/Download.html (install before libvpx)
   * https://code.google.com/p/webm/downloads/list
   * http://www.opus-codec.org/downloads/
   * http://www.freedesktop.org/wiki/Software/pkg-config/
 
-You must install yasm before installing libvpx, otherwise libvpx will fail to make correctly.
+Macports: (https://www.macports.org/)
+All toxcore dependencies can be installed from MacPorts. This is often easier on PowerPC Macs,
+and any version of OS X prior to 10.6, since Homebrew is supported on 10.6 and up, but not much
+(or at all) on older systems. A few packages have slightly different names from the corresponding
+package in Debian.
+
+Same: libtool autoconf automake libsodium check yasm
+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
+
+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)
 
 pkg-config is important for enabling a/v support in tox core, failure to install pkg-config will prevent tox core form finding the required libopus/libvpx libraries. (pkg-config may not configure properly, if you get an error about GLIB, run configure with the following parameter, --with-internal-glib).
 
@@ -174,9 +196,21 @@ Compiling and installing Tox Core
 ```bash
 cd toxcore
 autoreconf -i
-./configure
+./configure (OS X 10.5 specific)
+./configure CC="gcc -arch ppc -arch i386" CXX="g++ -arch ppc -arch i386" CPP="gcc -E" CXXCPP="g++ -E"
 make
-make install
+make install (OS X 10.5 specific)
+should be: sudo make install
+If it worked, you should have all the toxcore dylibs in /usr/local/lib: (besides the four below, the rest are symlinks to these)
+$ ls -la /usr/local/lib/libtox*.dylib
+libtoxav.0.dylib
+libtoxcore.0.dylib
+libtoxdns.0.dylib
+libtoxencryptsave.0.dylib
+to check what CPU architecture they're compiled for:
+$ lipo -i /usr/local/lib/libtoxencryptsave.0.dylib
+You should now be able to move on to compiling Toxic/Venom or some other client application
+There is also a shell script called "osx_build_script_toxcore.txt" which automates everything from "git pull" to "sudo make install", once the dependencies are already taken care of by MacPorts.
 ```
 
 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;
diff --git a/README.md b/README.md
index fab45653..9945028c 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ Every peer is represented as a [byte string][String] (the public key [Tox ID] of
 
 ## Q&A:
 
-### What are your goals of Tox?
+### What are your goals with Tox?
 
 We want Tox to be as simple as possible while remaining as secure as possible.
 
diff --git a/osx_build_script_toxcore.txt b/osx_build_script_toxcore.txt
new file mode 100644
index 00000000..8aea0d1c
--- /dev/null
+++ b/osx_build_script_toxcore.txt
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# written by Lubo Diakov
+# hard coded toxcore directory, replace with other path or variable as needed
+cd ~/Downloads/toxcore
+echo "Now working in:"`pwd`
+
+# must have working git binary, and have done git clone at least once before
+git pull
+echo "If git pull responds: Already up-to-date. you can cancel the build"
+echo "by typing anything except y or Y below"
+read -p "Continue with build? (enter y to continue): " Last_Chance
+
+# blah blah
+if [[ $Last_Chance = [Yy] ]]; then echo "Continuing!";
+else echo "Aborted!"; exit
+fi
+sleep 3
+
+# if libsodium is built with macports, link it from /opt/local/ to /usr/local
+if [ ! -L "/usr/local/lib/libsodium.dylib" ]; then
+  # Control will enter here if $DIRECTORY doesn't exist.
+   ln -s /opt/local/lib/libsodium.dylib /usr/local/lib/libsodium.dylib
+fi
+echo "The symlink /usr/local/lib/libsodium.dylib exists."
+sleep 3
+
+# replace ppc, i386 as needed.
+./configure CC="gcc -arch ppc -arch i386" CXX="g++  -arch ppc -arch i386" CPP="gcc -E" CXXCPP="g++ -E" 
+
+# get rid of prior builds, start clean
+make clean
+make
+echo ""
+echo "Sudo is required for make install only, all other steps run without it."
+echo "Please type your sudo password below for make install:"
+sudo make install
+
+exit
diff --git a/other/bootstrap_daemon/tox-bootstrapd.c b/other/bootstrap_daemon/tox-bootstrapd.c
index e4cadb35..7e78da4e 100644
--- a/other/bootstrap_daemon/tox-bootstrapd.c
+++ b/other/bootstrap_daemon/tox-bootstrapd.c
@@ -53,7 +53,7 @@
 
 
 #define DAEMON_NAME "tox-bootstrapd"
-#define DAEMON_VERSION_NUMBER 2014081600UL // yyyymmmddvv format: yyyy year, mm month, dd day, vv version change count for that day
+#define DAEMON_VERSION_NUMBER 2014101000UL // yyyymmmddvv format: yyyy year, mm month, dd day, vv version change count for that day
 
 #define SLEEP_TIME_MILLISECONDS 30
 #define sleep usleep(1000*SLEEP_TIME_MILLISECONDS)
@@ -61,7 +61,7 @@
 #define DEFAULT_PID_FILE_PATH         "tox-bootstrapd.pid"
 #define DEFAULT_KEYS_FILE_PATH        "tox-bootstrapd.keys"
 #define DEFAULT_PORT                  33445
-#define DEFAULT_ENABLE_IPV6           0 // 1 - true, 0 - false
+#define DEFAULT_ENABLE_IPV6           1 // 1 - true, 0 - false
 #define DEFAULT_ENABLE_LAN_DISCOVERY  1 // 1 - true, 0 - false
 #define DEFAULT_ENABLE_TCP_RELAY      1 // 1 - true, 0 - false
 #define DEFAULT_TCP_RELAY_PORTS       443, 3389, 33445 // comma-separated list of ports. make sure to adjust DEFAULT_TCP_RELAY_PORTS_COUNT accordingly
@@ -210,7 +210,9 @@ void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_ports, int
     }
 
     // the loop above skips invalid ports, so we adjust the allocated memory size
-    *tcp_relay_ports = realloc(*tcp_relay_ports, (*tcp_relay_port_count) * sizeof(uint16_t));
+    if ((*tcp_relay_port_count) * sizeof(uint16_t) > 0) {
+        *tcp_relay_ports = realloc(*tcp_relay_ports, (*tcp_relay_port_count) * sizeof(uint16_t));
+    }
 }
 
 // Gets general config options
@@ -616,7 +618,7 @@ int main(int argc, char *argv[])
     pid_t pid = fork();
 
     if (pid > 0) {
-        fprintf(pidf, "%d ", pid);
+        fprintf(pidf, "%d", pid);
         fclose(pidf);
         syslog(LOG_DEBUG, "Forked successfully: PID: %d.\n", pid);
         return 0;
diff --git a/toxcore/group.c b/toxcore/group.c
index a71bd5cf..84d7d2bb 100644
--- a/toxcore/group.c
+++ b/toxcore/group.c
@@ -1437,12 +1437,9 @@ static void handle_message_packet_group(Group_Chats *g_c, int groupnumber, const
 
             if (peer_number == kill_peer_number) {
                 delpeer(g_c, groupnumber, index);
-                return;
             } else {
                 //TODO
             }
-
-            return;
         }
         break;
 
diff --git a/toxdns/toxdns.h b/toxdns/toxdns.h
index 90b74281..06071b82 100644
--- a/toxdns/toxdns.h
+++ b/toxdns/toxdns.h
@@ -24,6 +24,10 @@
 #ifndef TOXDNS_H
 #define TOXDNS_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 
 /* Clients are encouraged to set this as the maximum length names can have. */
@@ -85,4 +89,8 @@ int tox_generate_dns3_string(void *dns3_object, uint8_t *string, uint16_t string
 int tox_decrypt_dns3_TXT(void *dns3_object, uint8_t *tox_id, uint8_t *id_record, uint32_t id_record_len,
                          uint32_t request_id);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/toxencryptsave/toxencryptsave.c b/toxencryptsave/toxencryptsave.c
index 953ee802..7efba089 100644
--- a/toxencryptsave/toxencryptsave.c
+++ b/toxencryptsave/toxencryptsave.c
@@ -59,7 +59,7 @@ uint32_t tox_encrypted_size(const Tox *tox)
  * returns 0 on success
  * returns -1 on failure
  */
-int tox_derive_key_from_pass(uint8_t* passphrase, uint32_t pplength, uint8_t* out_key)
+int tox_derive_key_from_pass(uint8_t *passphrase, uint32_t pplength, uint8_t *out_key)
 {
     if (pplength == 0)
         return -1;
@@ -98,7 +98,7 @@ int tox_derive_key_from_pass(uint8_t* passphrase, uint32_t pplength, uint8_t* ou
  * returns 0 on success
  * returns -1 on failure
  */
-int tox_pass_key_encrypt(uint8_t* data, uint32_t data_len, const uint8_t* key, uint8_t* out)
+int tox_pass_key_encrypt(uint8_t *data, uint32_t data_len, const uint8_t *key, uint8_t *out)
 {
     /* the output data consists of, in order:
      * salt, nonce, mac, enc_data
@@ -110,7 +110,7 @@ int tox_pass_key_encrypt(uint8_t* data, uint32_t data_len, const uint8_t* key, u
 
     /* first add the prefix */
     uint8_t nonce[crypto_box_NONCEBYTES];
-    random_nonce(nonce);    
+    random_nonce(nonce);
 
     memcpy(out, key, crypto_pwhash_scryptsalsa208sha256_SALTBYTES);
     key += crypto_pwhash_scryptsalsa208sha256_SALTBYTES;
@@ -134,9 +134,10 @@ int tox_pass_key_encrypt(uint8_t* data, uint32_t data_len, const uint8_t* key, u
  * returns 0 on success
  * returns -1 on failure
  */
-int tox_pass_encrypt(uint8_t* data, uint32_t data_len, uint8_t* passphrase, uint32_t pplength, uint8_t* out)
+int tox_pass_encrypt(uint8_t *data, uint32_t data_len, uint8_t *passphrase, uint32_t pplength, uint8_t *out)
 {
     uint8_t key[TOX_PASS_KEY_LENGTH];
+
     if (tox_derive_key_from_pass(passphrase, pplength, key) == -1)
         return -1;
 
@@ -171,7 +172,7 @@ int tox_encrypted_save(const Tox *tox, uint8_t *data, uint8_t *passphrase, uint3
  * returns the length of the output data (== data_len - TOX_PASS_ENCRYPTION_EXTRA_LENGTH) on success
  * returns -1 on failure
  */
-int tox_pass_key_decrypt(const uint8_t* data, uint32_t length, const uint8_t* key, uint8_t* out)
+int tox_pass_key_decrypt(const uint8_t *data, uint32_t length, const uint8_t *key, uint8_t *out)
 {
     if (length <= TOX_PASS_ENCRYPTION_EXTRA_LENGTH)
         return -1;
@@ -201,14 +202,14 @@ int tox_pass_key_decrypt(const uint8_t* data, uint32_t length, const uint8_t* ke
  * returns the length of the output data (== data_len - TOX_PASS_ENCRYPTION_EXTRA_LENGTH) on success
  * returns -1 on failure
  */
-int tox_pass_decrypt(const uint8_t* data, uint32_t length, uint8_t* passphrase, uint32_t pplength, uint8_t* out)
+int tox_pass_decrypt(const uint8_t *data, uint32_t length, uint8_t *passphrase, uint32_t pplength, uint8_t *out)
 {
-    
+
     uint8_t passkey[crypto_hash_sha256_BYTES];
     crypto_hash_sha256(passkey, passphrase, pplength);
 
     uint8_t salt[crypto_pwhash_scryptsalsa208sha256_SALTBYTES];
-    memcpy(salt, data, crypto_pwhash_scryptsalsa208sha256_SALTBYTES);    
+    memcpy(salt, data, crypto_pwhash_scryptsalsa208sha256_SALTBYTES);
 
     /* derive the key */
     uint8_t key[crypto_box_KEYBYTES + crypto_pwhash_scryptsalsa208sha256_SALTBYTES];
@@ -236,13 +237,15 @@ int tox_encrypted_load(Tox *tox, const uint8_t *data, uint32_t length, uint8_t *
 {
     if (memcmp(data, TOX_ENC_SAVE_MAGIC_NUMBER, TOX_ENC_SAVE_MAGIC_LENGTH) != 0)
         return -1;
-    data += TOX_ENC_SAVE_MAGIC_LENGTH; length -= TOX_ENC_SAVE_MAGIC_LENGTH;
+
+    data += TOX_ENC_SAVE_MAGIC_LENGTH;
+    length -= TOX_ENC_SAVE_MAGIC_LENGTH;
 
     uint32_t decrypt_length = length - TOX_PASS_ENCRYPTION_EXTRA_LENGTH;
     uint8_t temp_data[decrypt_length];
 
     if (tox_pass_decrypt(data, length, passphrase, pplength, temp_data)
-        != decrypt_length)
+            != decrypt_length)
         return -1;
 
     return tox_load(tox, temp_data, decrypt_length);
diff --git a/toxencryptsave/toxencryptsave.h b/toxencryptsave/toxencryptsave.h
index 6abcca42..2fb6a8c5 100644
--- a/toxencryptsave/toxencryptsave.h
+++ b/toxencryptsave/toxencryptsave.h
@@ -61,7 +61,7 @@ uint32_t tox_encrypted_size(const Tox *tox);
  * returns 0 on success
  * returns -1 on failure
  */
-int tox_derive_key_from_pass(uint8_t* passphrase, uint32_t pplength, uint8_t* out_key);
+int tox_derive_key_from_pass(uint8_t *passphrase, uint32_t pplength, uint8_t *out_key);
 
 /* Encrypt arbitrary with a key produced by tox_derive_key_from_pass. The output
  * array must be at least data_len + TOX_PASS_ENCRYPTION_EXTRA_LENGTH bytes long.
@@ -73,7 +73,7 @@ int tox_derive_key_from_pass(uint8_t* passphrase, uint32_t pplength, uint8_t* ou
  * returns 0 on success
  * returns -1 on failure
  */
-int tox_pass_key_encrypt(uint8_t* data, uint32_t data_len, const uint8_t* key, uint8_t* out);
+int tox_pass_key_encrypt(uint8_t *data, uint32_t data_len, const uint8_t *key, uint8_t *out);
 
 /* Encrypts the given data with the given passphrase. The output array must be
  * at least data_len + TOX_PASS_ENCRYPTION_EXTRA_LENGTH bytes long. This delegates
@@ -84,7 +84,7 @@ int tox_pass_key_encrypt(uint8_t* data, uint32_t data_len, const uint8_t* key, u
  * returns 0 on success
  * returns -1 on failure
  */
-int tox_pass_encrypt(uint8_t* data, uint32_t data_len, uint8_t* passphrase, uint32_t pplength, uint8_t* out);
+int tox_pass_encrypt(uint8_t *data, uint32_t data_len, uint8_t *passphrase, uint32_t pplength, uint8_t *out);
 
 /* Save the messenger data encrypted with the given password.
  * data must be at least tox_encrypted_size().
@@ -111,7 +111,7 @@ int tox_pass_key_decrypt(const uint8_t* data, uint32_t length, const uint8_t* ke
  * returns the length of the output data (== data_len - TOX_PASS_ENCRYPTION_EXTRA_LENGTH) on success
  * returns -1 on failure
  */
-int tox_pass_decrypt(const uint8_t* data, uint32_t length, uint8_t* passphrase, uint32_t pplength, uint8_t* out);
+int tox_pass_decrypt(const uint8_t *data, uint32_t length, uint8_t *passphrase, uint32_t pplength, uint8_t *out);
 
 /* Load the messenger from encrypted data of size length.
  *