sr-dev March 2020

sr-dev@lists.kamailio.org

27 participants
473 discussions

git:5.3:c93c0a98: janssonrpcc: use extern not to declare tmb global many times

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: c93c0a989c690acebc6e2896f6b2d7095b95eb3d URL: https://github.com/kamailio/kamailio/commit/c93c0a989c690acebc6e2896f6b2d70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:19:42+01:00 janssonrpcc: use extern not to declare tmb global many times (cherry picked from commit 6bb1e84907a6c8bdb0c72289bad7b9915c9b3385) --- Modified: src/modules/janssonrpcc/janssonrpc_funcs.c Modified: src/modules/janssonrpcc/janssonrpc_io.c --- Diff: https://github.com/kamailio/kamailio/commit/c93c0a989c690acebc6e2896f6b2d70… Patch: https://github.com/kamailio/kamailio/commit/c93c0a989c690acebc6e2896f6b2d70… --- diff --git a/src/modules/janssonrpcc/janssonrpc_funcs.c b/src/modules/janssonrpcc/janssonrpc_funcs.c index a8683407b3..ea96f69532 100644 --- a/src/modules/janssonrpcc/janssonrpc_funcs.c +++ b/src/modules/janssonrpcc/janssonrpc_funcs.c @@ -31,7 +31,7 @@ #include "janssonrpc_funcs.h" -struct tm_binds tmb; +extern struct tm_binds tmb; int jsonrpc_request(struct sip_msg* _m, char* _conn, diff --git a/src/modules/janssonrpcc/janssonrpc_io.c b/src/modules/janssonrpcc/janssonrpc_io.c index 898458b268..a503322057 100644 --- a/src/modules/janssonrpcc/janssonrpc_io.c +++ b/src/modules/janssonrpcc/janssonrpc_io.c @@ -51,7 +51,7 @@ #include "janssonrpc_connect.h" #include "netstring.h" -struct tm_binds tmb; +extern struct tm_binds tmb; /* event bases */ struct event_base* global_ev_base = NULL;

4 years, 9 months

git:5.3:fe8f6887: ims_diameter_server: extern declaration of global vars in header file

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: fe8f6887f4fa94f72c04d09f6e199218e0b6a90d URL: https://github.com/kamailio/kamailio/commit/fe8f6887f4fa94f72c04d09f6e19921… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:19:17+01:00 ims_diameter_server: extern declaration of global vars in header file (cherry picked from commit 19263243127c40d0418ff04e56048d31e9dd9d0c) --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c Modified: src/modules/ims_diameter_server/ims_diameter_server.h --- Diff: https://github.com/kamailio/kamailio/commit/fe8f6887f4fa94f72c04d09f6e19921… Patch: https://github.com/kamailio/kamailio/commit/fe8f6887f4fa94f72c04d09f6e19921… --- diff --git a/src/modules/ims_diameter_server/ims_diameter_server.c b/src/modules/ims_diameter_server/ims_diameter_server.c index f3e6fe040e..c7fe941b00 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.c +++ b/src/modules/ims_diameter_server/ims_diameter_server.c @@ -31,6 +31,13 @@ MODULE_VERSION extern gen_lock_t* process_lock; /* lock on the process table */ +struct cdp_binds cdpb; +cdp_avp_bind_t *cdp_avp; + +AAAMessage *request; +str responsejson; +str requestjson; + struct cdp_binds cdpb; cdp_avp_bind_t *cdp_avp; diff --git a/src/modules/ims_diameter_server/ims_diameter_server.h b/src/modules/ims_diameter_server/ims_diameter_server.h index 26848d5ebb..76775bd00c 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.h +++ b/src/modules/ims_diameter_server/ims_diameter_server.h @@ -26,14 +26,14 @@ /** callback functions */ -struct cdp_binds cdpb; -cdp_avp_bind_t *cdp_avp; +extern struct cdp_binds cdpb; +extern cdp_avp_bind_t *cdp_avp; struct AAAMessage; -AAAMessage *request; -str responsejson; -str requestjson; +extern AAAMessage *request; +extern str responsejson; +extern str requestjson; AAAMessage* callback_cdp_request(AAAMessage *request, void *param);

4 years, 9 months

git:5.3:267c9940: ims_ocs: declare extern global variables in header file

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 267c9940ce9e6f4c5cd57a31d472aba07ee242c7 URL: https://github.com/kamailio/kamailio/commit/267c9940ce9e6f4c5cd57a31d472aba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:19:06+01:00 ims_ocs: declare extern global variables in header file (cherry picked from commit 13da8cf58a2abfcd87a48fbc963d4e1a26d60085) --- Modified: src/modules/ims_ocs/ims_ocs_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/267c9940ce9e6f4c5cd57a31d472aba… Patch: https://github.com/kamailio/kamailio/commit/267c9940ce9e6f4c5cd57a31d472aba… --- diff --git a/src/modules/ims_ocs/ims_ocs_mod.h b/src/modules/ims_ocs/ims_ocs_mod.h index b46a29a4b4..cfddfdccc9 100644 --- a/src/modules/ims_ocs/ims_ocs_mod.h +++ b/src/modules/ims_ocs/ims_ocs_mod.h @@ -26,8 +26,8 @@ /** callback functions */ -struct cdp_binds cdpb; -cdp_avp_bind_t *cdp_avp; +extern struct cdp_binds cdpb; +extern cdp_avp_bind_t *cdp_avp; struct AAAMessage;

4 years, 9 months

git:5.3:6da1fd36: ims_charging: extern declaration for cdpb

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 6da1fd36fe4c003ccf20ad629250a1f545e5f189 URL: https://github.com/kamailio/kamailio/commit/6da1fd36fe4c003ccf20ad629250a1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:18:35+01:00 ims_charging: extern declaration for cdpb (cherry picked from commit 9cd1cec4dedadcfcd50322c4709c4844a3db2f4f) --- Modified: src/modules/ims_charging/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/6da1fd36fe4c003ccf20ad629250a1f… Patch: https://github.com/kamailio/kamailio/commit/6da1fd36fe4c003ccf20ad629250a1f… --- diff --git a/src/modules/ims_charging/dialog.c b/src/modules/ims_charging/dialog.c index 9b03998170..fdbaafe663 100644 --- a/src/modules/ims_charging/dialog.c +++ b/src/modules/ims_charging/dialog.c @@ -5,7 +5,7 @@ #include "ims_charging_stats.h" #include "../../core/parser/hf.h" -struct cdp_binds cdpb; +extern struct cdp_binds cdpb; extern int ro_db_mode; extern char *domain;

4 years, 9 months

git:5.3:17768cd7: ims_charging: use extern to avoid double declaration of globals

by Daniel-Constantin Mierla

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"; @@ -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;

4 years, 9 months

git:5.3:e58c80bd: ims_usrloc_scscf: extern declaration for duplicated global vars

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: e58c80bdba4feeabbdbcaacb2168ee9f358049c0 URL: https://github.com/kamailio/kamailio/commit/e58c80bdba4feeabbdbcaacb2168ee9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:18:08+01:00 ims_usrloc_scscf: extern declaration for duplicated global vars (cherry picked from commit 1bbab692b749feee7f23a6c5c3fbee1ac890fffa) --- Modified: src/modules/ims_usrloc_scscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/e58c80bdba4feeabbdbcaacb2168ee9… Patch: https://github.com/kamailio/kamailio/commit/e58c80bdba4feeabbdbcaacb2168ee9… --- diff --git a/src/modules/ims_usrloc_scscf/udomain.c b/src/modules/ims_usrloc_scscf/udomain.c index 080b790f34..361d5ba425 100644 --- a/src/modules/ims_usrloc_scscf/udomain.c +++ b/src/modules/ims_usrloc_scscf/udomain.c @@ -73,8 +73,8 @@ extern int unreg_validity; extern int db_mode; -struct contact_list* contact_list; -struct ims_subscription_list* ims_subscription_list; +extern struct contact_list* contact_list; +extern struct ims_subscription_list* ims_subscription_list; extern int subs_hash_size; extern int contact_delete_delay;

4 years, 9 months

git:5.3:d7c52a7c: ims_registrar_scscf: global vars declared extern in header files

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: d7c52a7c59c27c054a3782b7f004b865006b6d4d URL: https://github.com/kamailio/kamailio/commit/d7c52a7c59c27c054a3782b7f004b86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:17:55+01:00 ims_registrar_scscf: global vars declared extern in header files (cherry picked from commit a041e94c4dce464737d6531d11fbe4d61292d7b4) --- Modified: src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c Modified: src/modules/ims_registrar_scscf/registrar_notify.h Modified: src/modules/ims_registrar_scscf/stats.h --- Diff: https://github.com/kamailio/kamailio/commit/d7c52a7c59c27c054a3782b7f004b86… Patch: https://github.com/kamailio/kamailio/commit/d7c52a7c59c27c054a3782b7f004b86… --- diff --git a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c index b7a408b023..c402ac3985 100644 --- a/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c +++ b/src/modules/ims_registrar_scscf/ims_registrar_scscf_mod.c @@ -79,8 +79,11 @@ MODULE_VERSION extern gen_lock_t* process_lock; /* lock on the process table */ -int * callback_singleton; /**< Cx callback singleton */ +int *callback_singleton; /**< Cx callback singleton */ +stat_var* stat_sar_timeouts; +stat_var* sar_replies_received; +stat_var* sar_replies_response_time; struct tm_binds tmb; @@ -176,7 +179,10 @@ int max_notification_list_size = 0; int notification_processes = 4; /*Number of processes that processes the notification queue*/ -extern reg_notification_list *notification_list; /**< list of notifications for reg to be sent */ +reg_notification_list *notification_list; /**< list of notifications for reg to be sent */ + +IMS_Events_enum_t IMS_Events; +IMS_Registrar_events_enum_t IMS_Registrar_events; #define RCV_NAME "received" str rcv_param = str_init(RCV_NAME); diff --git a/src/modules/ims_registrar_scscf/registrar_notify.h b/src/modules/ims_registrar_scscf/registrar_notify.h index ee1fec52e8..5491c43b5d 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.h +++ b/src/modules/ims_registrar_scscf/registrar_notify.h @@ -96,13 +96,15 @@ typedef struct { } reg_notification_list; /** Events for subscriptions */ -enum { +typedef enum { IMS_EVENT_NONE, /**< Generic, no event */ IMS_EVENT_REG /**< Registration event */ -} IMS_Events; +} IMS_Events_enum_t; + +extern IMS_Events_enum_t IMS_Events; /** Event types for "reg" to generated notifications after */ -enum { +typedef enum { IMS_REGISTRAR_NONE, /**< no event - donothing */ IMS_REGISTRAR_SUBSCRIBE, /**< Initial SUBSCRIBE - just send all data - this should not be treated though */ IMS_REGISTRAR_UNSUBSCRIBE, /**< Final UnSUBSCRIBE - just send a NOTIFY which will probably fail */ @@ -114,10 +116,11 @@ enum { IMS_REGISTRAR_CONTACT_EXPIRED, /**< A contact has expired and will be removed */ IMS_REGISTRAR_CONTACT_UNREGISTERED, /**< User unregistered with Expires 0 */ IMS_REGISTRAR_CONTACT_UNREGISTERED_IMPLICIT, /**< User unregistered implicitly, ie not via explicit deregister */ -} IMS_Registrar_events; +} IMS_Registrar_events_enum_t; +extern IMS_Registrar_events_enum_t IMS_Registrar_events; -reg_notification_list *notification_list; //< List of pending notifications +extern reg_notification_list *notification_list; //< List of pending notifications int can_subscribe_to_reg(struct sip_msg *msg, char *str1, char *str2); diff --git a/src/modules/ims_registrar_scscf/stats.h b/src/modules/ims_registrar_scscf/stats.h index 3b2c61b964..ea4418f426 100644 --- a/src/modules/ims_registrar_scscf/stats.h +++ b/src/modules/ims_registrar_scscf/stats.h @@ -43,9 +43,9 @@ #include "../../core/counters.h" -stat_var* stat_sar_timeouts; -stat_var* sar_replies_received; -stat_var* sar_replies_response_time; +extern stat_var* stat_sar_timeouts; +extern stat_var* sar_replies_received; +extern stat_var* sar_replies_response_time; int register_stats(); unsigned long get_avg_sar_response_time();

4 years, 9 months

git:5.3:575ab954: tm: safe list iteration in tm_clean_lifetime()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 575ab954538cbd7fdd6ac763fa4fd1c9e5b7ab4b URL: https://github.com/kamailio/kamailio/commit/575ab954538cbd7fdd6ac763fa4fd1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:17:42+01:00 tm: safe list iteration in tm_clean_lifetime() (cherry picked from commit 325a45e846faae3e5dfa333727d5fab294e44dac) --- Modified: src/modules/tm/h_table.c --- Diff: https://github.com/kamailio/kamailio/commit/575ab954538cbd7fdd6ac763fa4fd1c… Patch: https://github.com/kamailio/kamailio/commit/575ab954538cbd7fdd6ac763fa4fd1c… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index d0ec6c8452..cf5201caec 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -596,6 +596,7 @@ void tm_clean_lifetime(void) { int r; tm_cell_t *tcell; + tm_cell_t *bcell; ticks_t texp; texp = get_ticks_raw() - S_TO_TICKS(TM_LIFETIME_LIMIT); @@ -612,7 +613,7 @@ void tm_clean_lifetime(void) continue; } - clist_foreach(&_tm_table->entries[r], tcell, next_c) + clist_foreach_safe(&_tm_table->entries[r], tcell, bcell, next_c) { if(TICKS_GT(texp, tcell->end_of_life)) { tm_log_transaction(tcell, L_WARN, "[hard cleanup]");

4 years, 9 months

git:master:92c6f04a: siputils: proper param type for kemi contact ops exports

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 92c6f04a3faa917a227fb5d3b8918c981a1b1d96 URL: https://github.com/kamailio/kamailio/commit/92c6f04a3faa917a227fb5d3b8918c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T09:11:04+01:00 siputils: proper param type for kemi contact ops exports --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/92c6f04a3faa917a227fb5d3b8918c9… Patch: https://github.com/kamailio/kamailio/commit/92c6f04a3faa917a227fb5d3b8918c9… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index e9593da3b4..c2da159088 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -553,12 +553,12 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { }, { str_init("siputils"), str_init("decode_contact"), SR_KEMIP_INT, ki_decode_contact, - { SR_KEMIP_NULL, SR_KEMIP_NULL, SR_KEMIP_NONE, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("siputils"), str_init("decode_contact_header"), SR_KEMIP_INT, ki_decode_contact_header, - { SR_KEMIP_NULL, SR_KEMIP_NULL, SR_KEMIP_NONE, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

4 years, 9 months

git:master:a771d9ab: app_python3: declare global vars extern in header file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a771d9abd9ce97228efa7a0dfc9c4d89690e9b38 URL: https://github.com/kamailio/kamailio/commit/a771d9abd9ce97228efa7a0dfc9c4d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-03-09T08:27:47+01:00 app_python3: declare global vars extern in header file --- Modified: src/modules/app_python3/app_python3_mod.c Modified: src/modules/app_python3/python_support.h --- Diff: https://github.com/kamailio/kamailio/commit/a771d9abd9ce97228efa7a0dfc9c4d8… Patch: https://github.com/kamailio/kamailio/commit/a771d9abd9ce97228efa7a0dfc9c4d8… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 92ce10e04f..502a6d540b 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -53,6 +53,7 @@ static int child_init(int rank); static void mod_destroy(void); PyObject *_sr_apy_handler_obj = NULL; +PyObject *format_exc_obj = NULL; char *dname = NULL, *bname = NULL; diff --git a/src/modules/app_python3/python_support.h b/src/modules/app_python3/python_support.h index 97c4e72e3e..8859f9a32a 100644 --- a/src/modules/app_python3/python_support.h +++ b/src/modules/app_python3/python_support.h @@ -25,7 +25,7 @@ #include <Python.h> #include <stdarg.h> -PyObject *format_exc_obj; +extern PyObject *format_exc_obj; void python_handle_exception(const char *, ...);

4 years, 9 months

← Newer
1
...
34
35
36
37
38
39
40
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2020