StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity
1,205 Commits 2 Branches 1 Tag 69 MiB
9d3a8d94f2
Commit Graph

378 Commits

Author SHA1 Message Date
irungentoo
9634a23437 Merge branch 'master' of https://github.com/nurupo/InsertProjectNameHere into nurupo-master 
Conflicts:
	core/Messenger.c
 2013-08-08 14:39:27 -04:00
Maxim Biro
04c974962c Made name consistent with other 'on change' callbacks 2013-08-08 13:54:16 -04:00
Maxim Biro
23f55c101d Fixed a silly code ordering mistake 2013-08-08 13:42:27 -04:00
irungentoo
1fb2085c67 Fixed dynamic memory allocation. 2013-08-08 12:13:29 -04:00
irungentoo
cd22973d48 Merge pull request #396 from lukechampine/dynamicfriends 
make friendlist resize dynamically
 2013-08-08 08:50:06 -07:00
irungentoo
a3a0fb57cb Moved a define and fixed another. 2013-08-08 10:59:22 -04:00
Luke Champine
815628b76a make friendlist resize dynamically 2013-08-08 10:49:36 -04:00
Maxim Biro
f66b6ce50b Made a callback for Friend.status change 2013-08-08 02:12:19 -04:00
stal
0e03b049d8 Reinstate semicolon 2013-08-07 22:58:39 -07:00
stal
67c2b9fffd Re-export m_callback_userstatus 2013-08-07 22:05:23 -07:00
Maxim Biro
4779561ea3 Refactored an expression 2013-08-07 20:24:06 -04:00
Maxim Biro
b6a3f2b403 Added length checks 2013-08-07 20:23:48 -04:00
Maxim Biro
f669b28a6c Merge branch 'master' of http://github.com/irungentoo/ProjectTox-Core 
Conflicts:
	core/Messenger.c
	core/Messenger.h
 2013-08-07 19:18:40 -04:00
irungentoo
4dbcfdf05d Some cosmetic improvements. 2013-08-07 18:14:35 -04:00
Maxim Biro
9801eceaa4 Separated StatusMessage from UserStatus 2013-08-07 18:12:31 -04:00
irungentoo
59f873fd68 Merge branch 'read-receipt' of https://github.com/stal888/ProjectTox-Core into pull-requests 
Conflicts:
	testing/toxic/chat.c
	testing/toxic/prompt.c
 2013-08-07 13:51:58 -04:00
Sebastian Stal
c0828667e7 Document functions, and fix bug. 2013-08-07 10:06:07 -07:00
Sebastian Stal
105e2fa4a3 Add read receipts using packet ID 65. 2013-08-07 09:53:52 -07:00
Jfreegman
90524356a7 Fixed two bugs 2013-08-07 02:34:55 -04:00
Nick ODell
eb546db56b Fix segfault when no broadcast device is found 2013-08-06 18:11:13 -06:00
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
irungentoo
91216719a5 Updated comments. 2013-08-01 20:40:58 -04:00
irungentoo
af8e843451 Merge pull request #229 from JFreegman/master 
fixed friend add bugs and gave no message its own error
 2013-08-01 17:38:29 -07:00
irungentoo
368ba8ed01 Merge pull request #247 from Jeffail/master 
Refactored most of DHT.c, added local vim config
 2013-08-01 17:35:31 -07:00
irungentoo
e3c47d90b9 Merge pull request #249 from rlt3/master 
Re-styling Lossless_UDP.c and .h
 2013-08-01 17:24:46 -07:00
irungentoo
2e892cc981 Merge pull request #251 from CharmlessCoin/network 
Rewrote get_broadcast() so it works now.
 2013-08-01 16:54:30 -07:00
Jeffail
4f2146c085 Back to old methods, reordered the structs, defines, and global variables to the top, should be no changes to binary 2013-08-01 22:53:50 +01:00
rlt3
7097349552 removed potential segfault 2013-08-01 17:52:17 -04:00
rlt3
a164c15c00 removing unnecessary binary files 2013-08-01 17:03:06 -04:00
charmlesscoin
4a5bc1f0fe removed debugging 2013-08-01 16:54:04 -04:00
rlt3
ba00e58f1d Changing some if loops around, specifically where some counts could be done once (checking if packets were over the max_data_size, etc) rather than over a couple lines 2013-08-01 16:53:31 -04:00
charmlesscoin
939c4afd2c moved some code around, changed how we print the debugging 2013-08-01 16:33:03 -04:00
charmlesscoin
8a0800da4e redid get_broadcast(), looks like it should work now 2013-08-01 16:25:22 -04:00
irungentoo
79f0a2ccba Fixed stupid copy pasting mistake. 2013-08-01 16:15:10 -04:00
rlt3
3720eba58e Trimming some things down and re styling comments 2013-08-01 16:11:36 -04:00
rlt3
36698f0824 Merge branch 'master' of https://github.com/rlt3/ProjectTox-Core 2013-08-01 16:01:29 -04:00
rlt3
307e4d2e3e Trying to make Lossless UDP more readable with style changes 2013-08-01 15:58:19 -04:00
irungentoo
ffd69a6525 Possible timing problem fixed. 2013-08-01 15:49:32 -04:00
Jeffail
ab8f549c65 Refactored most of DHT.c, added local vim config 2013-08-01 20:45:21 +01:00
Jfreegman
8abc0a3462 added error code for no message on friend add & updated nTox.c/nTox_win32.c 2013-08-01 15:27:08 -04:00
irungentoo
f6c510b3cc Merge pull request #244 from plutooo/master 
core: getaddrinfo() lookup error handling
 2013-08-01 12:21:45 -07:00
plutooo
3d916b35f2 core: getaddrinfo() lookup error handling 2013-08-01 11:54:06 -07:00
irungentoo
633edcf452 Fixed possible timing problem. 2013-08-01 14:44:51 -04:00
irungentoo
d534a05264 Removed code that didn't work. 2013-08-01 11:41:05 -04:00
irungentoo
7a08681af5 Fixed possible issues with the crypto reported by an anonymous person. 2013-08-01 11:22:56 -04:00
charmlesscoin
5ceb601fcd restored this branch to be on par with upstream 2013-08-01 03:42:33 -04:00
Jfreegman
d8867b95c5 corrected comment and removed forced message for friend adds 2013-07-31 21:42:28 -04:00
Astonex
f05aa30870 Merge remote-tracking branch 'ProjectTox/master' 2013-07-31 23:02:09 +01:00
Astonex
8dfba27242 Slight changes 2013-07-31 23:01:59 +01:00
irungentoo
f2f266e9a7 Merge branch 'master' of https://github.com/xzfc/ProjectTox-Core into xzfc-master 
Conflicts:
	CMakeLists.txt
 2013-07-31 07:56:10 -04:00
irungentoo
7252456c87 Merge pull request #171 from AMDmi3/freebsd-fixes 
FreeBSD fixes
 2013-07-31 04:46:12 -07:00
xzfcpw
f77fe65d54 NaCl compiling option 2013-07-31 15:42:05 +07:00
Dmitry Marakasov
89dd7ed011 Add detection of required libraries 2013-07-31 06:15:26 +04:00
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
Dmitry Marakasov
6d0abb4132 Add missing newlines at EOF in sources 
(missing newlines break build due to -Werror)
 2013-07-30 22:39:04 +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