diff options
author | irungentoo <irungentoo@gmail.com> | 2014-03-14 21:11:57 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2014-03-14 21:11:57 -0400 |
commit | e143e5d7f624addb284bbd683d50848b490fb7ac (patch) | |
tree | 83f3d8b4b0a0966a1c8771972d45ab44e426c01c | |
parent | 5594b87d3cdf25754cd86458491c676bff8478eb (diff) | |
parent | a13de8b105eb87c4f525319a09e1fe0fb318fc6c (diff) |
Merge branch 'udp_test_fixes' of https://github.com/kc1212/ProjectTox-Core into mouseym-patch-3
-rw-r--r-- | testing/Lossless_UDP_testclient.c | 5 | ||||
-rw-r--r-- | testing/Lossless_UDP_testserver.c | 3 | ||||
-rw-r--r-- | toxcore/network.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/testing/Lossless_UDP_testclient.c b/testing/Lossless_UDP_testclient.c index de34dd6b..535509e0 100644 --- a/testing/Lossless_UDP_testclient.c +++ b/testing/Lossless_UDP_testclient.c | |||
@@ -4,10 +4,10 @@ | |||
4 | * | 4 | * |
5 | * Best used in combination with Lossless_UDP_testserver | 5 | * Best used in combination with Lossless_UDP_testserver |
6 | * | 6 | * |
7 | * Compile with: gcc -O2 -Wall -lsodium -o testclient ../core/network.c ../core/Lossless_UDP.c Lossless_UDP_testclient.c | 7 | * Compile with: gcc -O2 -Wall -lsodium -o testclient ../toxcore/network.c ../toxcore/Lossless_UDP.c ../toxcore/util.c Lossless_UDP_testclient.c |
8 | * | 8 | * |
9 | * Command line arguments are the ip and port to connect and send the file to. | 9 | * Command line arguments are the ip and port to connect and send the file to. |
10 | * EX: ./testclient 127.0.0.1 33445 filename.txt | 10 | * EX: ./testclient --ipv4 127.0.0.1 33445 filename.txt |
11 | * | 11 | * |
12 | * Copyright (C) 2013 Tox project All Rights Reserved. | 12 | * Copyright (C) 2013 Tox project All Rights Reserved. |
13 | * | 13 | * |
@@ -34,6 +34,7 @@ | |||
34 | 34 | ||
35 | #include "../toxcore/network.h" | 35 | #include "../toxcore/network.h" |
36 | #include "../toxcore/Lossless_UDP.h" | 36 | #include "../toxcore/Lossless_UDP.h" |
37 | #include "../toxcore/util.h" | ||
37 | #include "misc_tools.c" | 38 | #include "misc_tools.c" |
38 | 39 | ||
39 | #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32) | 40 | #if defined(_WIN32) || defined(__WIN32__) || defined (WIN32) |
diff --git a/testing/Lossless_UDP_testserver.c b/testing/Lossless_UDP_testserver.c index 4ef098d2..dd4612f5 100644 --- a/testing/Lossless_UDP_testserver.c +++ b/testing/Lossless_UDP_testserver.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * Best used in combination with Lossless_UDP_testclient | 5 | * Best used in combination with Lossless_UDP_testclient |
6 | * | 6 | * |
7 | * Compile with: gcc -O2 -Wall -lsodium -o testserver ../core/network.c ../core/Lossless_UDP.c Lossless_UDP_testserver.c | 7 | * Compile with: gcc -O2 -Wall -lsodium -o testserver ../toxcore/network.c ../toxcore/Lossless_UDP.c ../toxcore/util.c Lossless_UDP_testserver.c |
8 | * | 8 | * |
9 | * Command line argument is the name of the file to save what we receive to. | 9 | * Command line argument is the name of the file to save what we receive to. |
10 | * EX: ./testserver filename1.txt | 10 | * EX: ./testserver filename1.txt |
@@ -34,6 +34,7 @@ | |||
34 | 34 | ||
35 | #include "../toxcore/network.h" | 35 | #include "../toxcore/network.h" |
36 | #include "../toxcore/Lossless_UDP.h" | 36 | #include "../toxcore/Lossless_UDP.h" |
37 | #include "../toxcore/util.h" | ||
37 | #include "misc_tools.c" | 38 | #include "misc_tools.c" |
38 | 39 | ||
39 | //Sleep function (x = milliseconds) | 40 | //Sleep function (x = milliseconds) |
diff --git a/toxcore/network.c b/toxcore/network.c index eb637546..d7ea2bf0 100644 --- a/toxcore/network.c +++ b/toxcore/network.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* network.h | 1 | /* network.c |
2 | * | 2 | * |
3 | * Functions for the core networking. | 3 | * Functions for the core networking. |
4 | * | 4 | * |