ffi-tox 0.1.0 → 0.1.1

data/ProjectTox-Core/testing/nTox.h

@@ -39,6 +39,7 @@
 #include "../core/network.h"
 #define STRING_LENGTH 256
 #define HISTORY 50
+#define PUB_KEY_BYTES 32
 
 void new_lines(char *line);
 void line_eval(char lines[HISTORY][STRING_LENGTH], char *line);

data/ProjectTox-Core/testing/nTox_win32.c

@@ -27,7 +27,7 @@
 #include <process.h>
 
 uint8_t pending_requests[256][CLIENT_ID_SIZE];
-uint8_t num_requests;
+uint8_t num_requests = 0;
 
 char line[STRING_LENGTH];
 char users_id[200];
@@ -77,25 +77,25 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length)
     printf(msg);
 }
 
-void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) {
+void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) 
+{
     char name[MAX_NAME_LENGTH];
     getname(friendnumber, (uint8_t*)name);
     char msg[100+length+strlen(name)+1];
-    sprintf(msg, "\n\n[i] [%d] %s's status changed to %s.\n", friendnumber, name, string);
+    sprintf(msg, "\n\n[i] [%d] %s's status changed to %s.\n\n", friendnumber, name, string);
     printf(msg);
 }
 
 void load_key() 
 {
     FILE *data_file = NULL;
-
-    if ((data_file = fopen("data", "r"))) {
+    data_file = fopen("data","r");
+    if (data_file) {
         fseek(data_file, 0, SEEK_END);
         int size = ftell(data_file);
         fseek(data_file, 0, SEEK_SET);
         uint8_t data[size];
-
-        if(fread(data, sizeof(uint8_t), size, data_file) != size) {
+        if (fread(data, sizeof(uint8_t), size, data_file) != size) {
             printf("\n[i] Could not read the data file. Exiting.");
             exit(1);
         }
@@ -107,115 +107,144 @@ void load_key()
         Messenger_save(data);
         data_file = fopen("data", "w");
 
-        if(fwrite(data, sizeof(uint8_t), size, data_file) != size) {
+        if (fwrite(data, sizeof(uint8_t), size, data_file) != size) {
             printf("\n[i] Could not write data to file. Exiting.");
             exit(1);
         }
     }
-
     fclose(data_file);
 }
 
 void line_eval(char* line)
 {
     if(line[0] == '/') {
+        char inpt_command = line[1];
         /* Add friend */
-        if(line[1] == 'f') {
+        if(inpt_command == 'f') {
             int i;
             char temp_id[128];
-            for (i=0; i<128; i++) 
+            for (i = 0; i < 128; i++) 
                 temp_id[i] = line[i+3];
             int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
-            char numstring[100];
-            sprintf(numstring, "\n[i] added friend %d\n\n", num);
-            printf(numstring);
+            if (num >= 0) {
+                char numstring[100];
+                sprintf(numstring, "\n[i] Friend request sent. Wait to be accepted. Friend id: %d\n\n", num);
+                printf(numstring);
+            }
+            else if (num == -1) 
+                printf("\nWrong key size\n\n");
+            else if (num == -2)
+                printf("\nYou can't add yourself\n\n");
+            else if (num == -3)
+                printf("\nYou already have this person added\n\n");
+            else if (num == -4)
+                printf("\nUndefined error when adding friend");
         }
 
-        else if (line[1] == 'r') {
+        else if (inpt_command == 'r') {
             do_header();
             printf("\n\n");
         }
 
-        else if (line[1] == 'l') {
-            printf("\n[i] Friend List | Total: %d\n\n", getnumfriends());
-
+        else if (inpt_command == 'l') {
+            int activefriends = 0;
             int i;
 
-            for (i=0; i < getnumfriends(); i++) {
+            for (i = 0; i <= getnumfriends(); i++)
+            {
+                if (m_friendstatus(i) == 4)
+                    activefriends++;
+            }
+
+            printf("\n[i] Friend List | Total: %d\n\n", activefriends);
+
+            for (i = 0; i <= getnumfriends(); i++) {
                 char name[MAX_NAME_LENGTH];
                 getname(i, (uint8_t*)name);
-                printf("[%d] %s\n\n", i, (uint8_t*)name);
+                if (m_friendstatus(i) == 4)    
+                    printf("[%d] %s\n\n", i, (uint8_t*)name);
             }
         }
 
-        else if (line[1] == 'd') {
+        else if (inpt_command == 'd') {
             size_t len = strlen(line);
             char numstring[len-3];
             int i;
-            for (i=0; i<len; i++) {
+            for (i = 0; i < len; i++) {
                 if (line[i+3] != ' ') {
                     numstring[i] = line[i+3];
                 }
             }
             int num = atoi(numstring);
             m_delfriend(num);
+            printf("\n\n");
         }
         /* Send message to friend */
-        else if (line[1] == 'm') {
-            int i;
+        else if (inpt_command == 'm') {
             size_t len = strlen(line);
             char numstring[len-3];
             char message[len-3];
-            for (i=0; i<len; i++) {
+            int i;
+            for (i = 0; i < len; i++) {
                 if (line[i+3] != ' ') {
                     numstring[i] = line[i+3];
                 } else {
                     int j;
-                    for (j=i+1; j<len; j++)
+                    for (j = (i+1); j < len; j++)
                         message[j-i-1] = line[j+3];
                     break;
                 }
             }
             int num = atoi(numstring);
             if(m_sendmessage(num, (uint8_t*) message, sizeof(message)) != 1) {
-                printf("\n[i] could not send message: %s\n", message);
+                printf("\n[i] could not send message (they may be offline): %s\n", message);
             } else {
                 //simply for aesthetics
                 printf("\n");
             }
         }
 
-        else if (line[1] == 'n') {
+        else if (inpt_command == 'n') {
             uint8_t name[MAX_NAME_LENGTH];
             int i = 0;
             size_t len = strlen(line);
-            for (i=3; i<len; i++) {
+            for (i = 3; i < len; i++) {
                 if (line[i] == 0 || line[i] == '\n') break;
-                name[i - 3] = line[i];
+                name[i-3] = line[i];
             }
-            name[i - 3] = 0;
+            name[i-3] = 0;
             setname(name, i);
             char numstring[100];
             sprintf(numstring, "\n[i] changed nick to %s\n\n", (char*)name);
             printf(numstring);
+
+            FILE *name_file = NULL;
+            name_file = fopen("namefile.txt", "w");
+            fprintf(name_file, "%s", (char*)name);
+            fclose(name_file);
         }
 
-        else if (line[1] == 's') {
+        else if (inpt_command == 's') {
             uint8_t status[MAX_USERSTATUS_LENGTH];
             int i = 0;
             size_t len = strlen(line);
-            for (i=3; i<len; i++) {
+            for (i = 3; i < len; i++) {
                 if (line[i] == 0 || line[i] == '\n') break;
-                status[i - 3] = line[i];
+                status[i-3] = line[i];
             }
-            status[i - 3] = 0;
+            status[i-3] = 0;
             m_set_userstatus(status, strlen((char*)status));
             char numstring[100];
             sprintf(numstring, "\n[i] changed status to %s\n\n", (char*)status);
             printf(numstring);
+
+            FILE* status_file = NULL;
+            status_file = fopen("statusfile.txt", "w");
+            fprintf(status_file, "%s", (char*)status);
+            fclose(status_file);
         }
 
-        else if (line[1] == 'a') {
+        else if (inpt_command == 'a') {
             uint8_t numf = atoi(line + 3);
             char numchar[100];
             sprintf(numchar, "\n[i] friend request %u accepted\n\n", numf);
@@ -225,12 +254,12 @@ void line_eval(char* line)
             printf(numchar);
         }
         /* EXIT */
-        else if (line[1] == 'q') { 
+        else if (inpt_command == 'q') { 
+            uint8_t status[MAX_USERSTATUS_LENGTH] = "Offline";
+            m_set_userstatus(status, strlen((char*)status));
             exit(EXIT_SUCCESS);
         }
-    } 
-    
-    else {
+    } else {
         //nothing atm
     }
 }
@@ -250,47 +279,74 @@ int main(int argc, char *argv[])
         printf("[!] Usage: %s [IP] [port] [public_key] <nokey>\n", argv[0]);
         exit(0);
     }
-
     if (initMessenger() == -1) {
         printf("initMessenger failed");
         exit(0);
     }
-    
     if (argc > 4) {
         if(strncmp(argv[4], "nokey", 6) < 0) {
         }
     } else {
         load_key();
     }
-    
+
+    int nameloaded = 0;
+    int statusloaded = 0;
+
+    FILE* name_file = NULL;
+    name_file = fopen("namefile.txt", "r");
+    if(name_file) {
+        uint8_t name[MAX_NAME_LENGTH];
+        while (fgets(line, MAX_NAME_LENGTH, name_file) != NULL) {
+            sscanf(line, "%s", (char*)name);
+        }
+        setname(name, strlen((char*)name)+1);
+        nameloaded = 1;
+        printf("%s\n", name);
+    }
+    fclose(name_file);
+
+    FILE* status_file = NULL;
+    status_file = fopen("statusfile.txt", "r");
+    if(status_file) {
+        uint8_t status[MAX_USERSTATUS_LENGTH];
+        while (fgets(line, MAX_USERSTATUS_LENGTH, status_file) != NULL) {
+            sscanf(line, "%s", (char*)status);
+        }
+        m_set_userstatus(status, strlen((char*)status)+1);
+        statusloaded = 1;
+        printf("%s\n", status);
+    }
+    fclose(status_file);
+
     m_callback_friendrequest(print_request);
     m_callback_friendmessage(print_message);
     m_callback_namechange(print_nickchange);
     m_callback_userstatus(print_statuschange);
-
-    char idstring1[32][5];
-    char idstring2[32][5];
-    uint32_t i;
-    for(i = 0; i < 32; i++)
+    char idstring1[PUB_KEY_BYTES][5];
+    char idstring2[PUB_KEY_BYTES][5];
+    int i;
+    for(i = 0; i < PUB_KEY_BYTES; i++)
     {
-        if(self_public_key[i] < 16)
+        if(self_public_key[i] < (PUB_KEY_BYTES/2))
             strcpy(idstring1[i],"0");
         else 
             strcpy(idstring1[i], "");
         sprintf(idstring2[i], "%hhX",self_public_key[i]);
     }
     strcpy(users_id,"[i] your ID: ");
-    for (i=0; i<32; i++) {
-        strcat(users_id,idstring1[i]);
-        strcat(users_id,idstring2[i]);
+    int j;
+    for (j = 0; j < PUB_KEY_BYTES; j++) {
+        strcat(users_id,idstring1[j]);
+        strcat(users_id,idstring2[j]);
     }
 
     do_header();
-
+    
     IP_Port bootstrap_ip_port;
     bootstrap_ip_port.port = htons(atoi(argv[2]));
     int resolved_address = resolve_addr(argv[1]);
-    if (resolved_address != -1)
+    if (resolved_address != 0)
         bootstrap_ip_port.ip.i = resolved_address;
     else 
         exit(1);
@@ -302,6 +358,16 @@ int main(int argc, char *argv[])
 
     _beginthread(get_input, 0, NULL);
 
+    if (nameloaded == 1) {
+        printf("\nNickname automatically loaded");
+        printf("\n---------------------------------");
+    }
+
+    if (statusloaded == 1) {
+        printf("\nStatus automatically loaded");
+        printf("\n---------------------------------");
+    }
+
     while(1) {
         if (on == 1 && DHT_isconnected() == -1) {
             printf("\n---------------------------------");
@@ -309,15 +375,13 @@ int main(int argc, char *argv[])
             printf("\n---------------------------------\n\n");
             on = 0;
         }
-
         if (on == 0 && DHT_isconnected()) {
             printf("\n[i] Connected to DHT");
             printf("\n---------------------------------\n\n");
             on = 1;
         }
-
         doMessenger();
+        Sleep(1);
     }
-
     return 0;
-}
+}

data/ProjectTox-Core/testing/nTox_win32.h

@@ -27,5 +27,14 @@
 #include "../core/network.h"
 
 #define STRING_LENGTH 256
+#define PUB_KEY_BYTES 32
+
+void do_header();
+void print_message(int friendnumber, uint8_t * string, uint16_t length);
+void print_nickchange(int friendnumber, uint8_t *string, uint16_t length);
+void print_statuschange(int friendnumber, uint8_t *string, uint16_t length);
+void load_key();
+void line_eval(char* line);
+void get_input();
 
 #endif

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-tox
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - Tristan Rice
@@ -14,33 +13,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: ffi-swig-generator
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
 description: Ruby FFI bindings to Tox
@@ -53,65 +48,70 @@ files:
 - lib/ffi-tox.rb
 - lib/ffi-tox/libtox.rb
 - interfaces/libtox.i
-- ProjectTox-Core/CMakeLists.txt
 - ProjectTox-Core/COPYING
+- ProjectTox-Core/CMakeLists.txt
 - ProjectTox-Core/INSTALL.md
 - ProjectTox-Core/README.md
 - ProjectTox-Core/core/DHT.c
 - ProjectTox-Core/core/DHT.h
 - ProjectTox-Core/core/LAN_discovery.c
 - ProjectTox-Core/core/LAN_discovery.h
-- ProjectTox-Core/core/Lossless_UDP.c
 - ProjectTox-Core/core/Lossless_UDP.h
+- ProjectTox-Core/core/friend_requests.c
+- ProjectTox-Core/core/net_crypto.h
+- ProjectTox-Core/core/CMakeLists.txt
+- ProjectTox-Core/core/Lossless_UDP.c
 - ProjectTox-Core/core/Messenger.c
 - ProjectTox-Core/core/Messenger.h
-- ProjectTox-Core/core/friend_requests.c
 - ProjectTox-Core/core/friend_requests.h
 - ProjectTox-Core/core/net_crypto.c
-- ProjectTox-Core/core/net_crypto.h
 - ProjectTox-Core/core/network.c
 - ProjectTox-Core/core/network.h
-- ProjectTox-Core/core/CMakeLists.txt
 - ProjectTox-Core/other/CMakeLists.txt
 - ProjectTox-Core/other/DHT_bootstrap.c
+- ProjectTox-Core/testing/DHT_sendfiletest.c
+- ProjectTox-Core/testing/Messenger_test.c
+- ProjectTox-Core/testing/misc_tools.c
+- ProjectTox-Core/testing/rect.py
 - ProjectTox-Core/testing/CMakeLists.txt
 - ProjectTox-Core/testing/DHT_cryptosendfiletest.c
-- ProjectTox-Core/testing/DHT_sendfiletest.c
 - ProjectTox-Core/testing/DHT_test.c
 - ProjectTox-Core/testing/Lossless_UDP_testclient.c
 - ProjectTox-Core/testing/Lossless_UDP_testserver.c
-- ProjectTox-Core/testing/Messenger_test.c
-- ProjectTox-Core/testing/misc_tools.c
 - ProjectTox-Core/testing/misc_tools.h
 - ProjectTox-Core/testing/nTox.c
 - ProjectTox-Core/testing/nTox.h
 - ProjectTox-Core/testing/nTox_win32.c
 - ProjectTox-Core/testing/nTox_win32.h
-- ProjectTox-Core/testing/rect.py
+- ProjectTox-Core/cmake/FindLIBCONFIG.cmake
+- ProjectTox-Core/cmake/FindNaCl.cmake
+- ProjectTox-Core/cmake/FindSODIUM.cmake
+- ProjectTox-Core/docs/commands.md
+- ProjectTox-Core/docs/start_guide.de.md
+- ProjectTox-Core/docs/start_guide.md
 - ext/ffi-tox/extconf.rb
 homepage: http://github.com/d4l3k/ffi-tox
 licenses:
 - Simplified BSD
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Tox bindings
 test_files: []