Commit Graph

2844 Commits

Author SHA1 Message Date
irungentoo
36cb9b003d Merge branch 'master' of https://github.com/rose-m/ProjectTox-Core into rose-m-master 2013-08-15 19:59:43 -04:00
irungentoo
0a00c5c291 Merge pull request #457 from aaboagye/master
core,nTox,toxic - Fix for Issue #453. Begin refactoring w/astyle.
2013-08-15 16:58:27 -07:00
irungentoo
75873e31db Merge pull request #475 from nurupo/master
Commented out nTox_win32 in cmake
2013-08-15 16:57:34 -07:00
Maxim Biro
d93b5e2cb8 Fixed function agruments according to new API 2013-08-15 19:45:03 -04:00
Maxim Biro
bc15b106a9 Commented out nTox_win32 2013-08-15 19:12:55 -04:00
Aaron Lipinski
ff7b4f8418 Add spam length to data length in comparison against max size 2013-08-16 08:27:03 +12:00
irungentoo
9e3d5d6488 Updated comment. 2013-08-15 14:26:26 -04:00
irungentoo
2663b9d23d Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-15 14:25:36 -04:00
irungentoo
575804d19f Small improvement to DHT. Useless file removed. Small fix to toxic. 2013-08-15 14:24:32 -04:00
irungentoo
bf0c2364e1 Merge pull request #473 from fhahn/check-realloc-return-value
Check return value of realloc_friendlist and return FAERR_NOMEM on error
2013-08-15 09:32:05 -07:00
Florian Hahn
3590f0a521 Check return value of realloc_friendlist and return FAERR_NOMEM on error 2013-08-15 15:34:27 +02:00
Michael Rose
56bcbb8fc4 Merge official 2013-08-15 12:12:11 +02:00
Michael Rose
76bfefff6f Merge fix 2013-08-15 12:11:48 +02:00
irungentoo
70b633d816 Merge pull request #469 from jmaldonado6253/patch-1
Added new DHT server
2013-08-15 03:01:36 -07:00
irungentoo
e6ac93eff7 Merge pull request #468 from ABrambleNinja/patch-1
For me, installing check wasn't enough. check-devel was required (Fedora 19)
2013-08-15 03:00:25 -07:00
Michael Rose
52d3194e87 Merge official 2013-08-15 11:24:40 +02:00
Javier Maldonado
8a56f9cb37 Added new server 2013-08-15 05:31:08 +00:00
ABrambleNinja
36dfea3b5e For me, installing check wasn't enough. check-devel was required (Fedora 19) 2013-08-15 04:07:43 +00:00
Aseda Gyeke Aboagye
d0098efa95 core,nTox,toxic - Fix for Issue #453. Refactoring w/astyle.
This commit introduces a few things. Basically I didn't like the fact that
although we had a coding style document, no one was following it. See
https://github.com/irungentoo/ProjectTox-Core/issues/453 for more info regarding
that. This commit just marks the first of my efforts to refactor the code base
according to the posted coding style document by introducing an astylerc and a
optional git pre-commit hook.

I propose that users can add this functionality as a  pre-commit hook. More
info is in the README file.

However, this has only been tested on Linux and I imagine should work on OSX as
well. I don't think pre-commit hooks work on Windows, but I may be mistaken.

The future commits I plan are refactoring the source files for other offending
items such as using typedefs. See http://wiki.tox.im/index.php/Coding_Style.
2013-08-14 19:10:03 -07:00
Aaron Lipinski
bf6c04b2ca add dhtstatus window 2013-08-15 12:02:57 +12:00
Aaron Lipinski
1e190c97b8 add dhtstatus file 2013-08-15 12:02:57 +12:00
Aaron Lipinski
6b38b704a4 provide access to the close client list 2013-08-15 12:02:56 +12:00
Aaron Lipinski
93b34ef9e3 move client data struct to header file 2013-08-15 12:02:56 +12:00
Aaron Lipinski
e9f15d3879 refresh windows after resize 2013-08-15 12:02:56 +12:00
irungentoo
26a01e92ec Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-14 18:26:17 -04:00
irungentoo
4330bfbf87 Metadata collection prevention part 1 of ???.
Crypto requests packets are packets that can be routed by nodes in the
DHT. In this pull request I have merged both Natping requests and friend
requests into one common packet (Crypto request packets). Both these
packets should now only be distinguishable by the size of the data in
them to an outside observer for an example on how to send and recieve
data with these packets see: friend_requests.c

Note that these packets are prefixed with id 32 (friend request packets)
which means this change is compatible with the currently running DHT
bootstrap servers.

Also changed small thing in DHT_test.c
2013-08-14 18:26:00 -04:00
irungentoo
b22537f1b9 Merge pull request #467 from JFreegman/master
small bug fixes for toxic
2013-08-14 13:26:40 -07:00
Jfreegman
aa114d2778 small bug fixes 2013-08-14 16:02:21 -04:00
irungentoo
f5d7d458ff Merge pull request #466 from naxuroqa/master
Fix for another segfault/leak case when using -f arg
2013-08-14 11:14:39 -07:00
naxuroqa
1b2ac061ec Fix for another segfault/leak case when using -f arg 2013-08-14 19:21:36 +02:00
irungentoo
95664357d4 Logo is now hosted on the repo. 2013-08-14 12:38:10 -04:00
irungentoo
566295037f Added logo in readme to repo. 2013-08-14 12:35:55 -04:00
irungentoo
3ce7f043cb Merge pull request #465 from manuel-arguelles/load_from_file
Fix segfault when using -f in toxic
2013-08-14 08:54:28 -07:00
Manuel Argüelles
2196fb8bc8 Fix segfault when using -f in toxic
Call strdup() to the data file argument string to avoid segmentation
fault when it is later freed.
2013-08-14 10:40:26 -05:00
irungentoo
a3d3d37c23 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-14 10:26:27 -04:00
irungentoo
5909a13ba4 Add friend now fails if it already is in DHT. 2013-08-14 10:26:02 -04:00
irungentoo
0338c3c9e8 Merge pull request #464 from slvr/crypto-fix
Incorrect constants: s/BOXZERO/ZERO/
2013-08-14 07:10:14 -07:00
irungentoo
8eb8fb2ab5 Messenger fix from pr #461. 2013-08-14 09:52:03 -04:00
slvr
a854a730ec Reduced redundant code, added new crypto test 2013-08-14 14:46:29 +01:00
slvr
ee34b51c24 s/BOXZERO/ZERO/ 2013-08-14 14:29:39 +01:00
slvr
0b27a0cb35 Incorrect constants: s/BOXZERO/ZERO/ 2013-08-14 14:26:04 +01:00
irungentoo
0e0785c822 Merge branch 'patch-6' of https://github.com/Astonex/ProjectTox-Core into pr 2013-08-14 09:00:55 -04:00
irungentoo
4ddd91b580 Fixed small compile error on my end. 2013-08-14 08:56:29 -04:00
irungentoo
661adacddf Merge branch 'remove_externs' of https://github.com/krisl/ProjectTox-Core into pr 2013-08-14 08:51:52 -04:00
irungentoo
b7dd8068ca Merge branch 'master' of https://github.com/mkfifo/ProjectTox-Core into pr 2013-08-14 08:49:28 -04:00
Aaron Lipinski
4946c809d7 remove temporary callbacks from refactoring 2013-08-15 00:36:31 +12:00
Aaron Lipinski
1edb7c1660 move windows functions to its own file 2013-08-15 00:36:30 +12:00
Aaron Lipinski
75ce48146a remove externs in favor of includes 2013-08-15 00:36:30 +12:00
Aaron Lipinski
3f37c5580d add header guard and includes to windows.h 2013-08-15 00:36:30 +12:00
irungentoo
9fb82fc3bf Merge branch 'master' of https://github.com/naxuroqa/ProjectTox-Core into pr 2013-08-14 08:35:43 -04:00