ffi-tox 0.1.1 → 0.1.3

data/ProjectTox-Core/core/net_crypto.h

@@ -1,134 +0,0 @@
-/* net_crypto.h
- *
- * Functions for the core network crypto.
- *
- *  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 NET_CRYPTO_H
-#define NET_CRYPTO_H
-
-#include "Lossless_UDP.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Our public key. */
-extern uint8_t self_public_key[crypto_box_PUBLICKEYBYTES];
-extern uint8_t self_secret_key[crypto_box_SECRETKEYBYTES];
-
-#define ENCRYPTION_PADDING (crypto_box_ZEROBYTES - crypto_box_BOXZEROBYTES)
-
-/* encrypts plain of length length to encrypted of length + 16 using the
-    public key(32 bytes) of the receiver and the secret key of the sender and a 24 byte nonce
-    return -1 if there was a problem.
-    return length of encrypted data if everything was fine. */
-int encrypt_data(uint8_t *public_key, uint8_t *secret_key, uint8_t *nonce,
-                    uint8_t *plain, uint32_t length, uint8_t *encrypted);
-
-
-/* decrypts encrypted of length length to plain of length length - 16 using the
-    public key(32 bytes) of the sender, the secret key of the receiver and a 24 byte nonce
-    return -1 if there was a problem(decryption failed)
-    return length of plain data if everything was fine. */
-int decrypt_data(uint8_t *public_key, uint8_t *secret_key, uint8_t *nonce,
-                    uint8_t *encrypted, uint32_t length, uint8_t *plain);
-
-
-/* fill the given nonce with random bytes. */
-void random_nonce(uint8_t *nonce);
-
-/* return 0 if there is no received data in the buffer
-    return -1  if the packet was discarded.
-    return length of received data if successful */
-int read_cryptpacket(int crypt_connection_id, uint8_t *data);
-
-/* return 0 if data could not be put in packet queue
-    return 1 if data was put into the queue */
-int write_cryptpacket(int crypt_connection_id, uint8_t *data, uint32_t length);
-
-/* create a request to peer with public_key.
-    packet must be an array of MAX_DATA_SIZE big.
-    Data represents the data we send with the request with length being the length of the data.
-    request_id is the id of the request (32 = friend request, 254 = ping request)
-    returns -1 on failure
-    returns the length of the created packet on success */
-int create_request(uint8_t *packet, uint8_t * public_key, uint8_t *data, uint32_t length, uint8_t request_id);
-
-/* puts the senders public key in the request in public_key, the data from the request
-    in data if a friend or ping request was sent to us and returns the length of the data.
-    packet is the request packet and length is its length
-    return -1 if not valid request. */
-int handle_request(uint8_t *public_key, uint8_t *data, uint8_t *packet, uint16_t length);
-
-/* Start a secure connection with other peer who has public_key and ip_port
-    returns -1 if failure
-    returns crypt_connection_id of the initialized connection if everything went well. */
-int crypto_connect(uint8_t *public_key, IP_Port ip_port);
-
-/* kill a crypto connection
-    return 0 if killed successfully
-    return 1 if there was a problem. */
-int crypto_kill(int crypt_connection_id);
-
-/* handle an incoming connection
-    return -1 if no crypto inbound connection
-    return incoming connection id (Lossless_UDP one) if there is an incoming crypto connection
-    Put the public key of the peer in public_key, the secret_nonce from the handshake into secret_nonce
-    and the session public key for the connection in session_key
-    to accept it see: accept_crypto_inbound(...)
-    to refuse it just call kill_connection(...) on the connection id */
-int crypto_inbound(uint8_t *public_key, uint8_t * secret_nonce, uint8_t *session_key);
-
-/* accept an incoming connection using the parameters provided by crypto_inbound
-    return -1 if not successful
-    returns the crypt_connection_id if successful */
-int accept_crypto_inbound(int connection_id, uint8_t *public_key, uint8_t * secret_nonce, uint8_t *session_key);
-
-/* return 0 if no connection, 1 we have sent a handshake, 2 if connexion is not confirmed yet
-    (we have received a handshake but no empty data packet), 3 if the connection is established.
-    4 if the connection is timed out and waiting to be killed */
-int is_cryptoconnected(int crypt_connection_id);
-
-
-/* Generate our public and private keys
-    Only call this function the first time the program starts. */
-void new_keys();
-
-/* save the public and private keys to the keys array
-    Length must be crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES */
-void save_keys(uint8_t * keys);
-
-/* load the public and private keys from the keys array
-    Length must be crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES */
-void load_keys(uint8_t * keys);
-
-/* run this to (re)initialize net_crypto
-    sets all the global connection variables to their default values. */
-void initNetCrypto();
-
-/* main loop */
-void doNetCrypto();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

data/ProjectTox-Core/core/network.c

@@ -1,205 +0,0 @@
-/* network.h
- *
- * Functions for the core networking.
- *
- *  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 "network.h"
-
-/* returns current UNIX time in microseconds (us). */
-uint64_t current_time()
-{
-    uint64_t time;
-#ifdef WIN32
-    /* This probably works fine */
-    FILETIME ft;
-    GetSystemTimeAsFileTime(&ft);
-    time = ft.dwHighDateTime;
-    time <<=32;
-    time |= ft.dwLowDateTime;
-    time -= 116444736000000000UL;
-    return time/10;
-#else
-    struct timeval a;
-    gettimeofday(&a, NULL);
-    time = 1000000UL*a.tv_sec + a.tv_usec;
-    return time;
-#endif
-}
-
-/* return a random number
-   NOTE: this function should probably not be used where cryptographic randomness is absolutely necessary */
-uint32_t random_int()
-{
-#ifndef VANILLA_NACL
-    //NOTE: this function comes from libsodium
-    return randombytes_random();
-#else
-    return random();
-#endif
-}
-
-/* our UDP socket, a global variable. */
-static int sock;
-
-/* Basic network functions:
-   Function to send packet(data) of length length to ip_port */
-int sendpacket(IP_Port ip_port, uint8_t * data, uint32_t length)
-{
-    ADDR addr = {AF_INET, ip_port.port, ip_port.ip};
-    return sendto(sock,(char *) data, length, 0, (struct sockaddr *)&addr, sizeof(addr));
-}
-
-/* Function to receive data, ip and port of sender is put into ip_port
-   the packet data into data
-   the packet length into length.
-   dump all empty packets. */
-int receivepacket(IP_Port * ip_port, uint8_t * data, uint32_t * length)
-{
-    ADDR addr;
-#ifdef WIN32
-    int addrlen = sizeof(addr);
-#else
-    uint32_t addrlen = sizeof(addr);
-#endif
-    (*(int32_t*)length) = recvfrom(sock,(char*) data, MAX_UDP_PACKET_SIZE, 0, (struct sockaddr*)&addr, &addrlen);
-    if (*(int32_t*)length <= 0)
-        return -1; /* nothing received or empty packet */
-
-    ip_port->ip = addr.ip;
-    ip_port->port = addr.port;
-    return 0;
-}
-
-/* initialize networking
-   bind to ip and port
-   ip must be in network order EX: 127.0.0.1 = (7F000001)
-   port is in host byte order (this means don't worry about it)
-   returns 0 if no problems
-   returns -1 if there are problems */
-int init_networking(IP ip, uint16_t port)
-{
-#ifdef WIN32
-    WSADATA wsaData;
-    if (WSAStartup(MAKEWORD(2,2), &wsaData) != NO_ERROR)
-        return -1;
-#else
-    srandom((uint32_t)current_time());
-#endif
-    srand((uint32_t)current_time());
-
-    /* initialize our socket */
-    sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-
-    /* Check for socket error */
-#ifdef WIN32
-    if (sock == INVALID_SOCKET) /* MSDN recommends this */
-        return -1;
-#else
-    if (sock < 0)
-        return -1;
-#endif
-
-    /* Functions to increase the size of the send and receive UDP buffers
-       NOTE: uncomment if necessary */
-    /*
-    int n = 1024 * 1024 * 2;
-    if(setsockopt(sock, SOL_SOCKET, SO_RCVBUF, (char*)&n, sizeof(n)) == -1)
-    {
-        return -1;
-    }
-
-    if(setsockopt(sock, SOL_SOCKET, SO_SNDBUF, (char*)&n, sizeof(n)) == -1)
-        return -1;
-    */
-
-    /* Enable broadcast on socket */
-    int broadcast = 1;
-    setsockopt(sock, SOL_SOCKET, SO_BROADCAST, (char*)&broadcast, sizeof(broadcast));
-
-    /* Set socket nonblocking */
-#ifdef WIN32
-    /* I think this works for windows */
-    u_long mode = 1;
-    /* ioctl(sock, FIONBIO, &mode); */
-    ioctlsocket(sock, FIONBIO, &mode);
-#else
-    fcntl(sock, F_SETFL, O_NONBLOCK, 1);
-#endif
-
-    /* Bind our socket to port PORT and address 0.0.0.0 */
-    ADDR addr = {AF_INET, htons(port), ip};
-    bind(sock, (struct sockaddr*)&addr, sizeof(addr));
-
-    return 0;
-
-}
-
-/* function to cleanup networking stuff */
-void shutdown_networking()
-{
-#ifdef WIN32
-    closesocket(sock);
-    WSACleanup();
-#else
-    close(sock);
-#endif
-    return;
-}
-
-/*
-  resolve_addr():
-    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
-
-    TODO: Fix ipv6 support
-*/
-uint32_t resolve_addr(const char *address)
-{
-    struct addrinfo *server = NULL;
-    struct addrinfo  hints;
-    int              rc;
-    uint32_t         addr;
-
-    memset(&hints, 0, sizeof(hints));
-    hints.ai_family   = AF_INET;    // IPv4 only right now.
-    hints.ai_socktype = SOCK_DGRAM; // type of socket Tox uses.
-
-    rc = getaddrinfo(address, "echo", &hints, &server);
-
-    // Lookup failed.
-    if(rc != 0) {
-        return 0;
-    }
-
-    // IPv4 records only..
-    if(server->ai_family != AF_INET) {
-        freeaddrinfo(server);
-        return 0;
-    }
-    
-
-    addr = ((struct sockaddr_in*)server->ai_addr)->sin_addr.s_addr;
-
-    freeaddrinfo(server);
-    return addr;
-}

data/ProjectTox-Core/core/network.h

@@ -1,134 +0,0 @@
-/* network.h
- *
- * Datatypes, functions and includes for the core networking.
- *
- *  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 NETWORK_H
-#define NETWORK_H
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <time.h>
-
-#ifdef WIN32 /* Put win32 includes here */
-//Windows XP
-#define WINVER 0x0501
-#include <winsock2.h>
-#include <windows.h>
-#include <ws2tcpip.h>
-
-#undef VANILLA_NACL /* make sure on windows we use libsodium */
-
-#else //Linux includes
-
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <errno.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <netdb.h>
-#include <unistd.h>
-
-#endif
-
-#ifndef VANILLA_NACL
-/* we use libsodium by default */
-#include <sodium.h>
-#else
-#include <crypto_box.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define MAX_UDP_PACKET_SIZE 65507
-
-typedef union {
-    uint8_t c[4];
-    uint16_t s[2];
-    uint32_t i;
-} IP;
-
-typedef struct {
-    IP ip;
-    uint16_t port;
-    /* not used for anything right now */
-    uint16_t padding;
-} IP_Port;
-
-typedef struct {
-    int16_t family;
-    uint16_t port;
-    IP ip;
-    uint8_t zeroes[8];
-#ifdef ENABLE_IPV6
-    uint8_t zeroes2[12];
-#endif
-} ADDR;
-
-/* returns current time in milleseconds since the epoch. */
-uint64_t current_time();
-
-/* return a random number
-    NOTE: this function should probably not be used where cryptographic randomness is absolutely necessary */
-uint32_t random_int();
-
-/* Basic network functions: */
-
-/* Function to send packet(data) of length length to ip_port */
-int sendpacket(IP_Port ip_port, uint8_t *data, uint32_t length);
-
-/* Function to receive data, ip and port of sender is put into ip_port
-    the packet data into data
-    the packet length into length. */
-int receivepacket(IP_Port *ip_port, uint8_t *data, uint32_t *length);
-
-/* initialize networking
-    bind to ip and port
-    ip must be in network order EX: 127.0.0.1 = (7F000001)
-    port is in host byte order (this means don't worry about it)
-    returns 0 if no problems
-    returns -1 if there were problems */
-int init_networking(IP ip, uint16_t port);
-
-/* function to cleanup networking stuff(doesn't do much right now) */
-void shutdown_networking();
-
-/*
-  resolve_addr():
-    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
-
-    TODO: Fix ipv6 support
-*/
-uint32_t resolve_addr(const char *address);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif