Merge branch 'master' of https://github.com/JamoBox/ProjectTox-Core into JamoBox-master

Conflicts:
	toxcore/LAN_discovery.h

3 files changed, 34 insertions, 28 deletions

diff --git a/other/DHT_bootstrap.c b/other/DHT_bootstrap.c
index 0bf71312..229e6593 100644
--- a/other/DHT_bootstrap.c
+++ b/other/DHT_bootstrap.c
@@ -31,7 +31,7 @@
 #include "../toxcore/friend_requests.h"
 #include "../testing/misc_tools.h"
 
-//Sleep function (x = milliseconds)
+/* Sleep function (x = milliseconds) */
 #ifdef WIN32
 #define c_sleep(x) Sleep(1*x)
 #else
@@ -52,7 +52,8 @@ void manage_keys(DHT *dht)
     FILE *keys_file = fopen("key", "r");
 
     if (keys_file != NULL) {
-        //if file was opened successfully -- load keys
+        /* If file was opened successfully -- load keys,
+           otherwise save new keys */
         size_t read_size = fread(keys, sizeof(uint8_t), KEYS_SIZE, keys_file);
 
         if (read_size != KEYS_SIZE) {
@@ -61,9 +62,8 @@ void manage_keys(DHT *dht)
         }
 
         load_keys(dht->c, keys);
-        printf("Keys loaded successfully\n");
+        printf("Keys loaded successfully.\n");
     } else {
-        //otherwise save new keys
         new_keys(dht->c);
         save_keys(dht->c, keys);
         keys_file = fopen("key", "w");
@@ -73,7 +73,7 @@ void manage_keys(DHT *dht)
             exit(1);
         }
 
-        printf("Keys saved successfully\n");
+        printf("Keys saved successfully.\n");
     }
 
     fclose(keys_file);
@@ -81,8 +81,8 @@ void manage_keys(DHT *dht)
 
 int main(int argc, char *argv[])
 {
-    //initialize networking
-    //bind to ip 0.0.0.0:PORT
+    /* Initialize networking -
+       Bind to ip 0.0.0.0:PORT */
     IP ip;
     ip.i = 0;
     DHT *dht = new_DHT(new_net_crypto(new_networking(ip, PORT)));
@@ -106,7 +106,7 @@ int main(int argc, char *argv[])
     printf("\n");
     printf("Port: %u\n", PORT);
 
-    perror("Initialization");
+    perror("Initialization.");
 
     if (argc > 3) {
         printf("Trying to bootstrap into the network...\n");
diff --git a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
index eec4e39f..0f39285b 100644
--- a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
+++ b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
@@ -74,7 +74,7 @@ int b16_to_key(char b16_string[], uint8_t *bs_pubkey)
 
 /*
   resolve_addr():
-    address should represent IPv4 or a hostname with A record
+    address should represent IPv4 or a hostname with a record
 
     returns a data in network byte order that can be used to set IP.i or IP_Port.ip.i
     returns 0 on failure
@@ -91,7 +91,7 @@ uint32_t resolve_addr(const char *address)
 
     memset(&hints, 0, sizeof(hints));
     hints.ai_family   = AF_INET;    // IPv4 only right now.
-    hints.ai_socktype = SOCK_DGRAM; // type of socket Tox uses.
+    hints.ai_socktype = SOCK_DGRAM; // Type of socket Tox uses.
 
     rc = getaddrinfo(address, "echo", &hints, &server);
 
@@ -113,7 +113,7 @@ uint32_t resolve_addr(const char *address)
     return addr;
 }
 
-/* This unction connects to all specified servers
+/* This function connects to all specified servers
 and connect to them.
 returns 1 if the connection to the DHT is up
 returns -1 if all attempts failed
@@ -178,7 +178,7 @@ void manage_keys(DHT *dht, char *keys_file)
         load_keys(dht->c, keys);
 
     } else {
-        /* otherwise save new keys */
+        /* Otherwise save new keys */
         /* Silly work-around to ignore any errors coming from new_keys() */
         new_keys(dht->c);
         save_keys(dht->c, keys);
@@ -273,7 +273,7 @@ struct server_conf_s configure_server(char *cfg_file)
 
         for (i = 0; i < count; ++i) {
             config_setting_t *server = config_setting_get_elem(server_list, i);
-            /* Get a pointer on the key aray */
+            /* Get a pointer on the key array */
             uint8_t *bs_pk_p = server_conf.info[i].bs_pk;
 
             /* Only output the record if all of the expected fields are present. */
@@ -288,17 +288,17 @@ struct server_conf_s configure_server(char *cfg_file)
 
             if (resolve_addr(strcpy(tmp_ip, bs_ip)) == 0) {
                 server_conf.info[i].valid = 0;
-                printf("bootstrap_server %d: Invalid IP\n", i);
+                printf("bootstrap_server %d: Invalid IP.\n", i);
             }
 
             if (strlen(bs_pk) != 64) {
                 server_conf.info[i].valid = 0;
-                printf("bootstrap_server %d: Invalid public key\n", i);
+                printf("bootstrap_server %d: Invalid public key.\n", i);
             }
 
             if (!bs_port) {
                 server_conf.info[i].valid = 0;
-                printf("bootstrap_server %d: Invalid port\n", i);
+                printf("bootstrap_server %d: Invalid port.\n", i);
             }
 
             server_conf.info[i].conn.ip.i = resolve_addr(strcpy(tmp_ip, bs_ip));
@@ -337,7 +337,7 @@ int main(int argc, char *argv[])
 
     server_conf = configure_server(argv[1]);
 
-    /* initialize networking
+    /* Initialize networking
     bind to ip 0.0.0.0:PORT */
     IP ip;
     ip.i = 0;
@@ -412,7 +412,7 @@ int main(int argc, char *argv[])
     /* If we got a good PID, then
     we can exit the parent process. */
     if (pid > 0) {
-        printf("Forked successfully: %d\n", pid);
+        printf("Forked successfully: %d.\n", pid);
 
         /* Write the PID file */
         fprintf(pidf, "%d\n", pid);
diff --git a/other/fun/sign.c b/other/fun/sign.c
index bcf54c3a..423d974a 100644
--- a/other/fun/sign.c
+++ b/other/fun/sign.c
@@ -1,5 +1,5 @@
 /* Binary signer/checker using ed25519
- * 
+ *
  * Compile with:
  *  gcc -o sign sign.c -lsodium
  *
@@ -60,6 +60,7 @@ int main(int argc, char *argv[])
 {
     unsigned char pk[crypto_sign_ed25519_PUBLICKEYBYTES];
     unsigned char sk[crypto_sign_ed25519_SECRETKEYBYTES];
+
     if (argc == 2 && argv[1][0] == 'g') {
         crypto_sign_ed25519_keypair(pk, sk);
         printf("Public key:\n");
@@ -89,19 +90,22 @@ int main(int argc, char *argv[])
         unsigned long long smlen;
         char *sm = malloc(size + crypto_sign_ed25519_BYTES * 2);
         crypto_sign_ed25519(sm, &smlen, data, size, secret_key);
+
         if (smlen - size != crypto_sign_ed25519_BYTES)
             goto fail;
+
         FILE *f = fopen(argv[4], "wb");
 
         if (f == NULL)
             goto fail;
-        memcpy(sm + smlen, sm, crypto_sign_ed25519_BYTES); //Move signature from beginning to end of file.
+
+        memcpy(sm + smlen, sm, crypto_sign_ed25519_BYTES); // Move signature from beginning to end of file.
 
         if (fwrite(sm + (smlen - size), 1, smlen, f) != smlen)
             goto fail;
 
         fclose(f);
-        printf("Signed successfully\n");
+        printf("Signed successfully.\n");
     }
 
     if (argc == 4 && argv[1][0] == 'c') {
@@ -113,22 +117,24 @@ int main(int argc, char *argv[])
             goto fail;
 
         char *signe = malloc(size + crypto_sign_ed25519_BYTES);
-        memcpy(signe, data + size - crypto_sign_ed25519_BYTES, crypto_sign_ed25519_BYTES);//Move signature from end to beginning of file.
+        memcpy(signe, data + size - crypto_sign_ed25519_BYTES,
+               crypto_sign_ed25519_BYTES); // Move signature from end to beginning of file.
         memcpy(signe + crypto_sign_ed25519_BYTES, data, size - crypto_sign_ed25519_BYTES);
         unsigned long long smlen;
         char *m = malloc(size);
         unsigned long long mlen;
 
         if (crypto_sign_ed25519_open(m, &mlen, signe, size, public_key) == -1) {
-            printf("Failed checking sig\n");
+            printf("Failed checking sig.\n");
             goto fail;
         }
-        printf("Checked successfully\n");
+
+        printf("Checked successfully.\n");
     }
 
     return 0;
-    
-    fail:
-        printf("FAIL\n");
-        return 1;
+
+fail:
+    printf("FAIL\n");
+    return 1;
 }