ims-volte-vowifi
/
doubango
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow disabling tinyMSRP, tinyBFCP and tinyIPSec when only the media engine is used

This commit is contained in:
bossiel 2015-03-11 00:20:15 +00:00
parent 799d6f0d70
commit 09c36b896b
5 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
branches/2.0/doubango/tinyDAV/include/tinydav/bfcp/tdav_session_bfcp.h
View File

@ -26,6 +26,7 @@
#include "tinydav_config.h" #include "tinydav_config.h"
#if !defined(HAVE_TINYBFCP) || HAVE_TINYBFCP
#include "tinymedia/tmedia_session.h" #include "tinymedia/tmedia_session.h"
TDAV_BEGIN_DECLS TDAV_BEGIN_DECLS
@ -34,4 +35,6 @@ TINYDAV_GEXTERN const tmedia_session_plugin_def_t *tdav_session_bfcp_plugin_def_
TDAV_END_DECLS TDAV_END_DECLS
#endif /* !defined(HAVE_TINYBFCP) || HAVE_TINYBFCP */
#endif /* TINYDAV_SESSION_BFCP_H */ #endif /* TINYDAV_SESSION_BFCP_H */

4
branches/2.0/doubango/tinyDAV/include/tinydav/msrp/tdav_session_msrp.h
View File

@ -28,6 +28,8 @@
#include "tinydav_config.h" #include "tinydav_config.h"
#if !defined(HAVE_TINYMSRP) || HAVE_TINYMSRP
#include "tinymsrp/session/tmsrp_sender.h" #include "tinymsrp/session/tmsrp_sender.h"
#include "tinymsrp/session/tmsrp_receiver.h" #include "tinymsrp/session/tmsrp_receiver.h"
#include "tmsrp.h" #include "tmsrp.h"
@ -105,4 +107,6 @@ TINYDAV_GEXTERN const tmedia_session_plugin_def_t *tdav_session_msrp_plugin_def_
TDAV_END_DECLS TDAV_END_DECLS
#endif /* !defined(HAVE_TINYMSRP) || HAVE_TINYMSRP */
#endif /* TINYDAV_SESSION_MSRP_H */ #endif /* TINYDAV_SESSION_MSRP_H */

4
branches/2.0/doubango/tinyDAV/src/bfcp/tdav_session_bfcp.c
View File

@ -22,6 +22,8 @@
*/ */
#include "tinydav/bfcp/tdav_session_bfcp.h" #include "tinydav/bfcp/tdav_session_bfcp.h"
#if !defined(HAVE_TINYBFCP) || HAVE_TINYBFCP
#include "tinybfcp/tbfcp_session.h" #include "tinybfcp/tbfcp_session.h"
#include "tinybfcp/tbfcp_pkt.h" #include "tinybfcp/tbfcp_pkt.h"
#include "tinybfcp/tbfcp_utils.h" #include "tinybfcp/tbfcp_utils.h"
@ -735,3 +737,5 @@ static const tmedia_session_plugin_def_t tdav_session_bfcp_plugin_def_s =
_tdav_session_bfcp_set_ro _tdav_session_bfcp_set_ro
}; };
const tmedia_session_plugin_def_t *tdav_session_bfcp_plugin_def_t = &tdav_session_bfcp_plugin_def_s; const tmedia_session_plugin_def_t *tdav_session_bfcp_plugin_def_t = &tdav_session_bfcp_plugin_def_s;
#endif /* !defined(HAVE_TINYBFCP) || HAVE_TINYBFCP */

3
branches/2.0/doubango/tinyDAV/src/msrp/tdav_session_msrp.c
View File

@ -30,6 +30,8 @@
*/ */
#include "tinydav/msrp/tdav_session_msrp.h" #include "tinydav/msrp/tdav_session_msrp.h"
#if !defined(HAVE_TINYMSRP) || HAVE_TINYMSRP
#include "tsk_memory.h" /* TSK_FREE */ #include "tsk_memory.h" /* TSK_FREE */
#define TDAV_MSRP_CONNECT_TIMEOUT 2000 #define TDAV_MSRP_CONNECT_TIMEOUT 2000
@ -979,3 +981,4 @@ static const tmedia_session_plugin_def_t tdav_session_msrp_plugin_def_s =
}; };
const tmedia_session_plugin_def_t *tdav_session_msrp_plugin_def_t = &tdav_session_msrp_plugin_def_s; const tmedia_session_plugin_def_t *tdav_session_msrp_plugin_def_t = &tdav_session_msrp_plugin_def_s;
#endif /* !defined(HAVE_TINYMSRP) || HAVE_TINYMSRP */

12
branches/2.0/doubango/tinyDAV/src/tdav.c
View File

@ -49,7 +49,9 @@ static const tsk_size_t __codec_plugins_all_count = sizeof(__codec_plugins_all)/
#include "tinymedia.h" #include "tinymedia.h"
// IPSec // IPSec
#if !defined(HAVE_TINYIPSEC) || HAVE_TINYIPSEC
#include "tipsec.h" #include "tipsec.h"
#endif
// Converters // Converters
#include "tinymedia/tmedia_converter_video.h" #include "tinymedia/tmedia_converter_video.h"
@ -224,6 +226,7 @@ int tdav_init()
} }
} }
/* IPSec implementation using Windows Filtering Platform (WFP) */ /* IPSec implementation using Windows Filtering Platform (WFP) */
#if !defined(HAVE_TINYIPSEC) || HAVE_TINYIPSEC
if (tdav_win32_is_winvista_or_later()) { if (tdav_win32_is_winvista_or_later()) {
tsk_sprintf(&full_path, "%s/pluginWinIPSecVista.dll", tdav_get_current_directory_const()); tsk_sprintf(&full_path, "%s/pluginWinIPSecVista.dll", tdav_get_current_directory_const());
if (tsk_plugin_file_exist(full_path) && (tipsec_plugin_register_file(full_path, &__dll_plugin_ipsec_wfp) == 0)) { if (tsk_plugin_file_exist(full_path) && (tipsec_plugin_register_file(full_path, &__dll_plugin_ipsec_wfp) == 0)) {
@ -231,6 +234,7 @@ int tdav_init()
__b_ipsec_supported = tsk_true; __b_ipsec_supported = tsk_true;
} }
} }
#endif
TSK_FREE(full_path); TSK_FREE(full_path);
TSK_DEBUG_INFO("Windows stand-alone plugins loaded = %u", plugins_count); TSK_DEBUG_INFO("Windows stand-alone plugins loaded = %u", plugins_count);
@ -257,9 +261,13 @@ int tdav_init()
tmedia_session_plugin_register(tmedia_session_ghost_plugin_def_t); tmedia_session_plugin_register(tmedia_session_ghost_plugin_def_t);
tmedia_session_plugin_register(tdav_session_audio_plugin_def_t); tmedia_session_plugin_register(tdav_session_audio_plugin_def_t);
tmedia_session_plugin_register(tdav_session_video_plugin_def_t); tmedia_session_plugin_register(tdav_session_video_plugin_def_t);
#if !defined(HAVE_TINYMSRP) || HAVE_TINYMSRP
tmedia_session_plugin_register(tdav_session_msrp_plugin_def_t); tmedia_session_plugin_register(tdav_session_msrp_plugin_def_t);
#endif
tmedia_session_plugin_register(tdav_session_t140_plugin_def_t); tmedia_session_plugin_register(tdav_session_t140_plugin_def_t);
#if !defined(HAVE_TINYBFCP) || HAVE_TINYBFCP
tmedia_session_plugin_register(tdav_session_bfcp_plugin_def_t); tmedia_session_plugin_register(tdav_session_bfcp_plugin_def_t);
#endif
tmedia_session_plugin_register(tdav_session_bfcpaudio_plugin_def_t); tmedia_session_plugin_register(tdav_session_bfcpaudio_plugin_def_t);
tmedia_session_plugin_register(tdav_session_bfcpvideo_plugin_def_t); tmedia_session_plugin_register(tdav_session_bfcpvideo_plugin_def_t);
@ -602,9 +610,13 @@ int tdav_deinit()
tmedia_session_plugin_unregister(tmedia_session_ghost_plugin_def_t); tmedia_session_plugin_unregister(tmedia_session_ghost_plugin_def_t);
tmedia_session_plugin_unregister(tdav_session_audio_plugin_def_t); tmedia_session_plugin_unregister(tdav_session_audio_plugin_def_t);
tmedia_session_plugin_unregister(tdav_session_video_plugin_def_t); tmedia_session_plugin_unregister(tdav_session_video_plugin_def_t);
#if !defined(HAVE_TINYMSRP) || HAVE_TINYMSRP
tmedia_session_plugin_unregister(tdav_session_msrp_plugin_def_t); tmedia_session_plugin_unregister(tdav_session_msrp_plugin_def_t);
#endif
tmedia_session_plugin_unregister(tdav_session_t140_plugin_def_t); tmedia_session_plugin_unregister(tdav_session_t140_plugin_def_t);
#if !defined(HAVE_TINYBFCP) || HAVE_TINYBFCP
tmedia_session_plugin_unregister(tdav_session_bfcp_plugin_def_t); tmedia_session_plugin_unregister(tdav_session_bfcp_plugin_def_t);
#endif
tmedia_session_plugin_unregister(tdav_session_bfcpaudio_plugin_def_t); tmedia_session_plugin_unregister(tdav_session_bfcpaudio_plugin_def_t);
tmedia_session_plugin_unregister(tdav_session_bfcpvideo_plugin_def_t); tmedia_session_plugin_unregister(tdav_session_bfcpvideo_plugin_def_t);