sr-dev April 2021

sr-dev@lists.kamailio.org

14 participants
302 discussions

git:master:912e2ef4: pua_dialoginfo: check request to cover cases of callbacks without it

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 912e2ef41533e961bc55ca80619305af8e474469 URL: https://github.com/kamailio/kamailio/commit/912e2ef41533e961bc55ca80619305a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-09T18:51:42+02:00 pua_dialoginfo: check request to cover cases of callbacks without it - updates the previous commit --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/912e2ef41533e961bc55ca80619305a… Patch: https://github.com/kamailio/kamailio/commit/912e2ef41533e961bc55ca80619305a… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index a146b52d19..7e7afe2eae 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -272,7 +272,7 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para } /* skip requests that do not control call state */ - if((request->REQ_METHOD)&(METHOD_PRACK|METHOD_UPDATE)) { + if(request && (request->REQ_METHOD)&(METHOD_PRACK|METHOD_UPDATE)) { return; } if(include_req_uri) {

3 years

git:master:80beb29a: dialog: safety check for prev field

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 80beb29ac0204697a8964231b441ac37866a4a1c URL: https://github.com/kamailio/kamailio/commit/80beb29ac0204697a8964231b441ac3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-09T17:18:54+02:00 dialog: safety check for prev field --- Modified: src/modules/dialog/dlg_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/80beb29ac0204697a8964231b441ac3… Patch: https://github.com/kamailio/kamailio/commit/80beb29ac0204697a8964231b441ac3… --- diff --git a/src/modules/dialog/dlg_timer.c b/src/modules/dialog/dlg_timer.c index 0ac13df25c..6b84a4d68c 100644 --- a/src/modules/dialog/dlg_timer.c +++ b/src/modules/dialog/dlg_timer.c @@ -222,7 +222,7 @@ static inline struct dlg_tl* get_expired_dlgs(unsigned int time) lock_get( d_timer->lock); if (d_timer->first.next==&(d_timer->first) - || d_timer->first.next->timeout > time ) { + || d_timer->first.next->timeout > time ) { lock_release( d_timer->lock); return 0; } @@ -247,7 +247,9 @@ static inline struct dlg_tl* get_expired_dlgs(unsigned int time) ret = 0; } else { ret = d_timer->first.next; - tl->prev->next = 0; + if(tl->prev) { + tl->prev->next = 0; + } d_timer->first.next = tl; tl->prev = &d_timer->first; }

3 years

[kamailio/kamailio] pua_dialoginfo publishing confirmed for an early call (#2700)

by Nathan

### Description When updating from Kamailio 5.2.2 to 5.4.4, we're encountering an issue: the pua_dialoginfo module publishes a `confirmed` state for the dialog, even though it's still ringing. It turns out this commit introduces the problem since 5.3.0: 4efe19f So since 5.3.0, the dialog module (i think correctly?) sends out state updates for PRACK dialog updates as `DLGCB_REQ_WITHIN` events. But the `pua_dialoginfo` module seems to see that as a signal to mark the dialog confirmed (see [here](https://github.com/kamailio/kamailio/blob/master/src/modules/pua_dial…). One easy fix would be to simply remove `DLGCB__REQ_WITHIN` from the case list in pua_dialoginfo? OpenSER [seems to](https://github.com/OpenSIPS/opensips/blob/master/modules/pua_dialoginfo… ditch the `DLGCB_REQ_WITHIN` messages altogether, for specific messages... ### Troubleshooting #### Reproduction - Use the pua_dialoginfo module - Make sure your device uses PRACK - See that the dialog is confirmed even before you pick up; watch for log lines: `__dialog_sendpublish(): dialog confirmed` #### Debugging Data N/A #### Log Messages With 5.4.4: ``` 2021-04-02T16:49:44.453339+02:00 debug proxy[17964]: DEBUG: pua_dialoginfo [pua_dialoginfo.c:295]: __dialog_sendpublish(): dialog confirmed, from=sip:220@188.166.42.37 ``` #### SIP Traffic Just a regular invite with prack. ### Possible Solutions See above. ### Additional Information Reproduced with Kamailio 5.4.4, but probably all versions from 5.3.0 are affected. -- 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/2700

3 years

git:master:a5f88102: siptrace: fallback to udp if send sock is not set

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a5f8810223021939b12eb0d04fc625f8d36980f7 URL: https://github.com/kamailio/kamailio/commit/a5f8810223021939b12eb0d04fc625f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-09T16:37:30+02:00 siptrace: fallback to udp if send sock is not set --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/a5f8810223021939b12eb0d04fc625f… Patch: https://github.com/kamailio/kamailio/commit/a5f8810223021939b12eb0d04fc625f… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 31cabefe3b..4648340d73 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2211,6 +2211,7 @@ int siptrace_net_data_sent(sr_event_param_t *evp) dest_info_t new_dst; siptrace_data_t sto; sip_msg_t tmsg; + int proto; if(evp->data == 0) return -1; @@ -2238,6 +2239,7 @@ int siptrace_net_data_sent(sr_event_param_t *evp) LM_WARN("no sending socket found\n"); strcpy(sto.fromip_buff, SIPTRACE_ANYADDR); sto.fromip.len = SIPTRACE_ANYADDR_LEN; + proto = PROTO_UDP; } else { if(new_dst.send_sock->sock_str.len>=SIPTRACE_ADDR_MAX-1) { LM_ERR("socket string is too large: %d\n", @@ -2247,11 +2249,12 @@ int siptrace_net_data_sent(sr_event_param_t *evp) strncpy(sto.fromip_buff, new_dst.send_sock->sock_str.s, new_dst.send_sock->sock_str.len); sto.fromip.len = new_dst.send_sock->sock_str.len; + proto = new_dst.send_sock->proto; } sto.fromip.s = sto.fromip_buff; sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", - siptrace_proto_name(new_dst.send_sock->proto), + siptrace_proto_name(proto), suip2a(&new_dst.to, sizeof(new_dst.to)), (int)su_getport(&new_dst.to)); if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) {

3 years

git:master:303be6a9: core: cfg ctx - checks for valid variable offset

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 303be6a94be40dbe7c26c96e768627e8e9d0f860 URL: https://github.com/kamailio/kamailio/commit/303be6a94be40dbe7c26c96e768627e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-09T16:24:01+02:00 core: cfg ctx - checks for valid variable offset --- Modified: src/core/cfg/cfg_ctx.c --- Diff: https://github.com/kamailio/kamailio/commit/303be6a94be40dbe7c26c96e768627e… Patch: https://github.com/kamailio/kamailio/commit/303be6a94be40dbe7c26c96e768627e… --- diff --git a/src/core/cfg/cfg_ctx.c b/src/core/cfg/cfg_ctx.c index 733e0b4619..a1e761f3a2 100644 --- a/src/core/cfg/cfg_ctx.c +++ b/src/core/cfg/cfg_ctx.c @@ -284,7 +284,11 @@ static int cfg_update_defaults(cfg_group_meta_t *meta, meta->array = array; clone_done = 1; } - memcpy(ginst->vars + var->offset, new_val, cfg_var_size(var)); + if(ginst->vars + var->offset) { + memcpy(ginst->vars + var->offset, new_val, cfg_var_size(var)); + } else { + LM_ERR("invalid variable offset\n"); + } } } return 0; @@ -1122,6 +1126,10 @@ int cfg_commit(cfg_ctx_t *ctx) } p = group_inst->vars + changed->var->offset; } + if(p==NULL) { + LM_ERR("failed to resolve valid variable offset\n"); + goto error; + } if (((changed->group_id_set && !changed->del_value && CFG_VAR_TEST_AND_SET(group_inst, changed->var))

3 years

git:master:bb917a29: modules: readme files regenerated - lost ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: bb917a29f3e1566417215b33a60124abdcd34a7b URL: https://github.com/kamailio/kamailio/commit/bb917a29f3e1566417215b33a60124a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-09T16:16:14+02:00 modules: readme files regenerated - lost ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/bb917a29f3e1566417215b33a60124a… Patch: https://github.com/kamailio/kamailio/commit/bb917a29f3e1566417215b33a60124a…

3 years

[kamailio/kamailio] Wkampich/dev (#2675)

by Wolfgang Kampichler

#### 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) - [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 - [x] Related to issue #2574 and #2641 #### Description  lost: new features, attributes and a new function to dereference location - features: LoST redirect, dynamic HELD url resolving (#2574), LoST NAPTR, POST request to dereference loation - attributes: reponse_time (-1:emergencyDispatch, 0:emergencyRouting, >0[ms]); post_request (POST method to dereference location #2641); recursion (1:yes/0:no); location_profile (PIDF/LO profile selection: 0:first/1:last/2:geo/3:civic); verbose 0/1 (detailed LoST response as log INFO); geoheader_type (filter schema: 0:any/1:cid/2:http/3:https); geoheader_order (0:first/1:last) - function: lost_held_dereference (specific function to dereference location using POST method); attributes are url (r;string), resp.-time (r;string), resp.-type (r;string), pidf (r/w;string) and error (r/w;string) - general: The extension of the module allows dynamic querying of LIS/HELD and LOST services via NAPTR lookup. In the case of LOST, a redirect response is evaluated. In case a lost_held_request (used to connect to a LIS via POST or GET) is passed with an empty string ("") for the connection parameter, then P-A-I or From header value hostnames are used for NAPTR lookup to get a corresponding service. http_client: http_client_request (api) content-type header support - new api call including a content-type argument implemented as new function - required to resolve geolocation url using POST (#2641) - Note: not sure if this is the most elegant solution, but it helps to avoid backward compatibility issues You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2675 -- Commit Summary -- * http_client: http_client_request (api) content-type header support * lost: new features, attributes and a new function to dereference location -- File Changes -- M src/modules/http_client/curl_api.c (1) M src/modules/http_client/curl_api.h (3) M src/modules/http_client/functions.c (68) M src/modules/http_client/functions.h (14) M src/modules/lost/functions.c (902) M src/modules/lost/functions.h (3) M src/modules/lost/lost.c (88) A src/modules/lost/naptr.c (255) A src/modules/lost/naptr.h (38) M src/modules/lost/pidf.c (5) A src/modules/lost/response.c (991) A src/modules/lost/response.h (131) M src/modules/lost/utilities.c (447) M src/modules/lost/utilities.h (27) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2675.patch https://github.com/kamailio/kamailio/pull/2675.diff -- 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/pull/2675

3 years

git:master:9a8ff2b8: Merge pull request #2675 from kamailio/wkampich/dev

by GitHub

Module: kamailio Branch: master Commit: 9a8ff2b8408c7b462d39f6ea25d81865b70ade42 URL: https://github.com/kamailio/kamailio/commit/9a8ff2b8408c7b462d39f6ea25d8186… Author: Wolfgang Kampichler <49035738+wkampich(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2021-04-09T16:10:45+02:00 Merge pull request #2675 from kamailio/wkampich/dev extensions to lost and http_client modules and core/parse_body.c/part_multipart_headers_cmp() log output changed from ERR to DBG in case a header does not exist --- Added: src/modules/lost/naptr.c Added: src/modules/lost/naptr.h Added: src/modules/lost/response.c Added: src/modules/lost/response.h Modified: src/core/parser/parse_body.c Modified: src/modules/http_client/curl_api.c Modified: src/modules/http_client/curl_api.h Modified: src/modules/http_client/functions.c Modified: src/modules/http_client/functions.h Modified: src/modules/lost/doc/lost.xml Modified: src/modules/lost/doc/lost_admin.xml Modified: src/modules/lost/functions.c Modified: src/modules/lost/functions.h Modified: src/modules/lost/lost.c Modified: src/modules/lost/pidf.c Modified: src/modules/lost/utilities.c Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/9a8ff2b8408c7b462d39f6ea25d8186… Patch: https://github.com/kamailio/kamailio/commit/9a8ff2b8408c7b462d39f6ea25d8186…

3 years

git:master:5f1959cd: lost: typedef naming changed and copyright added

by Wolfgang Kampichler

Module: kamailio Branch: master Commit: 5f1959cd42ff925009dd9e0fdd87f9d0487ec4fe URL: https://github.com/kamailio/kamailio/commit/5f1959cd42ff925009dd9e0fdd87f9d… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-08T21:31:24+02:00 lost: typedef naming changed and copyright added --- Modified: src/modules/lost/functions.c Modified: src/modules/lost/naptr.c Modified: src/modules/lost/naptr.h Modified: src/modules/lost/response.c Modified: src/modules/lost/response.h Modified: src/modules/lost/utilities.h --- Diff: https://github.com/kamailio/kamailio/commit/5f1959cd42ff925009dd9e0fdd87f9d… Patch: https://github.com/kamailio/kamailio/commit/5f1959cd42ff925009dd9e0fdd87f9d…

3 years

git:master:106b8a65: core: parse_body.c/part_multipart_headers_cmp() changed log output from ERR to DBG in case a header does not exist

by Wolfgang Kampichler

Module: kamailio Branch: master Commit: 106b8a659bd4a53e8a6872e9db8a9af0f12ff70a URL: https://github.com/kamailio/kamailio/commit/106b8a659bd4a53e8a6872e9db8a9af… Author: Wolfgang Kampichler <dev(a)kampichler.info> Committer: Wolfgang Kampichler <dev(a)kampichler.info> Date: 2021-04-07T13:10:30+02:00 core: parse_body.c/part_multipart_headers_cmp() changed log output from ERR to DBG in case a header does not exist --- Modified: src/core/parser/parse_body.c --- Diff: https://github.com/kamailio/kamailio/commit/106b8a659bd4a53e8a6872e9db8a9af… Patch: https://github.com/kamailio/kamailio/commit/106b8a659bd4a53e8a6872e9db8a9af… --- diff --git a/src/core/parser/parse_body.c b/src/core/parser/parse_body.c index 9794e43fb1..a9a3e64b82 100644 --- a/src/core/parser/parse_body.c +++ b/src/core/parser/parse_body.c @@ -475,8 +475,9 @@ int part_multipart_headers_cmp (char *buffer, ; } } else { + /* Nothing matched */ error = -9; - error_msg = "We reached the end of the buffer"; + error_msg = "Unsuccessfully reached the end of the buffer"; } found = found_content_type * found_content_id * found_content_length; if ((!found) && (!error)) { @@ -504,7 +505,7 @@ int part_multipart_headers_cmp (char *buffer, } if (error < 0) { - if(error == -2) { + if ((error == -2) || (error == -9)) { LM_DBG("result code: \"%i\" text: \"%s\".\n", error, error_msg); } else { LM_ERR("error code: \"%i\" error text: \"%s\".\n", error, error_msg);

3 years

← Newer
1
...
20
21
22
23
24
25
26
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2021