Resolved conflict

git-svn-id: http://svn.openzap.org/svn/openzap/branches/sangoma_boost@890 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Moises Silva 2009-11-20 16:42:31 +00:00
parent ac06f30774
commit 4de9a4c0d1
2 changed files with 7 additions and 1 deletions

View File

@ -1595,6 +1595,7 @@ static ZIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(zap_sangoma_boost_configure_span)
char path[255] = "";
char *err = NULL;
unsigned paramindex = 0;
zap_status_t rc = ZAP_SUCCESS;
for (; zap_parameters[paramindex].var; paramindex++) {
var = zap_parameters[paramindex].var;
@ -1646,6 +1647,11 @@ static ZIO_CONFIGURE_SPAN_SIGNALING_FUNCTION(zap_sangoma_boost_configure_span)
FAIL_CONFIG_RETURN(ZAP_FAIL);
}
rc = sigmod_iface->on_load();
if (rc != ZAP_SUCCESS) {
zap_log(ZAP_LOG_ERROR, "Failed to load Sangoma boost signaling module interface '%s': on_load method failed (%d)\n", path, rc);
FAIL_CONFIG_RETURN(ZAP_FAIL);
}
sigmod_iface->pvt = lib;
sigmod_iface->set_write_msg_cb(zap_boost_write_msg);
sigmod_iface->set_sig_status_cb(zap_boost_sig_status_change);

View File

@ -183,7 +183,7 @@ typedef struct boost_sigmod_interface_s {
/*! \brief the module was just loaded */
boost_on_load_func_t on_load;
/*! \brief the module is about to be unloaded */
boost_on_load_func_t on_unload;
boost_on_unload_func_t on_unload;
/*! \brief private pointer for the interface user */
void *pvt;
} boost_sigmod_interface_t;