sr-dev April 2021

sr-dev@lists.kamailio.org

14 participants
304 discussions

git:master:6d46ec71: core: dns - safety checks for port and proto
by Daniel-Constantin Mierla 12 Apr '21

12 Apr '21

Module: kamailio Branch: master Commit: 6d46ec71f941b9db9c06c6c2edac14fc9f3d1074 URL: https://github.com/kamailio/kamailio/commit/6d46ec71f941b9db9c06c6c2edac14f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-11T09:09:24+02:00 core: dns - safety checks for port and proto --- Modified: src/core/dns_cache.c Modified: src/core/resolve.c --- Diff: https://github.com/kamailio/kamailio/commit/6d46ec71f941b9db9c06c6c2edac14f… Patch: https://github.com/kamailio/kamailio/commit/6d46ec71f941b9db9c06c6c2edac14f… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 7dbde8f378..58247265eb 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -3011,25 +3011,30 @@ inline static int dns_srv_resolve_ip(struct dns_srv_handle* h, { int ret; str host; + unsigned short vport; host.len=0; host.s=0; + if(port) vport =*port; + else vport = 0; + do{ if (h->a==0){ #ifdef DNS_SRV_LB if ((ret=dns_srv_resolve_nxt(&h->srv, (flags & DNS_SRV_RR_LB)?&h->srv_tried_rrs:0, &h->srv_no, - name, &host, port))<0) + name, &host, &vport))<0) goto error; #else if ((ret=dns_srv_resolve_nxt(&h->srv, &h->srv_no, - name, &host, port))<0) + name, &host, &vport))<0) goto error; #endif - h->port=*port; /* store new port */ + h->port=vport; /* store new port */ + if(port) *port=vport; }else{ - *port=h->port; /* return the stored port */ + if(port) *port=h->port; /* return the stored port */ } if ((ret=dns_ip_resolve(&h->a, &h->ip_no, &host, ip, flags))<0){ /* couldn't find any good ip for this record, try the next one */ @@ -3257,6 +3262,7 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, char n_proto, origproto; str srv_name; int ret; + int res; int try_lookup_naptr = 0; ret=-E_DNS_NO_NAPTR; @@ -3302,7 +3308,7 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, if (!try_lookup_naptr) { if(proto) *proto=origproto; - int res = dns_srv_sip_resolve(h, name, ip, port, proto, flags); + res = dns_srv_sip_resolve(h, name, ip, port, proto, flags); if (res) { mark_skip_current_naptr(e->rr_lst, h->srv); if (have_more_active_naptr(e->rr_lst)) { @@ -3324,8 +3330,8 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, LM_DBG("(%.*s, %d, %d), srv0, ret=%d\n", name->len, name->s, h->srv_no, h->ip_no, ret); dns_hash_put(e); - *proto=n_proto; - h->proto=*proto; + if(proto) *proto=n_proto; + h->proto=n_proto; return ret; } } @@ -4130,7 +4136,9 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, new_rr->rdata = (void*)((char*)new_rr+rr_size); new_rr->expire = now + S_TO_TICKS(ttl); /* link the rr to the previous one */ - last_rr->next = new_rr; + if(last_rr) { + last_rr->next = new_rr; + } /* fix the total_size and expires values */ new->total_size=rounded_size+rr_size+rdata_size; @@ -4396,7 +4404,7 @@ int dns_cache_add_record(unsigned short type, if (*rr_iter != new_rr->next) { /* unlink rr from the list */ - *rr_p = (*rr_p)->next; + *rr_p = (*rr_p)?(*rr_p)->next:NULL; /* link it before *rr_iter */ new_rr->next = *rr_iter; *rr_iter = new_rr; diff --git a/src/core/resolve.c b/src/core/resolve.c index 928f6af3c5..deb20a740c 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -1261,7 +1261,7 @@ struct hostent* srv_sip_resolvehost(str* name, int zt, unsigned short* port, if (is_srv){ /* skip directly to srv resolving */ srv_proto=(proto)?*proto:0; - *port=(srv_proto==PROTO_TLS)?SIPS_PORT:SIP_PORT; + if(port) *port=(srv_proto==PROTO_TLS)?SIPS_PORT:SIP_PORT; if (zt){ srv_target=name->s; /* name.s must be 0 terminated in this case */

1 0

git:master:c9dc0336: pike: safety check for null node
by Daniel-Constantin Mierla 10 Apr '21

10 Apr '21

Module: kamailio Branch: master Commit: c9dc0336a33a0ecfe776975be7fbfab8f3c91b48 URL: https://github.com/kamailio/kamailio/commit/c9dc0336a33a0ecfe776975be7fbfab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-10T11:21:09+02:00 pike: safety check for null node --- Modified: src/modules/pike/ip_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/c9dc0336a33a0ecfe776975be7fbfab… Patch: https://github.com/kamailio/kamailio/commit/c9dc0336a33a0ecfe776975be7fbfab… --- diff --git a/src/modules/pike/ip_tree.c b/src/modules/pike/ip_tree.c index e8b93b84f2..c0324c0476 100644 --- a/src/modules/pike/ip_tree.c +++ b/src/modules/pike/ip_tree.c @@ -285,7 +285,7 @@ pike_ip_node_t* mark_node(unsigned char *ip,int ip_len, int byte_pos; kid = pike_root->entries[ ip[0] ].node; - node = 0; + node = NULL; byte_pos = 0; LM_DBG("search on branch %d (top=%p)\n", ip[0],kid); @@ -301,6 +301,10 @@ pike_ip_node_t* mark_node(unsigned char *ip,int ip_len, } } + if(node==NULL) { + return NULL; + } + LM_DBG("only first %d were matched!\n",byte_pos); *flag = 0; *father = 0;

1 0

git:master:912e2ef4: pua_dialoginfo: check request to cover cases of callbacks without it
by Daniel-Constantin Mierla 09 Apr '21

09 Apr '21

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) {

1 0

git:master:80beb29a: dialog: safety check for prev field
by Daniel-Constantin Mierla 09 Apr '21

09 Apr '21

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; }

1 0

[kamailio/kamailio] pua_dialoginfo publishing confirmed for an early call (#2700)
by Nathan 09 Apr '21

09 Apr '21

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

2 3

git:master:a5f88102: siptrace: fallback to udp if send sock is not set
by Daniel-Constantin Mierla 09 Apr '21

09 Apr '21

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) {

1 0

git:master:303be6a9: core: cfg ctx - checks for valid variable offset
by Daniel-Constantin Mierla 09 Apr '21

09 Apr '21

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

1 0

git:master:bb917a29: modules: readme files regenerated - lost ... [skip ci]
by Kamailio Dev 09 Apr '21

09 Apr '21

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…

1 0

[kamailio/kamailio] Wkampich/dev (#2675)
by Wolfgang Kampichler 09 Apr '21

09 Apr '21

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

5 52

git:master:9a8ff2b8: Merge pull request #2675 from kamailio/wkampich/dev
by GitHub 09 Apr '21

09 Apr '21

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…

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2021