Merge branch 'udp_test_fixes' of https://github.com/kc1212/ProjectTox-Core into mouseym-patch-3

This commit is contained in:
irungentoo 2014-03-14 21:11:57 -04:00
commit e143e5d7f6
3 changed files with 6 additions and 4 deletions

View File

@ -4,10 +4,10 @@
* *
* Best used in combination with Lossless_UDP_testserver * 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 * Compile with: gcc -O2 -Wall -lsodium -o testclient ../toxcore/network.c ../toxcore/Lossless_UDP.c ../toxcore/util.c Lossless_UDP_testclient.c
* *
* Command line arguments are the ip and port to connect and send the file to. * Command line arguments are the ip and port to connect and send the file to.
* EX: ./testclient 127.0.0.1 33445 filename.txt * EX: ./testclient --ipv4 127.0.0.1 33445 filename.txt
* *
* Copyright (C) 2013 Tox project All Rights Reserved. * Copyright (C) 2013 Tox project All Rights Reserved.
* *
@ -34,6 +34,7 @@
#include "../toxcore/network.h" #include "../toxcore/network.h"
#include "../toxcore/Lossless_UDP.h" #include "../toxcore/Lossless_UDP.h"
#include "../toxcore/util.h"
#include "misc_tools.c" #include "misc_tools.c"
#if defined(_WIN32) || defined(__WIN32__) || defined (WIN32) #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32)

View File

@ -4,7 +4,7 @@
* *
* Best used in combination with Lossless_UDP_testclient * 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 * Compile with: gcc -O2 -Wall -lsodium -o testserver ../toxcore/network.c ../toxcore/Lossless_UDP.c ../toxcore/util.c Lossless_UDP_testserver.c
* *
* Command line argument is the name of the file to save what we receive to. * Command line argument is the name of the file to save what we receive to.
* EX: ./testserver filename1.txt * EX: ./testserver filename1.txt
@ -34,6 +34,7 @@
#include "../toxcore/network.h" #include "../toxcore/network.h"
#include "../toxcore/Lossless_UDP.h" #include "../toxcore/Lossless_UDP.h"
#include "../toxcore/util.h"
#include "misc_tools.c" #include "misc_tools.c"
//Sleep function (x = milliseconds) //Sleep function (x = milliseconds)

View File

@ -1,4 +1,4 @@
/* network.h /* network.c
* *
* Functions for the core networking. * Functions for the core networking.
* *