diff options
| author | Matt Jordan <mjordan@digium.com> | 2016-06-08 12:26:29 -0500 |
|---|---|---|
| committer | Matt Jordan <mjordan@digium.com> | 2016-06-08 12:32:02 -0500 |
| commit | 7f5ca67e5fbc6d4e39a8f1f881faea568770819f (patch) | |
| tree | 3f1d4f96af64084396d54c730ef9fedd62852f19 /include | |
| parent | 5164e1fd859fcd884a4b9edef7cde3b6e1efc87a (diff) | |
res_hep_{pjsip|rtcp}: Decline module loads if res_hep had not loaded
A crash can occur in res_hep_pjsip or res_hep_rtcp if res_hep has not
loaded and does not have a configuration file. Previously when this
occurred, checks were put in to see if the configuration was loaded
successfully. While this is a good idea - and has been added to the
offending function in res_hep - the reality is res_hep_pjsip and
res_hep_rtcp have no business running if res_hep isn't also running.
As such, this patch also adds a function to res_hep that returns whether
or not it successfully loaded. Oddly enough, ast_module_check returns
"everything is peachy" even if a module declined its load - so it cannot
be solely relied on. res_hep_pjsip and res_hep_rtcp now also check this
function to see if they should continue to load; if it fails, they
decline their load as well.
ASTERISK-26096 #close
Change-Id: I007e535fcc2e51c2ca48534f48c5fc2ac38935ea
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/res_hep.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asterisk/res_hep.h b/include/asterisk/res_hep.h index bd0129eea..cfd213ad7 100644 --- a/include/asterisk/res_hep.h +++ b/include/asterisk/res_hep.h @@ -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 |