Commit Graph

175 Commits

Author SHA1 Message Date
irungentoo
1b4eea2186 Small fixes. 2013-07-30 19:38:05 -04:00
Astonex
cd0518a45c Update Messenger.c
Offer more meaningful returns so appropriate actions can be taken by the GUI.
2013-07-31 00:13:31 +01:00
irungentoo
bd695135dc Fixed segfault. 2013-07-30 14:43:32 -04:00
irungentoo
77fa38f597 Clarification. 2013-07-30 14:32:18 -04:00
irungentoo
87388b302e Merge branch 'master' of https://github.com/blackwolf12333/ProjectTox-Core into blackwolf12333-master
Also fixed his pull request.
2013-07-30 14:30:33 -04:00
Peter Maatman
12b19f6910 renamed getname to getfriendname and added a getname function to get the name of our client 2013-07-30 17:09:09 +02:00
irungentoo
b1726f55ed Merge branch 'master' of https://github.com/nurupo/InsertProjectNameHere into nurupo-master
Conflicts:
	testing/CMakeLists.txt
2013-07-30 07:31:51 -04:00
irungentoo
e9dd83b543 Merge pull request #146 from boredomist/patch-1
Replace magic value "7" with string "echo"
2013-07-30 04:26:31 -07:00
Astonex
e920be4c01 Fixed the friends listing 2013-07-30 09:21:22 +01:00
Erik Price
de7ebc55b1 Replace magic value "7" with string "echo" 2013-07-29 21:32:27 -04:00
Maxim Biro
261f365e55 Fixed function signature 2013-07-29 20:47:12 -04:00
Maxim Biro
1d8f6e94e7 Fixed formatting of some cmake files 2013-07-29 20:45:53 -04:00
irungentoo
db5775afb3 Added basic dynamic memory allocation to Lossless UDP. 2013-07-28 19:42:33 -04:00
irungentoo
0eb429e458 Slightly improved hole punching in the DHT. 2013-07-28 17:10:55 -04:00
irungentoo
deb124f539 Fixed name related functions.
They now should give proper lengths and take length into account when
sending.
2013-07-27 21:08:06 -04:00
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
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
nfkd
c9063cf24a Update DHT.c 2013-07-26 21:54:02 -03:00
irungentoo
e6a33fede6 Small inconsistency fixed. 2013-07-26 19:31:01 -04: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
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
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
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
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
Astonex
92398844a0 Changed the error checking to not just be Windows only 2013-07-24 01:33:08 +01:00
Astonex
0af0c274d3 Changed bind() == -1 check to INVALID_SOCK check 2013-07-24 01:22:45 +01:00
Astonex
29aa702a4f Added simple init_networking() error checking 2013-07-24 00:32:50 +01:00
Maxim Biro
23f13cd95d Fixed include 2013-07-23 03:09:00 -04:00
irungentoo
2cf05862d5 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-07-22 18:19:33 -04:00