Commit Graph

569 Commits

Author SHA1 Message Date
irungentoo
b83359cd05 Added friend request accepting to nTox and fixed a bug.
Fixed a bug in Lossless UDP that prevented 2 clients from sometimes
connecting when they connected at the same time to each other.
2013-07-27 20:04:56 -04:00
irungentoo
1864f2b396 Merge pull request #118 from nfkd/patch-1
styling
2013-07-27 09:52:14 -07:00
nfkd
52a11813a6 styling 2013-07-27 13:43:30 -03:00
irungentoo
8eb76e46a8 Merge pull request #117 from KostyaKow/master
created new files misc_tools.(c|h) and moved hex_string_to_bin() there.
2013-07-27 09:32:43 -07:00
Konstantin Kowalski
ecab4c8777 Fixing broken commit 2013-07-27 12:17:31 -04:00
Konstantin Kowalski
b3fa1fc8f4 [fixed]created new files misc_tools.(c|h) and moved hex_string_to_bin() there. 2013-07-27 12:10:41 -04:00
Konstantin Kowalski
77ebbed91b created new files misc_tools.(c|h) and moved hex_string_to_bin() there. 2013-07-27 10:53:01 -04:00
irungentoo
4edf2207fe Fixed small astyle problems. 2013-07-27 08:48:50 -04:00
irungentoo
14b43651c1 Ran the code through: astyle --style=linux 2013-07-27 08:43:36 -04:00
irungentoo
1a6446266c Merge branch 'master' of https://github.com/KostyaKow/ProjectTox-Core into KostyaKow-master
Conflicts:
	core/DHT.c
2013-07-27 08:26:00 -04:00
Konstantin Kowalski
241aca98bd A *lot* of style changes. 2013-07-26 23:07:25 -04:00
irungentoo
45b5ef0b79 Merge pull request #115 from Astonex/master
Close the socket in shutdown_networking()
2013-07-26 19:03:34 -07:00
irungentoo
792a02e9f6 Merge pull request #111 from nfkd/patch-3
Fix braces and a few whitespaces
2013-07-26 18:57:42 -07:00
Astonex
3e1b96f333 Merge remote-tracking branch 'ProjectTox/master' 2013-07-27 02:52:24 +01:00
Astonex
37a300f902 Close the socket in shutdown_networking() 2013-07-27 02:45:58 +01:00
nfkd
11e18d71c9 Update DHT.c 2013-07-26 22:42:33 -03:00
irungentoo
1b4ea2e1ae Merge pull request #114 from nurupo/master
Updated Windows instructions
2013-07-26 18:19:05 -07:00
Maxim Biro
753f47ef6c Updated Windows instructions 2013-07-26 21:05:24 -04:00
nfkd
c9063cf24a Update DHT.c 2013-07-26 21:54:02 -03:00
irungentoo
052a231559 Merge pull request #113 from Astonex/patch-1
Update INSTALL.md
2013-07-26 17:49:45 -07:00
irungentoo
85b2db2ad2 Merge pull request #112 from KostyaKow/master
took out several strlen() calls out of the loop; replaced int's with siz...
2013-07-26 17:48:12 -07:00
Astonex
6515a52d44 Update INSTALL.md
Spelling mistake
2013-07-27 01:46:35 +01:00
Astonex
6082293089 Update INSTALL.md
Updated the Windows install instructions - Changing the system path to include MinGW's bin directory.
2013-07-27 01:39:16 +01:00
irungentoo
e6a33fede6 Small inconsistency fixed. 2013-07-26 19:31:01 -04:00
irungentoo
d04f5f40d4 Merge pull request #110 from nfkd/patch-2
Fix braces and some white-spaces
2013-07-26 16:29:35 -07:00
nfkd
d62aec7db5 Fix braces and a few whitespaces 2013-07-26 20:18:45 -03:00
nfkd
4478cd4cd3 Fix braces and some white-spaces 2013-07-26 19:52:20 -03:00
irungentoo
0565374ddc Merge pull request #109 from nfkd/patch-1
Fix braces
2013-07-26 15:49:57 -07:00
irungentoo
2bbffc9ca0 Merge pull request #108 from sometwo/patch-5
styling
2013-07-26 15:42:13 -07:00
nfkd
16c9e23b3c Fix braces 2013-07-26 19:39:04 -03:00
sometwo
db8d47dccb styling
haven't fixed switch statements because I'm lazy
2013-07-26 19:17:24 -03:00
irungentoo
bd48ef52ec Merge pull request #107 from sometwo/patch-4
Fix some indenting
2013-07-26 15:13:44 -07:00
irungentoo
ef2e0c7aad Merge pull request #106 from sometwo/patch-3
Fix braces and a comment
2013-07-26 15:11:29 -07:00
sometwo
a3298d2b9e Fix some indenting 2013-07-26 19:10:22 -03:00
sometwo
a1fd6d53de Fix braces and a comment 2013-07-26 19:05:57 -03:00
irungentoo
056195be41 Fixed the multiple friends request recieved at the same time problem. 2013-07-26 17:06:03 -04:00
Konstantin Kowalski
a1b93c397c took out several strlen() calls out of the loop; replaced int's with size_t where needed 2013-07-26 16:16:58 -04:00
irungentoo
9d860fac79 Merge pull request #105 from nfkd/patch-1
Remove unnecessary braces
2013-07-26 10:20:59 -07:00
nfkd
5bfb3957c4 Remove unnecessary braces 2013-07-26 13:25:51 -03:00
irungentoo
e65bedc096 I don't know how this happened. 2013-07-26 10:31:49 -04:00
irungentoo
3d1c77dc57 Added basic Local/LAN discovery. 2013-07-26 10:24:56 -04:00
irungentoo
8c70b7c11d Merge pull request #103 from SilentSand/master
Licensing
2013-07-26 05:38:35 -07:00
SilentSand
1577a1eb61 Minor screwup fixed
I sure wish it was easier to compile on Windows.
2013-07-26 04:08:39 -04:00
SilentSand
59b34e423b Formatting.
Many stylistic changes, mostly formatting code more closely to the
coding style.
2013-07-26 04:02:17 -04:00
SilentSand
b9169ff1b2 Small change 2013-07-26 02:43:38 -04:00
SilentSand
f377eb9ca2 Licensing
Added the GPLv3 license to some files in addition to fixing some
comments at the beginning of the files.
2013-07-25 21:45:56 -04:00
irungentoo
63375b68b6 Broadcast now enabled on socket. 2013-07-25 21:00:31 -04:00
irungentoo
ee331fd73b Experimental and unoptimized symmetric NAT hole punching added. 2013-07-24 19:39:34 -04:00
irungentoo
57e7ed7c10 Merge pull request #99 from Astonex/master
Simple init_networking() error checking
2013-07-24 05:26:03 -07:00
Astonex
92398844a0 Changed the error checking to not just be Windows only 2013-07-24 01:33:08 +01:00