Michael Rose
514d1952d0
Merge with upstream
2013-08-19 14:40:15 +02:00
Michael Rose
26d691f021
fix potential memory issue
2013-08-19 10:19:57 +02:00
Michael Rose
4a8146b943
fix define checks
2013-08-19 09:23:40 +02:00
irungentoo
d941a46f3b
Merge pull request #491 from loadletter/master
...
Store data and DHTservers in .config/tox
2013-08-18 17:08:35 -07:00
Frederik Holden
1e0310cfed
Made configdir check XDG_CONFIG_HOME for config dir
2013-08-19 01:21:36 +02:00
loadletter
9367508824
Use configdir.c instead of hardcoded paths for the list of DHT servers.
2013-08-18 23:16:39 +02:00
Michael Rose
76473ea8b4
fix OS check in toxic
2013-08-18 21:12:54 +02:00
irungentoo
bb0251a027
Fixed stack problem.
2013-08-18 11:59:34 -04:00
irungentoo
3b58ad06b0
Merge branch 'tox-bugs' of https://github.com/stqism/ToxCore into stqism-tox-bugs
2013-08-18 10:19:35 -04:00
Sean Qureshi
3c77156d6d
Fixed toxic not running
2013-08-18 05:34:50 -07:00
Sean Qureshi
4fe94ca403
No longer assumes Minix/BSD/AIX users actually use Macs when assigning a default name
2013-08-18 03:44:52 -07:00
Sean Qureshi
8f244f2b6d
Added mac support to the standardized data file, cleaned up a bit
2013-08-18 03:41:30 -07:00
Sean Qureshi
1455716109
Added mac support with data, standarized data
2013-08-18 03:25:18 -07:00
Sean Qureshi
e5dd681b28
Added windows support to the standarized location
2013-08-18 03:12:55 -07:00
Sean Qureshi
ccfff8b305
Ran it through astyle
2013-08-18 01:48:36 -07:00
Aaron Lipinski
901d8eb8b9
remove callback introduced temporarily during refactoring
2013-08-18 20:35:38 +12:00
Aaron Lipinski
9ca6c99cdc
reduce number of windows, use consistent naming
2013-08-18 20:35:37 +12:00
Aaron Lipinski
61b72daf6a
remove WINDOW_STATUS, simplify adding and selecting chat windows
2013-08-18 20:26:39 +12:00
Sean Qureshi
6196c1f4eb
Might improve windows detection
2013-08-17 20:57:35 -07:00
Sean Qureshi
1a8dce7905
Added more colors
2013-08-17 19:43:10 -07:00
Sean Qureshi
374b7b9c6b
Standarized DHTservers
2013-08-17 19:26:31 -07:00
Michael Rose
5d8ccde3d9
Messenger stores / loads nickname
...
new toxic command to show nickname (mynick)
2013-08-17 11:59:28 +02:00
irungentoo
9dce121a76
Passed everything through astyle.
2013-08-16 13:11:09 -04:00
irungentoo
9f9ca0a971
Fixed loading and a small problem with the length of crypto requests.
2013-08-15 20:56:22 -04:00
irungentoo
4c529180e4
Merge branch 'master' of https://github.com/rose-m/ProjectTox-Core into rose-m-master
2013-08-15 19:59:43 -04:00
irungentoo
a59f4867ee
Small improvement to DHT. Useless file removed. Small fix to toxic.
2013-08-15 14:24:32 -04:00
Michael Rose
399dd33b97
Merge fix
2013-08-15 12:11:48 +02:00
Michael Rose
36086f16c3
Merge official
2013-08-15 11:24:40 +02:00
Aaron Lipinski
662b1f2bac
add dhtstatus window
2013-08-15 12:02:57 +12:00
Aaron Lipinski
1af9d84aad
add dhtstatus file
2013-08-15 12:02:57 +12:00
Aaron Lipinski
0ac97aa794
refresh windows after resize
2013-08-15 12:02:56 +12:00
Jfreegman
202d162d2e
small bug fixes
2013-08-14 16:02:21 -04:00
naxuroqa
cab4d43889
Fix for another segfault/leak case when using -f arg
2013-08-14 19:21:36 +02:00
Manuel Argüelles
9cabdaa6a0
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
42028289c5
Merge branch 'patch-6' of https://github.com/Astonex/ProjectTox-Core into pr
2013-08-14 09:00:55 -04:00
irungentoo
56210d46f9
Fixed small compile error on my end.
2013-08-14 08:56:29 -04:00
Aaron Lipinski
4a3292a32b
remove temporary callbacks from refactoring
2013-08-15 00:36:31 +12:00
Aaron Lipinski
722d272128
move windows functions to its own file
2013-08-15 00:36:30 +12:00
Aaron Lipinski
2c81fd5e4b
remove externs in favor of includes
2013-08-15 00:36:30 +12:00
Aaron Lipinski
063523a042
add header guard and includes to windows.h
2013-08-15 00:36:30 +12:00
Aaron Lipinski
5d07842d96
prefer param over static
...
Conflicts:
testing/toxic/main.c
2013-08-15 00:34:22 +12:00
Astonex
4a6edcbf1e
Update prompt.c
...
Make id uppercase.
2013-08-14 11:23:38 +01:00
Michael Rose
5225b7d55c
C99 fix
2013-08-14 11:59:11 +02:00
Michael Rose
6df39d572b
populate friends in toxic on startup
2013-08-14 11:37:58 +02:00
Aaron Lipinski
ce9d066054
Have toxic handle new no-spam values from friend request
2013-08-14 21:16:58 +12:00
Michael Rose
076ea43c07
fix memory leak
2013-08-14 09:31:19 +02:00
Michael Rose
1158930641
store messenger when friends are added
2013-08-13 22:07:46 +02:00
irungentoo
2857e6af8f
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
fcf556cd1b
Fixed merge problem and set better default names.
2013-08-13 07:39:04 -04:00
irungentoo
b17c1e9f33
Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JFreegman-master
2013-08-13 07:20:36 -04:00
