sr-dev November 2022

sr-dev@lists.kamailio.org

11 participants
217 discussions

git:master:4172faaa: modules: readme files regenerated - ims_usrloc_pcscf ... [skip ci]
by Kamailio Dev 09 Nov '22

09 Nov '22

Module: kamailio Branch: master Commit: 4172faaaa60333595fe6444deefbaa2babe8e9e1 URL: https://github.com/kamailio/kamailio/commit/4172faaaa60333595fe6444deefbaa2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-11-09T21:31:29+01:00 modules: readme files regenerated - ims_usrloc_pcscf ... [skip ci] --- Modified: src/modules/ims_usrloc_pcscf/README --- Diff: https://github.com/kamailio/kamailio/commit/4172faaaa60333595fe6444deefbaa2… Patch: https://github.com/kamailio/kamailio/commit/4172faaaa60333595fe6444deefbaa2… --- diff --git a/src/modules/ims_usrloc_pcscf/README b/src/modules/ims_usrloc_pcscf/README index 93efefc076..553ee25bbe 100644 --- a/src/modules/ims_usrloc_pcscf/README +++ b/src/modules/ims_usrloc_pcscf/README @@ -34,6 +34,7 @@ Carsten Bock 3.3. db_url (int) 3.4. db_mode (int) 3.5. match_contact_host_port (int) + 3.6. expires_grace (int) 4. RPC Commands @@ -54,6 +55,7 @@ Carsten Bock 1.3. Set db_url parameter 1.4. Set db_mode parameter 1.5. Set match_contact_host_port parameter + 1.6. Set expires_grace parameter Chapter 1. Admin Guide @@ -72,6 +74,7 @@ Chapter 1. Admin Guide 3.3. db_url (int) 3.4. db_mode (int) 3.5. match_contact_host_port (int) + 3.6. expires_grace (int) 4. RPC Commands @@ -122,6 +125,7 @@ Chapter 1. Admin Guide 3.3. db_url (int) 3.4. db_mode (int) 3.5. match_contact_host_port (int) + 3.6. expires_grace (int) 3.1. hash_size (int) @@ -194,6 +198,18 @@ modparam("ims_usrloc_pcscf", "db_mode", 1) modparam("ims_usrloc_pcscf", "match_contact_host_port", 0) ... +3.6. expires_grace (int) + + Specify a grace time for keeping the contacts until they are finally + deleted. The value of the parameter is defined in seconds. + + Default value is 3600. + + Example 1.6. Set expires_grace parameter +... +modparam("ims_usrloc_pcscf", "expires_grace", 1800) +... + 4. RPC Commands 4.1. ulpcscf.status

1 0

git:master:c4afb8da: ims_usrloc_pcscf: document expires_grace parameter
by Henning Westerholt 09 Nov '22

09 Nov '22

Module: kamailio Branch: master Commit: c4afb8dab4f12a3a305894e4e260292b5bdca0d7 URL: https://github.com/kamailio/kamailio/commit/c4afb8dab4f12a3a305894e4e260292… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-11-09T20:28:45Z ims_usrloc_pcscf: document expires_grace parameter --- Modified: src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c4afb8dab4f12a3a305894e4e260292… Patch: https://github.com/kamailio/kamailio/commit/c4afb8dab4f12a3a305894e4e260292… --- diff --git a/src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml b/src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml index a237a1eb61f..da4f99a7b9b 100644 --- a/src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml +++ b/src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml @@ -180,6 +180,24 @@ modparam("ims_usrloc_pcscf", "db_mode", 1) <programlisting format="linespecific">... modparam("ims_usrloc_pcscf", "match_contact_host_port", 0) ... +</programlisting> + </example> + </section> + + <section> + <title>expires_grace (int)</title> + + <para>Specify a grace time for keeping the contacts until they are finally deleted. + The value of the parameter is defined in seconds.</para> + + <para><emphasis>Default value is 3600.</emphasis></para> + + <example> + <title>Set expires_grace parameter</title> + + <programlisting format="linespecific">... +modparam("ims_usrloc_pcscf", "expires_grace", 1800) +... </programlisting> </example> </section>

1 0

git:master:e7bd1570: websocket: more details on debig messages
by Daniel-Constantin Mierla 08 Nov '22

08 Nov '22

Module: kamailio Branch: master Commit: e7bd1570e3788e9d04047b4d1d00cb8bd8b172d3 URL: https://github.com/kamailio/kamailio/commit/e7bd1570e3788e9d04047b4d1d00cb8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-07T21:11:56+01:00 websocket: more details on debig messages --- Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/e7bd1570e3788e9d04047b4d1d00cb8… Patch: https://github.com/kamailio/kamailio/commit/e7bd1570e3788e9d04047b4d1d00cb8… --- diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index a56eb492388..1a4f8ffbb3c 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -464,7 +464,7 @@ ws_connection_t *wsconn_get(int id) for(wsc = wsconn_id_hash[id_hash]; wsc; wsc = wsc->id_next) { if(wsc->id == id) { wsconn_ref(wsc); - LM_DBG("wsconn_get returns wsc [%p] refcnt [%d]\n", wsc, + LM_DBG("wsconn_get id [%d] returns wsc [%p] refcnt [%d]\n", id, wsc, atomic_get(&wsc->refcnt)); WSCONN_UNLOCK; diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 2da0863de5f..583e9040522 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -811,7 +811,8 @@ void ws_keepalive(unsigned int ticks, void *param) } else if (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_CONCHECK) { tcp_connection_t *con = tcpconn_get(wsc->id, 0, 0, 0, 0); if(con==NULL) { - LM_INFO("tcp connection has been lost\n"); + LM_INFO("tcp connection has been lost (id: %d wsc: %p)\n", + wsc->id, wsc); wsc->state = WS_S_CLOSING; } else { tcpconn_put(con);

1 0

git:master:a0d9deb9: secsipid: ensure headers are parsed
by Daniel-Constantin Mierla 04 Nov '22

04 Nov '22

Module: kamailio Branch: master Commit: a0d9deb9f852f887bed7c0809f3056b5f75379c8 URL: https://github.com/kamailio/kamailio/commit/a0d9deb9f852f887bed7c0809f3056b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-04T09:55:22+01:00 secsipid: ensure headers are parsed --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a0d9deb9f852f887bed7c0809f3056b… Patch: https://github.com/kamailio/kamailio/commit/a0d9deb9f852f887bed7c0809f3056b… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 1676c37c9a..fa1b864404 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -225,6 +225,11 @@ static int ki_secsipid_check_identity(sip_msg_t *msg, str *keypath) str ibody = STR_NULL; hdr_field_t *hf; + if (parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("error while parsing message\n"); + return -1; + } + if(secsipid_cache_dir.len > 0) { _secsipid_papi.SecSIPIDSetFileCacheOptions(secsipid_cache_dir.s, secsipid_cache_expire); @@ -283,6 +288,11 @@ static int ki_secsipid_check_identity_pubkey(sip_msg_t *msg, str *keyval) str ibody = STR_NULL; hdr_field_t *hf; + if (parse_headers(msg, HDR_EOH_F, 0) == -1) { + LM_ERR("error while parsing message\n"); + return -1; + } + if(secsipid_libopt_list_used==0) { str_list_t *sit; for(sit=secsipid_libopt_list; sit!=NULL; sit=sit->next) {

1 0

git:master:0920aa1a: secsipid: debug message if identity header is not found
by Daniel-Constantin Mierla 04 Nov '22

04 Nov '22

Module: kamailio Branch: master Commit: 0920aa1a27565bc52fd1ff9f4b9fc31dbd0d2a75 URL: https://github.com/kamailio/kamailio/commit/0920aa1a27565bc52fd1ff9f4b9fc31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-04T09:28:23+01:00 secsipid: debug message if identity header is not found --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0920aa1a27565bc52fd1ff9f4b9fc31… Patch: https://github.com/kamailio/kamailio/commit/0920aa1a27565bc52fd1ff9f4b9fc31… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 96f01487a3..1676c37c9a 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -251,6 +251,10 @@ static int ki_secsipid_check_identity(sip_msg_t *msg, str *keypath) } } + if(ibody.len==0) { + LM_DBG("identity header not found\n"); + } + LM_DBG("identity check: failed\n"); return ret; } @@ -301,6 +305,10 @@ static int ki_secsipid_check_identity_pubkey(sip_msg_t *msg, str *keyval) } } + if(ibody.len==0) { + LM_DBG("identity header not found\n"); + } + LM_DBG("identity check: failed\n"); return ret; }

1 0

git:master:e617ef84: secfilter: little fix in w_check_sqli
by Jose Luis Verdeguer 03 Nov '22

03 Nov '22

Module: kamailio Branch: master Commit: e617ef84c3bbd3bbcb780991bc45216112056f94 URL: https://github.com/kamailio/kamailio/commit/e617ef84c3bbd3bbcb780991bc45216… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Date: 2022-11-03T14:34:17+01:00 secfilter: little fix in w_check_sqli --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/e617ef84c3bbd3bbcb780991bc45216… Patch: https://github.com/kamailio/kamailio/commit/e617ef84c3bbd3bbcb780991bc45216… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index 90e7891aa6..5e967b2204 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -283,7 +283,7 @@ static int w_check_sqli(str val) memcpy(cval, val.s, val.len); if(strstr(cval, "'") || strstr(cval, "\"") || strstr(cval, "--") - || strstr(cval, "%27") || strstr(cval, "%24") + || strstr(cval, "%27") || strstr(cval, "%22") || strstr(cval, "%60")) { /* Illegal characters found */ lock_get(secf_lock);

1 0

git:master:cd3b7766: secsipid: iterate through all Identity headers
by Daniel-Constantin Mierla 03 Nov '22

03 Nov '22

Module: kamailio Branch: master Commit: cd3b776649e652b5d27b2718c22f08736b1e9e84 URL: https://github.com/kamailio/kamailio/commit/cd3b776649e652b5d27b2718c22f087… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-11-03T10:20:10+01:00 secsipid: iterate through all Identity headers --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cd3b776649e652b5d27b2718c22f087… Patch: https://github.com/kamailio/kamailio/commit/cd3b776649e652b5d27b2718c22f087… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 43c1ab4cb42..96f01487a3a 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -221,24 +221,10 @@ static void mod_destroy(void) */ static int ki_secsipid_check_identity(sip_msg_t *msg, str *keypath) { - int ret = 1; + int ret = -1; str ibody = STR_NULL; hdr_field_t *hf; - for (hf=msg->headers; hf; hf=hf->next) { - if (hf->name.len==SECSIPID_HDR_IDENTITY_LEN - && strncasecmp(hf->name.s, SECSIPID_HDR_IDENTITY, - SECSIPID_HDR_IDENTITY_LEN)==0) - break; - } - - if(hf == NULL) { - LM_DBG("no identity header\n"); - return -1; - } - - ibody = hf->body; - if(secsipid_cache_dir.len > 0) { _secsipid_papi.SecSIPIDSetFileCacheOptions(secsipid_cache_dir.s, secsipid_cache_expire); @@ -250,12 +236,19 @@ static int ki_secsipid_check_identity(sip_msg_t *msg, str *keypath) } secsipid_libopt_list_used = 1; } - ret = _secsipid_papi.SecSIPIDCheckFull(ibody.s, ibody.len, secsipid_expire, - keypath->s, secsipid_timeout); - if(ret==0) { - LM_DBG("identity check: ok\n"); - return 1; + for (hf=msg->headers; hf; hf=hf->next) { + if (hf->name.len==SECSIPID_HDR_IDENTITY_LEN + && strncasecmp(hf->name.s, SECSIPID_HDR_IDENTITY, + SECSIPID_HDR_IDENTITY_LEN)==0) { + ibody = hf->body; + ret = _secsipid_papi.SecSIPIDCheckFull(ibody.s, ibody.len, secsipid_expire, + keypath->s, secsipid_timeout); + if(ret==0) { + LM_DBG("identity check: ok\n"); + return 1; + } + } } LM_DBG("identity check: failed\n"); @@ -282,22 +275,10 @@ static int w_secsipid_check_identity(sip_msg_t *msg, char *pkeypath, char *str2) */ static int ki_secsipid_check_identity_pubkey(sip_msg_t *msg, str *keyval) { - int ret = 1; + int ret = -1; str ibody = STR_NULL; hdr_field_t *hf; - for (hf=msg->headers; hf; hf=hf->next) { - if (hf->name.len==SECSIPID_HDR_IDENTITY_LEN - && strncasecmp(hf->name.s, SECSIPID_HDR_IDENTITY, - SECSIPID_HDR_IDENTITY_LEN)==0) - break; - } - - if(hf == NULL) { - LM_DBG("no identity header\n"); - return -1; - } - if(secsipid_libopt_list_used==0) { str_list_t *sit; for(sit=secsipid_libopt_list; sit!=NULL; sit=sit->next) { @@ -306,14 +287,18 @@ static int ki_secsipid_check_identity_pubkey(sip_msg_t *msg, str *keyval) secsipid_libopt_list_used = 1; } - ibody = hf->body; - - ret = _secsipid_papi.SecSIPIDCheckFullPubKey(ibody.s, ibody.len, - secsipid_expire, keyval->s, keyval->len); - - if(ret==0) { - LM_DBG("identity check: ok\n"); - return 1; + for (hf=msg->headers; hf; hf=hf->next) { + if (hf->name.len==SECSIPID_HDR_IDENTITY_LEN + && strncasecmp(hf->name.s, SECSIPID_HDR_IDENTITY, + SECSIPID_HDR_IDENTITY_LEN)==0) { + ibody = hf->body; + ret = _secsipid_papi.SecSIPIDCheckFullPubKey(ibody.s, ibody.len, + secsipid_expire, keyval->s, keyval->len); + if(ret==0) { + LM_DBG("identity check: ok\n"); + return 1; + } + } } LM_DBG("identity check: failed\n");

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2022