Commit Graph

258 Commits

Author SHA1 Message Date
Nick ODell
7ddeb2bf6d Fix bug where we could run past the end of the friends list 2013-08-06 18:11:13 -06:00
irungentoo
29773d97fc Small bug fixed. 2013-08-06 17:25:32 -04:00
irungentoo
39a213a58c Merge pull request #361 from plutooo/master
core: Moved handle ping packets to ping.c
2013-08-06 13:41:04 -07:00
plutooo
9e0ee5b7df core: Moved handle ping packets to ping.c 2013-08-06 13:09:14 -07:00
irungentoo
fc5a2f53df Merge branch 'master' of https://github.com/plutooo/ProjectTox-Core into plutooo-master
Conflicts:
	core/ping.c
	core/util.c
2013-08-06 13:53:38 -04:00
plutooo
6e610749eb core: Move ping request/response into ping.c 2013-08-06 09:42:53 -07:00
plutooo
e71413d8f1 core: Move send ping packets functions to ping.c 2013-08-06 09:21:39 -07:00
irungentoo
1daf064621 Merge branch 'plutooo-master' 2013-08-05 20:36:20 -04:00
irungentoo
524cf18954 Fixed style and is_pinging(). 2013-08-05 20:35:47 -04:00
irungentoo
109fe7bd0a Merge pull request #341 from stal888/userstatus-ext
An extension to user statuses.
2013-08-05 17:24:04 -07:00
irungentoo
c9a597b794 Merge branch 'master' of https://github.com/plutooo/ProjectTox-Core into plutooo-master 2013-08-05 18:48:34 -04:00
Nick ODell
84607c8937 Fix bug where friendreq_handlepacket did not do bounds checking 2013-08-05 14:54:53 -06:00
Nick ODell
9364db9eff Fix bug where handle_NATping wouldn't perform bounds checking 2013-08-05 14:46:45 -06:00
plutooo
071ac46308 core: Rewrote ping-module, better performance and cleaner code. 2013-08-05 12:51:58 -07:00
Sebastian Stal
b7f989266d Add functions for dealing with userstatus kinds. 2013-08-05 12:30:07 -07:00
Luke Champine
d1f84efdd7 temporary fix to prevent m_addfriend from segfaulting 2013-08-05 11:22:47 -04:00
Florian Hahn
5617bf0bf1 Use void for functions with no parameters 2013-08-05 15:57:17 +02:00
Maxim Biro
03a2bac319 Improved cmake 2013-08-04 22:25:07 -04:00
Maxim Biro
f03dc44e97 Fixed Windows build 2013-08-04 21:20:48 -04:00
Florian Hahn
7567e0a1c4 Make private functions in core/DHT.c static 2013-08-04 23:05:43 +02:00
Florian Hahn
c387de52b2 Make private functions in core/LAN_discovery.c static 2013-08-04 23:05:35 +02:00
Florian Hahn
2a9fedc08f Make private functions in core/Lossless_UDP.c static 2013-08-04 23:05:27 +02:00
Florian Hahn
8680cf76bf Make private functions in core/net_crypto.c static 2013-08-04 23:05:20 +02:00
Jae Kwon
158751cb2d various fixes for first time user
* added linking to libsodium
* fixed links to docs to point to wiki
2013-08-03 14:46:52 -07:00
irungentoo
7b84aaaac8 Merge pull request #302 from ChlorideCull/master
Changed CMake options to compile the core as a shared library instead of static
2013-08-03 10:14:07 -07:00
irungentoo
fb14b3eccd Fixed compatibility with original NaCl. 2013-08-03 12:45:44 -04:00
Chloride Cull
add9c0b6dc Changed CMake options to compile the core shared
It is now compiled under 'toxcore' instead of just 'core' to be able to be installed without conflicts.
2013-08-03 18:25:12 +02:00
plutooo
e5d2c219af DHT: added id_equal(), ipport_equal(), is_timeout() 2013-08-03 08:32:09 -07:00
irungentoo
7d7c5faa09 Merge pull request #275 from nickodell/master
Fix bug where memcpy could overrun buffer; Replace ZEROBYTES - BOXZEROBYTES with MACBYTES
2013-08-02 17:30:44 -07:00
irungentoo
9e5800ab10 Fixed regression. 2013-08-02 20:21:49 -04:00
Nick ODell
9c039cfd2a Replace ZEROBYTES - BOXZEROBYTES with MACBYTES 2013-08-02 16:35:41 -06:00
irungentoo
802236272f Merge branch 'Jeffail-master' 2013-08-02 16:20:26 -04:00
irungentoo
7b46b04ce7 Time is better as an unsigned variable. 2013-08-02 15:57:53 -04:00
Nick ODell
8d1f7753f6 Fix bug where memcpy could overrun buffer 2013-08-02 13:40:56 -06:00
irungentoo
346e4b28ca Fixed problems. 2013-08-02 15:28:48 -04:00
charmlesscoin
b114575df8 updated return value comments 2013-08-02 12:35:34 -04:00
charmlesscoin
4b49df896f added #defines for friend.status as well as for erroring on m_addfriend* 2013-08-02 12:33:11 -04:00
irungentoo
2a074d1160 Merge branch 'master' into Jeffail-master 2013-08-02 12:17:24 -04:00
charmlesscoin
6ed5b89e5b removed getnumfriends() 2013-08-02 11:36:39 -04:00
irungentoo
b9176974a8 Merge branch 'master' into Jeffail-master
Conflicts:
	core/DHT.c
2013-08-02 10:41:03 -04:00
Andreas Schneider
20951dda7d DHT: Fix return value of time().
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Signed-off-by: irungentoo <irungentoo@gmail.com>
2013-08-02 09:41:22 -04:00
Jeffail
67efb67f96 Refactored DHT.c from end of NAT punching to EOF 2013-08-02 10:59:09 +01:00
Jeffail
bcf36e8115 Refactored DHT.c, all of NAT punching functions (line 1217 2013-08-02 10:56:10 +01:00
Jeffail
1708dc1a88 Refactored DHT.c down to line 1048 (beginning of NAT) 2013-08-02 10:53:28 +01:00
Jeffail
f9816b43f3 Refactored DHT.c down to line 881 2013-08-02 10:49:54 +01:00
Jeffail
cef8a3e4e5 Refactored DHT.c down to line 779 2013-08-02 10:47:32 +01:00
Jeffail
a5a1f917ab Refactored DHT.c down to line 567 2013-08-02 10:43:00 +01:00
Jeffail
e7f74555ea Refactored DHT.c down to line 367 2013-08-02 10:39:04 +01:00
Jeffail
fda296e41d Refactored client/friend helper functions (down to line 274) 2013-08-02 10:32:25 +01:00
Nick ODell
fd95ab5ed7 Remove some magic numbers; use macros to clarify intent 2013-08-01 19:21:50 -06:00