[sr-dev] git:master:1b124e96: ims_usrloc_scscf: updated to use new name for ims_dialog api

Module: kamailio Branch: master Commit: 1b124e9671c1f1044a11d85a461b52b5e5f15cd6 URL: https://github.com/kamailio/kamailio/commit/1b124e9671c1f1044a11d85a461b52b… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: 2016-09-15T12:26:16+02:00 ims_usrloc_scscf: updated to use new name for ims_dialog api --- Modified: modules/ims_usrloc_scscf/contact_dlg_handlers.c Modified: modules/ims_usrloc_scscf/impurecord.c Modified: modules/ims_usrloc_scscf/ul_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1b124e9671c1f1044a11d85a461b52b… Patch: https://github.com/kamailio/kamailio/commit/1b124e9671c1f1044a11d85a461b52b… --- diff --git a/modules/ims_usrloc_scscf/contact_dlg_handlers.c b/modules/ims_usrloc_scscf/contact_dlg_handlers.c index 0492ffb..aaf1774 100644 --- a/modules/ims_usrloc_scscf/contact_dlg_handlers.c +++ b/modules/ims_usrloc_scscf/contact_dlg_handlers.c @@ -12,7 +12,7 @@ #include "../../modules/ims_dialog/dlg_load.h" #include "../../modules/ims_dialog/dlg_hash.h" -extern struct dlg_binds dlgb; +extern ims_dlg_api_t dlgb; /*------------------------------------------------------------------------------------\ | Our call back handler function that handles |confirmed|expired|terminated|destroy. | diff --git a/modules/ims_usrloc_scscf/impurecord.c b/modules/ims_usrloc_scscf/impurecord.c index 97adf93..0576ff8 100644 --- a/modules/ims_usrloc_scscf/impurecord.c +++ b/modules/ims_usrloc_scscf/impurecord.c @@ -81,7 +81,7 @@ extern shtable_t sub_dialog_table; extern struct contact_list* contact_list; extern struct ims_subscription_list* ims_subscription_list; -extern struct dlg_binds dlgb; +extern ims_dlg_api_t dlgb; static ucontact_t* contacts_to_expire [MAX_CONTACTS_PER_IMPU]; //this is done to prevent fragmentation of memory... static int num_contacts_to_expire; diff --git a/modules/ims_usrloc_scscf/ul_mod.c b/modules/ims_usrloc_scscf/ul_mod.c index d416264..f49f15a 100644 --- a/modules/ims_usrloc_scscf/ul_mod.c +++ b/modules/ims_usrloc_scscf/ul_mod.c @@ -117,7 +117,7 @@ str db_url = str_init(DEFAULT_DB_URL); /*!< Database URL */ unsigned int nat_bflag = (unsigned int)-1; unsigned int init_flag = 0; -struct dlg_binds dlgb; +ims_dlg_api_t dlgb; int sub_dialog_hash_size = 9; shtable_t sub_dialog_table; @@ -199,7 +199,6 @@ struct module_exports exports = { */ static int mod_init(void) { int i; - load_dlg_f load_dlg; if (usrloc_debug){ LM_INFO("Logging usrloc records to %.*s\n", usrloc_debug_file.len, usrloc_debug_file.s); debug_file = fopen(usrloc_debug_file.s, "a"); @@ -346,13 +345,7 @@ static int mod_init(void) { } } - if (!(load_dlg = (load_dlg_f) find_export("load_dlg", 0, 0))) { /* bind to dialog module */ - LM_ERR("can not import load_dlg. This module requires Kamailio dialog module.\n"); - } - if (load_dlg(&dlgb) == -1) { - return -1; - } - if (load_dlg_api(&dlgb) != 0) { /* load the dialog API */ + if (load_ims_dlg_api(&dlgb) != 0) { /* load the dialog API */ LM_ERR("can't load Dialog API\n"); return -1; }