ffi-tox 0.1.1 → 0.1.3

data/ProjectTox-Core/testing/Lossless_UDP_testclient.c

@@ -1,214 +0,0 @@
-/* Lossless_UDP testclient
- * A program that connects and sends a file using our lossless UDP algorithm.
- * NOTE: this program simulates a 33% packet loss.
- * 
- * Best used in combination with Lossless_UDP_testserver
- * 
- * Compile with: gcc -O2 -Wall -lsodium -o testclient ../core/network.c ../core/Lossless_UDP.c Lossless_UDP_testclient.c
- * 
- * Command line arguments are the ip and port to connect and send the file to.
- * EX: ./testclient 127.0.0.1 33445 filename.txt
- *
- *  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/>.
- *  
- */
-
-#include "../core/network.h"
-#include "../core/Lossless_UDP.h"
-
-#ifdef WIN32
-
-#define c_sleep(x) Sleep(1*x)
-
-#else
-#include <unistd.h>
-#include <arpa/inet.h>
-#define c_sleep(x) usleep(1000*x)
-
-#endif
-
-#define PORT 33446
-
-void printpacket(uint8_t *data, uint32_t length, IP_Port ip_port)
-{
-    uint32_t i;
-    printf("UNHANDLED PACKET RECEIVED\nLENGTH:%u\nCONTENTS:\n", length);
-    printf("--------------------BEGIN-----------------------------\n");
-    for (i = 0; i < length; i++) {
-        if (data[i] < 16)
-            printf("0");
-        printf("%hhX",data[i]);
-    }
-    printf("\n--------------------END-----------------------------\n\n\n");
-}
-
-void printip(IP_Port ip_port)
-{
-    printf("\nIP: %u.%u.%u.%u Port: %u", ip_port.ip.c[0], ip_port.ip.c[1], ip_port.ip.c[2], ip_port.ip.c[3], ntohs(ip_port.port));
-}
-/*
-void printpackets(Data test)
-{
-    int i;
-    if(test.size == 0)
-        return;
-    printf("SIZE: %u\n", test.size);
-    for(i =0; i < test.size; i++)
-    {
-        printf("%hhX", test.data[i]);
-    }
-    printf("\n");
-}
-
-void printconnection(int connection_id)
-{
-    printf("--------------------BEGIN---------------------\n");
-    IP_Port ip_port = connections[connection_id].ip_port;
-    printf("IP: %u.%u.%u.%u Port: %u\n",ip_port.ip.c[0],ip_port.ip.c[1],ip_port.ip.c[2],ip_port.ip.c[3],ntohs(ip_port.port));
-    printf("status: %u, inbound: %u, SYNC_rate: %u\n", connections[connection_id].status, 
-    connections[connection_id].inbound, connections[connection_id].SYNC_rate);
-    printf("data rate: %u, last sync: %llu, last sent: %llu, last recv: %llu \n", connections[connection_id].data_rate, 
-    connections[connection_id].last_SYNC, connections[connection_id].last_sent, connections[connection_id].last_recv);
-    int i;
-    for(i =0; i < MAX_QUEUE_NUM; i++)
-    {
-        printf(" %u ",i);
-        printpackets(connections[connection_id].sendbuffer[i]);
-    }
-    for(i =0; i < MAX_QUEUE_NUM; i++)
-    {
-        printf(" %u ",i);
-        printpackets(connections[connection_id].recvbuffer[i]);
-    }
-    Data sendbuffer[MAX_QUEUE_NUM];
-    Data recvbuffer[MAX_QUEUE_NUM];
-    printf("recv_num: %u, orecv_num: %u, sent_packetnum %u, osent_packetnum: %u, successful_sent: %u, successful_read: %u\n", 
-    connections[connection_id].recv_packetnum, 
-    connections[connection_id].orecv_packetnum, connections[connection_id].sent_packetnum, connections[connection_id].osent_packetnum,
-    connections[connection_id].successful_sent,
-    connections[connection_id].successful_read);
-    
-    printf("req packets: \n");
-    for(i = 0; i < BUFFER_PACKET_NUM; i++)
-    {
-            printf(" %u ", connections[connection_id].req_packets[i]);
-    }
-    printf("\nNumber: %u recv_counter: %u, send_counter: %u\n", connections[connection_id].num_req_paquets,
-    connections[connection_id].recv_counter, connections[connection_id].send_counter);
-
-    printf("--------------------END---------------------\n");
-    
-}
-*/
-
-/*( recieve packets and send them to the packethandler */
-/*run doLossless_UDP(); */
-void Lossless_UDP()
-{
-    IP_Port ip_port;
-    uint8_t data[MAX_UDP_PACKET_SIZE];
-    uint32_t length;
-    while (receivepacket(&ip_port, data, &length) != -1) {
-        printf("packet with length: %u\n", length);
-        /* if(rand() % 3 != 1)//add packet loss
-         { */
-            if (LosslessUDP_handlepacket(data, length, ip_port))
-                printpacket(data, length, ip_port);
-            else 
-                printf("Received handled packet with length: %u\n", length); //printconnection(0);
-            
-       /* } */
-    }
-    
-    doLossless_UDP();   
-    
-}
-
-int main(int argc, char *argv[])
-{
-    if (argc < 4) {
-        printf("usage: %s ip port filename\n", argv[0]);
-        exit(0);
-    }
-    
-    uint8_t buffer[512];
-    int read;
-    
-    FILE *file = fopen(argv[3], "rb");
-    if (file == NULL)
-      return 1;
-    
-    
-    /* initialize networking */
-    /* bind to ip 0.0.0.0:PORT */
-    IP ip;
-    ip.i = 0;
-    init_networking(ip, PORT);
-    perror("Initialization");
-    IP_Port serverip;
-    serverip.ip.i = inet_addr(argv[1]);
-    serverip.port = htons(atoi(argv[2]));
-    printip(serverip);
-    int connection = new_connection(serverip);
-    uint64_t timer = current_time();
-    while (1) {
-       /* printconnection(connection); */
-        Lossless_UDP();
-        if (is_connected(connection) == 3) {
-            printf("Connecting took: %llu us\n", (unsigned long long)(current_time() - timer));
-            break;
-        }
-        if (is_connected(connection) == 0) {
-            printf("Connection timeout after: %llu us\n", (unsigned long long)(current_time() - timer));
-            return 1;
-        }
-        c_sleep(1);
-    }
-    timer = current_time();
-    
-    
-    /*read first part of file */
-    read = fread(buffer, 1, 512, file);
-    
-    while (1) {
-        /* printconnection(connection); */
-        Lossless_UDP();
-        if (is_connected(connection) == 3) {
-            
-            if (write_packet(connection, buffer, read)) {
-               /* printf("Wrote data.\n"); */
-                read = fread(buffer, 1, 512, file);
-
-            }
-            /* printf("%u\n", sendqueue(connection)); */
-            if (sendqueue(connection) == 0) {
-                if (read == 0) {
-                    printf("Sent file successfully in: %llu us\n", (unsigned long long)(current_time() - timer));
-                    break;
-                }
-            }
-        }
-        else {
-            printf("Connecting Lost after: %llu us\n", (unsigned long long)(current_time() - timer));
-            return 0;
-        }
-        /* c_sleep(1); */
-    }
-        
-    return 0;
-}

data/ProjectTox-Core/testing/Lossless_UDP_testserver.c

@@ -1,201 +0,0 @@
-/* Lossless_UDP testserver
- * A program that waits for a lossless UDP connection and then saves all the data recieved to a file.
- * NOTE: this program simulates a 33% packet loss.
- * 
- * Best used in combination with Lossless_UDP_testclient
- * 
- * Compile with: gcc -O2 -Wall -lsodium -o testserver ../core/network.c ../core/Lossless_UDP.c Lossless_UDP_testserver.c
- * 
- * Command line argument is the name of the file to save what we recieve to.
- * EX: ./testserver filename1.txt
- *
- *  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/>.
- *  
- */
-
-#include "../core/network.h"
-#include "../core/Lossless_UDP.h"
-
-//Sleep function (x = milliseconds)
-#ifdef WIN32
-
-#define c_sleep(x) Sleep(1*x)
-
-#else
-#include <unistd.h>
-#include <arpa/inet.h>
-#define c_sleep(x) usleep(1000*x)
-
-#endif
-
-#define PORT 33445
-
-void printpacket(uint8_t *data, uint32_t length, IP_Port ip_port)
-{
-    uint32_t i;
-    printf("UNHANDLED PACKET RECEIVED\nLENGTH:%u\nCONTENTS:\n", length);
-    printf("--------------------BEGIN-----------------------------\n");
-    for (i = 0; i < length; i++) {
-        if(data[i] < 16)
-            printf("0");
-        printf("%hhX",data[i]);
-    }
-    printf("\n--------------------END-----------------------------\n\n\n");
-}
-
-/*
-void printpackets(Data test)
-{
-    int i;
-    if(test.size == 0)
-        return;
-    printf("SIZE: %u\n", test.size);
-    for(i =0; i < test.size; i++)
-    {
-        printf("%hhX", test.data[i]);
-    }
-    printf("\n");
-}
-
-void printconnection(int connection_id)
-{
-    printf("--------------------BEGIN---------------------\n");
-    IP_Port ip_port = connections[connection_id].ip_port;
-    printf("IP: %u.%u.%u.%u Port: %u\n",ip_port.ip.c[0],ip_port.ip.c[1],ip_port.ip.c[2],ip_port.ip.c[3],ntohs(ip_port.port));
-    printf("status: %u, inbound: %u, SYNC_rate: %u\n", connections[connection_id].status, 
-    connections[connection_id].inbound, connections[connection_id].SYNC_rate);
-    printf("data rate: %u, last sync: %llu, last sent: %llu, last recv: %llu \n", connections[connection_id].data_rate, 
-    connections[connection_id].last_SYNC, connections[connection_id].last_sent, connections[connection_id].last_recv);
-    int i;
-    for(i =0; i < MAX_QUEUE_NUM; i++)
-    {
-        printf(" %u ",i);
-        printpackets(connections[connection_id].sendbuffer[i]);
-    }
-    for(i =0; i < MAX_QUEUE_NUM; i++)
-    {
-        printf(" %u ",i);
-        printpackets(connections[connection_id].recvbuffer[i]);
-    }
-    Data sendbuffer[MAX_QUEUE_NUM];
-    Data recvbuffer[MAX_QUEUE_NUM];
-    printf("recv_num: %u, orecv_num: %u, sent_packetnum %u, osent_packetnum: %u, successful_sent: %u, successful_read: %u\n", 
-    connections[connection_id].recv_packetnum, 
-    connections[connection_id].orecv_packetnum, connections[connection_id].sent_packetnum, connections[connection_id].osent_packetnum,
-    connections[connection_id].successful_sent,
-    connections[connection_id].successful_read);
-    
-    printf("req packets: \n");
-    for(i = 0; i < BUFFER_PACKET_NUM; i++)
-    {
-            printf(" %u ", connections[connection_id].req_packets[i]);
-    }
-    printf("\nNumber: %u recv_counter: %u, send_counter: %u\n", connections[connection_id].num_req_paquets,
-    connections[connection_id].recv_counter, connections[connection_id].send_counter);
-
-    printf("--------------------END---------------------\n");
-    
-}
-*/
-
-/* recieve packets and send them to the packethandler
- * run doLossless_UDP(); */
-void Lossless_UDP()
-{
-    IP_Port ip_port;
-    uint8_t data[MAX_UDP_PACKET_SIZE];
-    uint32_t length;
-    while (receivepacket(&ip_port, data, &length) != -1) {
-        //if(rand() % 3 != 1)//add packet loss
-        //{
-            if (LosslessUDP_handlepacket(data, length, ip_port)) {
-                    printpacket(data, length, ip_port);
-            } else {
-                //printconnection(0);
-                 printf("Received handled packet with length: %u\n", length);
-            }
-        //}
-    }
-    
-    doLossless_UDP();   
-}
-
-
-int main(int argc, char *argv[])
-{
-    if (argc < 2) {
-        printf("usage: %s filename\n", argv[0]);
-        exit(0);
-    }
-    
-    uint8_t buffer[512];
-    int read;
-    
-    FILE *file = fopen(argv[1], "wb");
-    if (file == NULL)
-      return 1;
-    
-    
-    //initialize networking
-    //bind to ip 0.0.0.0:PORT
-    IP ip;
-    ip.i = 0;
-    init_networking(ip, PORT);
-    perror("Initialization");
-    
-    int connection;
-    uint64_t timer = current_time();
-    
-    
-    while (1) {
-        Lossless_UDP();
-        connection = incoming_connection();
-        if(connection != -1) {
-            if(is_connected(connection) == 2) {
-                printf("Recieved the connection.\n");
-                
-            }
-            break;
-        }
-        c_sleep(1);
-    }
-    
-    timer = current_time();
-    
-    while (1) {
-        //printconnection(0);
-        Lossless_UDP();
-        if (is_connected(connection) >= 2) {
-            kill_connection_in(connection, 3000000);
-            read = read_packet(connection, buffer);
-            if (read != 0) {
-               // printf("Recieved data.\n");
-                if (!fwrite(buffer, read, 1, file)) 
-                        printf("file write error\n");
-            }
-        }
-        if(is_connected(connection) == 4) {
-            printf("Connecting Lost after: %llu us\n", (unsigned long long)(current_time() - timer));
-            fclose(file);
-            return 1;
-        }
-        c_sleep(1);
-    }
-        
-    return 0;
-}

data/ProjectTox-Core/testing/misc_tools.h

@@ -1,29 +0,0 @@
-/* misc_tools.h
- * 
- * Miscellaneous functions and data structures for doing random things.
- *
- *  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 MISC_TOOLS_H
-#define MISC_TOOLS_H
-
-unsigned char * hex_string_to_bin(char hex_string[]);
- 
-#endif // MISC_TOOLS_H

data/ProjectTox-Core/testing/nTox_win32.c

@@ -1,387 +0,0 @@
-/*  nTox_win32.c
- *
- *  Textual frontend for Tox - Windows version
- *
- *  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/>.
- *  
- */
-
-#include "nTox_win32.h"
-#include "misc_tools.h"
-
-#include <process.h>
-
-uint8_t pending_requests[256][CLIENT_ID_SIZE];
-uint8_t num_requests = 0;
-
-char line[STRING_LENGTH];
-char users_id[200];
-
-void do_header()
-{
-    system("cls");
-    printf(users_id);
-    printf("\n---------------------------------");
-    printf("\n[i] commands: /f ID (to add friend), /m friendnumber message  (to send message), /s status (to change status), /n nick (to change nickname), /l (lists friends), /d friendnumber (deletes friend), /q (to quit), /r (reset screen)");
-    printf("\n---------------------------------");
-}
-
-void print_request(uint8_t *public_key, uint8_t *data, uint16_t length)
-{
-    printf("\n\n[i] received friend request with message\n");
-    printf((char *)data);
-    char numchar[100];
-    sprintf(numchar, "\n\n[i] accept request with /a %u\n\n", num_requests);
-    printf(numchar);
-    memcpy(pending_requests[num_requests], public_key, CLIENT_ID_SIZE);
-    ++num_requests;
-}
-
-void print_message(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];
-    time_t rawtime;
-    struct tm * timeinfo;
-    time (&rawtime);
-    timeinfo = localtime (&rawtime);
-    char* temp = asctime(timeinfo);
-    size_t len = strlen(temp);
-    temp[len-1]='\0';
-    sprintf(msg, "\n[%d] %s <%s> %s\n\n", friendnumber, temp, name, string); // timestamp
-    printf(msg);
-}
-
-void print_nickchange(int friendnumber, uint8_t *string, uint16_t length)
-{
-    char name[MAX_NAME_LENGTH];
-    getname(friendnumber, (uint8_t*)name);
-    char msg[100+length];
-    sprintf(msg, "\n\n[i] [%d] %s is now known as %s.\n\n", friendnumber, name, string);
-    printf(msg);
-}
-
-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\n", friendnumber, name, string);
-    printf(msg);
-}
-
-void load_key() 
-{
-    FILE *data_file = NULL;
-    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) {
-            printf("\n[i] Could not read the data file. Exiting.");
-            exit(1);
-        }
-
-        Messenger_load(data, size);
-    } else {
-        int size = Messenger_size();
-        uint8_t data[size];
-        Messenger_save(data);
-        data_file = fopen("data", "w");
-
-        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(inpt_command == 'f') {
-            int i;
-            char temp_id[128];
-            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"));
-            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 (inpt_command == 'r') {
-            do_header();
-            printf("\n\n");
-        }
-
-        else if (inpt_command == 'l') {
-            int activefriends = 0;
-            int 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);
-                if (m_friendstatus(i) == 4)    
-                    printf("[%d] %s\n\n", i, (uint8_t*)name);
-            }
-        }
-
-        else if (inpt_command == 'd') {
-            size_t len = strlen(line);
-            char numstring[len-3];
-            int 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 (inpt_command == 'm') {
-            size_t len = strlen(line);
-            char numstring[len-3];
-            char message[len-3];
-            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++)
-                        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 (they may be offline): %s\n", message);
-            } else {
-                //simply for aesthetics
-                printf("\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++) {
-                if (line[i] == 0 || line[i] == '\n') break;
-                name[i-3] = line[i];
-            }
-            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 (inpt_command == 's') {
-            uint8_t status[MAX_USERSTATUS_LENGTH];
-            int i = 0;
-            size_t len = strlen(line);
-            for (i = 3; i < len; i++) {
-                if (line[i] == 0 || line[i] == '\n') break;
-                status[i-3] = line[i];
-            }
-            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 (inpt_command == 'a') {
-            uint8_t numf = atoi(line + 3);
-            char numchar[100];
-            sprintf(numchar, "\n[i] friend request %u accepted\n\n", numf);
-            printf(numchar);
-            int num = m_addfriend_norequest(pending_requests[numf]);
-            sprintf(numchar, "\n[i] added friendnumber %d\n\n", num);
-            printf(numchar);
-        }
-        /* EXIT */
-        else if (inpt_command == 'q') { 
-            uint8_t status[MAX_USERSTATUS_LENGTH] = "Offline";
-            m_set_userstatus(status, strlen((char*)status));
-            exit(EXIT_SUCCESS);
-        }
-    } else {
-        //nothing atm
-    }
-}
-
-void get_input()
-{
-    while(1) {
-        fgets(line, STRING_LENGTH, stdin);
-        line_eval(line);
-        strcpy(line, "");
-    }
-}
-
-int main(int argc, char *argv[])
-{
-    if (argc < 4) {
-        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[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] < (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: ");
-    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 != 0)
-        bootstrap_ip_port.ip.i = resolved_address;
-    else 
-        exit(1);
-    
-    DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
-
-    int c;
-    int on = 0;
-
-    _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---------------------------------");
-            printf("\n[i] Disconnected from the DHT");
-            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;
-}