83 Commits

Author SHA1 Message Date
Anthony Minessale
7151d6acea FS-6402 part 2 2014-04-02 03:21:37 +05:00
Anthony Minessale
5c0cff70b3 FS-6402 --resolve 2014-04-02 01:20:19 +05:00
Michael Jerris
8ed1d4f1ea FS-6293: fix mod_rtmp srcdir build 2014-03-17 08:46:38 -04:00
Anthony Minessale
804ef7709d change from sqlite hash to newly added one 2014-03-09 00:37:17 +05:00
Michael Jerris
bcd9f49fbe move applications to use automake 2014-03-07 18:36:12 -05:00
Seven Du
e88ad70563 FS-6235 try this patch, this will send you a DOWN state at last 2014-02-22 09:44:19 +08:00
Peter Olsson
93696934b2 Silence more compiler warnings 2014-01-23 12:25:15 +01:00
Peter Olsson
5a820fdc78 Disabled some compiler warnings on Windows build (for Visual Studio 2012), also disabled code analysis one some projects. This should make the Windows build more clean in the future. 2014-01-22 22:47:11 +01:00
Anthony Minessale
49f9bd01bf fix some contention in rtmp 2013-11-17 06:51:33 +05:00
Anthony Minessale
4a172402d2 some refactoring and plumbing for 1.4 2013-10-16 02:24:32 +05:00
Anthony Minessale
2b5e18af41 revert 2013-09-06 00:50:17 +05:00
Anthony Minessale
471772489a revert 2013-09-06 00:48:18 +05:00
Anthony Minessale
e195b8512d revert f24d1cde3db80df630bee348adb06f4f7051fd8a 2013-09-06 00:32:03 +05:00
Anthony Minessale
7d6d688e53 FS-5731 --resolve 2013-08-26 20:25:14 +05:00
Nathan Neulinger
32adc789f6 make noexpandtab explicit in all vim modelines other than xml files 2013-06-25 11:50:17 -05:00
Travis Cross
065043ce67 Remove unused variable in mod_rtmp
Unused variables break the build with recent versions of gcc and
clang.
2013-05-26 04:53:16 +00:00
William King
12f2f674f9 Let's bit a bit safer when dereferencing pointers. 2013-05-24 20:24:04 -07:00
William King
480407e5f3 Removing logically dead code 2013-05-24 19:59:32 -07:00
William King
dc4209275d Another location where mod_rtmp would leak memory. 2013-05-24 19:45:38 -07:00
William King
194e1ae366 Fix improper handling of a double linked list that could have caused a memory leak. 2013-05-24 19:42:17 -07:00
William King
e2d6bc3340 Appears to have been a copy paste error because this doesn't do what the api claims, and it also leaks the reference to the new node. 2013-05-24 19:35:56 -07:00
William King
f3fd94b3e5 Fixing a memory leak. name needs to be freed since it's being strdup'd lower. 2013-05-24 19:31:26 -07:00
William King
15f43bac09 FS-5440: don't assert on bad input rtmp data 2013-05-22 12:38:23 -07:00
Travis Cross
d2f3a3114e Spelling fix 2013-05-21 02:00:43 +00:00
William King
58e205ccdb how...? 2013-05-17 11:36:31 -07:00
William King
cfeb6aaf54 Since there isn't neutral ground, on the rtmp state callback we actually have to force the write lock of the session, but we only need a try lock on removing the session from the rsession->session_hash. This removes a deadlock caused when we had to enforce with locks that the rsession couldn't be destroyed if the FS session was in the middle of a hangup. 2013-05-17 11:36:30 -07:00
William King
f24d1cde3d Seems the session wasn't coming to the hangup in a locked state. 2013-05-17 11:36:30 -07:00
William King
36f198e883 Seems having a read lock still prevents a write lock to be taken, even if the thread that is trying to get the write lock currently has the read lock. 2013-05-17 11:36:29 -07:00
William King
9b0212ab59 Include the write lock since we're changing the tech_pvt 2013-05-17 11:36:29 -07:00
William King
9fa4bed8e3 FS-5395: False alarm on a reported valgrind memory leak. The io_private is alloc'd from a memory pool which valgrind sucks at tracking. No need to free this, because it'll get cleared when the memory pool on the rsession is destroyed. 2013-05-08 18:45:24 -07:00
William King
b3117e8f88 FS-5395: --resolve Resolve another mod_rtmp crash where oh specific hangup scenarios there would be a free of variable that wasn't ever malloced 2013-05-08 16:54:05 -07:00
William King
0d5888de2f Revert "fixed stuck mod_rtmp session when the call is killed from fs side, such as using uuid_kill"
This reverts commit d8edc031faa41d4e570aad1e347a0ed6c0d6c1d8.

Conflicts:
	src/mod/endpoints/mod_rtmp/mod_rtmp.c
2013-05-07 16:04:54 -07:00
William King
7ce7cbda57 FS-4332: --resolve 2013-05-03 00:01:24 -05:00
William King
17781cba1c FS-5240: --resolve Please test 2013-05-02 23:57:50 -05:00
William King
66d1755b06 If the rsession is null, then don't try to unlock it, since that'll just result in a segfault. 2013-04-23 17:52:33 -07:00
William King
5c87754e42 fixed rtmp active calls count 2013-04-23 17:52:33 -07:00
William King
1dd86108fb added rsession check before comparing its state. commented out active sessions loop 2013-04-23 17:52:32 -07:00
William King
f7cb641d17 Updating the contributor tags 2013-04-23 17:52:32 -07:00
William King
6f89e2537e Moving all rtmp specific logging to use the rtmp uuid rather than the session uuid. 2013-04-23 17:52:32 -07:00
William King
fa6d465711 Another variable name standardization 2013-04-23 17:52:32 -07:00
William King
e379a596b2 Should resolve the last of the rsession -> session and session -> rsession on_destroy race condition issues
Conflicts:
	src/mod/endpoints/mod_rtmp/mod_rtmp.c
2013-04-23 17:52:32 -07:00
William King
fec463fdfe White space cleanup and variable naming standardization 2013-04-23 17:52:32 -07:00
William King
ad3a5a3572 Standardizing on rsession to reference rtmp_session_t
Conflicts:
	src/mod/endpoints/mod_rtmp/mod_rtmp.c
2013-04-23 17:52:32 -07:00
William King
7e1aad02b2 Resolve the segfault where the channel is destroyed while it is still receiving audio
Conflicts:
	src/mod/endpoints/mod_rtmp/rtmp.c
2013-04-23 17:52:32 -07:00
William King
a687274308 Cleaning up and standardizing variable name to rsession if the session referenced is an rtmp_session_t 2013-04-23 17:52:32 -07:00
William King
f81d17c1e2 added debugging to print ip and port of rtmp connection as well as tie the rtmp session and fs session together 2013-04-23 17:52:31 -07:00
William King
d8edc031fa fixed stuck mod_rtmp session when the call is killed from fs side, such as using uuid_kill 2013-04-23 17:52:31 -07:00
William King
37d2a34b04 Don't try to get the channel if the session is null. 2013-01-25 11:41:57 -08:00
William King
79069c66d1 FS-3882, FS-3546, FS-3712, FS-3970: --resolve Fixes the segfault in mod_rtmp where the channel was destroyed, but the endpoint still tried to send or receive data from the session. 2013-01-15 13:22:28 -08:00
Jeff Lenk
dc2c11f13f FS-4768 initial add of vs2012 build support 2012-12-29 14:57:15 -06:00