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
680 Commits 2 Branches 1 Tag 69 MiB
7b84aaaac8
Commit Graph

234 Commits

Author SHA1 Message Date
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
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
Maxim Biro
52f3b1553f Added support of linkage with C++ code 2013-07-22 18:06:24 -04:00
irungentoo
8379941584 Added small thing to DHT. 2013-07-22 17:21:58 -04:00
irungentoo
d0b4fa56a3 Friend requests should be better. 2013-07-22 17:02:32 -04:00
irungentoo
11d02de9a1 Fixed small thing in DHT. 2013-07-22 16:26:10 -04:00
irungentoo
55361eac6f Modified the way friend requests worked. 
Added routing of friend requests.
 2013-07-22 14:52:42 -04:00
Maxim Biro
533f136d0e Made a cmake project for Core 2013-07-21 20:41:08 -04:00
redwire
b16013b86b Fixed temp redeclaration 2013-07-21 21:23:21 -02:30
redwire
99c3426cbc Going with irungentoo's suggestion and using memcpy instead of sectioning with arithmetic 2013-07-21 21:13:04 -02:30
Zack
9b634504a6 Fixed an embarassing typo 2013-07-21 18:40:24 -02:30
Zack
c999fb6462 Implemented a faster algorithm for generating nonces 2013-07-21 18:35:12 -02:30
irungentoo
7fecd73ae0 Added routing functions to DHT. 2013-07-21 13:14:36 -04:00
irungentoo
4f4e41f2eb Initial connections might be faster. 2013-07-20 22:22:17 -04:00
irungentoo
b9b50481be Fixed segfault. 2013-07-20 19:59:01 -04:00
Maxim Biro
e4469b5130 Added address resolving function (Thank you stal). 2013-07-20 17:31:36 -04:00
irungentoo
72ea431489 Merge pull request #62 from Captainhat/master 
More comments in core fixed
 2013-07-20 08:25:19 -07:00
Andrew
9616cc6a89 More changes made to comments, as requested by jvrv 2013-07-20 11:02:43 -04:00
Andrew
5101ef756a Fixed comments in other files as per request of jvrv 2013-07-20 10:39:05 -04:00
irungentoo
11e94066f7 Merge branch 'master' of https://github.com/sometwo/ProjectTox-Core into sometwo-master 
Conflicts:
	core/Messenger.c
 2013-07-20 07:55:21 -04:00
Maxim Biro
48e2a80720 Don't assume that all callbacks are set. 
If one of callbacks is not set, the application crashes.
This is the case when you update the library and the update adds more
callbacks, or when you simply don't want to receive some of the updates
(callbacks).
In any case, defining all callbacks shouldn't be mandatory.
 2013-07-19 23:17:15 -04:00
jvrv
a72777ed70 fix comments of some files 2013-07-20 00:00:10 -03:00
Martijnvdc
cf6327db49 Update net_crypto.c 
changed all "i++" into "++i", as proposed by nfkd
 2013-07-19 19:34:35 +02:00
Martijnvdc
727ab4adee Update Lossless_UDP.c 
changed all "i++" into "++i", as proposed by nfkd
 2013-07-19 19:28:58 +02:00
irungentoo
00320267ae Merge pull request #56 from Martijnvdc/patch-1 
Patch 1
 2013-07-19 10:02:52 -07:00
irungentoo
c657778f0c The last fix was wrong, this time it's properly fixed. 2013-07-19 12:35:52 -04:00
Martijnvdc
2b4712122c Update Messenger.c 
changed all "i++" into "++i", as proposed by nfkd
 2013-07-19 18:18:29 +02:00
irungentoo
2d88476d44 Fixed big bug in DHT. 2013-07-19 12:09:40 -04:00
Martijnvdc
c66787929f Update DHT.c 
changed all "i++" into "++i", as proposed by nfkd
 2013-07-19 17:55:34 +02:00
irungentoo
d792247dd8 Fixed bug that sometimes prevented two clients from connecting. 2013-07-19 10:57:05 -04:00
irungentoo
f06cd56ece Saving of userstatus not implemented, removed loading of them. 2013-07-18 17:57:01 -04:00
irungentoo
dd623d120e Merge pull request #50 from stal888/master 
Move packet IDs to Messenger.h.
 2013-07-18 14:12:53 -07:00
irungentoo
6291a04ed2 Fixed bug in the messenger loading. 2013-07-18 17:10:26 -04:00
Sebastian Stal
0de611627d Move packet IDs to Messenger.h. 2013-07-18 13:58:03 -07:00
irungentoo
c8d7044efb Status packet is now id 49 (It's cleaner that way). 2013-07-18 15:59:14 -04:00
Sebastian Stal
eb26220743 Fix a leak. 2013-07-18 11:13:29 -07:00
Sebastian Stal
b190dc6fbe Add custom user statuses to core, updated nTox to support nicknames and user statuses. 2013-07-18 10:56:50 -07:00
irungentoo
ad44110fd5 Added nicknames and nickname syncing. 2013-07-18 11:47:27 -04:00
irungentoo
817ad50d96 Fixed small mistake (Thank you stal). 2013-07-17 15:10:52 -04:00
irungentoo
f27b5c9296 Fixed bug with deleting friends. 2013-07-17 13:54:19 -04:00
irungentoo
4864cb9edb Bug fixed, Loading and saving added to core. 2013-07-17 12:07:19 -04:00
irungentoo
ffa809b379 ncurses test now tells you when you connect to the DHT. 2013-07-16 19:45:20 -04:00
irungentoo
bec416a050 Fixed some bugs and a regression. 2013-07-16 19:02:44 -04:00