Commit Graph

212 Commits

Author SHA1 Message Date
charmlesscoin
4b49df896f added #defines for friend.status as well as for erroring on m_addfriend* 2013-08-02 12:33:11 -04:00
charmlesscoin
6ed5b89e5b removed getnumfriends() 2013-08-02 11:36:39 -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
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