Commit Graph

63 Commits

Author SHA1 Message Date
irungentoo
2a70d29440
Merge branch 'master' of https://github.com/mannol1/toxcore 2014-07-03 12:13:03 -04:00
mannol
db88e7de61 Fix removed missing include 2014-07-03 17:56:55 +02:00
irungentoo
aa1194ab3e
Merge branch 'mannol1-master' 2014-07-03 11:13:11 -04:00
mannol
f8a2a865dc Resolved conflicts when merging upstream 2014-07-03 17:08:38 +02:00
mannol
d3560a3a77 Removed redundant code and fixed toxav codec actions being called when call inactive 2014-07-03 16:58:00 +02:00
irungentoo
c4f0650ae3
Fixed const related warnings. 2014-07-02 16:04:41 -04:00
irungentoo
bd6f8a2186
Merge branch 'mannol1-master' 2014-06-28 22:29:39 -04:00
mannol
aeaf997ca5 Removed redundant encryption and asserts 2014-06-28 04:13:38 +02:00
irungentoo
0d98869f3c
Fixed calling msi_reject more than once possibly causing issues. 2014-06-26 17:52:42 -04:00
irungentoo
ac4def6cd8
Fixed possible bug if more than one ringing msi packet was sent to us. 2014-06-26 17:42:37 -04:00
irungentoo
2735b4a8de
Fixed segfault that happened because calls could be hanged up more
than once.
2014-06-26 17:05:13 -04:00
notsecure
97c548bc80 unrelated: got rid of some warnings 2014-06-23 15:17:28 -04:00
irungentoo
139cfa7aeb
Merge branch 'master' of https://github.com/mannol1/toxcore 2014-06-22 19:54:40 -04:00
mannol
6f46dd5afd Removed hamful code 2014-06-23 00:22:01 +02:00
mannol
77150081ba Merged upstream 2014-06-22 02:41:32 +02:00
mannol
5c0b6c8117 Added tolerance to VAD and lowered Jitter buffer default value 2014-06-21 19:04:00 +02:00
irungentoo
bc62510a76
Merge branch 'tux3-cppcheck-style' 2014-06-20 22:36:16 -04:00
Tux3 / Mlkj / !Lev.uXFMLA
3044bd8101 Fix CppCheck style errors
#if 0 the content of toxav/msi.c : int stringify_message(MSIMessage
*msg, char *dest)
This function has no effect and does not seem to be used for actively
waiting.

Fix various other style errors, reduce scope when possible, avoid
redundant writes, clarify operator priorities, etc.
2014-06-20 21:43:21 +02:00
irungentoo
db724df189
Merge branch 'av-fix' of https://github.com/nurupo/InsertProjectNameHere into nurupo-av-fix 2014-06-18 19:46:39 -04:00
irungentoo
a82cbfff6a
Preparation work to make onion packets go through TCP. 2014-06-18 19:44:49 -04:00
Maxim Biro
741ad009e0 Removed IRC references 2014-06-18 17:58:01 -04:00
Tux3 / Mlkj / !Lev.uXFMLA
78bd8b3f17 Fix possible nullptr dereferences in toxav/msi.c 2014-06-18 21:33:11 +02:00
irungentoo
750c75a47d
Astyled code. 2014-06-15 10:36:57 -04:00
irungentoo
9684339ab9
Merge branch 'mannol1-master' 2014-05-31 15:36:37 -04:00
mannol
fa203aa1ad We gon let it burn burn burn 2014-05-31 21:02:50 +02:00
mannol
d7c1157375 Fixed byte order and removed log functions from misc_tools 2014-05-31 17:27:22 +02:00
irungentoo
ab44440f37
Merge branch 'master' of https://github.com/mannol1/ProjectTox-Core into mannol1-master 2014-05-30 19:11:28 -04:00
mannol
2ebefb85b7 Fixed potential memleaks 2014-05-31 00:29:43 +02:00
mannol
e0ed51b2dc Apparently i forgot the most important thing... 2014-05-30 00:02:47 +02:00
mannol
08ddce44d8 Rearranged mutex actions. Now allow calling av actions from callbacks 2014-05-29 23:57:58 +02:00
mannol
20ab02cf4b Double-free on timeout fix 2014-05-29 22:51:45 +02:00
irungentoo
82e38883a2
Merge branch 'mannol1-Multicalls' into multi-av 2014-05-25 12:27:48 -04:00
mannol
08ca08dcd9 Small fix 2014-05-24 16:40:17 +02:00
mannol
565e95301f Tests works and some fixes 2014-05-24 16:02:01 +02:00
Maxim Biro
d9f5e01bd7 Fixed memory allocation type inconsistency 2014-05-21 23:00:48 -04:00
mannol
0620d1f064 GOGOGO 2014-05-20 00:48:53 +02:00
mannol
c9f1c6882d Merge upstream fo real now? 2014-05-20 00:27:02 +02:00
mannol
a1f2a18ae4 Merge upstream and other stuff 2014-05-20 00:10:40 +02:00
mannol
843171fbc8 This works. 2014-05-16 19:56:40 +02:00
irungentoo
a26ced5fcb
Merge branch 'master' into TCP 2014-05-08 18:26:01 -04:00
mannol
0fa03b9240 Bunch of random changes 2014-05-03 01:46:03 +02:00
mannol
42b25a4d3e Yeah many calls 2014-04-27 19:21:26 +02:00
irungentoo
9c6a8432ce Crypto related cleanups.
Moved Bunch of functions from net_crypto to crypto_core.

decrypt_data_fast and decrypt_data_symmetric were the same thing
therefore, removed decrypt_data_fast.

Replaced all the crypto_secretbox_* defines with the equivalent
crypto_box_* one.

New define: crypto_box_KEYBYTES that is equal to
crypto_box_BEFORENMBYTES.
2014-04-21 16:51:36 -04:00
Carlos E. Garcia
cf33c2f9ad multiple spelling fixes 2014-04-16 12:14:44 -04:00
mannol
9b476ad94f Added test 2014-04-05 17:09:44 +02:00
mannol
05ddf40f99 Remove header 2014-03-23 22:49:53 +01:00
mannol
6c76aacbbb Why do it even care 2014-03-23 22:48:12 +01:00
mannol
88f286e607 Clare case fix
Wot fix
2014-03-22 19:42:05 +01:00
mannol
6b6dbc15e2 Well this seems to be working 2014-03-22 19:33:56 +01:00
mannol
6a63605501 Comment fix 2014-03-15 02:11:25 +01:00