- sr-dev - kamailio.org

git:5.6:9daacc36: sqlops: do not allow empty name component in URL
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: 5.6 Commit: 9daacc36e3ed858eca97e9b7ac7eaa90e10c0803 URL: https://github.com/kamailio/kamailio/commit/9daacc36e3ed858eca97e9b7ac7eaa9… Author: Pantelis Kolatsis <pk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:32:11+02:00 sqlops: do not allow empty name component in URL (cherry picked from commit b15db86e93120824dcfc879099432f3ec1c3b0c7) --- Modified: src/modules/sqlops/sql_api.c --- Diff: https://github.com/kamailio/kamailio/commit/9daacc36e3ed858eca97e9b7ac7eaa9… Patch: https://github.com/kamailio/kamailio/commit/9daacc36e3ed858eca97e9b7ac7eaa9… --- diff --git a/src/modules/sqlops/sql_api.c b/src/modules/sqlops/sql_api.c index 63c035ca89e..eed82f0a149 100644 --- a/src/modules/sqlops/sql_api.c +++ b/src/modules/sqlops/sql_api.c @@ -677,6 +677,9 @@ int sql_parse_param(char *val) if(p>in.s+in.len || *p=='\0') goto error; name.len = p - name.s; + if(name.len==0) { + goto error; + } if(*p!='=') { while(p<in.s+in.len && (*p==' ' || *p=='\t' || *p=='\n' || *p=='\r'))

1 0

git:master:9f3356de: htable: reformat initialized static structures
by Daniel-Constantin Mierla 17 Jul '23

17 Jul '23

Module: kamailio Branch: master Commit: 9f3356de1c769c610112df9dbcfdf6461de9f959 URL: https://github.com/kamailio/kamailio/commit/9f3356de1c769c610112df9dbcfdf64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T08:37:04+02:00 htable: reformat initialized static structures --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/9f3356de1c769c610112df9dbcfdf64… Patch: https://github.com/kamailio/kamailio/commit/9f3356de1c769c610112df9dbcfdf64…

1 0

git:master:15711980: modules: readme files regenerated - geoip2 ... [skip ci]
by Kamailio Dev 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 157119809f7ce08d568677342d1833ca64a78b01 URL: https://github.com/kamailio/kamailio/commit/157119809f7ce08d568677342d1833c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-14T17:32:04+02:00 modules: readme files regenerated - geoip2 ... [skip ci] --- Modified: src/modules/geoip2/README --- Diff: https://github.com/kamailio/kamailio/commit/157119809f7ce08d568677342d1833c… Patch: https://github.com/kamailio/kamailio/commit/157119809f7ce08d568677342d1833c… --- diff --git a/src/modules/geoip2/README b/src/modules/geoip2/README index 256689b5782..70319467ca5 100644 --- a/src/modules/geoip2/README +++ b/src/modules/geoip2/README @@ -35,7 +35,7 @@ Henning Westerholt 4. Functions 4.1. geoip2_match(ipaddr, pvc) - 4.2. distance(ip_addr, latitude, longitude) + 4.2. geoip2_distance(ip_addr, latitude, longitude) 5. RPC Commands @@ -48,7 +48,7 @@ Henning Westerholt 1.1. Set path parameter 1.2. Set resid parameter 1.3. geoip2_match usage - 1.4. distance usage + 1.4. geoip2_distance usage 1.5. geoip2.reload usage Chapter 1. Admin Guide @@ -69,7 +69,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. geoip2_match(ipaddr, pvc) - 4.2. distance(ip_addr, latitude, longitude) + 4.2. geoip2_distance(ip_addr, latitude, longitude) 5. RPC Commands @@ -154,7 +154,7 @@ if(geoip2_match("$si", "src")) { 4. Functions 4.1. geoip2_match(ipaddr, pvc) - 4.2. distance(ip_addr, latitude, longitude) + 4.2. geoip2_distance(ip_addr, latitude, longitude) 4.1. geoip2_match(ipaddr, pvc) @@ -169,19 +169,20 @@ if(geoip2_match("$si", "src")) xlog("SIP message from: $gip2(src=>cc)\n"); ... -4.2. distance(ip_addr, latitude, longitude) +4.2. geoip2_distance(ip_addr, latitude, longitude) The function calculates the distance in miles between the geocoordinates of the IP address passed as parameter (the coordinates are calculated inside the function) and the geocoordinates latitude and longitude - Example 1.4. distance usage + Example 1.4. geoip2_distance usage ... $var(client_ip) = "109.184.18.64"; $var(lat_pos) = "53.200660"; $var(lon_pos) = "45.004640"; - $var(dist) = distance($var(client_ip), $var(lat_pos), $var(lon_pos)); + $var(dist) = geoip2_distance($var(client_ip), $var(lat_pos), $var(lon_po +s)); xlog("distance is $var(dist)\n"); ...

1 0

[kamailio/kamailio] geoip2: added distance function (PR #3506)
by sergey-safarov 14 Jul '23

14 Jul '23

#### 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 Added distance function which allows to calculate the distance between the geocoordinates of the the IP-address passed as incoming parameter (coordinates for the IP are determined inside the function) and the geocoordinates passed as parameters for the function. Functions can be used to evaluate the RTPengine server closest to a user. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3506 -- Commit Summary -- * geoip2: added distance function -- File Changes -- M src/modules/geoip2/doc/geoip2_admin.xml (23) M src/modules/geoip2/geoip2_mod.c (154) M src/modules/geoip2/geoip2_pv.c (8) M src/modules/geoip2/geoip2_pv.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3506.patch https://github.com/kamailio/kamailio/pull/3506.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3506 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3506(a)github.com>

2 4

git:master:956cb12f: geoip2: docs - updated name from distance to geoip2_distance()
by Daniel-Constantin Mierla 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 956cb12f47befe860de87864c943c21347bf906f URL: https://github.com/kamailio/kamailio/commit/956cb12f47befe860de87864c943c21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-14T17:21:41+02:00 geoip2: docs - updated name from distance to geoip2_distance() --- Modified: src/modules/geoip2/doc/geoip2_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/956cb12f47befe860de87864c943c21… Patch: https://github.com/kamailio/kamailio/commit/956cb12f47befe860de87864c943c21… --- diff --git a/src/modules/geoip2/doc/geoip2_admin.xml b/src/modules/geoip2/doc/geoip2_admin.xml index 196c87a0cef..50a7d855fa8 100644 --- a/src/modules/geoip2/doc/geoip2_admin.xml +++ b/src/modules/geoip2/doc/geoip2_admin.xml @@ -151,7 +151,7 @@ if(geoip2_match("$si", "src")) </section> <section> <title> - <function moreinfo="none">distance(ip_addr, latitude, longitude)</function> + <function moreinfo="none">geoip2_distance(ip_addr, latitude, longitude)</function> </title> <para> The function calculates the distance in miles between the geocoordinates of @@ -159,13 +159,13 @@ if(geoip2_match("$si", "src")) and the geocoordinates <emphasis>latitude</emphasis> and <emphasis>longitude</emphasis> </para> <example> - <title><function>distance</function> usage</title> + <title><function>geoip2_distance</function> usage</title> <programlisting format="linespecific"> ... $var(client_ip) = "109.184.18.64"; $var(lat_pos) = "53.200660"; $var(lon_pos) = "45.004640"; - $var(dist) = distance($var(client_ip), $var(lat_pos), $var(lon_pos)); + $var(dist) = geoip2_distance($var(client_ip), $var(lat_pos), $var(lon_pos)); xlog("distance is $var(dist)\n"); ...

1 0

git:master:fcfa9413: geoip2: implemented distance fucntion for kemi
by Daniel-Constantin Mierla 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: fcfa941320d4553545e5c8522d9668f309a1c10b URL: https://github.com/kamailio/kamailio/commit/fcfa941320d4553545e5c8522d9668f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-14T17:19:43+02:00 geoip2: implemented distance fucntion for kemi --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/fcfa941320d4553545e5c8522d9668f… Patch: https://github.com/kamailio/kamailio/commit/fcfa941320d4553545e5c8522d9668f…

1 0

git:master:87be8a59: geoip2: prefix distance with geoip2_ to reflect the module
by Daniel-Constantin Mierla 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 87be8a593ba32bd2205d14304c7084bc5788297a URL: https://github.com/kamailio/kamailio/commit/87be8a593ba32bd2205d14304c7084b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-14T17:10:17+02:00 geoip2: prefix distance with geoip2_ to reflect the module --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/87be8a593ba32bd2205d14304c7084b… Patch: https://github.com/kamailio/kamailio/commit/87be8a593ba32bd2205d14304c7084b… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index e0a9dd1530e..208288eb007 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -51,8 +51,8 @@ static int w_geoip2_match(struct sip_msg *msg, char *str1, char *str2); static int geoip2_match(sip_msg_t *msg, str *tomatch, str *pvclass); static int geoip2_resid_param(modparam_t type, void *val); -static int w_distance(struct sip_msg *msg, char *str1, char *str2, char *str3); -static int distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon); +static int w_geoip2_distance(struct sip_msg *msg, char *str1, char *str2, char *str3); +static int ki_geoip2_distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon); /* clang-format off */ static pv_export_t mod_pvs[] = { @@ -65,7 +65,7 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"geoip2_match", (cmd_function)w_geoip2_match, 2, fixup_spve_spve, 0, ANY_ROUTE}, - {"distance", (cmd_function)w_distance, 3, + {"geoip2_distance", (cmd_function)w_geoip2_distance, 3, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -166,7 +166,7 @@ static int w_geoip2_match(sip_msg_t *msg, char *target, char *pvname) return geoip2_match(msg, &tomatch, &pvclass); } -static int distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon) +static int ki_geoip2_distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon) { char ip_addr[MAX_GEO_STR_SIZE] = {0}; double lat1, lon1, lat2, lon2, orig_lat2, orig_lon2; @@ -255,7 +255,7 @@ static int distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon) return dist; } -static int w_distance(struct sip_msg *msg, char *ip_addr_param, char *lat_param, +static int w_geoip2_distance(struct sip_msg *msg, char *ip_addr_param, char *lat_param, char *lon_param) { str ip_addr_str = STR_NULL; @@ -295,7 +295,7 @@ static int w_distance(struct sip_msg *msg, char *ip_addr_param, char *lat_param, return -1; } - return distance(msg, &ip_addr_str, lat, lon); + return ki_geoip2_distance(msg, &ip_addr_str, lat, lon); } static void geoip2_rpc_reload(rpc_t *rpc, void *ctx) @@ -306,12 +306,17 @@ static void geoip2_rpc_reload(rpc_t *rpc, void *ctx) } } +/* clang-format off */ static const char *geoip2_rpc_reload_doc[2] = { - "Reload GeoIP2 database file.", 0}; + "Reload GeoIP2 database file.", + 0 +}; rpc_export_t ubl_rpc[] = { - {"geoip2.reload", geoip2_rpc_reload, geoip2_rpc_reload_doc, 0}, - {0, 0, 0, 0}}; + {"geoip2.reload", geoip2_rpc_reload, geoip2_rpc_reload_doc, 0}, + {0, 0, 0, 0} +}; +/* clang-format on */ static int geoip2_rpc_init(void) {

1 0

git:master:7a459481: geoip2: reformat module exports structures
by Daniel-Constantin Mierla 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 7a459481ebacf9aec4e7c61aa5a08de934a2edc5 URL: https://github.com/kamailio/kamailio/commit/7a459481ebacf9aec4e7c61aa5a08de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-14T17:06:21+02:00 geoip2: reformat module exports structures --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7a459481ebacf9aec4e7c61aa5a08de… Patch: https://github.com/kamailio/kamailio/commit/7a459481ebacf9aec4e7c61aa5a08de… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 779db6b68e6..e0a9dd1530e 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -54,32 +54,41 @@ static int geoip2_resid_param(modparam_t type, void *val); static int w_distance(struct sip_msg *msg, char *str1, char *str2, char *str3); static int distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon); +/* clang-format off */ static pv_export_t mod_pvs[] = { - {{"gip2", sizeof("gip2") - 1}, PVT_OTHER, pv_get_geoip2, 0, - pv_parse_geoip2_name, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{"gip2", sizeof("gip2") - 1}, PVT_OTHER, pv_get_geoip2, 0, + pv_parse_geoip2_name, 0, 0, 0}, + + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; -static cmd_export_t cmds[] = {{"geoip2_match", (cmd_function)w_geoip2_match, 2, - fixup_spve_spve, 0, ANY_ROUTE}, - {"distance", (cmd_function)w_distance, 3, fixup_spve_all, - fixup_free_spve_all, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; +static cmd_export_t cmds[] = { + {"geoip2_match", (cmd_function)w_geoip2_match, 2, + fixup_spve_spve, 0, ANY_ROUTE}, + {"distance", (cmd_function)w_distance, 3, + fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; -static param_export_t params[] = {{"path", PARAM_STRING, &geoip2_path}, - {"resid", PARAM_STR | PARAM_USE_FUNC, &geoip2_resid_param}, {0, 0, 0}}; +static param_export_t params[] = { + {"path", PARAM_STRING, &geoip2_path}, + {"resid", PARAM_STR | PARAM_USE_FUNC, &geoip2_resid_param}, + {0, 0, 0} +}; struct module_exports exports = { - "geoip2", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* RPC method exports */ - mod_pvs, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module initialization function */ - 0, /* per-child init function */ - mod_destroy /* module destroy function */ + "geoip2", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + mod_destroy /* module destroy function */ }; +/* clang-format on */ /** * init module function

1 0

git:master:40225a82: geoip2: use generic spve fixup functions
by Daniel-Constantin Mierla 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 40225a82ebbba4dd6fbdfb2f0d152b6178b4dafd URL: https://github.com/kamailio/kamailio/commit/40225a82ebbba4dd6fbdfb2f0d152b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-14T17:01:09+02:00 geoip2: use generic spve fixup functions --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/40225a82ebbba4dd6fbdfb2f0d152b6… Patch: https://github.com/kamailio/kamailio/commit/40225a82ebbba4dd6fbdfb2f0d152b6… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index e3f51b45819..779db6b68e6 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -54,26 +54,6 @@ static int geoip2_resid_param(modparam_t type, void *val); static int w_distance(struct sip_msg *msg, char *str1, char *str2, char *str3); static int distance(sip_msg_t *msg, str *_ip_addr, double lat, double lon); -static int fixup_distance_param(void **param, int param_no) -{ - if(param_no >= 1 && param_no <= 3) { - return fixup_spve_null(param, 1); - } - - LM_ERR("invalid parameter number <%d>\n", param_no); - return -1; -} - -static int fixup_free_distance_param(void **param, int param_no) -{ - if(param_no >= 1 && param_no <= 3) { - return fixup_free_spve_null(param, 1); - } - - LM_ERR("invalid parameter number <%d>\n", param_no); - return -1; -} - static pv_export_t mod_pvs[] = { {{"gip2", sizeof("gip2") - 1}, PVT_OTHER, pv_get_geoip2, 0, pv_parse_geoip2_name, 0, 0, 0}, @@ -81,8 +61,8 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = {{"geoip2_match", (cmd_function)w_geoip2_match, 2, fixup_spve_spve, 0, ANY_ROUTE}, - {"distance", (cmd_function)w_distance, 3, fixup_distance_param, - fixup_free_distance_param, ANY_ROUTE}, + {"distance", (cmd_function)w_distance, 3, fixup_spve_all, + fixup_free_spve_all, ANY_ROUTE}, {0, 0, 0, 0, 0, 0}}; static param_export_t params[] = {{"path", PARAM_STRING, &geoip2_path},

1 0

git:master:2b152b09: modules: readme files regenerated - geoip2 ... [skip ci]
by Kamailio Dev 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 2b152b09adb9bbfefe24826e075f3f6dd525a23f URL: https://github.com/kamailio/kamailio/commit/2b152b09adb9bbfefe24826e075f3f6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-14T15:02:09+02:00 modules: readme files regenerated - geoip2 ... [skip ci] --- Modified: src/modules/geoip2/README --- Diff: https://github.com/kamailio/kamailio/commit/2b152b09adb9bbfefe24826e075f3f6… Patch: https://github.com/kamailio/kamailio/commit/2b152b09adb9bbfefe24826e075f3f6… --- diff --git a/src/modules/geoip2/README b/src/modules/geoip2/README index d89372c48b3..256689b5782 100644 --- a/src/modules/geoip2/README +++ b/src/modules/geoip2/README @@ -35,6 +35,7 @@ Henning Westerholt 4. Functions 4.1. geoip2_match(ipaddr, pvc) + 4.2. distance(ip_addr, latitude, longitude) 5. RPC Commands @@ -47,7 +48,8 @@ Henning Westerholt 1.1. Set path parameter 1.2. Set resid parameter 1.3. geoip2_match usage - 1.4. geoip2.reload usage + 1.4. distance usage + 1.5. geoip2.reload usage Chapter 1. Admin Guide @@ -67,6 +69,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. geoip2_match(ipaddr, pvc) + 4.2. distance(ip_addr, latitude, longitude) 5. RPC Commands @@ -151,6 +154,7 @@ if(geoip2_match("$si", "src")) { 4. Functions 4.1. geoip2_match(ipaddr, pvc) + 4.2. distance(ip_addr, latitude, longitude) 4.1. geoip2_match(ipaddr, pvc) @@ -165,6 +169,23 @@ if(geoip2_match("$si", "src")) xlog("SIP message from: $gip2(src=>cc)\n"); ... +4.2. distance(ip_addr, latitude, longitude) + + The function calculates the distance in miles between the + geocoordinates of the IP address passed as parameter (the coordinates + are calculated inside the function) and the geocoordinates latitude and + longitude + + Example 1.4. distance usage +... + $var(client_ip) = "109.184.18.64"; + $var(lat_pos) = "53.200660"; + $var(lon_pos) = "45.004640"; + $var(dist) = distance($var(client_ip), $var(lat_pos), $var(lon_pos)); + + xlog("distance is $var(dist)\n"); +... + 5. RPC Commands 5.1. geoip2.reload @@ -174,7 +195,7 @@ if(geoip2_match("$si", "src")) Reload the internal GeoIP database. This is necessary after the database file has been changed on the disk. - Example 1.4. geoip2.reload usage + Example 1.5. geoip2.reload usage ... kamcmd geoip2.reload ...

1 0

git:master:84591b66: modules: readme files regenerated - mohqueue ... [skip ci]
by The Root 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 84591b667e06ac8794d9f1050796a6273ce4532c URL: https://github.com/kamailio/kamailio/commit/84591b667e06ac8794d9f1050796a62… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2023-07-14T15:01:17+02:00 modules: readme files regenerated - mohqueue ... [skip ci] --- Modified: src/modules/mohqueue/README Modified: src/modules/osp/README Modified: src/modules/pike/README Modified: src/modules/qos/README Modified: src/modules/ratelimit/README Modified: src/modules/registrar/README Modified: src/modules/rr/README Modified: src/modules/rtimer/README Modified: src/modules/rtp_media_server/README Modified: src/modules/ruxc/README Modified: src/modules/statsd/README Modified: src/modules/tcpops/README Modified: src/modules/textops/README Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/84591b667e06ac8794d9f1050796a62… Patch: https://github.com/kamailio/kamailio/commit/84591b667e06ac8794d9f1050796a62…

1 0

git:master:60abf767: geoip2: added distance function
by Daniel-Constantin Mierla 14 Jul '23

14 Jul '23

Module: kamailio Branch: master Commit: 60abf767988dba052d7e08c386a589c1aeb711ef URL: https://github.com/kamailio/kamailio/commit/60abf767988dba052d7e08c386a589c… Author: Nikolay Ivanuschak <ivanuschak.nikolay(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-14T14:47:12+02:00 geoip2: added distance function Added distance function which allows to calculate the distance between the geocoordinates of the the IP-address passed as incoming parameter (coordinates for the IP are determined inside the function) and the geocoordinates passed as parameters for the function. --- 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/60abf767988dba052d7e08c386a589c… Patch: https://github.com/kamailio/kamailio/commit/60abf767988dba052d7e08c386a589c…

1 0

[kamailio/kamailio] Typos (PR #3491)
by Дилян Палаузов 14 Jul '23

14 Jul '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3491 -- Commit Summary -- * mohqueue: typo * osp: typos * p_usrloc: typo * permissions: typos * pike: typo * presence: typo * qos: typos * ratelimit: typo * regex: typos * registrar: typos and formatting * rls: typos * rr: typo * rtimer: typo * rtp_media_server: typos * ruxc: typos * sca: typos * seas: typo * snmpstats: typos * statsd: typo * tcpops: typos * textops: typos -- File Changes -- M src/modules/mohqueue/doc/mohqueue_admin.xml (2) M src/modules/osp/destination.c (2) M src/modules/osp/doc/osp_admin.xml (4) M src/modules/osp/orig_transaction.c (2) M src/modules/osp/osp_mod.c (2) M src/modules/osp/osptoolkit.h (2) M src/modules/p_usrloc/udomain.c (2) M src/modules/permissions/trusted.c (4) M src/modules/permissions/trusted.h (2) M src/modules/pike/doc/pike_devel.xml (2) M src/modules/presence/doc/presence_admin.xml (2) M src/modules/qos/doc/qos_devel.xml (6) M src/modules/qos/qos.c (2) M src/modules/qos/qos_cb.c (4) M src/modules/qos/qos_handlers.c (2) M src/modules/ratelimit/doc/ratelimit_admin.xml (2) M src/modules/regex/regex_mod.c (6) M src/modules/registrar/doc/registrar_admin.xml (21) M src/modules/registrar/lookup.c (4) M src/modules/registrar/save.c (2) M src/modules/registrar/save.h (2) M src/modules/rls/notify.c (2) M src/modules/rls/resource_notify.c (6) M src/modules/rls/rls.c (4) M src/modules/rls/subscribe.c (2) M src/modules/rr/doc/rr_devel.xml (2) M src/modules/rtimer/doc/rtimer_admin.xml (2) M src/modules/rtp_media_server/doc/rtp_media_server_admin.xml (4) M src/modules/rtp_media_server/rms_sdp.c (2) M src/modules/rtp_media_server/rtp_media_server.c (6) M src/modules/ruxc/doc/ruxc_admin.xml (8) M src/modules/sca/sca_call_info.c (2) M src/modules/sca/sca_subscribe.c (4) M src/modules/sca/sca_util.c (2) M src/modules/seas/event_dispatcher.c (2) M src/modules/snmpstats/snmpObjects.c (2) M src/modules/snmpstats/snmpstats.c (2) M src/modules/statsd/doc/statsd_admin.xml (2) M src/modules/tcpops/doc/params.xml (2) M src/modules/tcpops/doc/tcpops.xml (2) M src/modules/textops/api.h (2) M src/modules/textops/doc/textops_admin.xml (2) M src/modules/textopsx/api.h (2) M src/modules/textopsx/doc/functions.xml (12) M src/modules/textopsx/textopsx.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3491.patch https://github.com/kamailio/kamailio/pull/3491.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3491 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3491(a)github.com>

2 1

git: new commits in branch master
by Daniel-Constantin Mierla 14 Jul '23

14 Jul '23

- URL: https://github.com/kamailio/kamailio/commit/0dcaaed5148cba775cebfd88d8e4a59… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 mohqueue: typo - URL: https://github.com/kamailio/kamailio/commit/c663fac898f6976ed96480bc924cc7e… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 osp: typos - URL: https://github.com/kamailio/kamailio/commit/dfbc9aba5bf9a11545cbaee74393225… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 p_usrloc: typo - URL: https://github.com/kamailio/kamailio/commit/26caea49d9d1834a3bf9ebe208a5b3e… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 permissions: typos - URL: https://github.com/kamailio/kamailio/commit/194cc306c445c8050da5dcd5ecc64b5… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 pike: typo - URL: https://github.com/kamailio/kamailio/commit/2d26aa4193f2bf8c6598ca00fb8b03b… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 presence: typo - URL: https://github.com/kamailio/kamailio/commit/73a766a99a859f41ad796cb4282ac3f… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 qos: typos - URL: https://github.com/kamailio/kamailio/commit/fcbde898093f3316e238baa19af5099… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 ratelimit: typo - URL: https://github.com/kamailio/kamailio/commit/650b109dbcfe2c3083e09c987bae7ca… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 regex: typos - URL: https://github.com/kamailio/kamailio/commit/44bbc54018375c6717adb78f8bffdd1… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 registrar: typos and formatting - URL: https://github.com/kamailio/kamailio/commit/373fb98ef5e4f9a403d0e93080906ce… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 rls: typos - URL: https://github.com/kamailio/kamailio/commit/86f0fd45e420874cef4f23f0a1c350e… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 rr: typo - URL: https://github.com/kamailio/kamailio/commit/c741e8c7a04d77dec08d0b4953de812… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 rtimer: typo - URL: https://github.com/kamailio/kamailio/commit/f6c5638e3ef5c5ff195fdf179e2cdae… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 rtp_media_server: typos - URL: https://github.com/kamailio/kamailio/commit/286f0c764bcc4856ee3195119f929cb… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 ruxc: typos - URL: https://github.com/kamailio/kamailio/commit/ad81a4a258c0e70ce04bfef36dfbd52… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 sca: typos - URL: https://github.com/kamailio/kamailio/commit/b6f84b7e5985bdd12122cc51f5a07cc… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 seas: typo - URL: https://github.com/kamailio/kamailio/commit/2ac0cf8c3e73af59480e54aaa483d19… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 snmpstats: typos - URL: https://github.com/kamailio/kamailio/commit/b582e77086f9b8a93223979fa5bdcb4… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 statsd: typo - URL: https://github.com/kamailio/kamailio/commit/267a7ac1056979af800bb0818b87390… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 tcpops: typos - URL: https://github.com/kamailio/kamailio/commit/1f1926f1e2feb4cd2eccc2ec5e21606… Author: �� <git-dpa(a)aegee.org> Date: 2023-07-14T14:45:19+02:00 textops: typos

1 0

git:master:1335e93a: modules: readme files regenerated - imc ... [skip ci]
by Kamailio Dev 13 Jul '23

13 Jul '23

Module: kamailio Branch: master Commit: 1335e93a76d051cb724bc696ac857aa7c3a3f43e URL: https://github.com/kamailio/kamailio/commit/1335e93a76d051cb724bc696ac857aa… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-13T17:46:27+02:00 modules: readme files regenerated - imc ... [skip ci] --- Modified: src/modules/imc/README --- Diff: https://github.com/kamailio/kamailio/commit/1335e93a76d051cb724bc696ac857aa… Patch: https://github.com/kamailio/kamailio/commit/1335e93a76d051cb724bc696ac857aa… --- diff --git a/src/modules/imc/README b/src/modules/imc/README index 6fa83d72aa6..a62f56d429f 100644 --- a/src/modules/imc/README +++ b/src/modules/imc/README @@ -46,6 +46,7 @@ Joey Golan 4.1. imc_manager() 4.2. imc_room_active(room) + 4.3. imc_room_member(room, user) 5. RPC Commands @@ -73,7 +74,8 @@ Joey Golan 1.10. Set check_on_create parameter 1.11. Usage of imc_manager() function 1.12. Usage of imc_room_active() function - 1.13. List of commands + 1.13. Usage of imc_room_member() function + 1.14. List of commands Chapter 1. Admin Guide @@ -102,6 +104,7 @@ Chapter 1. Admin Guide 4.1. imc_manager() 4.2. imc_room_active(room) + 4.3. imc_room_member(room, user) 5. RPC Commands @@ -289,6 +292,7 @@ modparam("imc", "check_on_create", 1) 4.1. imc_manager() 4.2. imc_room_active(room) + 4.3. imc_room_member(room, user) 4.1. imc_manager() @@ -329,6 +333,21 @@ if(is_method("MESSAGE) } ... +4.3. imc_room_member(room, user) + + Return 1 (true) if the user is member of the room, -1 (false) if the + user is not member of the room. The parameters are the SIP URIs to + identify the room and the user, they can contain variables. + + This function can be used from ANY_ROUTE. + + Example 1.13. Usage of imc_room_member() function +... + if(imc_room_member("sip:chat-sip@$fd", "sip:$rU@$rd")) { + ... + } +... + 5. RPC Commands 5.1. imc.list_rooms @@ -377,7 +396,7 @@ kamcmd imc_list_members _room_ Next picture presents the list of commands and their parameters. - Example 1.13. List of commands + Example 1.14. List of commands ... 1.create

1 0

git:master:27a4fc54: imc: docs for imc_room_member()
by Daniel-Constantin Mierla 13 Jul '23

13 Jul '23

Module: kamailio Branch: master Commit: 27a4fc543cb60636308e587523236b1ac4d56754 URL: https://github.com/kamailio/kamailio/commit/27a4fc543cb60636308e587523236b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-13T17:41:16+02:00 imc: docs for imc_room_member() --- Modified: src/modules/imc/doc/imc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/27a4fc543cb60636308e587523236b1… Patch: https://github.com/kamailio/kamailio/commit/27a4fc543cb60636308e587523236b1… --- diff --git a/src/modules/imc/doc/imc_admin.xml b/src/modules/imc/doc/imc_admin.xml index 1b485ac77ca..d77c3028b9b 100644 --- a/src/modules/imc/doc/imc_admin.xml +++ b/src/modules/imc/doc/imc_admin.xml @@ -332,6 +332,29 @@ if(is_method("MESSAGE) ... } ... +</programlisting> + </example> + </section> + <section> + <title id="imc.p.imc_room_member"> + <function moreinfo="none">imc_room_member(room, user)</function> + </title> + <para> + Return 1 (true) if the user is member of the room, -1 (false) if the + user is not member of the room. The parameters are the SIP URIs to + identify the room and the user, they can contain variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title>Usage of <varname>imc_room_member()</varname> function</title> + <programlisting format="linespecific"> +... + if(imc_room_member("sip:chat-sip@$fd", "sip:$rU@$rd")) { + ... + } +... </programlisting> </example> </section>

1 0

git:master:04bb88f9: imc: added function to check if a user is member of a chat room
by Daniel-Constantin Mierla 13 Jul '23

13 Jul '23

Module: kamailio Branch: master Commit: 04bb88f988d4e99625efef3f3b575b5a2dc652c1 URL: https://github.com/kamailio/kamailio/commit/04bb88f988d4e99625efef3f3b575b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-13T17:41:16+02:00 imc: added function to check if a user is member of a chat room --- Modified: src/modules/imc/imc.c --- Diff: https://github.com/kamailio/kamailio/commit/04bb88f988d4e99625efef3f3b575b5… Patch: https://github.com/kamailio/kamailio/commit/04bb88f988d4e99625efef3f3b575b5… --- diff --git a/src/modules/imc/imc.c b/src/modules/imc/imc.c index c5b65cb95d7..14b36c62300 100644 --- a/src/modules/imc/imc.c +++ b/src/modules/imc/imc.c @@ -91,6 +91,7 @@ static int child_init(int); static int w_imc_manager(struct sip_msg *, char *, char *); static int w_imc_room_active(sip_msg_t *, char *, char *); +static int w_imc_room_member(sip_msg_t *, char *, char *); static int imc_rpc_init(void); @@ -107,6 +108,8 @@ static cmd_export_t cmds[] = { {"imc_manager", (cmd_function)w_imc_manager, 0, 0, 0, REQUEST_ROUTE}, {"imc_room_active", (cmd_function)w_imc_room_active, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, + {"imc_room_member", (cmd_function)w_imc_room_member, 2, + fixup_spve_spve, fixup_free_spve_spve, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -471,7 +474,7 @@ static int w_imc_room_active(sip_msg_t *msg, char *proom, char *str2) { str room = STR_NULL; - if(fixup_get_svalue(msg, (gparam_t*)proom, &room) != 0) { + if(fixup_get_svalue(msg, (gparam_t *)proom, &room) != 0) { LM_ERR("invalid room parameter"); return -1; } @@ -479,6 +482,57 @@ static int w_imc_room_active(sip_msg_t *msg, char *proom, char *str2) return ki_imc_room_active(msg, &room); } +/** + * + */ +static int ki_imc_room_member(sip_msg_t *msg, str *room, str *member) +{ + sip_uri_t puri; + imc_room_t *rm; + imc_member_t *mb; + + if(parse_uri(room->s, room->len, &puri) != 0) { + LM_ERR("failed to parse room uri [%.*s]\n", room->len, room->s); + return -1; + } + + rm = imc_get_room(&puri.user, &puri.host); + + if(rm == NULL) { + return -1; + } + + if(parse_uri(member->s, member->len, &puri) != 0) { + imc_release_room(rm); + LM_ERR("failed to parse member uri [%.*s]\n", member->len, member->s); + return -1; + } + mb = imc_get_member(rm, &puri.user, &puri.host); + imc_release_room(rm); + + return (mb != NULL) ? 1 : -1; +} + +/** + * + */ +static int w_imc_room_member(sip_msg_t *msg, char *proom, char *pmember) +{ + str room = STR_NULL; + str member = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t *)proom, &room) != 0) { + LM_ERR("invalid room parameter"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t *)pmember, &member) != 0) { + LM_ERR("invalid member parameter"); + return -1; + } + + return ki_imc_room_member(msg, &room, &member); +} + /** * destroy module */

1 0

git:master:daa88d8b: imc: exported imc_room_member() to kemi
by Daniel-Constantin Mierla 13 Jul '23

13 Jul '23

Module: kamailio Branch: master Commit: daa88d8b287de5b40a478fd8291a45311fe738b2 URL: https://github.com/kamailio/kamailio/commit/daa88d8b287de5b40a478fd8291a453… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-13T17:41:16+02:00 imc: exported imc_room_member() to kemi --- Modified: src/modules/imc/imc.c --- Diff: https://github.com/kamailio/kamailio/commit/daa88d8b287de5b40a478fd8291a453… Patch: https://github.com/kamailio/kamailio/commit/daa88d8b287de5b40a478fd8291a453… --- diff --git a/src/modules/imc/imc.c b/src/modules/imc/imc.c index 14b36c62300..1251b993b63 100644 --- a/src/modules/imc/imc.c +++ b/src/modules/imc/imc.c @@ -739,6 +739,11 @@ static sr_kemi_t sr_kemi_imc_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("imc"), str_init("imc_room_member"), + SR_KEMIP_INT, ki_imc_room_member, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

[kamailio/kamailio] siptrace: fix pseudo var direction attribute length (PR #3489)
by Mvondo Eric 13 Jul '23

13 Jul '23

#### 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:  - [x] PR should be backported to stable branches - [ ] 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/3489 -- Commit Summary -- * siptrace: fix pseudo var direction attribute length -- File Changes -- M src/modules/siptrace/siptrace.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3489.patch https://github.com/kamailio/kamailio/pull/3489.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3489 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3489(a)github.com>

2 3

git:master:508886c3: siptrace: fix pseudo var direction attribute length
by Daniel-Constantin Mierla 13 Jul '23

13 Jul '23

Module: kamailio Branch: master Commit: 508886c3054a8470fe4469e78e63aa37ae93922d URL: https://github.com/kamailio/kamailio/commit/508886c3054a8470fe4469e78e63aa3… Author: MVONDO Eric OBS/OINIS <bycl2332(a)orange.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-13T08:47:33+02:00 siptrace: fix pseudo var direction attribute length --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/508886c3054a8470fe4469e78e63aa3… Patch: https://github.com/kamailio/kamailio/commit/508886c3054a8470fe4469e78e63aa3… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 1c129762314..b37d860ca3f 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2795,6 +2795,8 @@ int pv_parse_siptrace_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 6; else if(strncmp(in->s, "dst_proto", 9)==0) sp->pvp.pvn.u.isname.name.n = 7; + else if(strncmp(in->s, "direction", 9)==0) + sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; case 10: @@ -2802,8 +2804,6 @@ int pv_parse_siptrace_name(pv_spec_t *sp, str *in) sp->pvp.pvn.u.isname.name.n = 8; else if(strncmp(in->s, "dst_hostip", 10)==0) sp->pvp.pvn.u.isname.name.n = 9; - else if(strncmp(in->s, "direction", 10)==0) - sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; default:

1 0

git:master:7e8a70e9: jsonrcps: use strncpy() for setting boundaries
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: 7e8a70e9bf3d0b52eae1b7933633095686f234b2 URL: https://github.com/kamailio/kamailio/commit/7e8a70e9bf3d0b52eae1b7933633095… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:59+02:00 jsonrcps: use strncpy() for setting boundaries * use strncat() > https://github.com/kamailio/kamailio/security/code-scanning/2381 > https://github.com/kamailio/kamailio/security/code-scanning/2380 > https://github.com/kamailio/kamailio/security/code-scanning/1843 > https://github.com/kamailio/kamailio/security/code-scanning/1841 --- Modified: src/modules/jsonrpcs/jsonrpcs_fifo.c Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/7e8a70e9bf3d0b52eae1b7933633095… Patch: https://github.com/kamailio/kamailio/commit/7e8a70e9bf3d0b52eae1b7933633095… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_fifo.c b/src/modules/jsonrpcs/jsonrpcs_fifo.c index f6ff7049890..906deb03334 100644 --- a/src/modules/jsonrpcs/jsonrpcs_fifo.c +++ b/src/modules/jsonrpcs/jsonrpcs_fifo.c @@ -560,10 +560,10 @@ int jsonrpc_fifo_mod_init(void) LM_ERR("no more pkg\n"); return -1; } - strcpy(p, runtime_dir); + strncpy(p, runtime_dir, len); if(sep) strcat(p, "/"); - strcat(p, jsonrpc_fifo); + strncat(p, jsonrpc_fifo, len - strlen(runtime_dir) - sep); jsonrpc_fifo = p; LM_DBG("fifo path is [%s]\n", jsonrpc_fifo); } diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 4c6eb028a69..c73687a8239 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -205,10 +205,10 @@ int jsonrpc_dgram_mod_init(void) LM_ERR("no more pkg\n"); return -1; } - strcpy(p, runtime_dir); + strncpy(p, runtime_dir, len); if(sep) strcat(p, "/"); - strcat(p, jsonrpc_dgram_socket); + strncat(p, jsonrpc_dgram_socket, len - strlen(runtime_dir) - sep); jsonrpc_dgram_socket = p; LM_DBG("unix socket path is [%s]\n", jsonrpc_dgram_socket); }

1 0

git:master:675f6c02: core: modparam use strncpy() for setting boundaries
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: 675f6c0224897544d30f5f863c503499b2e5f2fe URL: https://github.com/kamailio/kamailio/commit/675f6c0224897544d30f5f863c50349… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:59+02:00 core: modparam use strncpy() for setting boundaries * use strncat() > https://github.com/kamailio/kamailio/security/code-scanning/1836 > https://github.com/kamailio/kamailio/security/code-scanning/1834 --- Modified: src/core/modparam.c Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/675f6c0224897544d30f5f863c50349… Patch: https://github.com/kamailio/kamailio/commit/675f6c0224897544d30f5f863c50349… --- diff --git a/src/core/modparam.c b/src/core/modparam.c index cf7957a16a9..46ea0169e53 100644 --- a/src/core/modparam.c +++ b/src/core/modparam.c @@ -72,7 +72,7 @@ int set_mod_param_regex(char *regex, char *name, modparam_t type, void *val) { struct sr_module *t; regex_t preg; - int mod_found, len; + int mod_found, len, len_param; char *reg; void *ptr, *val2; modparam_t param_type; @@ -143,15 +143,15 @@ int set_mod_param_regex(char *regex, char *name, modparam_t type, void *val) } else { switch(PARAM_TYPE_MASK(param_type)) { case PARAM_STRING: - *((char **)ptr) = - pkg_malloc(strlen((char *)val2) + 1); + len_param = strlen((char *)val2); + *((char **)ptr) = pkg_malloc(len_param + 1); if(!*((char **)ptr)) { PKG_MEM_ERROR; regfree(&preg); pkg_free(reg); return -1; } - strcpy(*((char **)ptr), (char *)val2); + strncpy(*((char **)ptr), (char *)val2, len_param); break; case PARAM_STR: diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 2c5b4f1852f..1b7ea7332d2 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -503,7 +503,7 @@ int ksr_locate_module(char *mod_path, char **new_path) len++; } path[len] = 0; - strcat(path, mod_path); + strncat(path, mod_path, strlen(mod_path)); if(stat(path, &stat_buf) == -1) { LM_DBG("module file not found <%s>\n", path);

1 0

git:master:dd04bceb: path: use snprintf() instead of sprintf()
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: dd04bceb99ba69bd59c67ba103f3c55d47a31dd6 URL: https://github.com/kamailio/kamailio/commit/dd04bceb99ba69bd59c67ba103f3c55… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:58+02:00 path: use snprintf() instead of sprintf() > https://github.com/kamailio/kamailio/security/code-scanning/2612 > https://github.com/kamailio/kamailio/security/code-scanning/2613 > https://github.com/kamailio/kamailio/security/code-scanning/2614 > https://github.com/kamailio/kamailio/security/code-scanning/2615 --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/dd04bceb99ba69bd59c67ba103f3c55… Patch: https://github.com/kamailio/kamailio/commit/dd04bceb99ba69bd59c67ba103f3c55… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index 23309c33fe9..2431a985553 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -105,7 +105,8 @@ static int prepend_path( sip_msg_t *_m, str *user, path_param_t param, str *add_params) { struct lump *l; - char *prefix, *suffix, *cp, *dp; + char *prefix, *suffix, *dp; + str cp = STR_NULL; const char *proto_str; int prefix_len, suffix_len; struct hdr_field *hf; @@ -115,13 +116,13 @@ static int prepend_path( + IP_ADDR_MAX_STR_SIZE + 2 + (add_params ? add_params->len : 0) + path_received_name.len + 1; - cp = suffix = pkg_malloc(suffix_len); + cp.s = suffix = pkg_malloc(suffix_len); if(!suffix) { PKG_MEM_ERROR_FMT("for suffix\n"); goto out1; } - cp += sprintf(cp, ";lr"); + cp.len = sprintf(cp.s, ";lr"); if(param & PATH_PARAM_RECEIVED) { if(path_received_format == 0) { @@ -132,21 +133,25 @@ static int prepend_path( proto_str = NULL; } if(_m->rcv.src_ip.af == AF_INET6) { - cp += sprintf(cp, ";%s=sip:[%s]:%hu%s", path_received_name.s, + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, + ";%s=sip:[%s]:%hu%s", path_received_name.s, ip_addr2a(&_m->rcv.src_ip), _m->rcv.src_port, proto_str ?: ""); } else { - cp += sprintf(cp, ";%s=sip:%s:%hu%s", path_received_name.s, + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, + ";%s=sip:%s:%hu%s", path_received_name.s, ip_addr2a(&_m->rcv.src_ip), _m->rcv.src_port, proto_str ?: ""); } } else { if(_m->rcv.src_ip.af == AF_INET6) { - cp += sprintf(cp, ";%s=[%s]~%hu~%d", path_received_name.s, + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, + ";%s=[%s]~%hu~%d", path_received_name.s, ip_addr2a(&_m->rcv.src_ip), _m->rcv.src_port, (int)_m->rcv.proto); } else { - cp += sprintf(cp, ";%s=%s~%hu~%d", path_received_name.s, + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, + ";%s=%s~%hu~%d", path_received_name.s, ip_addr2a(&_m->rcv.src_ip), _m->rcv.src_port, (int)_m->rcv.proto); } @@ -154,17 +159,18 @@ static int prepend_path( } if(param & PATH_PARAM_OB) { - cp += sprintf(cp, ";ob"); + cp.len += sprintf(cp.s + cp.len, ";ob"); } if(add_params && add_params->len) { - cp += sprintf(cp, ";%.*s", add_params->len, add_params->s); + cp.len += snprintf(cp.s + cp.len, suffix_len - cp.len, ";%.*s", + add_params->len, add_params->s); } if(path_enable_r2 == 0) { - cp += sprintf(cp, ">\r\n"); + cp.len += sprintf(cp.s + cp.len, ">\r\n"); } else { - cp += sprintf(cp, ";r2=on>\r\n"); + cp.len += sprintf(cp.s + cp.len, ";r2=on>\r\n"); } prefix_len = PATH_PREFIX_LEN + (user ? user->len : 0) + 2; @@ -174,7 +180,8 @@ static int prepend_path( goto out2; } if(user && user->len) - prefix_len = sprintf(prefix, PATH_PREFIX "%.*s@", user->len, user->s); + prefix_len = snprintf( + prefix, prefix_len, PATH_PREFIX "%.*s@", user->len, user->s); else prefix_len = sprintf(prefix, PATH_PREFIX); @@ -201,7 +208,7 @@ static int prepend_path( l, (path_sockname_mode) ? SUBST_SND_ALL_EX : SUBST_SND_ALL, 0); if(!l) goto out2; - l = insert_new_lump_before(l, suffix, cp - suffix, 0); + l = insert_new_lump_before(l, suffix, cp.s - suffix, 0); if(!l) goto out2; @@ -216,10 +223,10 @@ static int prepend_path( l, (path_sockname_mode) ? SUBST_RCV_ALL_EX : SUBST_RCV_ALL, 0); if(!l) goto out1; - dp = path_strzdup(suffix, cp - suffix); + dp = path_strzdup(suffix, cp.s - suffix); if(dp == NULL) goto out1; - l = insert_new_lump_before(l, dp, cp - suffix, 0); + l = insert_new_lump_before(l, dp, cp.s - suffix, 0); if(!l) goto out1; }

1 0

git:master:77ca2e93: permissions: use strncpy() for setting boundaries
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: 77ca2e93e945fe46783e953d58bc546d9d6d1b81 URL: https://github.com/kamailio/kamailio/commit/77ca2e93e945fe46783e953d58bc546… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:59+02:00 permissions: use strncpy() for setting boundaries > https://github.com/kamailio/kamailio/security/code-scanning/2616 > https://github.com/kamailio/kamailio/security/code-scanning/1845 --- Modified: src/modules/permissions/parse_config.c Modified: src/modules/permissions/rule.c --- Diff: https://github.com/kamailio/kamailio/commit/77ca2e93e945fe46783e953d58bc546… Patch: https://github.com/kamailio/kamailio/commit/77ca2e93e945fe46783e953d58bc546… --- diff --git a/src/modules/permissions/parse_config.c b/src/modules/permissions/parse_config.c index 20fdf8b6c47..7bf0c95a4fc 100644 --- a/src/modules/permissions/parse_config.c +++ b/src/modules/permissions/parse_config.c @@ -1,7 +1,7 @@ /* * PERMISSIONS module * - * Copyright (C) 2003 Mikl�s Tirp�k (mtirpak(a)sztaki.hu) + * Copyright (C) 2003 Mikl��s Tirp��k (mtirpak(a)sztaki.hu) * * This file is part of Kamailio, a free SIP server. * @@ -137,7 +137,7 @@ static int parse_expression(char *sv, expression **e, expression **e_exceptions) } } else { /* no exception */ - strcpy(str2, sv); + strncpy(str2, sv, LINE_LENGTH); *e_exceptions = NULL; } diff --git a/src/modules/permissions/rule.c b/src/modules/permissions/rule.c index 3140acfe01f..f315d10d749 100644 --- a/src/modules/permissions/rule.c +++ b/src/modules/permissions/rule.c @@ -1,7 +1,7 @@ /* * PERMISSIONS module * - * Copyright (C) 2003 Mikl�s Tirp�k (mtirpak(a)sztaki.hu) + * Copyright (C) 2003 Mikl��s Tirp��k (mtirpak(a)sztaki.hu) * * This file is part of Kamailio, a free SIP server. * @@ -148,7 +148,7 @@ expression *new_expression(char *sv) return 0; } - strcpy(e->value, sv); + strncpy(e->value, sv, EXPRESSION_LENGTH); e->reg_value = (regex_t *)pkg_malloc(sizeof(regex_t)); if(!e->reg_value) {

1 0

git:master:e347d89d: core: socket_info use strncpy() for setting boundaries
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: e347d89dba284f2d9635828b10b7ed49ad2244ad URL: https://github.com/kamailio/kamailio/commit/e347d89dba284f2d9635828b10b7ed4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:59+02:00 core: socket_info use strncpy() for setting boundaries > https://github.com/kamailio/kamailio/security/code-scanning/2586 --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/e347d89dba284f2d9635828b10b7ed4… Patch: https://github.com/kamailio/kamailio/commit/e347d89dba284f2d9635828b10b7ed4… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 56a4ba261eb..04a2e609323 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -329,10 +329,10 @@ static inline struct socket_info *new_sock_info(char *name, } if(usename != NULL) { si->useinfo.name.len = strlen(usename); - si->useinfo.name.s = (char *)pkg_malloc(si->useinfo.name.len + 1); + si->useinfo.name.s = (char *)pkg_malloc(si->useinfo.name.len); if(si->useinfo.name.s == 0) goto error; - strcpy(si->useinfo.name.s, usename); + strncpy(si->useinfo.name.s, usename, si->useinfo.name.len + 1); if(usename[0] == '[' && usename[si->useinfo.name.len - 1] == ']') { si->useinfo.address_str.len = si->useinfo.name.len - 2; p = si->useinfo.name.s + 1; @@ -354,7 +354,7 @@ static inline struct socket_info *new_sock_info(char *name, (char *)pkg_malloc(si->useinfo.port_no_str.len + 1); if(si->useinfo.port_no_str.s == NULL) goto error; - strcpy(si->useinfo.port_no_str.s, p); + strncpy(si->useinfo.port_no_str.s, p, si->useinfo.port_no_str.len); si->useinfo.port_no = useport; he = resolvehost(si->useinfo.name.s);

1 0

git:master:cbd7810f: sipcapture: use memcpy instead of strncpy for coherence
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: cbd7810fff3d5145c1ce34c0e362b5590bb92a12 URL: https://github.com/kamailio/kamailio/commit/cbd7810fff3d5145c1ce34c0e362b55… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:46+02:00 sipcapture: use memcpy instead of strncpy for coherence > https://github.com/kamailio/kamailio/security/code-scanning/2620 > https://github.com/kamailio/kamailio/security/code-scanning/2621 --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/cbd7810fff3d5145c1ce34c0e362b55… Patch: https://github.com/kamailio/kamailio/commit/cbd7810fff3d5145c1ce34c0e362b55… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 46f9059d489..de0a15174cc 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -1849,6 +1849,7 @@ static int sip_capture( struct timeval tvb; struct timezone tz; char tmp_node[100]; + str ip; LM_DBG("CAPTURE DEBUG...\n"); @@ -2249,9 +2250,11 @@ static int sip_capture( /* IP source and destination */ - strcpy(buf_ip, ip_addr2a(&msg->rcv.src_ip)); + ip.s = ip_addr2a(&msg->rcv.src_ip); + ip.len = strlen(ip.s); + memcpy(buf_ip, ip.s, ip.len); sco.source_ip.s = buf_ip; - sco.source_ip.len = strlen(buf_ip); + sco.source_ip.len = ip.len; sco.source_port = msg->rcv.src_port; /*source ip*/ @@ -2794,7 +2797,7 @@ static int report_capture(sip_msg_t *msg, str *_table, str *_corr, str *_data) struct timezone tz; char tmp_node[100]; time_t epoch_time_as_time_t; - str corrtmp = STR_NULL, tmp; + str corrtmp = STR_NULL, tmp, ip; _capture_mode_data_t *c = NULL; @@ -2834,10 +2837,11 @@ static int report_capture(sip_msg_t *msg, str *_table, str *_corr, str *_data) //EMPTY_STR(sco.msg); /* IP source and destination */ - - strcpy(buf_ip, ip_addr2a(&msg->rcv.src_ip)); + ip.s = ip_addr2a(&msg->rcv.src_ip); + ip.len = strlen(ip.s); + memcpy(buf_ip, ip.s, ip.len); sco.source_ip.s = buf_ip; - sco.source_ip.len = strlen(buf_ip); + sco.source_ip.len = ip.len; sco.source_port = msg->rcv.src_port; /*source ip*/

1 0

git:master:d00ceda2: rtpproxy: use memcpy instead of strcpy for coherence
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: d00ceda2c0428c6c02f3ed6d4c8c067e3f6ae94b URL: https://github.com/kamailio/kamailio/commit/d00ceda2c0428c6c02f3ed6d4c8c067… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-13T00:12:58+02:00 rtpproxy: use memcpy instead of strcpy for coherence > https://github.com/kamailio/kamailio/security/code-scanning/2617 > https://github.com/kamailio/kamailio/security/code-scanning/2618 > https://github.com/kamailio/kamailio/security/code-scanning/2620 --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/d00ceda2c0428c6c02f3ed6d4c8c067… Patch: https://github.com/kamailio/kamailio/commit/d00ceda2c0428c6c02f3ed6d4c8c067… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 493d8ffdf88..8103fef4edd 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1667,7 +1667,7 @@ static int set_rtp_proxy_set_f(struct sip_msg *msg, char *str1, char *str2) static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) { - char *cp = NULL; + str cp = STR_NULL; char newip[IP_ADDR_MAX_STR_SIZE]; int method; int nosdp; @@ -1696,8 +1696,9 @@ static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) return unforce_rtp_proxy(msg, flags); if(ip == NULL) { - cp = ip_addr2a(&msg->rcv.dst_ip); - strcpy(newip, cp); + cp.s = ip_addr2a(&msg->rcv.dst_ip); + cp.len = strlen(cp.s); + memcpy(newip, cp.s, cp.len); } if(msg->msg_flags & FL_SDP_BODY) @@ -1707,13 +1708,13 @@ static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) if(msg->first_line.type == SIP_REQUEST) { if(method == METHOD_ACK && nosdp == 0) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 0, + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, 0, (ip != NULL) ? 1 : 0); if(method == METHOD_PRACK && nosdp == 0) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 1, + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, 1, (ip != NULL) ? 1 : 0); if(method == METHOD_UPDATE && nosdp == 0) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 1, + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, 1, (ip != NULL) ? 1 : 0); if(method == METHOD_INVITE && nosdp == 0) { msg->msg_flags |= FL_SDP_BODY; @@ -1722,7 +1723,7 @@ static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) tmb.t_gett()->uas.request->msg_flags |= FL_SDP_BODY; if(route_type == FAILURE_ROUTE) return unforce_rtp_proxy(msg, flags); - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 1, + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, 1, (ip != NULL) ? 1 : 0); } } else if(msg->first_line.type == SIP_REPLY) { @@ -1730,19 +1731,19 @@ static int rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) return unforce_rtp_proxy(msg, flags); if(nosdp == 0) { if(method == METHOD_PRACK) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 0, - (ip != NULL) ? 1 : 0); + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, + 0, (ip != NULL) ? 1 : 0); if(method == METHOD_UPDATE) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 0, - (ip != NULL) ? 1 : 0); + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, + 0, (ip != NULL) ? 1 : 0); if(tmb.t_gett == NULL || tmb.t_gett() == NULL || tmb.t_gett() == T_UNDEFINED) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 0, - (ip != NULL) ? 1 : 0); + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, + 0, (ip != NULL) ? 1 : 0); if(tmb.t_gett()->uas.request->msg_flags & FL_SDP_BODY) - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 0, - (ip != NULL) ? 1 : 0); - return force_rtp_proxy(msg, flags, (cp != NULL) ? newip : ip, 1, + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, + 0, (ip != NULL) ? 1 : 0); + return force_rtp_proxy(msg, flags, (cp.s != NULL) ? newip : ip, 1, (ip != NULL) ? 1 : 0); } } @@ -1823,15 +1824,16 @@ static int rtpproxy_offer2_f(struct sip_msg *msg, char *param1, char *param2) static int rtpproxy_answer1_helper_f(struct sip_msg *msg, char *flags) { - char *cp; + str cp = STR_NULL; char newip[IP_ADDR_MAX_STR_SIZE]; if(msg->first_line.type == SIP_REQUEST) if(msg->first_line.u.request.method_value != METHOD_ACK) return -1; - cp = ip_addr2a(&msg->rcv.dst_ip); - strcpy(newip, cp); + cp.s = ip_addr2a(&msg->rcv.dst_ip); + cp.len = strlen(cp.s); + memcpy(newip, cp.s, cp.len); return force_rtp_proxy(msg, flags, newip, 0, 0); }

1 0

[kamailio/kamailio] Rabbitmq amqps (PR #3510)
by joelbax 12 Jul '23

12 Jul '23

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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 - [ ] 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/3510 -- Commit Summary -- * db_redis: Adding TLS support * ndb_redis: Adding TLS support * db_redis: Fixing format * db_redis: Missing format fixes * ndb_redis: Format fixes * db_redis: Fixing build * db_redis: Fixing Makefile * db_redis: Fixing global variables * ndb_redis: Fixing global variables names * ndb_redis: Missing uprotected redisSSLContext * db_redis: Searching SSL support in gcc search library path * ndb_redis: Searching SSL support in gcc search library path * db_redis: Format fixes * ndb_redis: Fixing format * Merge remote-tracking branch 'upstream/master' * rabbitmq: Adding ampqs support -- File Changes -- M src/modules/rabbitmq/doc/rabbitmq_admin.xml (3) M src/modules/rabbitmq/rabbitmq.c (33) M src/modules/rabbitmq/rabbitmq.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3510.patch https://github.com/kamailio/kamailio/pull/3510.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3510 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3510(a)github.com>

2 2

git:master:e17a3de2: nats: nats_publish set reply parameter to be optional
by Victor Seva 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: e17a3de2994e3237ea4a0916f60635f9f038d266 URL: https://github.com/kamailio/kamailio/commit/e17a3de2994e3237ea4a0916f60635f… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-07-12T09:55:10+02:00 nats: nats_publish set reply parameter to be optional --- Modified: src/modules/nats/nats_mod.c Modified: src/modules/nats/nats_mod.h Modified: src/modules/nats/nats_pub.c Modified: src/modules/nats/nats_pub.h --- Diff: https://github.com/kamailio/kamailio/commit/e17a3de2994e3237ea4a0916f60635f… Patch: https://github.com/kamailio/kamailio/commit/e17a3de2994e3237ea4a0916f60635f…

1 0

[kamailio/kamailio] nats: nats_publish set reply parameter to be optional (PR #3507)
by Emmanuel Schmidbauer 12 Jul '23

12 Jul '23

#### 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: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description commit a725b4fd224c27d84a9f5623faa5af3c3873a2e5 seems to make the `nats_publish` function require the `reply.topic` parameter required. The change from that commit breaks backward compatibility and forces the configuration to pass a reply.topic. This PR makes the `reply.topic` optional. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3507 -- Commit Summary -- * nats: nats_publish set reply parameter to be optional -- File Changes -- M src/modules/nats/nats_mod.c (4) M src/modules/nats/nats_mod.h (6) M src/modules/nats/nats_pub.c (39) M src/modules/nats/nats_pub.h (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3507.patch https://github.com/kamailio/kamailio/pull/3507.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3507 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3507(a)github.com>

2 2

git:master:9fd006e4: modules: readme files regenerated - imc ... [skip ci]
by Kamailio Dev 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: 9fd006e48469d86f68926418fc749cb798fdc9b7 URL: https://github.com/kamailio/kamailio/commit/9fd006e48469d86f68926418fc749cb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-12T09:16:27+02:00 modules: readme files regenerated - imc ... [skip ci] --- Modified: src/modules/imc/README --- Diff: https://github.com/kamailio/kamailio/commit/9fd006e48469d86f68926418fc749cb… Patch: https://github.com/kamailio/kamailio/commit/9fd006e48469d86f68926418fc749cb… --- diff --git a/src/modules/imc/README b/src/modules/imc/README index fa467ab6148..6fa83d72aa6 100644 --- a/src/modules/imc/README +++ b/src/modules/imc/README @@ -45,6 +45,7 @@ Joey Golan 4. Functions 4.1. imc_manager() + 4.2. imc_room_active(room) 5. RPC Commands @@ -71,7 +72,8 @@ Joey Golan 1.9. Set create_on_join parameter 1.10. Set check_on_create parameter 1.11. Usage of imc_manager() function - 1.12. List of commands + 1.12. Usage of imc_room_active() function + 1.13. List of commands Chapter 1. Admin Guide @@ -99,6 +101,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. imc_manager() + 4.2. imc_room_active(room) 5. RPC Commands @@ -285,6 +288,7 @@ modparam("imc", "check_on_create", 1) 4. Functions 4.1. imc_manager() + 4.2. imc_room_active(room) 4.1. imc_manager() @@ -310,6 +314,21 @@ if(is_method("MESSAGE) } ... +4.2. imc_room_active(room) + + Return 1 (true) if the room is active, -1 (false) if the room is not + found. The parameter is the SIP URI to identify the room, it can + contain variables. + + This function can be used from ANY_ROUTE. + + Example 1.12. Usage of imc_room_active() function +... + if(imc_room_active("sip:chat-sip@$fd")) { + ... + } +... + 5. RPC Commands 5.1. imc.list_rooms @@ -358,7 +377,7 @@ kamcmd imc_list_members _room_ Next picture presents the list of commands and their parameters. - Example 1.12. List of commands + Example 1.13. List of commands ... 1.create

1 0

git:master:4d045954: imc: docs for imc_room_active() function
by Daniel-Constantin Mierla 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: 4d0459545ada92786d3d7ee1f9aeefd82c8527e7 URL: https://github.com/kamailio/kamailio/commit/4d0459545ada92786d3d7ee1f9aeefd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-12T09:06:49+02:00 imc: docs for imc_room_active() function --- Modified: src/modules/imc/doc/imc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4d0459545ada92786d3d7ee1f9aeefd… Patch: https://github.com/kamailio/kamailio/commit/4d0459545ada92786d3d7ee1f9aeefd… --- diff --git a/src/modules/imc/doc/imc_admin.xml b/src/modules/imc/doc/imc_admin.xml index 853176eaa6d..1b485ac77ca 100644 --- a/src/modules/imc/doc/imc_admin.xml +++ b/src/modules/imc/doc/imc_admin.xml @@ -309,6 +309,29 @@ if(is_method("MESSAGE) exit; } ... +</programlisting> + </example> + </section> + <section> + <title id="imc.p.imc_room_active"> + <function moreinfo="none">imc_room_active(room)</function> + </title> + <para> + Return 1 (true) if the room is active, -1 (false) if the room is not + found. The parameter is the SIP URI to identify the room, it can contain + variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title>Usage of <varname>imc_room_active()</varname> function</title> + <programlisting format="linespecific"> +... + if(imc_room_active("sip:chat-sip@$fd")) { + ... + } +... </programlisting> </example> </section>

1 0

git:master:874351c0: imc: reformat initialized structures
by Daniel-Constantin Mierla 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: 874351c0d4bc4e8fce5dd9f3ca617e8c3b61ef89 URL: https://github.com/kamailio/kamailio/commit/874351c0d4bc4e8fce5dd9f3ca617e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-12T08:28:41+02:00 imc: reformat initialized structures --- Modified: src/modules/imc/imc.c --- Diff: https://github.com/kamailio/kamailio/commit/874351c0d4bc4e8fce5dd9f3ca617e8… Patch: https://github.com/kamailio/kamailio/commit/874351c0d4bc4e8fce5dd9f3ca617e8… --- diff --git a/src/modules/imc/imc.c b/src/modules/imc/imc.c index b15e42aba2f..4364609a10b 100644 --- a/src/modules/imc/imc.c +++ b/src/modules/imc/imc.c @@ -100,45 +100,53 @@ struct tm_binds tmb; /** TM callback function */ void inv_callback(struct cell *t, int type, struct tmcb_params *ps); +/* clang-format off */ static cmd_export_t cmds[] = { - {"imc_manager", (cmd_function)w_imc_manager, 0, 0, 0, REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - + {"imc_manager", (cmd_function)w_imc_manager, 0, 0, 0, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; -static param_export_t params[] = {{"db_url", PARAM_STR, &db_url}, - {"db_mode", INT_PARAM, &db_mode}, - {"hash_size", INT_PARAM, &imc_hash_size}, - {"imc_cmd_start_char", PARAM_STR, &imc_cmd_start_str}, - {"rooms_table", PARAM_STR, &rooms_table}, - {"members_table", PARAM_STR, &members_table}, - {"outbound_proxy", PARAM_STR, &outbound_proxy}, - {"extra_hdrs", PARAM_STR, &extra_hdrs}, - {"create_on_join", INT_PARAM, &imc_create_on_join}, - {"check_on_create", INT_PARAM, &imc_check_on_create}, {0, 0, 0}}; +static param_export_t params[] = { + {"db_url", PARAM_STR, &db_url}, + {"db_mode", INT_PARAM, &db_mode}, + {"hash_size", INT_PARAM, &imc_hash_size}, + {"imc_cmd_start_char", PARAM_STR, &imc_cmd_start_str}, + {"rooms_table", PARAM_STR, &rooms_table}, + {"members_table", PARAM_STR, &members_table}, + {"outbound_proxy", PARAM_STR, &outbound_proxy}, + {"extra_hdrs", PARAM_STR, &extra_hdrs}, + {"create_on_join", INT_PARAM, &imc_create_on_join}, + {"check_on_create", INT_PARAM, &imc_check_on_create}, + {0, 0, 0} +}; #ifdef STATISTICS #include "../../core/counters.h" stat_var *imc_active_rooms; -stat_export_t imc_stats[] = {{"active_rooms", 0, &imc_active_rooms}, {0, 0, 0}}; +stat_export_t imc_stats[] = { + {"active_rooms", 0, &imc_active_rooms}, + {0, 0, 0} +}; #endif /** module exports */ struct module_exports exports = { - "imc", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported commands */ - params, /* exported parameters */ - 0, /* exported rpc functions */ - 0, /* exported pseudo-variables */ - 0, /* response handling function */ - mod_init, /* module init function */ - child_init, /* child init function */ - destroy /* module destroy function */ + "imc", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported commands */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module init function */ + child_init, /* child init function */ + destroy /* module destroy function */ }; +/* clang-format on */ static int mod_init(void) { @@ -601,10 +609,13 @@ static const char *imc_rpc_list_rooms_doc[2] = {"List imc rooms.", 0}; static const char *imc_rpc_list_members_doc[2] = { "List members in an imc room.", 0}; -rpc_export_t imc_rpc[] = {{"imc.list_rooms", imc_rpc_list_rooms, - imc_rpc_list_rooms_doc, RET_ARRAY}, - {"imc.list_members", imc_rpc_list_members, imc_rpc_list_members_doc, 0}, - {0, 0, 0, 0}}; +/* clang-format off */ +rpc_export_t imc_rpc[] = { + {"imc.list_rooms", imc_rpc_list_rooms, imc_rpc_list_rooms_doc, RET_ARRAY}, + {"imc.list_members", imc_rpc_list_members, imc_rpc_list_members_doc, 0}, + {0, 0, 0, 0} +}; +/* clang-format on */ static int imc_rpc_init(void) {

1 0

git:master:ce3b1656: imc: added function to check if a room is active
by Daniel-Constantin Mierla 12 Jul '23

12 Jul '23

Module: kamailio Branch: master Commit: ce3b16565a3375c4fcdabb39bfbd0c814f402da9 URL: https://github.com/kamailio/kamailio/commit/ce3b16565a3375c4fcdabb39bfbd0c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-12T09:00:56+02:00 imc: added function to check if a room is active --- Modified: src/modules/imc/imc.c --- Diff: https://github.com/kamailio/kamailio/commit/ce3b16565a3375c4fcdabb39bfbd0c8… Patch: https://github.com/kamailio/kamailio/commit/ce3b16565a3375c4fcdabb39bfbd0c8… --- diff --git a/src/modules/imc/imc.c b/src/modules/imc/imc.c index 4364609a10b..c5b65cb95d7 100644 --- a/src/modules/imc/imc.c +++ b/src/modules/imc/imc.c @@ -43,6 +43,7 @@ #include "../../core/hashes.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" +#include "../../core/mod_fix.h" #include "../../core/kemi.h" #include "../../modules/tm/tm_load.h" @@ -89,6 +90,7 @@ static int mod_init(void); static int child_init(int); static int w_imc_manager(struct sip_msg *, char *, char *); +static int w_imc_room_active(sip_msg_t *, char *, char *); static int imc_rpc_init(void); @@ -103,6 +105,8 @@ void inv_callback(struct cell *t, int type, struct tmcb_params *ps); /* clang-format off */ static cmd_export_t cmds[] = { {"imc_manager", (cmd_function)w_imc_manager, 0, 0, 0, REQUEST_ROUTE}, + {"imc_room_active", (cmd_function)w_imc_room_active, 1, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -430,11 +434,51 @@ static int ki_imc_manager(struct sip_msg *msg) return ret; } +/** + * + */ static int w_imc_manager(struct sip_msg *msg, char *str1, char *str2) { return ki_imc_manager(msg); } +/** + * + */ +static int ki_imc_room_active(sip_msg_t *msg, str *room) +{ + sip_uri_t puri; + imc_room_t *rm; + + if(parse_uri(room->s, room->len, &puri) != 0) { + LM_ERR("failed to parse room uri [%.*s]\n", room->len, room->s); + return -1; + } + + rm = imc_get_room(&puri.user, &puri.host); + + if(rm != NULL) { + imc_release_room(rm); + return 1; + } + return -1; +} + +/** + * + */ +static int w_imc_room_active(sip_msg_t *msg, char *proom, char *str2) +{ + str room = STR_NULL; + + if(fixup_get_svalue(msg, (gparam_t*)proom, &room) != 0) { + LM_ERR("invalid room parameter"); + return -1; + } + + return ki_imc_room_active(msg, &room); +} + /** * destroy module */ @@ -636,6 +680,11 @@ static sr_kemi_t sr_kemi_imc_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("imc"), str_init("imc_room_active"), + SR_KEMIP_INT, ki_imc_room_active, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:5da9ba4c: modules: readme files regenerated - msilo ... [skip ci]
by Kamailio Dev 11 Jul '23

11 Jul '23

Module: kamailio Branch: master Commit: 5da9ba4c12161ac864022b1624faef6c16777b4f URL: https://github.com/kamailio/kamailio/commit/5da9ba4c12161ac864022b1624faef6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-11T18:32:06+02:00 modules: readme files regenerated - msilo ... [skip ci] --- Modified: src/modules/msilo/README --- Diff: https://github.com/kamailio/kamailio/commit/5da9ba4c12161ac864022b1624faef6… Patch: https://github.com/kamailio/kamailio/commit/5da9ba4c12161ac864022b1624faef6…

1 0

git:master:917b608f: msilo: docs for use_mode parameter
by Daniel-Constantin Mierla 11 Jul '23

11 Jul '23

Module: kamailio Branch: master Commit: 917b608f958e9a7a68388d8b53630cdf9cb2f3b1 URL: https://github.com/kamailio/kamailio/commit/917b608f958e9a7a68388d8b53630cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-11T18:22:06+02:00 msilo: docs for use_mode parameter --- Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/917b608f958e9a7a68388d8b53630cd… Patch: https://github.com/kamailio/kamailio/commit/917b608f958e9a7a68388d8b53630cd… --- diff --git a/src/modules/msilo/doc/msilo_admin.xml b/src/modules/msilo/doc/msilo_admin.xml index 1c4a0d0e06d..f9623891411 100644 --- a/src/modules/msilo/doc/msilo_admin.xml +++ b/src/modules/msilo/doc/msilo_admin.xml @@ -726,6 +726,27 @@ m_store(...); </example> </section> + <section id="msilo.p.use_mode"> + <title><varname>use_mode</varname> (int)</title> + <para> + If set to 1, the call-id header of incoming MESSAGE is stored and reused + later for delivery MESSAGE. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set the <quote>use_mode</quote> parameter</title> + <programlisting format="linespecific"> +... +modparam("msilo", "use_mode", 1) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:38514a77: msilo: docs for parms to set column names for callid and status
by Daniel-Constantin Mierla 11 Jul '23

11 Jul '23

Module: kamailio Branch: master Commit: 38514a77aea446e36ba5ce2db32d0c4ae57571ed URL: https://github.com/kamailio/kamailio/commit/38514a77aea446e36ba5ce2db32d0c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-11T18:22:06+02:00 msilo: docs for parms to set column names for callid and status --- Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/38514a77aea446e36ba5ce2db32d0c4… Patch: https://github.com/kamailio/kamailio/commit/38514a77aea446e36ba5ce2db32d0c4… --- diff --git a/src/modules/msilo/doc/msilo_admin.xml b/src/modules/msilo/doc/msilo_admin.xml index 189ee5ee9e6..1c4a0d0e06d 100644 --- a/src/modules/msilo/doc/msilo_admin.xml +++ b/src/modules/msilo/doc/msilo_admin.xml @@ -297,6 +297,36 @@ modparam("msilo", "sc_snd_time", "send_reminder_time") ... modparam("msilo", "sc_stored_hdrs", "extra_headers") ... +</programlisting> + </example> + </section> + <section id="msilo.p.sc_callid"> + <title><varname>sc_callid</varname> (string)</title> + <para> + The name of the column in silo table, storing callid. + </para> + <para>Default value is <quote>callid</quote>.</para> + <example> + <title>Set the <quote>sc_callid</quote> parameter</title> + <programlisting format="linespecific"> +... +modparam("msilo", "sc_callid", "call_id") +... +</programlisting> + </example> + </section> + <section id="msilo.p.sc_status"> + <title><varname>sc_callid</varname> (string)</title> + <para> + The name of the column in silo table, storing status. + </para> + <para>Default value is <quote>status</quote>.</para> + <example> + <title>Set the <quote>sc_status</quote> parameter</title> + <programlisting format="linespecific"> +... +modparam("msilo", "sc_status", "st") +... </programlisting> </example> </section>

1 0

git:master:8ada99e8: msilo: option to store call-id and reuse it on delivery
by Daniel-Constantin Mierla 11 Jul '23

11 Jul '23

Module: kamailio Branch: master Commit: 8ada99e8c686db639ee73a6584816c3fe0096b6d URL: https://github.com/kamailio/kamailio/commit/8ada99e8c686db639ee73a6584816c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-11T18:22:06+02:00 msilo: option to store call-id and reuse it on delivery --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/8ada99e8c686db639ee73a6584816c3… Patch: https://github.com/kamailio/kamailio/commit/8ada99e8c686db639ee73a6584816c3…

1 0

git:master:cdd6b960: msilo: exppose callid and status columns as params to match db schema
by Daniel-Constantin Mierla 11 Jul '23

11 Jul '23

Module: kamailio Branch: master Commit: cdd6b960f4cfea2fa8a2f5f79750568d8c49d89f URL: https://github.com/kamailio/kamailio/commit/cdd6b960f4cfea2fa8a2f5f79750568… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-11T18:22:06+02:00 msilo: exppose callid and status columns as params to match db schema --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/cdd6b960f4cfea2fa8a2f5f79750568… Patch: https://github.com/kamailio/kamailio/commit/cdd6b960f4cfea2fa8a2f5f79750568… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index e086148907a..b231fe2c13c 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -53,7 +53,7 @@ #include "api.h" #define MAX_DEL_KEYS 1 -#define NR_KEYS 11 +#define NR_KEYS 13 static str sc_mid = str_init("id"); /* 0 */ static str sc_from = str_init("src_addr"); /* 1 */ @@ -66,6 +66,8 @@ static str sc_exp_time = str_init("exp_time"); /* 7 */ static str sc_inc_time = str_init("inc_time"); /* 8 */ static str sc_snd_time = str_init("snd_time"); /* 9 */ static str sc_stored_hdrs = str_init("extra_hdrs"); /* 10 */ +static str sc_callid = str_init("callid"); /* 11 */ +static str sc_status = str_init("status"); /* 12 */ #define SET_STR_VAL(_str, _res, _r, _c) \ if(RES_ROWS(_res)[_r].values[_c].nul == 0) { \ @@ -213,6 +215,8 @@ static param_export_t params[] = { {"sc_inc_time", PARAM_STR, &sc_inc_time}, {"sc_snd_time", PARAM_STR, &sc_snd_time}, {"sc_stored_hdrs", PARAM_STR, &sc_stored_hdrs}, + {"sc_callid", PARAM_STR, &sc_callid}, + {"sc_status", PARAM_STR, &sc_status}, {"snd_time_avp", PARAM_STR, &ms_snd_time_avp_param}, {"extra_hdrs_avp", PARAM_STR, &ms_extra_hdrs_avp_param}, {"add_date", INT_PARAM, &ms_add_date},

1 0

[kamailio/kamailio] NATS Module not working (Issue #3253)
by iliesh 10 Jul '23

10 Jul '23

### Description Trying to get NATS module working but Kamailio is refusing to start. ``` Sep 27 23:08:27 server kernel: kamailio[338880]: segfault at 70 ip 00007fe97b06f1cc sp 00007fff72d158f0 error 4 in libuv.so.1.0.0[7fe97b066000+1f000] Sep 27 23:08:27 server kernel: Code: 5a 85 ff ff b8 ea ff ff ff c3 0f 1f 40 00 f3 0f 1e fa 8b 4e 30 83 f9 ff 0f 84 80 00 00 00 48 83 ec 08 85 c9 0f 88 90 00 00 00 <3b> 4f 70 73 45 f7 d2 21 56 28 48 8d 4e 18 48 89 f0 48 8b 76 18 75 Sep 27 23:08:27 server systemd[1]: Started Process Core Dump (PID 338886/UID 0). ``` #### Log Messages In the log message I'm getting the following error: ``` INFO: nats [nats_mod.c:437]: nats_init_connection(): adding server [nats://192.168.1.1:4222] [1] ERROR: nats [nats_mod.c:456]: nats_init_connection(): could not create nats options [System Error] ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (version: kamailio 5.6.1 (x86_64/linux) 34e6dd) ``` NATS Server version: ``` nats-server: v2.9.0 ``` libnats version: ``` libnats.so.3.4.0 ``` * **Operating System**: ``` CentOS Stream 9 5.14.0-163.el9.x86_64 #1 SMP PREEMPT_DYNAMIC Thu Sep 8 13:52:29 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ``` * **Module Configuration**: ``` loadmodule "nats.so" modparam("nats", "nats_url", "nats://192.168.1.1:4222") ``` There is no issue at the network/firewall level as by using telnet I'm able to connect to the NATS server successfully. What is weird is that with tcpdump I can't see even attempts to connect to the NATS server. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3253 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3253(a)github.com>

5 31

[kamailio/kamailio] RFC8599 (Issue #3508)
by Sterlin11 10 Jul '23

10 Jul '23

-- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3508 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3508(a)github.com>

2 2

Kamailio - VoNR support
by Sivanesh Kumar K 10 Jul '23

10 Jul '23

Hi team, I was tested with Volte by using kamailio sip server . I want to know its supporting VoNR for 5G voice call . For my understanding VoNR requires kamailio IMS to use SBI interface, it's not implemented in kamailio IMS. Please correct me if I am wrong ? If not implemented means , any pipeline in feature. Regards, Sivaneshkumar K Mobiveil INC., CONFIDENTIALITY NOTICE: This e-mail message, including any attachments, is for the sole use of the intended recipient(s) and may contain proprietary confidential or privileged information or otherwise be protected by law. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please notify the sender and destroy all copies and the original message.

2 1

git:master:7ca151a0: modules: readme files regenerated - msilo ... [skip ci]
by Kamailio Dev 10 Jul '23

10 Jul '23

Module: kamailio Branch: master Commit: 7ca151a0479e4971980f4bbbc10cbd8f7deea1b6 URL: https://github.com/kamailio/kamailio/commit/7ca151a0479e4971980f4bbbc10cbd8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-07-10T11:01:31+02:00 modules: readme files regenerated - msilo ... [skip ci] --- Modified: src/modules/msilo/README --- Diff: https://github.com/kamailio/kamailio/commit/7ca151a0479e4971980f4bbbc10cbd8… Patch: https://github.com/kamailio/kamailio/commit/7ca151a0479e4971980f4bbbc10cbd8… --- diff --git a/src/modules/msilo/README b/src/modules/msilo/README index 987c9504ebd..046a57ca068 100644 --- a/src/modules/msilo/README +++ b/src/modules/msilo/README @@ -70,7 +70,8 @@ Juha Heinanen 4. Functions 4.1. m_store([owner]) - 4.2. m_dump([owner]) + 4.2. m_store_addrs(owner, srcaddr, dstaddr) + 4.3. m_dump([owner]) 5. Statistics @@ -118,8 +119,9 @@ Juha Heinanen 1.30. Set the ��extra_hdrs_avp�� parameter 1.31. Set the ��skip_notification_flag�� parameter 1.32. m_store usage - 1.33. m_dump usage - 1.34. Kamailio config script - sample msilo usage + 1.33. m_store_addrs usage + 1.34. m_dump usage + 1.35. Kamailio config script - sample msilo usage Chapter 1. Admin Guide @@ -168,7 +170,8 @@ Chapter 1. Admin Guide 4. Functions 4.1. m_store([owner]) - 4.2. m_dump([owner]) + 4.2. m_store_addrs(owner, srcaddr, dstaddr) + 4.3. m_dump([owner]) 5. Statistics @@ -655,7 +658,8 @@ m_store(...); 4. Functions 4.1. m_store([owner]) - 4.2. m_dump([owner]) + 4.2. m_store_addrs(owner, srcaddr, dstaddr) + 4.3. m_dump([owner]) 4.1. m_store([owner]) @@ -679,7 +683,28 @@ m_store(); m_store("$tu"); ... -4.2. m_dump([owner]) +4.2. m_store_addrs(owner, srcaddr, dstaddr) + + Similar to m_store(), but instead of getting source user address from + From-URI and destination user address from To_URI, this function allows + to give them via parameters. + + Meaning of the parameters is as follows: + * owner - is a string that must contain a SIP URI in whose inbox the + message will be stored. It can have any pseudo variable. + * srcaddr - is a string that must contain a SIP URI corresponding to + From user. It can have any pseudo variable. + * dstaddr - is a string that must contain a SIP URI correspinding to + To user. It can have any pseudo variable. + + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + + Example 1.33. m_store_addrs usage +... +m_store_addrs("sip:$rU@a.com", "sip:$fU@a.com", "sip:$tU@a.com"); +... + +4.3. m_dump([owner]) The method sends stored messages for the SIP user that has registered to the contact address in the registration. The method should be called @@ -693,7 +718,7 @@ m_store("$tu"); This function can be used from REQUEST_ROUTE. - Example 1.33. m_dump usage + Example 1.34. m_dump usage ... m_dump(); m_dump("$fu"); @@ -735,7 +760,7 @@ m_dump("$fu"); Next picture displays a sample usage of msilo. - Example 1.34. Kamailio config script - sample msilo usage + Example 1.35. Kamailio config script - sample msilo usage ... # # MSILO usage example

1 0

git:master:3542608f: msilo: new function to allow specifying src/dst addresses
by Daniel-Constantin Mierla 10 Jul '23

10 Jul '23

Module: kamailio Branch: master Commit: 3542608f89dba934d943c3de8b66e178c0cecdc5 URL: https://github.com/kamailio/kamailio/commit/3542608f89dba934d943c3de8b66e17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-10T10:42:15+02:00 msilo: new function to allow specifying src/dst addresses --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/3542608f89dba934d943c3de8b66e17… Patch: https://github.com/kamailio/kamailio/commit/3542608f89dba934d943c3de8b66e17…

1 0

git:master:8da60f5a: msilo: docs for m_store_addrs()
by Daniel-Constantin Mierla 10 Jul '23

10 Jul '23

Module: kamailio Branch: master Commit: 8da60f5a0a55fa2d5bb084b8215b96ec4c032161 URL: https://github.com/kamailio/kamailio/commit/8da60f5a0a55fa2d5bb084b8215b96e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-10T10:48:46+02:00 msilo: docs for m_store_addrs() --- Modified: src/modules/msilo/doc/msilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8da60f5a0a55fa2d5bb084b8215b96e… Patch: https://github.com/kamailio/kamailio/commit/8da60f5a0a55fa2d5bb084b8215b96e… --- diff --git a/src/modules/msilo/doc/msilo_admin.xml b/src/modules/msilo/doc/msilo_admin.xml index abd3e45bbff..189ee5ee9e6 100644 --- a/src/modules/msilo/doc/msilo_admin.xml +++ b/src/modules/msilo/doc/msilo_admin.xml @@ -731,6 +731,49 @@ m_store(...); m_store(); m_store("$tu"); ... +</programlisting> + </example> + </section> + <section id="msilo.f.m_store_addrs"> + <title><function moreinfo="none">m_store_addrs(owner, srcaddr, dstaddr)</function></title> + <para> + Similar to m_store(), but instead of getting source user address from + From-URI and destination user address from To_URI, this function allows + to give them via parameters. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>owner</emphasis> - is a string that must contain + a SIP URI in whose inbox the message will be stored. It can have + any pseudo variable. + </para> + </listitem> + <listitem> + <para> + <emphasis>srcaddr</emphasis> - is a string that must contain + a SIP URI corresponding to From user. It can have + any pseudo variable. + </para> + </listitem> + <listitem> + <para> + <emphasis>dstaddr</emphasis> - is a string that must contain + a SIP URI correspinding to To user. It can have + any pseudo variable. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + </para> + <example> + <title><function>m_store_addrs</function> usage</title> + <programlisting format="linespecific"> +... +m_store_addrs("sip:$rU@a.com", "sip:$fU@a.com", "sip:$tU@a.com"); +... </programlisting> </example> </section>

1 0

git:master:b1356efd: registrar: increase max size for user and domain building aor
by Daniel-Constantin Mierla 10 Jul '23

10 Jul '23

Module: kamailio Branch: master Commit: b1356efd61e56eaa3426d8e2e813ea6730b4f2c9 URL: https://github.com/kamailio/kamailio/commit/b1356efd61e56eaa3426d8e2e813ea6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-10T09:41:15+02:00 registrar: increase max size for user and domain building aor - renamed max aor lenght define to match the user and domain style --- Modified: src/modules/registrar/common.c Modified: src/modules/registrar/registrar.h --- Diff: https://github.com/kamailio/kamailio/commit/b1356efd61e56eaa3426d8e2e813ea6… Patch: https://github.com/kamailio/kamailio/commit/b1356efd61e56eaa3426d8e2e813ea6… --- diff --git a/src/modules/registrar/common.c b/src/modules/registrar/common.c index 9e619190644..6142d277d36 100644 --- a/src/modules/registrar/common.c +++ b/src/modules/registrar/common.c @@ -34,14 +34,14 @@ #include "common.h" #include "config.h" -#define MAX_AOR_LEN 256 +#define AOR_MAX_SIZE 512 /*! \brief * Extract Address of Record */ int extract_aor(str *_uri, str *_a, sip_uri_t *_pu) { - static char aor_buf[MAX_AOR_LEN]; + static char aor_buf[AOR_MAX_SIZE]; str tmp; sip_uri_t turi; sip_uri_t *puri; @@ -49,7 +49,7 @@ int extract_aor(str *_uri, str *_a, sip_uri_t *_pu) str *uri; str realm_prefix = {0}; - memset(aor_buf, 0, MAX_AOR_LEN); + memset(aor_buf, 0, AOR_MAX_SIZE); uri = _uri; if(_pu != NULL) @@ -63,7 +63,7 @@ int extract_aor(str *_uri, str *_a, sip_uri_t *_pu) return -1; } - if((puri->user.len + puri->host.len + 1) > MAX_AOR_LEN + if((puri->user.len + puri->host.len + 2) > AOR_MAX_SIZE || puri->user.len > USERNAME_MAX_SIZE || puri->host.len > DOMAIN_MAX_SIZE) { rerrno = R_AOR_LEN; diff --git a/src/modules/registrar/registrar.h b/src/modules/registrar/registrar.h index 68b00671f0e..bd28b5bd8fd 100644 --- a/src/modules/registrar/registrar.h +++ b/src/modules/registrar/registrar.h @@ -42,8 +42,8 @@ extern int contact_max_size; /* configurable using module parameter "contact_max_size" instead of compile time constant */ #define RECEIVED_MAX_SIZE 255 -#define USERNAME_MAX_SIZE 64 -#define DOMAIN_MAX_SIZE 128 +#define USERNAME_MAX_SIZE 248 +#define DOMAIN_MAX_SIZE 248 #define CALLID_MAX_SIZE 255 #define PATH_MODE_STRICT 2

1 0

git:master:7827013c: msilo: reformat exports structures for better alignment
by Daniel-Constantin Mierla 10 Jul '23

10 Jul '23

Module: kamailio Branch: master Commit: 7827013c50121b5d085dc3352b44aad940460513 URL: https://github.com/kamailio/kamailio/commit/7827013c50121b5d085dc3352b44aad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-10T10:15:49+02:00 msilo: reformat exports structures for better alignment --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/7827013c50121b5d085dc3352b44aad… Patch: https://github.com/kamailio/kamailio/commit/7827013c50121b5d085dc3352b44aad…

1 0

tracing, zipkin
by Sergey Safarov 10 Jul '23

10 Jul '23

When used different application servers like: 1) kamailio; 2) freeswitch; 3) crm Required correlate logs and events between all daemons. For such purposes can be used tracing (OpenTelementry, Zipkin). An example for Envoy tracking can look like POST /api/v2/spans HTTP/1.1 host: zipkin content-type: application/json x-envoy-internal: true x-forwarded-for: 217.12.247.98 x-envoy-expected-rq-timeout-ms: 5000 transfer-encoding: chunked 2ad [{"tags":{"upstream_cluster":"dynamic_forward_proxy_cluster","component":"proxy","response_flags":"DC","peer.address":"127.0.0.1","http.method":"CONNECT","http.protocol":"HTTP/1.1","downstream_cluster":"-","user_agent":"curl/7.85.0","request_size":"842","guid:x-request-id":"0456e862-4cf7-9ee2-b280-e6f59965a70d"," upstream_cluster.name ":"dynamic_forward_proxy_cluster","http.status_code":"200","response_size":"3750"},"name":" ifconfig.net:443 ","annotations":[{"timestamp":1688924085239932,"value":"ss"}],"kind":"SERVER","localEndpoint":{"port":0,"ipv4":"217.12.247.98"},"timestamp":1688924084352715,"shared":true,"traceId":"67480febdcdd48dc","duration":886997,"id":"67480febdcdd48dc"}] 0 HTTP/1.1 202 Accepted content-length: 0 server: Armeria/1.17.2 date: Sun, 9 Jul 2023 17:34:47 GMT where json body looks like [ { "tags": { "upstream_cluster": "dynamic_forward_proxy_cluster", "component": "proxy", "response_flags": "DC", "peer.address": "127.0.0.1", "http.method": "CONNECT", "http.protocol": "HTTP/1.1", "downstream_cluster": "-", "user_agent": "curl/7.85.0", "request_size": "842", "guid:x-request-id": "0456e862-4cf7-9ee2-b280-e6f59965a70d", "upstream_cluster.name": "dynamic_forward_proxy_cluster", "http.status_code": "200", "response_size": "3750" }, "name": "ifconfig.net:443", "annotations": [ { "timestamp": 1688924085239932, "value": "ss" } ], "kind": "SERVER", "localEndpoint": { "port": 0, "ipv4": "217.12.247.98" }, "timestamp": 1688924084352715, "shared": true, "traceId": "67480febdcdd48dc", "duration": 886997, "id": "67480febdcdd48dc" } ] I looking to create a task for the team developer to develop a module like "tracing_zipkin". This module should allow trace transactions and dialogs 1. request and response timing; 2. dialog start-stop events; 3. business logic like call hold/unhold, media added//removed (video, text, message, audio), request multipart content raw or filtered. I will appreciate it if you share your thoughts about how JSON POST should look. Sergey Safarov

2 2

[kamailio/kamailio] tlsa + OpenSSL 3.0.5: multiple unpredictable shm corruption (Issue #3222)
by space88man 08 Jul '23

08 Jul '23

### Description * kamailio 5.6.1 on AlmaLinux 9 and OpenSSL 3.0.5 * Used tlsa to separate the OS version of OpenSSL (which is 3.0.1). The same issue happens with the OS version of OpenSSL * Generating TLS client traffic * The issue will occur at about 25 conn/sec * Multiple unpredicatable types of shm corruption ### Troubleshooting * No issue with tlsa + OpenSSL 1.1.1q; the module can sustain 50 conn/sec up to 500 persistent connections. #### Reproduction 1. Used kamailio configuration from the outbound module documentation; i.e., configure kamailio as a TLS edge proxy. To isolate the registrar is another kamailio system 1. Use a SIP load tester to generate REGISTER traffic(Expires: 600) ; at the end of the REGISTER, keep the connection alive and reREGISTER at 300 secs. 1. Generate traffic at > 25 conn/sec (with < 25 conn/sec the test usually succeeds) #### Debugging Data BT in comments below #### Log Messages #### SIP Traffic ### Possible Solutions ### Additional Information 5.6.1 * **Operating System**: AlmaLinux 9, with (OS) OpenSSL 3.0.1. I used tlsa + OpenSSL 3.0.5 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3222 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3222(a)github.com>

4 16

[kamailio/kamailio] Kamailio Random Crash Alert - 5.4.7 (Issue #3186)
by hardikpatel89 07 Jul '23

07 Jul '23

### Description -- Hello Team, We are using Kamailio 5.4.7 and we found there is a random crash. We have observed the core logs and we noticed it is due to some of the RPC events. We have noticed it has been crashed from the "ctl handler" process. -- #### Debugging Data -- Core dump files are attached. [core-7519.txt](https://github.com/kamailio/kamailio/files/9099633/core-7519… [core-17582.txt](https://github.com/kamailio/kamailio/files/9099634/core-175… [core-7519.txt](https://github.com/kamailio/kamailio/files/9099638/core-7519… [core-17582.txt](https://github.com/kamailio/kamailio/files/9099639/core-175… -- ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.7 (x86_64/linux) a19fe1 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: a19fe1 compiled on 02:56:57 Feb 16 2022 with gcc 8.3.0 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3186 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3186(a)github.com>

3 5

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev