sr-dev October 2021

sr-dev@lists.kamailio.org

19 participants
243 discussions

[kamailio/kamailio] SIP Preconditions Settings? (#2866)

by JoelBorrego

Hi GitHub Team, We are trying to find how to disable the SIP Precondition flag in the Kamailio, because until now the only way to do any changes is via UE (Smartphones with debug SW). According with the RFC3312 (https://datatracker.ietf.org/doc/html/rfc3312) The SDP parameters are the following We define the following media level SDP attributes: current-status = "a=curr:" precondition-type SP status-type SP direction-tag desired-status = "a=des:" precondition-type SP strength-tag SP status-type SP direction-tag confirm-status = "a=conf:" precondition-type SP status-type SP direction-tag **precondition-type = "qos" | token strength-tag = ("mandatory" | "optional" | "none" = | "failure" | "unknown")** status-type = ("e2e" | "local" | "remote") direction-tag = ("none" | "send" | "recv" | "sendrecv") Which one should be the equivalent in the Kamailio?, is the a specific module? Br, Joel -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2866

2 years, 6 months

git:master:1ea71703: lwsc: wait to read more data if not last ws fragment

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1ea717032d90fcc98a5de07e746ec367eaeed3be URL: https://github.com/kamailio/kamailio/commit/1ea717032d90fcc98a5de07e746ec36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-01T12:41:02+02:00 lwsc: wait to read more data if not last ws fragment - GH #2862 --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1ea717032d90fcc98a5de07e746ec36… Patch: https://github.com/kamailio/kamailio/commit/1ea717032d90fcc98a5de07e746ec36… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index a6985acb6d..7eb1f4285e 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -144,6 +144,7 @@ typedef struct lwsc_endpoint { /* first LWS_PRE bytes must preserved for headers */ str wbuf; str rbuf; + int rdone; int tlson; struct lws_protocols protocols[2]; struct lws_context_creation_info crtinfo; @@ -226,6 +227,7 @@ static int ksr_lwsc_callback(struct lws *wsi, enum lws_callback_reasons reason, lwsc_endpoint_t *ep = NULL; str rbuf = STR_NULL; str wbuf = STR_NULL; + int blen = 0; if(_lwsc_verbosity>1) { LM_DBG("callback called with reason %d\n", reason); @@ -349,28 +351,35 @@ static int ksr_lwsc_callback(struct lws *wsi, enum lws_callback_reasons reason, LM_DBG("LWS_CALLBACK_RECEIVE - wsi: %p len: %lu\n", wsi, (unsigned long)len); #endif + ep = lwsc_get_endpoint_by_wsi(wsi); + if(ep==NULL) { + LM_ERR("no endpoint for wsi %p\n", wsi); + goto done; + } + pthread_mutex_lock(&ep->wslock); if(len>0) { - ep = lwsc_get_endpoint_by_wsi(wsi); - if(ep==NULL) { - LM_ERR("no endpoint for wsi %p\n", wsi); - goto done; - } - rbuf.s = (char*)pkg_malloc(len + 1); + blen = ep->rbuf.len + len; + rbuf.s = (char*)pkg_malloc(blen + 1); if(rbuf.s==NULL) { PKG_MEM_ERROR; } else { - memcpy(rbuf.s, in, len); - rbuf.len = len; - rbuf.s[rbuf.len] = '\0'; - pthread_mutex_lock(&ep->wslock); if(ep->rbuf.s!=NULL) { - LM_ERR("losing read buffer of %d bytes\n", ep->rbuf.len); + LM_DBG("append to read buffer of %d bytes more %d bytes\n", + ep->rbuf.len, (int)len); + memcpy(rbuf.s, ep->rbuf.s, ep->rbuf.len); pkg_free(ep->rbuf.s); + ep->rbuf.s = NULL; } + memcpy(rbuf.s + ep->rbuf.len, in, len); + rbuf.len = blen; + rbuf.s[rbuf.len] = '\0'; ep->rbuf = rbuf; - pthread_mutex_unlock(&ep->wslock); } } + if (lws_is_final_fragment(wsi)) { + ep->rdone = 1; + } + pthread_mutex_unlock(&ep->wslock); break; case LWS_CALLBACK_WS_PEER_INITIATED_CLOSE: @@ -646,6 +655,7 @@ static int lwsc_api_request(str* wsurl, str *wsproto, str* sdata, ep->rbuf.s = NULL; ep->rbuf.len = 0; } + ep->rdone = 0; if(ep->wbuf.s!=NULL) { LM_ERR("losing write buffer content of %d bytes\n", ep->wbuf.len); pkg_free(ep->wbuf.s); @@ -659,10 +669,13 @@ static int lwsc_api_request(str* wsurl, str *wsproto, str* sdata, do { pthread_mutex_lock(&ep->wslock); - if(ep->rbuf.s!=NULL) { - *rdata = ep->rbuf; - ep->rbuf.s = NULL; - ep->rbuf.len = 0; + if(ep->rdone==1) { + if(ep->rbuf.s!=NULL) { + *rdata = ep->rbuf; + ep->rbuf.s = NULL; + ep->rbuf.len = 0; + } + ep->rdone = 0; } pthread_mutex_unlock(&ep->wslock); if(rdata->s==NULL) {

2 years, 6 months

git:master:e4e07a9c: posops: set index relative to the buffer for search functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e4e07a9cca8d91cb4acce8cbf7c8def9c3df06d9 URL: https://github.com/kamailio/kamailio/commit/e4e07a9cca8d91cb4acce8cbf7c8def… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-10-01T08:43:22+02:00 posops: set index relative to the buffer for search functions --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e4e07a9cca8d91cb4acce8cbf7c8def… Patch: https://github.com/kamailio/kamailio/commit/e4e07a9cca8d91cb4acce8cbf7c8def… --- diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 9c6f7d702f..5710b83da2 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -684,7 +684,7 @@ static int ki_posops_pos_search_helper(sip_msg_t *msg, int idx, regex_t *re) return -1; } - _posops_data.idx = (int)(msg->buf + idx + pmatch.rm_so); + _posops_data.idx = idx + pmatch.rm_so; _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; _posops_data.len = pmatch.rm_eo-pmatch.rm_so; @@ -757,7 +757,7 @@ static int ki_posops_pos_rsearch_helper(sip_msg_t *msg, int idx, regex_t *re) return -1; } - _posops_data.idx = (int)(msg->buf + i + pmatch.rm_so); + _posops_data.idx = i + pmatch.rm_so; _posops_data.ret = (_posops_data.idx==0)?posops_idx0:_posops_data.idx; _posops_data.len = pmatch.rm_eo-pmatch.rm_so;

2 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2021