Commit Graph

83 Commits

Author SHA1 Message Date
irungentoo
aaaeac8f3d
Merge branch 'master' of https://github.com/mannol1/toxcore
Conflicts:
	toxav/toxav.c
2014-08-04 13:49:53 -04:00
mannol
733c509582 Fix some toxav warnings 2014-08-04 00:15:00 +02:00
irungentoo
e1158be5a6
Fixed segfault. 2014-07-28 09:58:53 -04:00
irungentoo
ab4673e873
Merge branch 'mannol1-master' 2014-07-26 21:26:32 -04:00
mannol
54e7d29589 Make codec settings dynamic 2014-07-26 19:29:49 +02:00
notsecure
f6bca8e928 fix warnings 2014-07-23 13:26:55 -04:00
notsecure
fffe72bcaa fix mannol 2014-07-23 13:24:51 -04:00
irungentoo
511d197e8c
Fixed warning. 2014-07-22 11:24:47 -04:00
irungentoo
6ede3e8ad4
Merge branch 'master' of https://github.com/mannol1/toxcore 2014-07-22 11:20:55 -04:00
mannol
0cf9f27b70 This should fix test failing 2014-07-21 22:11:59 +02:00
mannol
79115259a8 Fixed conflicts 2014-07-21 04:10:05 +02:00
mannol
1aeeef58b2 Improved protocol and cleaned code a bit 2014-07-21 01:10:57 +02:00
irungentoo
f0a172f198
Set some functions as static, fixed warning. 2014-07-19 22:08:05 -04:00
irungentoo
271f03a717
Call now gets terminated when other person times out. 2014-07-10 18:20:07 -04:00
irungentoo
bd4c142e38
Fixed some timer related issues. 2014-07-08 14:39:23 -04:00
irungentoo
7ce9816e40
Fixed threading bug that could cause segfaults. 2014-07-08 12:04:13 -04:00
irungentoo
9874173d71
Fixed deadlock. 2014-07-08 11:51:27 -04:00
irungentoo
95d737cb5f
Fixed segfault and other possible bugs in msi.c
toxav should no longer have weird behaviour when a dead call times out.
2014-07-07 23:19:56 -04:00
mannol
9af7c335e7 This might be causing problems 2014-07-05 17:36:12 +02:00
mannol
8b9d3992a4 Make rtp & codec actions thread-safe 2014-07-05 15:11:25 +02:00
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