Module: kamailio Branch: 5.3 Commit: 17768cd71db7464b295db17706b4593e9dc75b59 URL: https://github.com/kamailio/kamailio/commit/17768cd71db7464b295db17706b4593… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:18:19+01:00 ims_charging: use extern to avoid double declaration of globals (cherry picked from commit a13d49fb099dd5e8d832a0559a8e69aa8c61c1ae) --- Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ims_ro.c Modified: src/modules/ims_charging/ro_session_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/17768cd71db7464b295db17706b4593… Patch: https://github.com/kamailio/kamailio/commit/17768cd71db7464b295db17706b4593… --- diff --git a/src/modules/ims_charging/ims_charging_mod.c b/src/modules/ims_charging/ims_charging_mod.c index 06284c6732..5fabde6714 100644 --- a/src/modules/ims_charging/ims_charging_mod.c +++ b/src/modules/ims_charging/ims_charging_mod.c @@ -25,6 +25,8 @@ MODULE_VERSION +struct dlg_binds* dlgb_p; + /* parameters */ char* ro_destination_host_s = "hss.ims.smilecoms.com"; char* ro_service_context_id_root_s = "32260(a)3gpp.org".org"; @@ -46,6 +48,8 @@ int video_service_identifier = 1001; int video_rating_group = 200; +struct impu_data impu_data_t; + /* DB params */ static str db_url = str_init(DEFAULT_DB_URL); static unsigned int db_update_period = DB_DEFAULT_UPDATE_PERIOD; diff --git a/src/modules/ims_charging/ims_ro.c b/src/modules/ims_charging/ims_ro.c index cd3ae215ae..b78016b99a 100644 --- a/src/modules/ims_charging/ims_ro.c +++ b/src/modules/ims_charging/ims_ro.c @@ -54,10 +54,10 @@ struct session_setup_data { unsigned int tlabel; }; -struct dlg_binds* dlgb_p; +extern struct dlg_binds* dlgb_p; extern struct tm_binds tmb; -int interim_request_credits; +extern int interim_request_credits; extern int voice_service_identifier; extern int voice_rating_group; diff --git a/src/modules/ims_charging/ro_session_hash.h b/src/modules/ims_charging/ro_session_hash.h index b81e843245..556d11d849 100644 --- a/src/modules/ims_charging/ro_session_hash.h +++ b/src/modules/ims_charging/ro_session_hash.h @@ -42,7 +42,9 @@ struct diameter_avp_value { struct impu_data { str identity; str contact; -} impu_data_t; +}; + +extern struct impu_data impu_data_t; struct ro_session { volatile int ref;