kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_hep_{pjsip|rtcp}: Decline module loads if res_hep had not loaded" into 13

Browse Source
This commit is contained in:
Joshua Colp
2016-06-08 19:03:05 -05:00
committed by Gerrit Code Review
parent f834852137 eabb398d71
commit 9d8a174092
5 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/asterisk/res_hep.h
View File

@@ -118,6 +118,14 @@ int hepv3_send_packet(struct hepv3_capture_info *capture_info);
*/
enum hep_uuid_type hepv3_get_uuid_type(void);
/*!
* \brief Return whether or not we're currently loaded and active
*
* \retval 0 The module is not loaded
* \retval 1 The module is loaded
*/
int hepv3_is_loaded(void);
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif

12
res/res_hep.c
View File

@@ -409,9 +409,21 @@ enum hep_uuid_type hepv3_get_uuid_type(void)
{
RAII_VAR(struct module_config *, config, ao2_global_obj_ref(global_config), ao2_cleanup);
if (!config) {
/* Well, that's unfortunate. Return something. */
return HEP_UUID_TYPE_CALL_ID;
}
return config->general->uuid_type;
}
int hepv3_is_loaded(void)
{
RAII_VAR(struct module_config *, config, ao2_global_obj_ref(global_config), ao2_cleanup);
return (config != NULL) ? 1 : 0;
}
struct hepv3_capture_info *hepv3_create_capture_info(const void *payload, size_t len)
{
struct hepv3_capture_info *info;

1
res/res_hep.exports.in
View File

@@ -3,6 +3,7 @@
LINKER_SYMBOL_PREFIX*hepv3_send_packet;
LINKER_SYMBOL_PREFIX*hepv3_create_capture_info;
LINKER_SYMBOL_PREFIX*hepv3_get_uuid_type;
LINKER_SYMBOL_PREFIX*hepv3_is_loaded;
local:
*;
};

5
res/res_hep_pjsip.c
View File

@@ -210,6 +210,11 @@ static int load_module(void)
{
CHECK_PJSIP_MODULE_LOADED();
if (!ast_module_check("res_hep.so") || !hepv3_is_loaded()) {
ast_log(AST_LOG_WARNING, "res_hep is not loaded or running; declining module load\n");
return AST_MODULE_LOAD_DECLINE;
}
ast_sip_register_service(&logging_module);
return AST_MODULE_LOAD_SUCCESS;
}

4
res/res_hep_rtcp.c
View File

@@ -149,6 +149,10 @@ static void rtp_topic_handler(void *data, struct stasis_subscription *sub, struc
static int load_module(void)
{
if (!ast_module_check("res_hep.so") || !hepv3_is_loaded()) {
ast_log(AST_LOG_WARNING, "res_hep is not loaded or running; declining module load\n");
return AST_MODULE_LOAD_DECLINE;
}
stasis_rtp_subscription = stasis_subscribe(ast_rtp_topic(),
rtp_topic_handler, NULL);