sr-dev July 2023

sr-dev@lists.kamailio.org

15 participants
240 discussions

git:5.6:b524321a: app_lua: fix crash on exausted memory scenario

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: b524321a4871c349e6ebb464ea018e138bc6d5ed URL: https://github.com/kamailio/kamailio/commit/b524321a4871c349e6ebb464ea018e1… Author: Victor Seva <vseva(a)sipwise.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:35:40+02:00 app_lua: fix crash on exausted memory scenario (cherry picked from commit ef94da7bac8e2aaf5a452d7b7dc3e2b544153ff6) --- Modified: src/modules/app_lua/app_lua_api.c --- Diff: https://github.com/kamailio/kamailio/commit/b524321a4871c349e6ebb464ea018e1… Patch: https://github.com/kamailio/kamailio/commit/b524321a4871c349e6ebb464ea018e1… --- diff --git a/src/modules/app_lua/app_lua_api.c b/src/modules/app_lua/app_lua_api.c index 0a1d13532cc..1010fc5b005 100644 --- a/src/modules/app_lua/app_lua_api.c +++ b/src/modules/app_lua/app_lua_api.c @@ -912,6 +912,10 @@ void sr_kemi_lua_push_dict(lua_State *L, sr_kemi_dict_item_t *item) { void sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) { + if(!item) { + LM_CRIT("BUG: dict field empty\n"); + return; + } switch(item->vtype) { case SR_KEMIP_NONE: LM_CRIT("BUG: vtype is NONE\n"); @@ -951,6 +955,10 @@ sr_kemi_lua_push_dict_item(lua_State *L, sr_kemi_dict_item_t *item) */ int sr_kemi_lua_return_xval(lua_State* L, sr_kemi_t *ket, sr_kemi_xval_t *rx) { + if(!rx) { + LM_CRIT("BUG: xval field empty\n"); + return 0; + } switch(rx->vtype) { case SR_KEMIP_NONE: return 0;

1 year, 5 months

git:5.6:ca13a338: auth_ephemeral: fix authentication with secrets added at runtime (#3390)

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: ca13a3382b9067a0dc14fc7ec995ec2d95c8c6cb URL: https://github.com/kamailio/kamailio/commit/ca13a3382b9067a0dc14fc7ec995ec2… Author: Dennis <dennis_y(a)mail.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-07-17T10:32:33+02:00 auth_ephemeral: fix authentication with secrets added at runtime (#3390) * auth_ephemeral: fix authentication with secrets added at runtime - proper way to work with shm pointer to secret list * fix: free secret_struct shm Free shm secret_struct in case the allocation error of secret_list pointer. (cherry picked from commit 6fa5a8fa8ddfe09bdab2fb445bee94e51d86b7fc) --- Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.c Modified: src/modules/auth_ephemeral/auth_ephemeral_mod.h Modified: src/modules/auth_ephemeral/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/ca13a3382b9067a0dc14fc7ec995ec2… Patch: https://github.com/kamailio/kamailio/commit/ca13a3382b9067a0dc14fc7ec995ec2…

1 year, 5 months

git:5.6:9daacc36: sqlops: do not allow empty name component in URL

by Daniel-Constantin Mierla

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 year, 5 months

git:master:9f3356de: htable: reformat initialized static structures

by Daniel-Constantin Mierla

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 year, 5 months

git:master:15711980: modules: readme files regenerated - geoip2 ... [skip ci]

by Kamailio Dev

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 year, 5 months

[kamailio/kamailio] geoip2: added distance function (PR #3506)

by sergey-safarov

#### 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>

1 year, 5 months

git:master:956cb12f: geoip2: docs - updated name from distance to geoip2_distance()

by Daniel-Constantin Mierla

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 year, 5 months

git:master:fcfa9413: geoip2: implemented distance fucntion for kemi

by Daniel-Constantin Mierla

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 year, 5 months

git:master:87be8a59: geoip2: prefix distance with geoip2_ to reflect the module

by Daniel-Constantin Mierla

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 year, 5 months

git:master:7a459481: geoip2: reformat module exports structures

by Daniel-Constantin Mierla

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 year, 5 months

← Newer
1
...
15
16
17
18
19
20
21
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2023