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
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
