Commit Graph

370 Commits

Author SHA1 Message Date
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
irungentoo
5572396c53 Saving and loading of keys added. 2013-07-16 13:44:46 -04:00
irungentoo
e63ba9c61b Loading and saving added to DHT. 2013-07-16 13:20:45 -04:00
irungentoo
c8d046e348 Some very basic flow control added to lossless UDP. 2013-07-16 10:36:59 -04:00
Jeffail
859f31c160 Just cleaning up as I read, no behaviour changes 2013-07-15 15:42:50 +01:00
irungentoo
f3dfeb607b Fixed useless inbound connection not timing out. 2013-07-14 15:22:49 -04:00
irungentoo
41d31e9802 Deleting friend now kills the connection to that friend. 2013-07-14 11:52:32 -04:00
irungentoo
6e1390554c Some dynamic memory allocation added to the DHT. 2013-07-14 11:50:34 -04:00
irungentoo
084185a2c2 use DEBUG define to turn on some printfs. 2013-07-14 11:40:42 -04:00
irungentoo
96b8cb1c43 Fixed @ appearing in messages. 2013-07-13 22:28:25 -04:00
Oliver Hunt
b69fbb15e2 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into ncursesclient 2013-07-14 02:57:16 +01:00
Oliver Hunt
9f38ab582c fixed the ncurses client i believe 2013-07-14 02:57:09 +01:00
irungentoo
11a39bb49a Cmake changed, small change in random_int()
Cmake builds now builds the new ncurses test only on non windows.
2013-07-13 19:24:14 -04:00
irungentoo
11a2bf0878 Fixed 2 small mistakes present in the last pull request. 2013-07-13 18:20:58 -04:00
Maxim Biro
c2fb803ad5 Added conversion from friend_id to client_id 2013-07-13 18:09:17 -04:00
irungentoo
e80ac120e1 Build fixed? 2013-07-12 16:35:45 -04:00
irungentoo
79aa715514 First part of DHT hardening done.
Added crypto to the DHT communications.

This defeats completely the first attack mentioned in
docs/DHT_hardening.

Also updated the build system to build the latest test (it links it with
libsodium)
2013-07-12 16:27:19 -04:00
irungentoo
e830861a9d Use UTF-8 for all the text that is sent/recieved. 2013-07-11 08:54:34 -04:00
irungentoo
a20efb7c1b Removed useless define. 2013-07-11 07:20:12 -04:00
irungentoo
0b18dcda6f Per friend request data added. 2013-07-10 17:31:58 -04:00
irungentoo
f471602d5d updated TODO 2013-07-10 12:54:39 -04:00
juryben-fedora
c600835ad3 cast parameters to unsigned char and terminal localhost regex without domain 2013-07-09 23:16:59 -04:00
irungentoo
e680d885d7 Delete friends function now works and some other changes. 2013-07-09 20:25:52 -04:00
irungentoo
803fbafc50 Comments updated. 2013-07-09 13:42:28 -04:00
irungentoo
127fced11f Added comment block to Messenger test. 2013-07-09 13:27:47 -04:00
irungentoo
4d50638528 Basic IM messenger backend pretty much done (You can start the GUI)
And a couple of fixes to the other parts.
2013-07-09 13:20:48 -04:00
irungentoo
db37eca44b Some work done on the messenger part. 2013-07-08 20:50:25 -04:00
Anthony Super
dd8d34d460 Quick fix
Used two if statements, both of which just broke a loop. Just threw them together with ||. Should be slightly faster.
2013-07-08 11:05:20 -06:00
irungentoo
c00cf85078 Spelling mistakes fixed. 2013-07-08 12:36:11 -04:00
irungentoo
9a0d749083 Added IDEAS.txt and added checks to 2 net_crypto functions. 2013-07-07 23:09:00 -04:00
irungentoo
a632d960f8 Fixed to be confilcts with the DHT and the messenger part. 2013-07-07 11:54:25 -04:00
irungentoo
2528ec148c Very basic start on the Tox messaging api.(Should give you a basic idea how it's gonna work) 2013-07-06 22:28:15 -04:00
irungentoo
7458473dca Forward secrecy implemented into crypto. 2013-07-06 10:57:49 -04:00
irungentoo
a480c0195a Crypto done(still need to test it a bit more thought)
Replaced chars with uint8_t

Added a new test program.

Added some functions to Lossless UDP.

And some other stuff.
2013-07-05 17:00:39 -04:00
irungentoo
ccb270add2 Compiled for windows and fixed stuff accordingly. 2013-07-03 16:35:44 -04:00
irungentoo
c86c1c8132 TODO updated. 2013-07-03 09:45:01 -04:00
irungentoo
62839f1bd9 Small changes. 2013-07-01 10:55:39 -04:00
irungentoo
65a198ffa5 Fixed small bug. Updated TODO. 2013-07-01 10:15:04 -04:00
irungentoo
9f6b609e08 Made code more portable. 2013-07-01 08:54:21 -04:00
irungentoo
d718af7f4d Moved XML parser to another folder. 2013-06-30 21:35:40 -04:00
Magmus
fefa06263b Update README 2013-06-30 18:21:51 -07:00
Magmus
1404e2bb49 Update README 2013-06-30 18:21:12 -07:00
Magmus
1eb64e7778 Rename README.md to README 2013-06-30 18:18:07 -07:00
Magmus
fa85f6c43b Create README.md 2013-06-30 18:17:42 -07:00
Magmus
c9d71e61d5 Added asm-xml source 2013-06-30 18:11:27 -07:00
Magmus
377f2219ad Added more object files 2013-06-30 18:10:05 -07:00
Magmus
1e81efaeb2 Rename asm-xml.h.h to asm-xml.h 2013-06-30 18:06:39 -07:00
Magmus
4b6929bcc8 Added friend list parser 2013-06-30 17:59:08 -07:00
irungentoo
2e0c3bb593 Added a new test program. Fixed some stuff in Lossless UDP. 2013-06-30 17:19:15 -04:00
irungentoo
4ad22addf4 Updated Lossless UDP. 2013-06-30 11:34:35 -04:00
irungentoo
6bd24212ee Lossless UDP now works.
The testclient and testserver simulate a packet loss of 33%.

The only thing left to do in lossless UDP is the flow control (automatic
adjustment of the data send rate) which is only needed to transfer large
amounts of data.
2013-06-29 18:40:41 -04:00
irungentoo
d86a39ebfd Cleaned bunch of stuff. Only the actual data transmission is left to do. 2013-06-29 11:14:33 -04:00
irungentoo
fd44c68801 Couple fixes. 2013-06-28 09:15:19 -04:00
irungentoo
457feeed0b Added current work on Lossless_UDP (Not done do not test it yet)
Lossless_UDP code is probably filled with problems right now.
this is normal.
2013-06-27 20:59:16 -04:00
irungentoo
3986206de8 Added a function. 2013-06-27 17:19:09 -04:00
irungentoo
24925a24ec Cleaned up some stuff. 2013-06-27 10:01:31 -04:00
irungentoo
d0ed163914 Fixed something in the DHT, added a milisecond time function. 2013-06-27 07:37:06 -04:00
irungentoo
488df25e05 Changed function name. 2013-06-26 15:33:32 -04:00
irungentoo
e6d14d1dad Oups. 2013-06-26 15:05:15 -04:00
irungentoo
dcc3921682 Licenced the code under the GPL for now. 2013-06-26 15:02:42 -04:00
irungentoo
46ee2d6be6 Stuff added 2013-06-26 14:07:01 -04:00
irungentoo
c7f7e30c75 Moved the network functions from the DHT into network.
Also made a nice function to init networking.
2013-06-26 09:56:15 -04:00
irungentoo
f7574c61fc Updated docs. 2013-06-26 08:32:42 -04:00
irungentoo
d1837342e0 Couple fixes. 2013-06-26 07:40:07 -04:00
irungentoo
5d70f9c119 Fixed a line in DHT.c and clarified something in DHT_test.c. 2013-06-25 17:50:30 -04:00
irungentoo
1837745d96 Fixed one possible bug in the DHT and added a basic TODO list.
Fixed a possible segfault which could have been cause by handling an
empty packet.
2013-06-25 17:16:45 -04:00
irungentoo
adc9c64fe6 Fixed stuff, things work better now.
Client no longer responds to packets from itself.

DHT_test can now find the ip of one peer based on its client id.

Some stuff fixed.
2013-06-25 15:24:31 -04:00
irungentoo
3396d8e495 DHT implementation finished. Currently testing it. 2013-06-25 12:11:11 -04:00
irungentoo
bd37e3ad68 Fixed sendnodes and updated readme. 2013-06-25 09:59:54 -04:00
irungentoo
c93858110b DHT almost done, started testing. Fixed ADDR compiling problem. No more warnings with GCC and clang. 2013-06-25 09:19:01 -04:00
irungentoo
8f4a011464 Last commit of the day. Client will soon be able to send send nodes packets. 2013-06-24 20:51:07 -04:00
irungentoo
af1b3b7f9b Made small application to test the DHT. Core DHT: finished some more functions. 2013-06-24 16:50:43 -04:00
irungentoo
61e9103076 Fixed some mistakes. 2013-06-24 14:31:50 -04:00
irungentoo
bdf3d9f6ab Added the ping list functions. 2013-06-24 14:26:29 -04:00
irungentoo
3bc95be051 More functions added, some fixes. 2013-06-24 12:23:46 -04:00
irungentoo
73a742a2ba Added distance function and changed some stuff.
Also fixed typo in Readme.
2013-06-24 10:42:55 -04:00
irungentoo
388c0f38f7 More Functions. 2013-06-24 08:59:42 -04:00
irungentoo
7e341fb171 Now compiles. Functions starting to take form. 2013-06-24 08:28:19 -04:00
irungentoo
baf14f8121 Merged "wxWidgets VS template for windows" from juryben
That big 40MB file is useless so I merged the repos in a way that it
dissapears forever from the main repo.
2013-06-24 07:26:30 -04:00
irungentoo
25f5af009f Added base DHT.c 2013-06-24 01:05:28 -04:00
irungentoo
f3dfd885cc Updated readme and DHT.h 2013-06-24 00:40:33 -04:00
irungentoo
6e881efad6 Added function to DHT.h and fixed half written sentence in readme. 2013-06-23 23:57:06 -04:00
irungentoo
1f5fba0a0c Updated DHT.h 2013-06-23 23:23:28 -04:00
Ben B
e1d7d8c885 Update DHT.h 2013-06-23 23:43:31 -03:00
irungentoo
b24bb233a2 Added DHT.h (I hope it's not to bad) 2013-06-23 22:27:29 -04:00