sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

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

opinion on kamailio docker file extensions
by Henning Westerholt 31 Oct '22

31 Oct '22

Hello, are there any objections to extend the https://github.com/kamailio/kamailio-docker packages to support some environment variables to allow some customization? * add a run.sh script * evaluate SHM_MEMORY and PKG_MEMORY variables * set "-M" and "-m" parameters appropriately for startup The shared memory pool can be set in the kamailio.cfg, but AFAIK the private memory pool not. Additionally using environment variables would be the common way that is used also in other well-known packages. If no variable is set, the default would be used. Thanks, Henning

1 0

git:master:065a83fb: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 29 Oct '22

29 Oct '22

Module: kamailio Branch: master Commit: 065a83fbb1a8b9b1912aadecff039a485c2d46dd URL: https://github.com/kamailio/kamailio/commit/065a83fbb1a8b9b1912aadecff039a4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-10-29T09:31:37+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/065a83fbb1a8b9b1912aadecff039a4… Patch: https://github.com/kamailio/kamailio/commit/065a83fbb1a8b9b1912aadecff039a4… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 9d4287804f..abf41a6d85 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1206,7 +1206,9 @@ With congestion control the formula becomes : set is chosen. * limit - the maximum number of items to be stored in XAVP list for further fail-overs (the first selected destination and default - destination are the first to be put in the list) + destination are the first to be put in the list). This can improve + the performance especially if you are using a large list of + gateways. This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.

1 0

git:master:0dc7d711: dispatcher: small docs extensions regarding to ds_select_dst
by Henning Westerholt 29 Oct '22

29 Oct '22

Module: kamailio Branch: master Commit: 0dc7d711c4c2d16d532862344f9ccd629de38e20 URL: https://github.com/kamailio/kamailio/commit/0dc7d711c4c2d16d532862344f9ccd6… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-10-29T07:17:10Z dispatcher: small docs extensions regarding to ds_select_dst --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0dc7d711c4c2d16d532862344f9ccd6… Patch: https://github.com/kamailio/kamailio/commit/0dc7d711c4c2d16d532862344f9ccd6… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 1c9de29ba78..022c915e139 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1399,7 +1399,8 @@ With congestion control the formula becomes : <emphasis>limit</emphasis> - the maximum number of items to be stored in XAVP list for further fail-overs (the first selected destination and default destination are the first to be put in - the list) + the list). This can improve the performance especially if you + are using a large list of gateways. </para> </listitem> </itemizedlist>

1 0

git:master:9b4d4d05: dispatcher: small spelling fix in comment
by Henning Westerholt 29 Oct '22

29 Oct '22

Module: kamailio Branch: master Commit: 9b4d4d059e6222a64a9b9cadb0b867bea27ed0d8 URL: https://github.com/kamailio/kamailio/commit/9b4d4d059e6222a64a9b9cadb0b867b… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-10-29T07:15:10Z dispatcher: small spelling fix in comment --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/9b4d4d059e6222a64a9b9cadb0b867b… Patch: https://github.com/kamailio/kamailio/commit/9b4d4d059e6222a64a9b9cadb0b867b… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 8f06f6f5cbb..66ebd19996e 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2065,7 +2065,7 @@ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode) * Set destination address from group 'set' selected with alogorithm 'alg' * - the rest of addresses in group are added as next destination in xavps, * up to the 'limit' - * - mode specify to set address in R-URI or outboud proxy + * - mode specify to set address in R-URI or outbound proxy * */ int ds_select_dst_limit(sip_msg_t *msg, int set, int alg, uint32_t limit,

1 0

git:master:e7e23666: core: small spelling fix in comment
by Henning Westerholt 29 Oct '22

29 Oct '22

Module: kamailio Branch: master Commit: e7e2366634f7b56136b11d4b196150467a18b651 URL: https://github.com/kamailio/kamailio/commit/e7e2366634f7b56136b11d4b1961504… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-10-29T07:14:57Z core: small spelling fix in comment --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/e7e2366634f7b56136b11d4b1961504… Patch: https://github.com/kamailio/kamailio/commit/e7e2366634f7b56136b11d4b1961504… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 595c1be8957..d582ddf7200 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -110,7 +110,7 @@ typedef enum request_method { #define FL_MSG_NOREPLY (1<<23) /*!< do not send sip reply for request */ #define FL_SIPTRACE (1<<24) /*!< message to be traced in stateless replies */ #define FL_ROUTE_ADDR (1<<25) /*!< request has Route address for next hop */ -#define FL_USE_OTCPID (1<<26) /*!< request to be routed using outboud tcp con id */ +#define FL_USE_OTCPID (1<<26) /*!< request to be routed using outbound tcp con id */ /* WARNING: Value (1 << 28) is reserved for use in kamailio call_control * module (flag FL_USE_CALL_CONTROL )! */

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