sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

git:master:85c4ad10: modules: readme files regenerated - geoip2 ... [skip ci]
by Kamailio Dev 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 85c4ad1025cc3aa882ddfb42cb35257500f4528b URL: https://github.com/kamailio/kamailio/commit/85c4ad1025cc3aa882ddfb42cb35257… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-13T08:46:12+02:00 modules: readme files regenerated - geoip2 ... [skip ci] --- Modified: src/modules/geoip2/README --- Diff: https://github.com/kamailio/kamailio/commit/85c4ad1025cc3aa882ddfb42cb35257… Patch: https://github.com/kamailio/kamailio/commit/85c4ad1025cc3aa882ddfb42cb35257… --- diff --git a/src/modules/geoip2/README b/src/modules/geoip2/README index 697ccf0889..0362750258 100644 --- a/src/modules/geoip2/README +++ b/src/modules/geoip2/README @@ -10,6 +10,10 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> +Henning Westerholt + + gilawa.com + Copyright © 2010 Daniel-Constantin Mierla (asipto.com) __________________________________________________________________ @@ -31,12 +35,17 @@ Daniel-Constantin Mierla 4.1. geoip2_match(ipaddr, pvc) - 5. Exported pseudo-variables + 5. RPC Commands + + 5.1. userblocklist.reload_blocklist + + 6. Exported pseudo-variables List of Examples 1.1. Set path parameter 1.2. geoip2_match usage + 1.3. geoip2.reload usage Chapter 1. Admin Guide @@ -56,7 +65,11 @@ Chapter 1. Admin Guide 4.1. geoip2_match(ipaddr, pvc) - 5. Exported pseudo-variables + 5. RPC Commands + + 5.1. userblocklist.reload_blocklist + + 6. Exported pseudo-variables 1. Overview @@ -126,7 +139,21 @@ if(geoip2_match("$si", "src")) xlog("SIP message from: $gip2(src=>cc)\n"); ... -5. Exported pseudo-variables +5. RPC Commands + + 5.1. userblocklist.reload_blocklist + +5.1. userblocklist.reload_blocklist + + Reload the internal GeoIP database. This is necessary after the + database file has been changed on the disk. + + Example 1.3. geoip2.reload usage +... +kamcmd geoip2.reload +... + +6. Exported pseudo-variables * $gip2(pvc=>key) - pvc is an identifier for this query result; it is designated by the second parameter of geoip2_match(). The key can

1 0

[kamailio/kamailio] [Feature Request] Add reload capability for geoip2 module (#2029)
by Joel Serrano 13 Apr '22

13 Apr '22

### Description Currently, the `geoip2` module loads the IP database at startup and keeps it in cache and there is no way to tell Kamailio to reload the database without a full restart. ### Possible Solutions To keep this module inline with other modules that use external datasources, I would suggest to implement a new RPC command and a new geoip2 function to reload the database defined in the `path` geoip2 modparam without the need of a restart. I'm not aware of the effort required for implementing either of them, but only having an RPC command would effectively solve this issue as you can call RPC commands from within Kamailio conf, thus, the reload function would not be something strictly required but more of a nice-to-have. ### Examples: Function: ``` geoip2_reload() ``` RPC command: ``` kamctl rpc gip2.reload / kamctl rpc geoip2.reload ``` Kamcmd command: ``` kamcmd geoip2.reload ``` -- 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/issues/2029

2 3

git:master:2f78b97e: geoip2: add reload RCP command fuctionality (related to GH #2029)
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 2f78b97eaf3d4232a623be0d2eb2da575c93f13b URL: https://github.com/kamailio/kamailio/commit/2f78b97eaf3d4232a623be0d2eb2da5… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T06:36:23Z geoip2: add reload RCP command fuctionality (related to GH #2029) --- Modified: src/modules/geoip2/doc/geoip2.xml Modified: src/modules/geoip2/doc/geoip2_admin.xml Modified: src/modules/geoip2/geoip2_mod.c Modified: src/modules/geoip2/geoip2_pv.c Modified: src/modules/geoip2/geoip2_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/2f78b97eaf3d4232a623be0d2eb2da5… Patch: https://github.com/kamailio/kamailio/commit/2f78b97eaf3d4232a623be0d2eb2da5…

1 0

git:master:3440a433: modules: readme files regenerated - userblocklist ... [skip ci]
by Kamailio Dev 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 3440a43377ee14fd68de90c940a763b845e98be1 URL: https://github.com/kamailio/kamailio/commit/3440a43377ee14fd68de90c940a763b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-13T08:16:10+02:00 modules: readme files regenerated - userblocklist ... [skip ci] --- Modified: src/modules/userblocklist/README --- Diff: https://github.com/kamailio/kamailio/commit/3440a43377ee14fd68de90c940a763b… Patch: https://github.com/kamailio/kamailio/commit/3440a43377ee14fd68de90c940a763b…

1 0

git:master:d1342772: userblocklist: add a note about deactivated MI cmds to docs
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: d1342772cdcd882b0c26db111b608e37b748314d URL: https://github.com/kamailio/kamailio/commit/d1342772cdcd882b0c26db111b608e3… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T06:02:57Z userblocklist: add a note about deactivated MI cmds to docs --- Modified: src/modules/userblocklist/doc/userblocklist_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d1342772cdcd882b0c26db111b608e3… Patch: https://github.com/kamailio/kamailio/commit/d1342772cdcd882b0c26db111b608e3… --- diff --git a/src/modules/userblocklist/doc/userblocklist_admin.xml b/src/modules/userblocklist/doc/userblocklist_admin.xml index a5f136d8f4..8e562f63e1 100644 --- a/src/modules/userblocklist/doc/userblocklist_admin.xml +++ b/src/modules/userblocklist/doc/userblocklist_admin.xml @@ -405,24 +405,7 @@ if (!check_allowlist("globalblocklist")) { <section> <title>MI Commands</title> - <section> - <title> - <function moreinfo="none">reload_blocklist</function> - </title> - <para> - Reload the internal global blocklist cache. This is necessary after - the database tables for the global blocklist have been changed. - </para> - <example> - <title><function>reload_blocklist</function> usage</title> - <programlisting format="linespecific"> - ... - &ctltool; fifo reload_blocklist - ... - </programlisting> - </example> - </section> - + The following MI commands are currently disabled, they need to migrated to the RPC infrastructure. <section> <title> <function moreinfo="none">dump_blocklist</function>

1 0

git:master:79859614: modules: readme files regenerated - userblocklist ... [skip ci]
by Kamailio Dev 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 79859614cb584ec1f3d3bbdd885b7f4979e61da5 URL: https://github.com/kamailio/kamailio/commit/79859614cb584ec1f3d3bbdd885b7f4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-13T08:01:18+02:00 modules: readme files regenerated - userblocklist ... [skip ci] --- Modified: src/modules/userblocklist/README --- Diff: https://github.com/kamailio/kamailio/commit/79859614cb584ec1f3d3bbdd885b7f4… Patch: https://github.com/kamailio/kamailio/commit/79859614cb584ec1f3d3bbdd885b7f4…

1 0

git:master:dd12c792: userblocklist: small spelling improvement in docs
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: dd12c792b42c223bf93bb58ff0103efb454ab88b URL: https://github.com/kamailio/kamailio/commit/dd12c792b42c223bf93bb58ff0103ef… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T05:59:15Z userblocklist: small spelling improvement in docs --- Modified: src/modules/userblocklist/doc/userblocklist_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dd12c792b42c223bf93bb58ff0103ef… Patch: https://github.com/kamailio/kamailio/commit/dd12c792b42c223bf93bb58ff0103ef… --- diff --git a/src/modules/userblocklist/doc/userblocklist_admin.xml b/src/modules/userblocklist/doc/userblocklist_admin.xml index f991e0efa2..a5f136d8f4 100644 --- a/src/modules/userblocklist/doc/userblocklist_admin.xml +++ b/src/modules/userblocklist/doc/userblocklist_admin.xml @@ -33,7 +33,7 @@ The module exports four functions, <function>check_blocklist</function>, <function>check_allowlist</function>, <function>check_user_blocklist</function> and <function>check_user_allowlist</function> - for usage in the configuration file. Furthermore it provides a MI function to + for usage in the configuration file. Furthermore it provides a RPC function to reload the global blocklist cache. </para> <para>

1 0

git:master:7f03faa0: geoip2: logging library version at startup
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: 7f03faa01ee4d832f5079b9344fc895ff425ac6c URL: https://github.com/kamailio/kamailio/commit/7f03faa01ee4d832f5079b9344fc895… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T05:59:15Z geoip2: logging library version at startup --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7f03faa01ee4d832f5079b9344fc895… Patch: https://github.com/kamailio/kamailio/commit/7f03faa01ee4d832f5079b9344fc895… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 1ac03f06d6..17d910399b 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -80,6 +80,7 @@ struct module_exports exports = { */ static int mod_init(void) { + LM_INFO("using GeoIP library version %s\n", MMDB_lib_version()); if(geoip2_path==NULL || strlen(geoip2_path)==0) {

1 0

git:master:b467ce54: geoip2: also log database path
by Henning Westerholt 13 Apr '22

13 Apr '22

Module: kamailio Branch: master Commit: b467ce544afa709c28e39d8734b2e9ba6a43b79c URL: https://github.com/kamailio/kamailio/commit/b467ce544afa709c28e39d8734b2e9b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-04-13T05:59:15Z geoip2: also log database path --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b467ce544afa709c28e39d8734b2e9b… Patch: https://github.com/kamailio/kamailio/commit/b467ce544afa709c28e39d8734b2e9b… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 17d910399b..f24a853c3a 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -80,7 +80,7 @@ struct module_exports exports = { */ static int mod_init(void) { - LM_INFO("using GeoIP library version %s\n", MMDB_lib_version()); + LM_INFO("using GeoIP database path %s, library version %s\n", geoip2_path, MMDB_lib_version()); if(geoip2_path==NULL || strlen(geoip2_path)==0) {

1 0

git:master:1bde8e0e: core: function to get local socket by index
by Daniel-Constantin Mierla 12 Apr '22

12 Apr '22

Module: kamailio Branch: master Commit: 1bde8e0e6193f0ed63452b3b8d31bfc78121dfb6 URL: https://github.com/kamailio/kamailio/commit/1bde8e0e6193f0ed63452b3b8d31bfc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-12T08:38:07+02:00 core: function to get local socket by index --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/1bde8e0e6193f0ed63452b3b8d31bfc… Patch: https://github.com/kamailio/kamailio/commit/1bde8e0e6193f0ed63452b3b8d31bfc… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 5622e2634d..c9dd89118d 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -912,6 +912,40 @@ socket_info_t* ksr_get_socket_by_advertise(str *sockstr) return NULL; } +socket_info_t* ksr_get_socket_by_index(int idx) +{ + socket_info_t *si = NULL; + struct socket_info** list; + unsigned short c_proto; + + if (idx<0) { + idx += _ksr_sockets_no; + if (idx < 0) { + LM_DBG("negative overall index\n"); + return NULL; + } + } + c_proto = PROTO_UDP; + do { + /* get the proper sock_list */ + list=get_sock_info_list(c_proto); + + if (list==0) { + /* disabled or unknown protocol */ + continue; + } + + for (si=*list; si; si=si->next) { + if(idx==0) { + return si; + } + idx--; + } + } while((c_proto = next_proto(c_proto))!=0); + + return NULL; +} + /* checks if the proto:port is one of the ports we listen on * and returns the corresponding socket_info structure. * if proto==0 (PROTO_NONE) the protocol is ignored diff --git a/src/core/socket_info.h b/src/core/socket_info.h index 3c8deeb244..cbc630b9b8 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -106,6 +106,7 @@ struct socket_info* find_si(struct ip_addr* ip, unsigned short port, socket_info_t* ksr_get_socket_by_name(str *sockname); socket_info_t* ksr_get_socket_by_listen(str *sockstr); socket_info_t* ksr_get_socket_by_advertise(str *sockstr); +socket_info_t* ksr_get_socket_by_index(int idx); struct socket_info** get_sock_info_list(unsigned short proto);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev