From 4de9a4c0d13a94359b8d1094a76447a3e56e550d Mon Sep 17 00:00:00 2001 From: Moises Silva Date: Fri, 20 Nov 2009 16:42:31 +0000 Subject: [PATCH] Resolved conflict git-svn-id: http://svn.openzap.org/svn/openzap/branches/sangoma_boost@890 a93c3328-9c30-0410-af19-c9cd2b2d52af --- .../src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c | 6 ++++++ .../src/ozmod/ozmod_sangoma_boost/sangoma_boost_interface.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libs/freetdm/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c b/libs/freetdm/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c index 32af0a5c48..783200a536 100644 --- a/libs/freetdm/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c +++ b/libs/freetdm/src/ozmod/ozmod_sangoma_boost/ozmod_sangoma_boost.c @@ -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); diff --git a/libs/freetdm/src/ozmod/ozmod_sangoma_boost/sangoma_boost_interface.h b/libs/freetdm/src/ozmod/ozmod_sangoma_boost/sangoma_boost_interface.h index bcd2184991..3b5d11b007 100644 --- a/libs/freetdm/src/ozmod/ozmod_sangoma_boost/sangoma_boost_interface.h +++ b/libs/freetdm/src/ozmod/ozmod_sangoma_boost/sangoma_boost_interface.h @@ -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;