sr-dev

sr-dev@lists.kamailio.org

14 participants
44971 discussions

git:master:e65b03cd: xmlrpc: removed unnecessary code
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: e65b03cdd946d735a3ef33ae3582bcfad464d2c7 URL: https://github.com/kamailio/kamailio/commit/e65b03cdd946d735a3ef33ae3582bcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T10:16:00+01:00 xmlrpc: removed unnecessary code --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/e65b03cdd946d735a3ef33ae3582bcf… Patch: https://github.com/kamailio/kamailio/commit/e65b03cdd946d735a3ef33ae3582bcf… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index eb44f4450dd..24a0c375a54 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -2091,9 +2091,7 @@ static int rpc_struct_printf( goto err; } } - if(buf) - mxr_free(buf); - return 0; + err: if(buf) mxr_free(buf);

1 0

git:master:edbb5b11: ctl: refactored error handling and removed unnecessary code
by Daniel-Constantin Mierla 14 Feb '25

14 Feb '25

Module: kamailio Branch: master Commit: edbb5b11e9453be3519e6e9a945937307c95709e URL: https://github.com/kamailio/kamailio/commit/edbb5b11e9453be3519e6e9a9459373… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-14T08:37:23+01:00 ctl: refactored error handling and removed unnecessary code --- Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/edbb5b11e9453be3519e6e9a9459373… Patch: https://github.com/kamailio/kamailio/commit/edbb5b11e9453be3519e6e9a9459373… --- diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index 70ce92deb76..2d671798cce 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -1290,7 +1290,7 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) &nm, 1); /* Escape all characters, including : and , */ if(!m) { rpc_fault(ctx, 500, "Internal Server Error"); - goto err; + goto error; } s.s = buf; @@ -1300,7 +1300,7 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) rpc_fault(ctx, 500, "Internal Server Error"); free_chunk(m); ERR("Error while creating text_chunk structure"); - goto err; + goto error; } l->flags |= CHUNK_MEMBER_VALUE; @@ -1326,13 +1326,12 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) if((buf0 = ctl_realloc(buf, buf_size)) == 0) { rpc_fault(ctx, 500, "Internal Server Error (No memory left)"); ERR("No memory left\n"); - goto err; + goto error; } buf = buf0; } - ctl_free(buf); - return 0; -err: + +error: if(buf) ctl_free(buf); return -1;

1 0

git:master:a6d692be: pv: free buf uri in case of error setting xto attr
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: a6d692be4283dc349c38b455ee71c4e21dcef6aa URL: https://github.com/kamailio/kamailio/commit/a6d692be4283dc349c38b455ee71c4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T11:58:21+01:00 pv: free buf uri in case of error setting xto attr --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/a6d692be4283dc349c38b455ee71c4e… Patch: https://github.com/kamailio/kamailio/commit/a6d692be4283dc349c38b455ee71c4e… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 38d46c01dba..56d96b20d75 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3817,6 +3817,9 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return 0; error: + if(buf_uri.s != 0) { + pkg_free(buf_uri.s); + } if(buf.s != NULL) { pkg_free(buf.s); }

1 0

git:master:b875e736: pv: free next field on error when parsing xav* names
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: b875e7368dcc8e221007caafa3599c3e354404f7 URL: https://github.com/kamailio/kamailio/commit/b875e7368dcc8e221007caafa3599c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T11:45:06+01:00 pv: free next field on error when parsing xav* names --- Modified: src/modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/b875e7368dcc8e221007caafa3599c3… Patch: https://github.com/kamailio/kamailio/commit/b875e7368dcc8e221007caafa3599c3… --- diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index 89d9ba131d0..8858c376367 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -516,6 +516,10 @@ int pv_parse_xavp_name(pv_spec_p sp, str *in) error: if(xname != NULL) { + if(xname->next != NULL) { + pkg_free(xname->next); + xname->next = NULL; + } pv_xavp_name_destroy(xname); pkg_free(xname); } @@ -964,6 +968,10 @@ int pv_parse_xavu_name(pv_spec_t *sp, str *in) error: if(xname != NULL) { + if(xname->next != NULL) { + pkg_free(xname->next); + xname->next = NULL; + } pv_xavu_name_destroy(xname); pkg_free(xname); } @@ -1111,6 +1119,10 @@ int pv_parse_xavi_name(pv_spec_p sp, str *in) error: if(xname != NULL) { + if(xname->next != NULL) { + pkg_free(xname->next); + xname->next = NULL; + } pv_xavi_name_destroy(xname); pkg_free(xname); }

1 0

git:master:d0cd3c4b: topoh: check on pointer only for via decode return
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: d0cd3c4b40fd791143122622a6d74703e1375832 URL: https://github.com/kamailio/kamailio/commit/d0cd3c4b40fd791143122622a6d7470… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T11:01:20+01:00 topoh: check on pointer only for via decode return - code reformatted --- Modified: src/modules/topoh/th_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/d0cd3c4b40fd791143122622a6d7470… Patch: https://github.com/kamailio/kamailio/commit/d0cd3c4b40fd791143122622a6d7470… --- diff --git a/src/modules/topoh/th_msg.c b/src/modules/topoh/th_msg.c index 1984875e0c6..54d3caffe62 100644 --- a/src/modules/topoh/th_msg.c +++ b/src/modules/topoh/th_msg.c @@ -177,10 +177,8 @@ int th_mask_via(sip_msg_t *msg, str *via_prefix) vlen = th_skip_rw(via->name.s, via->bsize); LM_DBG("body: %d: [%.*s]\n", vlen, vlen, via->name.s); if(i != 1) { - out.s = th_mask_encode( - via->name.s, vlen, via_prefix, &out.len); - if(out.s == NULL) - { + out.s = th_mask_encode(via->name.s, vlen, via_prefix, &out.len); + if(out.s == NULL) { LM_ERR("cannot encode via %d\n", i); return -1; } @@ -372,11 +370,11 @@ int th_unmask_via(sip_msg_t *msg, str *ip, str *cookie) LM_DBG("body: %d: [%.*s]\n", vlen, vlen, via->name.s); if(i != 1) { /* Skip if via is not encoded */ - if (th_uri_prefix_checks - && (via->host.len != ip->len - || strncasecmp(via->host.s, ip->s, ip->len) - != 0)) { - LM_DBG("via %d is not encoded - skip\n",i); + if(th_uri_prefix_checks + && (via->host.len != ip->len + || strncasecmp(via->host.s, ip->s, ip->len) + != 0)) { + LM_DBG("via %d is not encoded - skip\n", i); continue; } @@ -404,7 +402,7 @@ int th_unmask_via(sip_msg_t *msg, str *ip, str *cookie) out.s = th_mask_decode(vp->value.s, vp->value.len, &th_vparam_prefix, 0, &out.len); } - if(out.s == NULL || out.len <= 0) { + if(out.s == NULL) { LM_ERR("cannot decode via %d\n", i); return -1; } @@ -599,7 +597,7 @@ int th_flip_record_route(sip_msg_t *msg, str *uri_prefix, str *ip, int mode) case 1: /* encode */ if(act != 0 && mode == 1) { out.s = th_mask_encode(rr->nameaddr.uri.s, - rr->nameaddr.uri.len, uri_prefix, &out.len); + rr->nameaddr.uri.len, uri_prefix, &out.len); if(out.s == NULL) { LM_ERR("cannot encode r-r %d\n", i); return -1; @@ -665,10 +663,10 @@ int th_unmask_route(sip_msg_t *msg, str *uri_prefix) i++; if(i != 1) { /* Skip if route is not encoded */ - if (th_uri_prefix_checks - && ((rr->nameaddr.uri.len<uri_prefix->len) - || (strncasecmp(rr->nameaddr.uri.s, - uri_prefix->s, uri_prefix->len) + if(th_uri_prefix_checks + && ((rr->nameaddr.uri.len < uri_prefix->len) + || (strncasecmp(rr->nameaddr.uri.s, + uri_prefix->s, uri_prefix->len) != 0))) { LM_DBG("rr %d is not encoded: [%.*s] - missing prefix\n", i, rr->nameaddr.uri.len, rr->nameaddr.uri.s); @@ -721,12 +719,12 @@ int th_unmask_ruri(sip_msg_t *msg, str *uri_prefix) str out; /* Do nothing if ruri is not encoded */ - if (th_uri_prefix_checks - && ((REQ_LINE(msg).uri.len<uri_prefix->len) + if(th_uri_prefix_checks + && ((REQ_LINE(msg).uri.len < uri_prefix->len) || (strncasecmp(REQ_LINE(msg).uri.s, uri_prefix->s, uri_prefix->len) != 0))) { - LM_DBG("ruri [%.*s] is not encoded",REQ_LINE(msg).uri.len, + LM_DBG("ruri [%.*s] is not encoded", REQ_LINE(msg).uri.len, REQ_LINE(msg).uri.s); return 0; } @@ -784,11 +782,11 @@ int th_unmask_refer_to(sip_msg_t *msg, str *uri_prefix) uri = &(get_refer_to(msg)->uri); /* Do nothing if refer_to is not encoded */ - if (th_uri_prefix_checks - && ((uri->len<uri_prefix->len) + if(th_uri_prefix_checks + && ((uri->len < uri_prefix->len) || (strncasecmp(uri->s, uri_prefix->s, uri_prefix->len) != 0))) { - LM_DBG("refer-to [%.*s] is not encoded",uri->len,uri->s); + LM_DBG("refer-to [%.*s] is not encoded", uri->len, uri->s); return 0; }

1 0

git:master:aa081dbd: tm: rpc uac - jump to error when failing to create delayed context
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: aa081dbd1ee1901c6174ffddd556bda47b6ef732 URL: https://github.com/kamailio/kamailio/commit/aa081dbd1ee1901c6174ffddd556bda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T10:50:32+01:00 tm: rpc uac - jump to error when failing to create delayed context --- Modified: src/modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/aa081dbd1ee1901c6174ffddd556bda… Patch: https://github.com/kamailio/kamailio/commit/aa081dbd1ee1901c6174ffddd556bda… --- diff --git a/src/modules/tm/rpc_uac.c b/src/modules/tm/rpc_uac.c index e63da4fb835..2d7bd6113d4 100644 --- a/src/modules/tm/rpc_uac.c +++ b/src/modules/tm/rpc_uac.c @@ -778,7 +778,7 @@ static void rpc_t_uac(rpc_t *rpc, void *c, int reply_wait) dctx = rpc->delayed_ctx_new(c); if(dctx == 0) { rpc->fault(c, 500, "internal error: failed to create context"); - return; + goto error01; } uac_req.cb = rpc_uac_callback; uac_req.cbp = dctx;

1 0

git:master:27e1e910: tm: jump to error when failing to built content length for uac cancel
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: 27e1e9102f07047a3d2c2f28baa708f14be556a6 URL: https://github.com/kamailio/kamailio/commit/27e1e9102f07047a3d2c2f28baa708f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T10:42:27+01:00 tm: jump to error when failing to built content length for uac cancel --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/27e1e9102f07047a3d2c2f28baa708f… Patch: https://github.com/kamailio/kamailio/commit/27e1e9102f07047a3d2c2f28baa708f… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index 71fd4e644b3..d9231486c61 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1827,7 +1827,8 @@ char *build_uac_cancel(str *headers, str *body, struct cell *cancelledT, char branch_buf[MAX_BRANCH_PARAM_LEN]; str branch_str; struct hostport hp; - str content_length, via; + str content_length; + str via = STR_NULL; LM_DBG("sing FROM=<%.*s>, TO=<%.*s>, CSEQ_N=<%.*s>\n", cancelledT->from_hdr.len, cancelledT->from_hdr.s, @@ -1866,7 +1867,7 @@ char *build_uac_cancel(str *headers, str *body, struct cell *cancelledT, /* Content Length */ if(print_content_length(&content_length, body) < 0) { LM_ERR("failed to print content-length\n"); - return 0; + goto error01; } /* Content-Length */ *len += (body ? (CONTENT_LENGTH_LEN + content_length.len + CRLF_LEN) : 0);

1 0

git:master:e85d07e5: tm: split reverse rte list function
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: e85d07e5b42ff25f81b74f68ab412e0ab27e7170 URL: https://github.com/kamailio/kamailio/commit/e85d07e5b42ff25f81b74f68ab412e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T10:32:51+01:00 tm: split reverse rte list function --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/e85d07e5b42ff25f81b74f68ab412e0… Patch: https://github.com/kamailio/kamailio/commit/e85d07e5b42ff25f81b74f68ab412e0… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index b2c101bf2b6..71fd4e644b3 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -750,6 +750,26 @@ static inline int get_contact_uri(struct sip_msg *msg, str *uri) return 0; } +/** + * reverse rte list + */ +static inline rte_t *tm_reverse_rte_list(rte_t *head) +{ + rte_t *prev = NULL; + rte_t *current = NULL; + rte_t *next = NULL; + + current = head; + while(current != NULL) { + next = current->next; + current->next = prev; + prev = current; + current = next; + } + + return prev; +} + /** * Extract route set from the message (out of Record-Route, if reply, OR * Route, if request). @@ -760,7 +780,7 @@ static inline int get_uac_rs(sip_msg_t *msg, int is_req, struct rte **rtset) { struct hdr_field *ptr; rr_t *p, *new_p; - struct rte *t, *head, *old_head; + struct rte *t, *head; head = 0; for(ptr = is_req ? msg->route : msg->record_route; ptr; ptr = ptr->next) { @@ -810,14 +830,7 @@ static inline int get_uac_rs(sip_msg_t *msg, int is_req, struct rte **rtset) if(is_req) { /* harvesting the R/RR HF above inserts at head, which suites RRs (as * they must be reversed, anyway), but not Rs => reverse once more */ - old_head = head; - head = 0; - while(old_head) { - t = old_head; - old_head = old_head->next; - t->next = head; - head = t; - } + head = tm_reverse_rte_list(head); } *rtset = head; @@ -827,7 +840,6 @@ static inline int get_uac_rs(sip_msg_t *msg, int is_req, struct rte **rtset) return -1; } - static inline unsigned short uri2port(const struct sip_uri *puri) { if(puri->port.s) {

1 0

git:master:7c908137: xprint: break on first resolved ip address
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: 7c908137826071b8180bd93ff8ba3994be66da3a URL: https://github.com/kamailio/kamailio/commit/7c908137826071b8180bd93ff8ba399… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T09:48:33+01:00 xprint: break on first resolved ip address --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/7c908137826071b8180bd93ff8ba399… Patch: https://github.com/kamailio/kamailio/commit/7c908137826071b8180bd93ff8ba399… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index 567e62ade86..cdcde6807d2 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -1888,6 +1888,7 @@ int xl_mod_init() if(str_ipaddr.s) { memcpy(str_ipaddr.s, s, str_ipaddr.len); str_ipaddr.s[str_ipaddr.len] = '\0'; + break; } else { pkg_free(s); s = NULL;

1 0

git:master:4c4d7f79: ctl: fifo - clean intermediary buffer
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: 4c4d7f7967a99d4dd4acdc5e198bce493bf15d67 URL: https://github.com/kamailio/kamailio/commit/4c4d7f7967a99d4dd4acdc5e198bce4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T09:43:43+01:00 ctl: fifo - clean intermediary buffer --- Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/4c4d7f7967a99d4dd4acdc5e198bce4… Patch: https://github.com/kamailio/kamailio/commit/4c4d7f7967a99d4dd4acdc5e198bce4… --- diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index 197302c1771..70ce92deb76 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -1261,7 +1261,7 @@ static int rpc_add(rpc_ctx_t *ctx, char *fmt, ...) static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) { int n, buf_size; - char *buf; + char *buf = NULL; char *buf0; va_list ap; str s, nm; @@ -1314,6 +1314,7 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) c->next = m; if(c == ctx->last) ctx->last = m; + ctl_free(buf); return 0; } /* Else try again with more space. */ @@ -1329,6 +1330,7 @@ static int rpc_struct_printf(struct text_chunk *c, char *name, char *fmt, ...) } buf = buf0; } + ctl_free(buf); return 0; err: if(buf)

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