sr-dev September 2021

sr-dev@lists.kamailio.org

18 participants
307 discussions

git:master:622f02d0: registrar: implemented lookup filter mode 2
by Daniel-Constantin Mierla 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: 622f02d0f817c5b6c70783cc98745cf06a986f84 URL: https://github.com/kamailio/kamailio/commit/622f02d0f817c5b6c70783cc98745cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-10T13:20:12+02:00 registrar: implemented lookup filter mode 2 - use only contacts that have associated TCP/TLS/WSS connection active --- Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/622f02d0f817c5b6c70783cc98745cf… Patch: https://github.com/kamailio/kamailio/commit/622f02d0f817c5b6c70783cc98745cf… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index e310636f01..cafd8bbcf3 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1109,6 +1109,14 @@ end rlf_bflags - e.g., $xavp(reg=>rlf_bflags). </para> </listitem> + <listitem> + <para> + <emphasis>2</emphasis> - apply the active tcp connection filter + - return only contact records that have the associated TCP/TLS/WSS + connection active. UDP and SCTP contacts are not filtered, all + are returned. + </para> + </listitem> </itemizedlist> <para> <emphasis> diff --git a/src/modules/registrar/lookup.c b/src/modules/registrar/lookup.c index 81f9b7afd9..b58fbd6f7d 100644 --- a/src/modules/registrar/lookup.c +++ b/src/modules/registrar/lookup.c @@ -45,6 +45,8 @@ #include "lookup.h" #include "config.h" +#define REG_LOOKUP_FILTER_BFLAG (1<<0) +#define REG_LOOKUP_FILTER_TCPCON (1<<1) extern int reg_lookup_filter_mode; @@ -60,12 +62,13 @@ static void reg_lookup_filter_init(void) str filter_bflags = str_init("rlf_bflags"); sr_xavp_t *vavp = NULL; - if(reg_lookup_filter_mode==0 || reg_xavp_cfg.s==NULL) { + if(reg_lookup_filter_mode==0) { return; } memset(&_reg_lookup_filter, 0, sizeof(reg_lookup_filter_t)); - if((reg_lookup_filter_mode & 1) + if((reg_lookup_filter_mode & REG_LOOKUP_FILTER_BFLAG) + && (reg_xavp_cfg.s != NULL && reg_xavp_cfg.len > 0) && (vavp = xavp_get_child_with_ival(&reg_xavp_cfg, &filter_bflags)) != NULL) { if(vavp->val.v.i != 0) { @@ -73,24 +76,45 @@ static void reg_lookup_filter_init(void) _reg_lookup_filter.factive = 1; } } + + if(reg_lookup_filter_mode & REG_LOOKUP_FILTER_TCPCON) { + _reg_lookup_filter.factive = 1; + } return; } static int reg_lookup_filter_match(ucontact_t* ptr) { - if(reg_lookup_filter_mode==0 || reg_xavp_cfg.s==NULL) { - return 1; - } - if(_reg_lookup_filter.factive==0) { + tcp_connection_t *con = NULL; + + if(reg_lookup_filter_mode==0 || _reg_lookup_filter.factive==0) { return 1; } - if(_reg_lookup_filter.bflags!=0) { + + if((reg_lookup_filter_mode & REG_LOOKUP_FILTER_BFLAG) + && _reg_lookup_filter.bflags!=0) { if((_reg_lookup_filter.bflags & ptr->cflags)==0) { return 0; } } - return 1; + if(reg_lookup_filter_mode & REG_LOOKUP_FILTER_TCPCON) { + if(ptr->tcpconn_id > 0) { + con = tcpconn_get(ptr->tcpconn_id, 0, 0, 0, 0); + if (unlikely(con == NULL)) { + LM_DBG("connection id %d does not exist\n", ptr->tcpconn_id); + return 0; + } + if (con->state != S_CONN_OK) { + LM_DBG("connection id %d not in state ok\n", ptr->tcpconn_id); + tcpconn_put(con); + return 0; + } + tcpconn_put(con); + } + } + + return 1; } static int has_to_tag(struct sip_msg* msg) @@ -485,7 +509,9 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) if (!cfg_get(registrar, registrar_cfg, append_branches)) goto done; for( ; ptr ; ptr = ptr->next ) { - if ((VALID_CONTACT(ptr, act_time) || cfg_get(registrar,registrar_cfg,use_expired_contacts)) && allowed_method(_m, ptr) + if ((VALID_CONTACT(ptr, act_time) + || cfg_get(registrar,registrar_cfg,use_expired_contacts)) + && allowed_method(_m, ptr) && reg_lookup_filter_match(ptr)) { path_dst.len = 0; if(ptr->path.s && ptr->path.len) { @@ -500,7 +526,8 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) continue; } if (check_self(&(path_uri.host), 0, 0)) { - /* first hop in path vector is local - check for additional hops and if present, point to next one */ + /* first hop in path vector is local + * - check for additional hops and if present, point to next one */ if (path_str.len > (path_dst.len + 3)) { path_str.s = path_str.s + path_dst.len + 3; path_str.len = path_str.len - path_dst.len - 3;

1 0

git:master:bfc545f3: modules: readme files regenerated - sipt ... [skip ci]
by Kamailio Dev 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: bfc545f35193290a441c430a0de2eb05cd7d749b URL: https://github.com/kamailio/kamailio/commit/bfc545f35193290a441c430a0de2eb0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-10T12:16:25+02:00 modules: readme files regenerated - sipt ... [skip ci] --- Modified: src/modules/sipt/README --- Diff: https://github.com/kamailio/kamailio/commit/bfc545f35193290a441c430a0de2eb0… Patch: https://github.com/kamailio/kamailio/commit/bfc545f35193290a441c430a0de2eb0…

1 0

git:master:42db40db: rollback sipt_get_redirection_info
by Henning Westerholt 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: 42db40db857c103404aaf3080ea2461e6d57618a URL: https://github.com/kamailio/kamailio/commit/42db40db857c103404aaf3080ea2461… Author: Mikhail Kalashnikov <mikhail.kalashnikov(a)sifox.ru> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-10T12:06:01+02:00 rollback sipt_get_redirection_info --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/42db40db857c103404aaf3080ea2461… Patch: https://github.com/kamailio/kamailio/commit/42db40db857c103404aaf3080ea2461… --- diff --git a/src/modules/sipt/sipt.c b/src/modules/sipt/sipt.c index 39b6a04199..533e114699 100644 --- a/src/modules/sipt/sipt.c +++ b/src/modules/sipt/sipt.c @@ -371,9 +371,9 @@ static int sipt_get_redirection_info(struct sip_msg *msg, pv_param_t *param, pv_ return -1; } - if((body.s[0] != ISUP_ACM) && (body.s[0] != ISUP_CPG) && (body.s[0] != ISUP_IAM)) + if((body.s[0] != ISUP_ACM) && (body.s[0] != ISUP_CPG)) { - LM_DBG("message not an ACM or CPG or IAM\n"); + LM_DBG("message not an ACM or CPG\n"); return -1; }

1 0

git:master:8f2b2bbf: sipt: added one function and 8 pseudo-variables
by Henning Westerholt 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: 8f2b2bbfa43e87841dc90cf4113c9e41f09b9b97 URL: https://github.com/kamailio/kamailio/commit/8f2b2bbfa43e87841dc90cf4113c9e4… Author: Mikhail Kalashnikov <mikhail.kalashnikov(a)sifox.ru> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-10T12:06:01+02:00 sipt: added one function and 8 pseudo-variables - sipt_has_isup_body() - $sipt(redirection_information.reason) - $sipt(redirection_information.original_reason) - $sipt(redirecting_number.nai) - $sipt(redirecting_number) - $sipt(original_called_number.nai) - $sipt(original_called_number) - $sipt(generic_number.nai) - $sipt(generic_number) --- Modified: src/modules/sipt/doc/sipt_admin.xml Modified: src/modules/sipt/sipt.c Modified: src/modules/sipt/ss7.h Modified: src/modules/sipt/ss7_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/8f2b2bbfa43e87841dc90cf4113c9e4… Patch: https://github.com/kamailio/kamailio/commit/8f2b2bbfa43e87841dc90cf4113c9e4…

1 0

git:master:c311fb78: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: c311fb78976fd7ba97e9ec1e3b8c4176ebeccc0f URL: https://github.com/kamailio/kamailio/commit/c311fb78976fd7ba97e9ec1e3b8c417… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-10T11:16:30+02:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/c311fb78976fd7ba97e9ec1e3b8c417… Patch: https://github.com/kamailio/kamailio/commit/c311fb78976fd7ba97e9ec1e3b8c417… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index bcabbe4db2..d180968e95 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -98,6 +98,7 @@ Carsten Bock 3.56. ka_loglevel (int) 3.57. ka_logmsg (str) 3.58. load_rank (int) + 3.59. db_clean_tcp (int) 4. RPC Commands @@ -203,6 +204,7 @@ Carsten Bock 1.56. ka_loglevel parameter usage 1.57. ka_logmsg parameter usage 1.58. load_rank parameter usage + 1.59. db_clean_tcp parameter usage Chapter 1. Admin Guide @@ -277,6 +279,7 @@ Chapter 1. Admin Guide 3.56. ka_loglevel (int) 3.57. ka_logmsg (str) 3.58. load_rank (int) + 3.59. db_clean_tcp (int) 4. RPC Commands @@ -414,6 +417,7 @@ Chapter 1. Admin Guide 3.56. ka_loglevel (int) 3.57. ka_logmsg (str) 3.58. load_rank (int) + 3.59. db_clean_tcp (int) 3.1. nat_bflag (int) @@ -1231,6 +1235,22 @@ modparam("usrloc", "ka_logmsg", " to-uri: [$tu] remote-addr: [$sas]") modparam("usrloc", "load_rank", 1) ... +3.59. db_clean_tcp (int) + + If set to 1, when Kamailio starts it removes the contacts with + transport TCP, TLS or WSS, no longer loading them. Useful when end + points do not listen for incoming connections on contact address, which + is quite common (end point use only tcp client connections). On + restart, connections are lost, therefore the corresponding contact + records become useless. + + Default value is “0” (do not clean tcp contacts). + + Example 1.59. db_clean_tcp parameter usage +... +modparam("usrloc", "db_clean_tcp", 1) +... + 4. RPC Commands 4.1. ul.dump

1 0

git:master:18b7337a: usrloc: added db_clean_tcp parameter
by Daniel-Constantin Mierla 10 Sep '21

10 Sep '21

Module: kamailio Branch: master Commit: 18b7337ad4b868a84d4cb70abb37a3d4ba16a428 URL: https://github.com/kamailio/kamailio/commit/18b7337ad4b868a84d4cb70abb37a3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-10T11:12:01+02:00 usrloc: added db_clean_tcp parameter - if set, tcp contacts are deleted before loading location table at start time - it is very common that end points use only tcp client connections, on restart those connections are lost and corresponding contacts are useless --- Modified: src/modules/usrloc/doc/usrloc_admin.xml Modified: src/modules/usrloc/udomain.c Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/18b7337ad4b868a84d4cb70abb37a3d… Patch: https://github.com/kamailio/kamailio/commit/18b7337ad4b868a84d4cb70abb37a3d… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 25124abcc1..66dae44913 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1517,6 +1517,29 @@ modparam("usrloc", "load_rank", 1) </example> </section> + <section id="usrloc.p.db_clean_tcp"> + <title><varname>db_clean_tcp</varname> (int)</title> + <para> + If set to 1, when &kamailio; starts it removes the contacts with + transport TCP, TLS or WSS, no longer loading them. Useful when + end points do not listen for incoming connections on contact address, + which is quite common (end point use only tcp client connections). + On restart, connections are lost, therefore the corresponding + contact records become useless. + </para> + <para> + Default value is <quote>0</quote> (do not clean tcp contacts). + </para> + <example> + <title><varname>db_clean_tcp</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "db_clean_tcp", 1) +... + </programlisting> + </example> + </section> + </section> <section> diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index 204ddfd29f..4025cc549e 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -45,6 +45,7 @@ #include "urecord.h" extern int ul_rm_expired_delay; +extern int ul_db_clean_tcp; #ifdef STATISTICS static char *build_stat_name( str* domain, char *var_name) @@ -372,6 +373,52 @@ static inline ucontact_info_t* dbrow2info(db_val_t *vals, str *contact, int rcon return &ci; } +/*! + * \brief Delete all location records with tcp connection + * + * \param _c database connection + * \param _d loaded domain + * \return 0 on success, -1 on failure + */ +int uldb_delete_tcp_records(db1_con_t* _c, udomain_t* _d) +{ + db_key_t keys[2]; + db_op_t ops[2]; + db_val_t vals[2]; + int nr_keys = 0; + + LM_DBG("delete location tcp records\n"); + + keys[nr_keys] = &ul_con_id_col;; + ops[nr_keys] = OP_GT; + vals[nr_keys].type = DB1_INT; + vals[nr_keys].nul = 0; + vals[nr_keys].val.int_val = 0; + nr_keys++; + + if (ul_db_srvid != 0) { + keys[nr_keys] = &ul_srv_id_col; + ops[nr_keys] = OP_EQ; + vals[nr_keys].type = DB1_INT; + vals[nr_keys].nul = 0; + vals[nr_keys].val.int_val = server_id; + nr_keys++; + } + + if (ul_dbf.use_table(_c, _d->name) < 0) { + LM_ERR("sql use_table failed\n"); + return -1; + } + + + if (ul_dbf.delete(_c, keys, ops, vals, nr_keys) < 0) { + LM_ERR("deleting from database failed\n"); + return -1; + } + + return 0; +} + /*! * \brief Load all records from a udomain @@ -400,6 +447,10 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) urecord_t* r; ucontact_t* c; + if(ul_db_clean_tcp!=0) { + uldb_delete_tcp_records(_c, _d); + } + columns[0] = &ul_user_col; columns[1] = &ul_contact_col; columns[2] = &ul_expires_col; diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 733c16a3ff..5668586733 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -176,6 +176,7 @@ int ul_desc_time_order = 0; /*!< By default do not enable timestamp ordering int ul_handle_lost_tcp = 0; /*!< By default do not remove contacts before expiration time */ int ul_close_expired_tcp = 0; /*!< By default do not close TCP connections for expired contacts */ int ul_skip_remote_socket = 0; /*!< By default do not skip remote socket */ +int ul_db_clean_tcp = 0; /*!< Clean TCP/TLS/WSS contacts in DB before loading records */ int ul_fetch_rows = 2000; /*!< number of rows to fetch from result */ int ul_hash_size = 10; @@ -263,6 +264,7 @@ static param_export_t params[] = { {"ka_loglevel", PARAM_INT, &ul_ka_loglevel}, {"ka_logmsg", PARAM_STR, &ul_ka_logmsg}, {"load_rank", PARAM_INT, &ul_load_rank}, + {"db_clean_tcp", PARAM_INT, &ul_db_clean_tcp}, {0, 0, 0} };

1 0

git:master:608118de: modules: readme files regenerated - snmpstats ... [skip ci]
by Kamailio Dev 09 Sep '21

09 Sep '21

Module: kamailio Branch: master Commit: 608118deffa70cf12f4c3de29e18a0cfb1ff934c URL: https://github.com/kamailio/kamailio/commit/608118deffa70cf12f4c3de29e18a0c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-09T21:46:13+02:00 modules: readme files regenerated - snmpstats ... [skip ci] --- Modified: src/modules/snmpstats/README --- Diff: https://github.com/kamailio/kamailio/commit/608118deffa70cf12f4c3de29e18a0c… Patch: https://github.com/kamailio/kamailio/commit/608118deffa70cf12f4c3de29e18a0c… --- diff --git a/src/modules/snmpstats/README b/src/modules/snmpstats/README index 5308308e36..155003e027 100644 --- a/src/modules/snmpstats/README +++ b/src/modules/snmpstats/README @@ -44,7 +44,8 @@ Olle E. Johansson 4.5. dlg_major_threshold (Integer) 4.6. snmpgetPath (String) 4.7. snmpCommunity (String) - 4.8. export_registrar (int) + 4.8. snmpVersion (String) + 4.9. export_registrar (int) 5. Functions 6. Installation and Running @@ -69,7 +70,8 @@ Olle E. Johansson 1.5. Setting the dlg_major_threshold parameter 1.6. Setting the snmpgetPath parameter 1.7. Setting the snmpCommunity parameter - 1.8. Setting the export_registrar parameter + 1.8. Setting the snmpVersion parameter + 1.9. Setting the export_registrar parameter Chapter 1. Admin Guide @@ -100,7 +102,8 @@ Chapter 1. Admin Guide 4.5. dlg_major_threshold (Integer) 4.6. snmpgetPath (String) 4.7. snmpCommunity (String) - 4.8. export_registrar (int) + 4.8. snmpVersion (String) + 4.9. export_registrar (int) 5. Functions 6. Installation and Running @@ -309,7 +312,8 @@ Chapter 1. Admin Guide 4.5. dlg_major_threshold (Integer) 4.6. snmpgetPath (String) 4.7. snmpCommunity (String) - 4.8. export_registrar (int) + 4.8. snmpVersion (String) + 4.9. export_registrar (int) 4.1. sipEntityType (String) @@ -426,7 +430,21 @@ modparam("snmpstats", "snmpgetPath", "/my/custom/path/") modparam("snmpstats", "snmpCommunity", "customCommunityString") ... -4.8. export_registrar (int) +4.8. snmpVersion (String) + + The SNMPStats module provides the kamailioSIPServiceStartTime scalar. + This scalar requires the SNMPStats module to perform a snmpget query to + the master agent. You can use this parameter to set specific SNMP + version. + + Default value is “3”. + + Example 1.8. Setting the snmpVersion parameter +... +modparam("snmpstats", "snmpVersion", "2c") +... + +4.9. export_registrar (int) The SNMPStats module will export registrar (usrloc) records if this parameter is set to 1. This will result in more memory usage and bigger @@ -440,7 +458,7 @@ modparam("snmpstats", "snmpCommunity", "customCommunityString") Default value is “0” (don't export). - Example 1.8. Setting the export_registrar parameter + Example 1.9. Setting the export_registrar parameter ... modparam("snmpstats", "export_registrar", 1) ...

1 0

[kamailio/kamailio] snmpstats: add parameter to specify SNMP version (#2846)
by Marat 09 Sep '21

09 Sep '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2846 -- Commit Summary -- * snmpstats: add parameter to specify SNMP version -- File Changes -- M src/modules/snmpstats/doc/snmpstats_admin.xml (26) M src/modules/snmpstats/snmpstats.c (30) M src/modules/snmpstats/snmpstats_globals.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2846.patch https://github.com/kamailio/kamailio/pull/2846.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2846

2 3

git:master:9f3b344a: snmpstats: add parameter to specify SNMP version
by Henning Westerholt 09 Sep '21

09 Sep '21

Module: kamailio Branch: master Commit: 9f3b344a737f2bf8628be1126e4aa6145963b9bc URL: https://github.com/kamailio/kamailio/commit/9f3b344a737f2bf8628be1126e4aa61… Author: Marat Gareev <maratkin94(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-09-09T21:42:56+02:00 snmpstats: add parameter to specify SNMP version --- Modified: src/modules/snmpstats/doc/snmpstats_admin.xml Modified: src/modules/snmpstats/snmpstats.c Modified: src/modules/snmpstats/snmpstats_globals.h --- Diff: https://github.com/kamailio/kamailio/commit/9f3b344a737f2bf8628be1126e4aa61… Patch: https://github.com/kamailio/kamailio/commit/9f3b344a737f2bf8628be1126e4aa61… --- diff --git a/src/modules/snmpstats/doc/snmpstats_admin.xml b/src/modules/snmpstats/doc/snmpstats_admin.xml index a6a4f1e3b4..870a8630a0 100644 --- a/src/modules/snmpstats/doc/snmpstats_admin.xml +++ b/src/modules/snmpstats/doc/snmpstats_admin.xml @@ -439,6 +439,32 @@ modparam("snmpstats", "snmpCommunity", "customCommunityString") </example> </section> + <section id ="snmpstats.p.snmpVersion"> + <title><varname>snmpVersion</varname> (String)</title> + + <para> + The SNMPStats module provides the kamailioSIPServiceStartTime scalar. + This scalar requires the SNMPStats module to perform a snmpget query + to the master agent. You can use this parameter to set specific + SNMP version. + </para> + + <para> + <emphasis> + Default value is <quote>3</quote>. + </emphasis> + </para> + + <example> + <title>Setting the <varname>snmpVersion</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("snmpstats", "snmpVersion", "2c") +... + </programlisting> + </example> + </section> + <section id ="snmpstats.p.export_registrar"> <title><varname>export_registrar</varname> (int)</title> diff --git a/src/modules/snmpstats/snmpstats.c b/src/modules/snmpstats/snmpstats.c index a9d8b1fc88..4fae5dad09 100644 --- a/src/modules/snmpstats/snmpstats.c +++ b/src/modules/snmpstats/snmpstats.c @@ -145,6 +145,8 @@ static param_export_t mod_params[] = { (void *)set_snmpget_path}, {"snmpCommunity", PARAM_STRING | USE_FUNC_PARAM, (void *)set_snmp_community}, + {"snmpVersion", PARAM_STRING | USE_FUNC_PARAM, + (void *)set_snmp_version}, {"export_registrar", INT_PARAM, &snmp_export_registrar}, {0, 0, 0} }; @@ -178,10 +180,11 @@ volatile pid_t sysUpTime_pid; * for a full description. */ static int spawn_sysUpTime_child(); -/*! Storage for the "snmpgetPath" and "snmpCommunity" kamailio.cfg parameters. +/*! Storage for the "snmpgetPath", "snmpCommunity" and "snmpVersion" kamailio.cfg parameters. * The parameters are used to define what happens with the sysUpTime child. */ char *snmpget_path = NULL; char *snmp_community = NULL; +char *snmp_version = NULL; /*! * This module replaces the default SIGCHLD handler with our own, as explained @@ -462,6 +465,7 @@ static int spawn_sysUpTime_child(void) char *full_path_to_snmpget = NULL; char *snmp_community_string = "public"; + char *snmp_version_string = "3"; /* Set up a new SIGCHLD handler. The handler will be responsible for * ignoring SIGCHLDs generated by our sysUpTime child process. Every @@ -509,8 +513,16 @@ static int spawn_sysUpTime_child(void) snmp_community_string); } - char *args[] = {"-Ov", "-c", snmp_community_string, "localhost", - SYSUPTIME_OID, (char *)0}; + if(snmp_version != NULL) { + snmp_version_string = snmp_version; + } else { + LM_INFO("A snmpVersion parameter was not provided." + " Defaulting to %s\n", + snmp_version_string); + } + + char *args[] = {"snmpget", "-v", snmp_version_string, "-Ov", "-c", + snmp_community_string, "localhost", SYSUPTIME_OID, (char *)0}; /* Make sure we have a path to snmpget, so we can retrieve the * sysUpTime. */ @@ -586,3 +598,15 @@ int set_snmp_community(modparam_t type, void *val) return 0; } + +/* Handles setting of the snmp version. */ +int set_snmp_version(modparam_t type, void *val) +{ + if(!stringHandlerSanityCheck(type, val, "snmpVersion")) { + return -1; + } + + snmp_version = (char *)val; + + return 0; +} diff --git a/src/modules/snmpstats/snmpstats_globals.h b/src/modules/snmpstats/snmpstats_globals.h index f40e65d42b..3a01e7ef70 100644 --- a/src/modules/snmpstats/snmpstats_globals.h +++ b/src/modules/snmpstats/snmpstats_globals.h @@ -159,4 +159,7 @@ int set_snmpget_path(modparam_t type, void *val); /*! Handles setting of the snmp community string. */ int set_snmp_community(modparam_t type, void *val); +/*! Handles setting of the snmp version. */ +int set_snmp_version(modparam_t type, void *val); + #endif \ No newline at end of file

1 0

[kamailio/kamailio] core: logging: JSON: CEE: add the @cee prefix in Syslog messages (#2848)
by Daniel Pocock 09 Sep '21

09 Sep '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The JSON CEE output from ```stderr``` is OK When the messages are sent through Syslog, they need this extra prefix ```@cee:``` before the JSON string Tested with ```rsyslog-omelasticsearch``` and [OpenSearch Dashboard (replacement for Kibana)](https://opensearch.org/) ``` module(load="mmjsonparse") # we handle LOG_LOCAL5 only, use the same setting in the application config local5.* :mmjsonparse: template(name="isJSON" type="list") { property(name="$!all-json") } module(load="omelasticsearch") local5.* action(type="omelasticsearch" template="isJSON" server="some-server" serverport="9200" searchIndex="log" searchType="_doc/" uid="admin" pwd="admin") ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2848 -- Commit Summary -- * core: logging: JSON: CEE: add the @cee prefix in Syslog messages -- File Changes -- M src/core/dprint.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2848.patch https://github.com/kamailio/kamailio/pull/2848.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2848

2 3

← Newer
1
...
20
21
22
23
24
25
26
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2021