Commit Graph

1197 Commits

Author SHA1 Message Date
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
Aaron Lipinski
4e21ac0d57 prefer param over static
Conflicts:
	testing/toxic/main.c
2013-08-15 00:34:22 +12:00
irungentoo
eeafe23f2e Merge pull request #460 from krisl/master
Have toxic handle new no-spam values from friend request
2013-08-14 05:01:40 -07:00
Astonex
1260aee9e1 Update prompt.c
Make id uppercase.
2013-08-14 11:23:38 +01:00
Michael Rose
5c7245fecd C99 fix 2013-08-14 11:59:11 +02:00
Michael Rose
08735b142f fixed calculation of messenger size (no spam was not accounted for) 2013-08-14 11:38:30 +02:00
Michael Rose
bfa624139a populate friends in toxic on startup 2013-08-14 11:37:58 +02:00
Aaron Lipinski
3b42f489e4 Have toxic handle new no-spam values from friend request 2013-08-14 21:16:58 +12:00
naxuroqa
72ee99e848 rewrite of get_id function 2013-08-14 10:44:57 +02:00
Michael Rose
d3828cd7ab Merge commit 'a8d1f86f8ba9b39c8f913bce99a2282d81235cc9' 2013-08-14 09:33:09 +02:00
Michael Rose
382094a6e8 fix memory leak 2013-08-14 09:31:19 +02:00
Chris Hall
cf5ad56a4a fixing minor memory leak of friendlist 2013-08-14 17:35:15 +12:00
Chris Hall
0590d8325c removing unnecessary function pointer _isset variables 2013-08-14 17:27:10 +12:00
irungentoo
a8d1f86f8b ... 2013-08-13 20:37:09 -04:00
irungentoo
c8a46e1c09 ... 2013-08-13 20:32:45 -04:00
irungentoo
7d588ef8bd Fuck. 2013-08-13 20:31:41 -04:00
irungentoo
3c35db104a Commented out old tests that are broken with current master. 2013-08-13 20:22:44 -04:00
irungentoo
e7d002fbc0 Hackish fix for the tests. 2013-08-13 20:02:07 -04:00
irungentoo
63efa44dfa Attempt to quickly fix a test. 2013-08-13 19:36:02 -04:00
irungentoo
06ccdb5b91 Simple XOR checksum added to address. 2013-08-13 19:07:59 -04:00
irungentoo
4132cdff49 clarified comment. 2013-08-13 18:30:14 -04:00
irungentoo
73163f6c98 Friend requests with different nospam fix and added saving/loading of nospam. 2013-08-13 17:25:52 -04:00
Michael Rose
381ae769db store messenger when friends are added 2013-08-13 22:07:46 +02:00
irungentoo
f93e23e411 Updated some files. 2013-08-13 11:50:33 -04:00
irungentoo
97f449a2f1 Fixed spam problem. (I broke the API so this will not build)
The friend address is what the byte string that you give away for people
to add you will be called.

1. Every friend address now contains a number set by the friend. This is
to prevent someone from randomly spamming people in the DHT with friend
requests and makes it so you need the person to actually give you the
address in some way to send the friend request. This number is expected
to be encrypted with the friend request. All requests that do not
contain this number will be rejected. This means the spammer can no
longer use the DHT to collect lists of valid addresses to spam. It also
enables users to quickly change the number in case a spammer gets hold
of the address and starts spamming it.

2. A 2 byte checksum will be added (not implemented yet) to prevent
people from accidentally adding random strings as friends. (NOTE that
this has nothing to do with the spam problem I just decided to add a
placeholder for it now.)
2013-08-13 09:32:31 -04:00
irungentoo
8fe1dec5d6 Fixed merge problem and set better default names. 2013-08-13 07:39:04 -04:00
irungentoo
d0cd78fbea Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JFreegman-master 2013-08-13 07:20:36 -04:00
irungentoo
cb4f67b37a Merge pull request #441 from slvr/timer
Timer Subsystem
2013-08-13 04:14:01 -07:00
irungentoo
4cc4e79088 Merge pull request #447 from gladiac/fixes
Fixes
2013-08-13 04:12:23 -07:00
irungentoo
fe4e37760b Merge pull request #445 from ReAzem/patch-1
Update README.md
2013-08-13 04:11:17 -07:00
slvr
471c148090 Portabily print out uint64_t using PRIu64 2013-08-13 09:55:49 +01:00
slvr
9e3f48c165 Removed core/Messenger.c.orig
Cleanup from merge conflict.
2013-08-13 09:51:18 +01:00
slvr
4bfeb2f483 timer_new -> new_timer and timer_delete -> delete_timer to avoid name conflict 2013-08-13 09:45:11 +01:00
Andreas Schneider
6b06431e9b core: Fix a possible buffer overflow using getself_name().
If the passed buffer is smaller than MAX_NAME_LENGTH then, you
will probably overflow it.
2013-08-13 09:50:51 +02:00
Andreas Schneider
6b256ffdb4 toxic: Fix get_user_config_dir(). 2013-08-13 09:50:42 +02:00
Jfreegman
5c0da43d19 unresolved addresses fail silently 2013-08-12 22:34:08 -04:00
Jfreegman
0ac4f1fcb3 auto-connect errors verbose 2013-08-12 22:04:07 -04:00
Alexandre Viau
d343dca8fe Update README.md
Linked to wiki instead of dead pages.
2013-08-12 20:43:48 -04:00
Jfreegman
92029baff1 put a bunch of repeated code into a function and added timestamps to status/nick changes 2013-08-12 20:28:43 -04:00
Jfreegman
565a348ceb minor improvements and bug fixes 2013-08-12 19:50:50 -04:00
slvr
a0c6296d6c Resolve Merge Conflict 2013-08-12 23:47:15 +01:00
slvr
be840b46b9 Merge remote-tracking branch 'upstream/master' into timer
Conflicts:
	core/Messenger.c
2013-08-12 23:08:48 +01:00
irungentoo
f9bfb42504 Merge pull request #439 from Alek900/master
Added support for userdata in callbacks
2013-08-12 13:33:20 -07:00
irungentoo
107e4b8a5e Merge pull request #437 from JFreegman/master
make connection more robust for toxic
2013-08-12 08:13:33 -07:00
slvr
a56d87cd3f remember to call timer_poll 2013-08-12 14:54:40 +01:00
slvr
c6b496d85b Messenger Timer 2013-08-12 14:44:59 +01:00
slvr
f3511db29b Added LAN discovery timer 2013-08-12 14:19:25 +01:00
alek900
8d3e68b74d Added support for userdata in callbacks 2013-08-12 14:23:46 +02:00