- sr-dev - kamailio.org

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

git:master:ff712539: xmlrpc: clean allocated buffer
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: ff712539566c903312ebba2f8e2585f9c80ffdcf URL: https://github.com/kamailio/kamailio/commit/ff712539566c903312ebba2f8e2585f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T09:40:00+01:00 xmlrpc: clean allocated buffer --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/ff712539566c903312ebba2f8e2585f… Patch: https://github.com/kamailio/kamailio/commit/ff712539566c903312ebba2f8e2585f… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 4157e94904d..eb44f4450dd 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -2024,7 +2024,7 @@ static int rpc_struct_printf( struct rpc_struct *s, char *member_name, char *fmt, ...) { int n, buf_size; - char *buf; + char *buf = NULL; va_list ap; str st, name; struct xmlrpc_reply *reply; @@ -2076,6 +2076,7 @@ static int rpc_struct_printf( if(add_xmlrpc_reply(out, &member_suffix) < 0) goto err; + mxr_free(buf); return 0; } /* Else try again with more space. */ @@ -2090,6 +2091,8 @@ static int rpc_struct_printf( goto err; } } + if(buf) + mxr_free(buf); return 0; err: if(buf) @@ -2745,7 +2748,7 @@ static int ki_xmlrpc_reply(sip_msg_t *msg, int rcode, str *reason) if(add_xmlrpc_reply(&reply, &int_suffix) < 0) goto error; if(add_xmlrpc_reply(&reply, &success_suffix) < 0) - return -1; + goto error; } if(send_reply(msg, &reply.body) < 0) goto error;

1 0

git:master:b17038ec: xprint: init globals when declared
by Daniel-Constantin Mierla 13 Feb '25

13 Feb '25

Module: kamailio Branch: master Commit: b17038ec072b1854fa2fae1c2d4725c1471ef8ac URL: https://github.com/kamailio/kamailio/commit/b17038ec072b1854fa2fae1c2d4725c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-13T09:18:00+01:00 xprint: init globals when declared --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/b17038ec072b1854fa2fae1c2d4725c… Patch: https://github.com/kamailio/kamailio/commit/b17038ec072b1854fa2fae1c2d4725c… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index fda12a82fc3..567e62ade86 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -56,7 +56,10 @@ static str str_null = STR_STATIC_INIT("<null>"); static str str_empty = STR_STATIC_INIT(""); static str str_per = STR_STATIC_INIT("%"); -static str str_hostname, str_domainname, str_fullname, str_ipaddr; +static str str_hostname = STR_NULL; +static str str_domainname = STR_NULL; +static str str_fullname = STR_NULL; +static str str_ipaddr = STR_NULL; enum xl_host_t { @@ -1835,14 +1838,7 @@ int xl_mod_init() PKG_MEM_ERROR; return -1; } - if(gethostname(s, HOSTNAME_MAX) < 0) { - str_fullname.len = 0; - str_fullname.s = NULL; - str_hostname.len = 0; - str_hostname.s = NULL; - str_domainname.len = 0; - str_domainname.s = NULL; - } else { + if(gethostname(s, HOSTNAME_MAX) >= 0) { str_fullname.len = strlen(s); s = pkg_reallocxf( s, str_fullname.len + 1); /* this will leave the ending \0 */ @@ -1870,8 +1866,6 @@ int xl_mod_init() } } - str_ipaddr.len = 0; - str_ipaddr.s = NULL; if(str_fullname.len) { he = resolvehost(str_fullname.s); if(he) {

1 0

git:master:4a71d3c9: ctl: free rpc struct in case of error
by Daniel-Constantin Mierla 12 Feb '25

12 Feb '25

Module: kamailio Branch: master Commit: 4a71d3c9e6a4f92ef33ce8e62372b2c4dba62a56 URL: https://github.com/kamailio/kamailio/commit/4a71d3c9e6a4f92ef33ce8e62372b2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-12T17:48:42+01:00 ctl: free rpc struct in case of error --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/4a71d3c9e6a4f92ef33ce8e62372b2c… Patch: https://github.com/kamailio/kamailio/commit/4a71d3c9e6a4f92ef33ce8e62372b2c… --- diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index 1a9eb27bd79..cb1220b5c87 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -1027,7 +1027,7 @@ static int rpc_add(struct binrpc_ctx *ctx, char *fmt, ...) int err; str st; str *sp; - struct rpc_struct_l *rs; + struct rpc_struct_l *rs = NULL; str null_value = str_init("<null string>"); double d; @@ -1071,12 +1071,14 @@ static int rpc_add(struct binrpc_ctx *ctx, char *fmt, ...) if(err < 0) goto error_add; rs = new_rpc_struct(); - if(rs == 0) + if(rs == NULL) goto error_mem; rs->offset = binrpc_pkt_len(&ctx->out.pkt); err = binrpc_end_struct(&ctx->out.pkt); - if(err < 0) + if(err < 0) { + ctl_free(rs); goto error_add; + } clist_append(&ctx->out.structs, rs, next, prev); *(va_arg(ap, void **)) = rs; break; @@ -1182,7 +1184,7 @@ static int rpc_struct_add(struct rpc_struct_l *s, char *fmt, ...) va_list ap; int err; struct binrpc_val avp; - struct rpc_struct_l *rs; + struct rpc_struct_l *rs = NULL; str *sp; str null_value = str_init("<null string>"); @@ -1228,7 +1230,7 @@ static int rpc_struct_add(struct rpc_struct_l *s, char *fmt, ...) goto error_add; } rs = new_rpc_struct(); - if(rs == 0) { + if(rs == NULL) { LM_ERR("not enough memory (%c)\n", *fmt); goto error_mem; } @@ -1236,6 +1238,7 @@ static int rpc_struct_add(struct rpc_struct_l *s, char *fmt, ...) err = binrpc_end_struct(&s->pkt); if(err < 0) { LM_ERR("failed to end struct (%c)\n", *fmt); + ctl_free(rs); goto error_add; } clist_append(&s->substructs, rs, next, prev); @@ -1291,8 +1294,8 @@ static int rpc_array_add(struct rpc_struct_l *s, char *fmt, ...) va_list ap; int err; str st; - str *sp; - struct rpc_struct_l *rs; + str *sp = NULL; + struct rpc_struct_l *rs = NULL; str null_value = str_init("<null string>"); double d; @@ -1336,12 +1339,14 @@ static int rpc_array_add(struct rpc_struct_l *s, char *fmt, ...) if(err < 0) goto error_add; rs = new_rpc_struct(); - if(rs == 0) + if(rs == NULL) goto error_mem; rs->offset = binrpc_pkt_len(&s->pkt); err = binrpc_end_struct(&s->pkt); - if(err < 0) + if(err < 0) { + ctl_free(rs); goto error_add; + } clist_append(&s->substructs, rs, next, prev); *(va_arg(ap, void **)) = rs; break;

1 0

[kamailio/kamailio] Kamailio passive instance tries to send dialog keepalives after service restart (Issue #4077)
by akabihno 12 Feb '25

12 Feb '25

### Description Kamailio is running on 2 nodes using DMQ for HA. Following DMQ parameters are set: ``` modparam("dmq", "server_address", "sip:LOCAL_IP:DMQ_PORT") modparam("dmq", "notification_address", "sip:OTHER_NODE_IP:DMQ_PORT") modparam("dmq", "multi_notify", 0) modparam("dmq_usrloc", "enable", 1) modparam("dmq_usrloc", "sync", 1) modparam("dmq_usrloc", "replicate_socket_info", 1) modparam("dmq_usrloc", "batch_msg_contacts", 50) modparam("dmq_usrloc", "batch_size", 10000) modparam("dmq_usrloc", "batch_usleep", 500000) ``` If kamailio is restarted on passive instance, it tries to send keepalives for DMQ replicated dialog, producing errors ### Troubleshooting #### Reproduction - Have set dialog properties "ka-src", "ka-dst": ``` if (is_method("INVITE")) { setflag(FLT_ACC); #!ifdef WITH_DIALOG dlg_manage(); dlg_set_property("ka-src"); dlg_set_property("ka-dst"); #!endif } ``` - Have calls on active instance and DMQ replicated dialogs on passive instance ``` kamcmd dlg.list { h_entry: 936 h_id: 7534 ref: 2 call-id: inds188n38bjr7tsa2hb from_uri: sip:90123@10.1.2.3 to_uri: sip:0012345@10.1.2.3 state: 4 start_ts: 1734441148 init_ts: 1734441142 end_ts: 0 duration: 119 timeout: 1734484347 lifetime: 43200 dflags: 0 sflags: 0 iflags: 64 caller: { tag: c91qu93uc5 contact: sip:hp3405ho@iacvttr6b897.invalid;transport=ws;ob;alias=10.5.6.7~39402~6 cseq: 2 route_set: socket: <null string> } callee: { tag: 32fd1f16-2fd3-4924-9423-4267871f4ea8 contact: sip:10.2.3.4:5060 cseq: 0 route_set: socket: <null string> } profiles: { } variables: { } } ``` - Restart kamailio service on passive instance #### Debugging Data #### Log Messages ``` Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) WARNING: <core> [core/msg_translator.c:3024]: via_builder(): TCP/TLS connection (id: 0) for WebSocket could not be found Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) ERROR: tm [t_msgbuilder.c:1423]: assemble_via(): via building failed Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) ERROR: tm [t_msgbuilder.c:1614]: build_uac_req(): error while assembling Via Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) ERROR: tm [uac.c:552]: t_uac_prepare(): Error while building message Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) ERROR: dialog [dlg_req_within.c:810]: dlg_send_ka(): failed to send the OPTIONS request Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) ERROR: <core> [core/udp_server.c:810]: udp_send(): sendto(sock, buf: 0x7f3736a421b0, len: 329, 0, dst: (10.5.2.192:5060), tolen: 16) - err: Invalid argument (22) Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) CRITICAL: <core> [core/udp_server.c:817]: udp_send(): invalid sendtoparameters Dec 17 13:15:34 hostname.redacted.com docker[31099]: one possible reason is the server is bound to localhost and Dec 17 13:15:34 hostname.redacted.com docker[31099]: attempts to send to the net Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) ERROR: tm [../../core/forward.h:245]: msg_send_buffer(): udp_send failed Dec 17 13:15:34 hostname.redacted.com docker[31099]: 45(53) ERROR: tm [uac.c:708]: send_prepared_request_impl(): Attempt to send to precreated request failed Dec 17 13:15:34 hostname.redacted.com docker[31099]: 34(42) ERROR: <core> [core/udp_server.c:810]: udp_send(): sendto(sock, buf: 0x7f3736a42000, len: 329, 0, dst: (10.5.2.192:5060), tolen: 16) - err: Invalid argument (22) Dec 17 13:15:34 hostname.redacted.com docker[31099]: 34(42) CRITICAL: <core> [core/udp_server.c:817]: udp_send(): invalid sendtoparameters Dec 17 13:15:34 hostname.redacted.com docker[31099]: one possible reason is the server is bound to localhost and Dec 17 13:15:34 hostname.redacted.com docker[31099]: attempts to send to the net Dec 17 13:15:34 hostname.redacted.com docker[31099]: 34(42) ERROR: tm [../../core/forward.h:245]: msg_send_buffer(): udp_send failed ``` #### SIP Traffic ### Possible Solutions ### Additional Information ``` version: kamailio 5.8.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_SEND_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 13:38:04 Nov 12 2024 with gcc 13.2.1 ``` * **Operating System**: Running https://ghcr.io/kamailio/kamailio-ci:5.8.4-alpine in docker as systemd service ``` Host system: lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 16.04.3 LTS Release: 16.04 Codename: xenial uname -a Linux _hostname redacted_ 4.4.0-1052-aws #61-Ubuntu SMP Mon Feb 12 23:05:58 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux docker -v Docker version 20.10.7, build f0df350 ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4077 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4077(a)github.com>

2 2

Build failed in Jenkins: kamailio57-repos » amd64,bullseye,master #8
by kamailio＠sipwise.com 12 Feb '25

12 Feb '25

See <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> Changes: ------------------------------------------ Started by upstream project "kamailio57-repos" build number 8 originally caused by: Started by upstream project "kamailio57-binaries" build number 10 originally caused by: Started by upstream project "kamailio57-source" build number 27 originally caused by: Started by an SCM change Running as SYSTEM Building on the built-in node in workspace <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> [master] $ /bin/sh -xe /tmp/jenkins2066408270855458561.sh + echo * Removing files workspace before copying artifacts from another project. * * Removing files workspace before copying artifacts from another project. * + rm -f ./* Copied 51 artifacts from "kamailio57-binaries » amd64,bullseye" build number 10 [master] $ /bin/sh -xe /tmp/jenkins1310728410749387094.sh + /home/admin/kamailio-deb-jenkins/scripts/jdg-repository + set -e + '[' -z /srv/repository/kamailio57 ']' + repository_is_missing_in_env=false + '[' -r /etc/jenkins/debian_glue ']' + echo '*** Sourcing /etc/jenkins/debian_glue ***' *** Sourcing /etc/jenkins/debian_glue *** + . /etc/jenkins/debian_glue ++ PBUILDER_CONFIG=/etc/jenkins/pbuilderrc ++ KEY_ID=508EA4C8 + '[' -n /srv/repository/kamailio57 ']' + false + '[' '' = true ']' + ARCHITECTURES='amd64 i386 source' + COMPONENTS=main + UDEB_COMPONENTS=main + '[' 1 -gt 1 ']' + '[' 1 -lt 1 ']' + REPOS=bullseye ++ awk '/^ii/ {print $3}' ++ dpkg --list jenkins-debian-glue + JENKINS_DEBIAN_GLUE_VERSION=0.23.0+0~20240619103048.364~1.gbp807dcd + '[' -n 0.23.0+0~20240619103048.364~1.gbp807dcd ']' + echo '*** Running jenkins-debian-glue version 0.23.0+0~20240619103048.364~1.gbp807dcd ***' *** Running jenkins-debian-glue version 0.23.0+0~20240619103048.364~1.gbp807dcd *** + '[' -z '' ']' + echo '*** Repository variable DEFAULT_REPOSITORY is unset, using default [] ***' *** Repository variable DEFAULT_REPOSITORY is unset, using default [] *** + DEFAULT_REPOSITORY=/srv/repository + '[' -z /srv/repository/kamailio57 ']' + mkdir -p /srv/repository/kamailio57/conf ++ id -un + chown jenkins /srv/repository/kamailio57/conf + touch /srv/repository/kamailio57/conf/distributions + '[' -z 508EA4C8 ']' ++ id -un + flock --timeout 5 9 + grep -q '^$Codename\|Suite$: bullseye$' /srv/repository/kamailio57/conf/distributions + echo 'Codename/repository bullseye exists already, ignoring request to add again.' Codename/repository bullseye exists already, ignoring request to add again. + exit 0 ++ id -un + rm -f /var/lock/jdg-generate-reprepro-codename.jenkins + set -u + umask 022 + PATH=/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin + export QEMU_RESERVED_VA=0x0 + QEMU_RESERVED_VA=0x0 + export TERM=dumb + TERM=dumb ++ date + echo '*** Starting /usr/bin/build-and-provide-package at Wed 12 Feb 2025 01:15:53 AM UTC ***' *** Starting /usr/bin/build-and-provide-package at Wed 12 Feb 2025 01:15:53 AM UTC *** ++ sed -e 's/^$[0-9]*$.*/\1/' + start_seconds=5326767 ++ awk '/^ii/ {print $3}' ++ dpkg --list jenkins-debian-glue + JENKINS_DEBIAN_GLUE_VERSION=0.23.0+0~20240619103048.364~1.gbp807dcd + '[' -n 0.23.0+0~20240619103048.364~1.gbp807dcd ']' + echo '*** Running jenkins-debian-glue version 0.23.0+0~20240619103048.364~1.gbp807dcd ***' *** Running jenkins-debian-glue version 0.23.0+0~20240619103048.364~1.gbp807dcd *** ++ dpkg --print-architecture + HOST_ARCH=amd64 + '[' -n amd64 ']' + echo '*** Identified host architecture amd64 ***' *** Identified host architecture amd64 *** + trap bailout SIGHUP SIGINT SIGQUIT SIGABRT SIGALRM SIGTERM + checks_and_defaults + '[' -z /srv/repository/kamailio57 ']' + local repository_is_missing_in_env=false + '[' -r /etc/jenkins/debian_glue ']' + . /etc/jenkins/debian_glue ++ PBUILDER_CONFIG=/etc/jenkins/pbuilderrc ++ KEY_ID=508EA4C8 + '[' -n /srv/repository/kamailio57 ']' + false + '[' -n '' ']' + '[' -z kamailio57-repos/architecture=amd64,distribution=bullseye,label=master ']' + '[' -z amd64 ']' + set_debootstrap + '[' -n '' ']' + '[' amd64 = amd64 ']' + DEBOOTSTRAP=debootstrap + return 0 + '[' -z '' ']' + REPREPRO_OPTS='-v --waitforlock 1000' + echo '*** REPREPRO_OPTS is unset, using default: -v --waitforlock 1000 ***' *** REPREPRO_OPTS is unset, using default: -v --waitforlock 1000 *** + REPREPRO_CMD=reprepro + '[' -z '' ']' + DEFAULT_REPOSITORY=/srv/repository + '[' -z /srv/repository/kamailio57 ']' + '[' -z '' ']' + PBUILDER_HOOKDIR=/usr/share/jenkins-debian-glue/pbuilder-hookdir/ + '[' -z '' ']' + '[' -z '' ']' + FREIGHT_VARLIB=/var/lib/freight + FREIGHT_VARCACHE=/var/cache/freight + FREIGHT_CONF=/etc/freight.conf + '[' '' = true ']' + clean_workspace ++ pwd + echo '*** The following files have been noticed in the workspace [<https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…]>: ***' *** The following files have been noticed in the workspace [<https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…]>: *** + ls -la ./ total 12 drwxr-xr-x 3 jenkins jenkins 4096 Feb 12 01:15 . drwxr-xr-x 3 jenkins jenkins 4096 Feb 12 01:15 .. drwxr-xr-x 2 jenkins jenkins 4096 Feb 12 01:15 binaries + identify_package_name + PACKAGE=kamailio57 + PACKAGE=kamailio57 + '[' -n kamailio57 ']' + echo '*** Identified Debian package name kamailio57 ***' *** Identified Debian package name kamailio57 *** + set_base_path + '[' -n binaries/ ']' + echo '*** Using provided binaries/ as BASE_PATH ***' *** Using provided binaries/ as BASE_PATH *** + build_info + '[' -n bullseye ']' + echo '*** Using supplied repository name bullseye ***' *** Using supplied repository name bullseye *** + identify_sourcefile + '[' -n '' ']' + echo '*** Identifying newest package version ***' *** Identifying newest package version *** + newest_version= + for file in "${BASE_PATH}/"*.dsc ++ awk '/^Source: / {print $2}' binaries//kamailio_5.7.6+bpo11.dsc + SOURCE_PACKAGE=kamailio ++ basename binaries//kamailio_5.7.6+bpo11.dsc .dsc + p=kamailio_5.7.6+bpo11 + '[' kamailio_5.7.6+bpo11 = '*' ']' + cur_version=5.7.6+bpo11 + '[' -z '' ']' + newest_version=5.7.6+bpo11 + echo '*** Found package version 5.7.6+bpo11 ***' *** Found package version 5.7.6+bpo11 *** + sourcefile='binaries//kamailio_*5.7.6+bpo11.dsc' + echo '*** Using binaries//kamailio_*5.7.6+bpo11.dsc (version: 5.7.6+bpo11)' *** Using binaries//kamailio_*5.7.6+bpo11.dsc (version: 5.7.6+bpo11) + dist_and_arch_settings + '[' -z amd64 ']' + '[' amd64 = all ']' + arch=amd64 + echo '*** architecture is set to amd64 ***' *** architecture is set to amd64 *** + '[' -n bullseye ']' + local DIST=bullseye + '[' -n '' ']' + echo '*** Using cowbuilder base for distribution bullseye ***' *** Using cowbuilder base for distribution bullseye *** + COWBUILDER_DIST=bullseye + '[' -n '' ']' + COWBUILDER_BASE=/var/cache/pbuilder/base-bullseye-amd64.cow + echo '*** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-bullseye-amd64.cow as cowbuilder base.cow ***' *** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-bullseye-amd64.cow as cowbuilder base.cow *** + local lockfiles=/run/lock/bullseye-amd64 + build_lockfile=/run/lock/bullseye-amd64.building.1575155 + update_lockfile=/run/lock/bullseye-amd64.update + update_lockfile_pid=/run/lock/bullseye-amd64.update.1575155 + '[' -n true ']' + echo '*** Config variable '\''PROVIDE_ONLY'\'' is set, ignoring request to run cowbuilder. ***' *** Config variable 'PROVIDE_ONLY' is set, ignoring request to run cowbuilder. *** + '[' -n '' ']' + deploy_to_releases + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + '[' -n '' ']' + reprepro_wrapper + '[' -n '' ']' + '[' -d /srv/repository/kamailio57 ']' + '[' -r /srv/repository/kamailio57/conf/distributions ']' + grep -q '^$Codename\|Suite$: bullseye$' /srv/repository/kamailio57/conf/distributions + remove_packages + '[' -n true ']' + echo '*** Skipping removal of existing packages as requested via SKIP_REMOVAL ***' *** Skipping removal of existing packages as requested via SKIP_REMOVAL *** + return 0 + remove_missing_binary_packages + '[' -n true ']' + echo '*** Skipping removal of existing packages as requested via SKIP_MISSING_BINARY_REMOVAL or SKIP_REMOVAL ***' *** Skipping removal of existing packages as requested via SKIP_MISSING_BINARY_REMOVAL or SKIP_REMOVAL *** + return 0 + echo '*** Including packages in repository bullseye ***' *** Including packages in repository bullseye *** ++ get_arch_changes ++ case ${architecture} in ++ echo amd64 + reprepro -b /srv/repository/kamailio57 -v --waitforlock 1000 --ignore=wrongdistribution --ignore=uploaders --ignore=surprisingbinary include bullseye <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> File "pool/main/k/kamailio/kamailio_5.7.6+bpo11_amd64.deb" is already registered with different checksums! md5 expected: 0476e074842bb457e84f501bdb9bc526, got: a5916b0ccfb5a35a6e8b9e432d386860 sha1 expected: 46b8e82a6f227f5814404bcec28cfdb229cdd83f, got: 0bf3b86d239b06d0316e1c7a913d38ddfc48876f sha256 expected: c84ef99085b456f61d88ef20b1a569cfdf506552bb18ee48275fd8b9a9414dad, got: 2e31fe81cc37eb33a67f05ec108f867d4642457c25b69a9423e251944c46e163 size expected: 9441148, got: 9440900 There have been errors! + '[' 254 -eq 0 ']' + bailout 1 'Error: Failed to include binary package in bullseye repository.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to include binary package in bullseye repository.' ']' + echo 'Error: Failed to include binary package in bullseye repository.' Error: Failed to include binary package in bullseye repository. + rm -f /run/lock/bullseye-amd64.building.1575155 + '[' -r /run/lock/bullseye-amd64.update.1575155 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> to avoid problems in next run. *** + rm -f <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> <https://kamailio.sipwise.com/job/kamailio57-repos/architecture=amd64,distri…> + '[' -n '' ']' + '[' -n '' ']' + '[' -n 5326767 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=0 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Wed 12 Feb 2025 01:15:53 AM UTC [running 0 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Wed 12 Feb 2025 01:15:53 AM UTC [running 0 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts

1 0

git:master:f37940b9: db_sqlite: added prefix to internal helper function
by Daniel-Constantin Mierla 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: f37940b9a113ab79611f851334af7f8fbb7b3f6a URL: https://github.com/kamailio/kamailio/commit/f37940b9a113ab79611f851334af7f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-11T15:27:26+01:00 db_sqlite: added prefix to internal helper function --- Modified: src/modules/db_sqlite/dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/f37940b9a113ab79611f851334af7f8… Patch: https://github.com/kamailio/kamailio/commit/f37940b9a113ab79611f851334af7f8… --- diff --git a/src/modules/db_sqlite/dbase.c b/src/modules/db_sqlite/dbase.c index a82f8e59546..2ff40fc0898 100644 --- a/src/modules/db_sqlite/dbase.c +++ b/src/modules/db_sqlite/dbase.c @@ -369,7 +369,7 @@ static int type_to_dbtype(int type) } } -static str *str_dup(const char *_s) +static str *sqlt_str_dup(const char *_s) { str *s; int len = strlen(_s); @@ -432,7 +432,8 @@ int db_sqlite_store_result(const db1_con_t *_h, db1_res_t **_r) const char *decltype; int dbtype; - RES_NAMES(res)[i] = str_dup(sqlite3_column_name(conn->stmt, i)); + RES_NAMES(res) + [i] = sqlt_str_dup(sqlite3_column_name(conn->stmt, i)); if(RES_NAMES(res)[i] == NULL) goto no_mem; decltype = sqlite3_column_decltype(conn->stmt, i);

1 0

git:master:3fb1d783: ims_registrar_scscf: updates for lib/ims macro names
by Daniel-Constantin Mierla 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: 3fb1d7832006d290ee1c2e15ea1e731dc0768b5f URL: https://github.com/kamailio/kamailio/commit/3fb1d7832006d290ee1c2e15ea1e731… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-11T15:26:27+01:00 ims_registrar_scscf: updates for lib/ims macro names --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/3fb1d7832006d290ee1c2e15ea1e731… Patch: https://github.com/kamailio/kamailio/commit/3fb1d7832006d290ee1c2e15ea1e731… --- diff --git a/src/modules/ims_registrar_scscf/registrar_notify.c b/src/modules/ims_registrar_scscf/registrar_notify.c index b1af5189a8d..25425af7a1f 100644 --- a/src/modules/ims_registrar_scscf/registrar_notify.c +++ b/src/modules/ims_registrar_scscf/registrar_notify.c @@ -2478,7 +2478,7 @@ void uac_request_cb(struct cell *t, int type, struct tmcb_params *ps) } done: if(watcher_contact) { - str_free(*watcher_contact, shm); + ims_str_free(*watcher_contact, shm); shm_free(watcher_contact); *(ps->param) = 0; } @@ -2618,10 +2618,10 @@ void send_notification(reg_notification *n) watcher_contact = 0; done: out_of_memory: - str_free(h, pkg); - str_free(content, pkg); + ims_str_free(h, pkg); + ims_str_free(content, pkg); if(watcher_contact) { - str_free(*watcher_contact, shm); + ims_str_free(*watcher_contact, shm); shm_free(watcher_contact); } free_tm_dlg(td);

1 0

git:master:b9c36860: ims_qos_npn: updates for lib/ims macro names
by Daniel-Constantin Mierla 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: b9c36860fc8a91fc6c73b456ff64b6191f61813b URL: https://github.com/kamailio/kamailio/commit/b9c36860fc8a91fc6c73b456ff64b61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-11T15:25:30+01:00 ims_qos_npn: updates for lib/ims macro names --- Modified: src/modules/ims_qos_npn/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/b9c36860fc8a91fc6c73b456ff64b61… Patch: https://github.com/kamailio/kamailio/commit/b9c36860fc8a91fc6c73b456ff64b61… --- diff --git a/src/modules/ims_qos_npn/rx_avp.c b/src/modules/ims_qos_npn/rx_avp.c index 54afddaa354..fd17533c99a 100644 --- a/src/modules/ims_qos_npn/rx_avp.c +++ b/src/modules/ims_qos_npn/rx_avp.c @@ -2038,7 +2038,7 @@ int rx_avp_process_3gpp_user_location_information(AAAMessage *rar, str *dst) LOG(L_INFO, "P-Access-Network-Info from Diameter is [%.*s]\n", dst->len, dst->s); if(!dst->len) { - str_free(*dst, pkg); + ims_str_free(*dst, pkg); } return (dst->len > 1); }

1 0

git:master:f1abcba4: ims_charging: updates for lib/ims macro names
by Daniel-Constantin Mierla 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: f1abcba4eeabccf96a8d16c2e63a47b27db62f88 URL: https://github.com/kamailio/kamailio/commit/f1abcba4eeabccf96a8d16c2e63a47b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-11T15:24:20+01:00 ims_charging: updates for lib/ims macro names --- Modified: src/modules/ims_charging/Ro_data.c Modified: src/modules/ims_charging/Ro_data.h Modified: src/modules/ims_charging/ccr.c Modified: src/modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/f1abcba4eeabccf96a8d16c2e63a47b… Patch: https://github.com/kamailio/kamailio/commit/f1abcba4eeabccf96a8d16c2e63a47b…

1 0

git:master:c45c7116: lib/ims: renamed specific macros with pretty generic name
by Daniel-Constantin Mierla 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: c45c71164ed40e06cdfab4ceda292d29d2d1459f URL: https://github.com/kamailio/kamailio/commit/c45c71164ed40e06cdfab4ceda292d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-11T15:23:34+01:00 lib/ims: renamed specific macros with pretty generic name --- Modified: src/lib/ims/ims_getters.c Modified: src/lib/ims/ims_getters.h --- Diff: https://github.com/kamailio/kamailio/commit/c45c71164ed40e06cdfab4ceda292d2… Patch: https://github.com/kamailio/kamailio/commit/c45c71164ed40e06cdfab4ceda292d2… --- diff --git a/src/lib/ims/ims_getters.c b/src/lib/ims/ims_getters.c index 44f1a0be34d..8d97a7a54f9 100644 --- a/src/lib/ims/ims_getters.c +++ b/src/lib/ims/ims_getters.c @@ -1303,20 +1303,21 @@ int cscf_get_p_charging_vector( if(!header->body.s || !header->body.len) return 0; - str_dup(header_body, header->body, pkg); + ims_str_dup(header_body, header->body, pkg); LM_DBG("p_charging_vector body is %.*s\n", header_body.len, header_body.s); p = strtok(header_body.s, " ;:\r\t\n\"="); loop: - if(p == NULL || p > (header_body.s + header_body.len)) + if(p == NULL || p > (header_body.s + header_body.len)) { return 1; + } if(strncmp(p, "icid-value", 10) == 0) { p = strtok(NULL, " ;:\r\t\n\"="); if(p == NULL || p > (header_body.s + header_body.len)) { LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); - return 0; + goto error; } temp.s = p; temp.len = 0; @@ -1332,11 +1333,10 @@ int cscf_get_p_charging_vector( p = strtok(NULL, " ;:\r\t\n\"="); goto loop; } else if(strncmp(p, "orig-ioi", 8) == 0) { - p = strtok(NULL, " ;:\r\t\n\"="); if(p == NULL || p > (header_body.s + header_body.len)) { LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); - return 0; + goto error; } temp.s = p; temp.len = 0; @@ -1352,11 +1352,10 @@ int cscf_get_p_charging_vector( p = strtok(NULL, " ;:\r\t\n\"="); goto loop; } else if(strncmp(p, "term-ioi", 8) == 0) { - p = strtok(NULL, " ;:\r\t\n\"="); if(p == NULL || p > (header_body.s + header_body.len)) { LM_ERR("cscf_get_p_charging_vector: no value for icid\n"); - return 0; + goto error; } temp.s = p; temp.len = 0; @@ -1374,10 +1373,12 @@ int cscf_get_p_charging_vector( } LM_DBG("end\n"); - str_free(header_body, pkg); + ims_str_free(header_body, pkg); return 1; out_of_memory: PKG_MEM_ERROR; +error: + ims_str_free(header_body, pkg); return 0; } diff --git a/src/lib/ims/ims_getters.h b/src/lib/ims/ims_getters.h index 081a5ae1934..4d10c00077d 100644 --- a/src/lib/ims/ims_getters.h +++ b/src/lib/ims/ims_getters.h @@ -80,7 +80,7 @@ enum cscf_dialog_direction * @param src - source src * @param mem - type of mem to duplicate into (shm/pkg) */ -#define str_dup(dst, src, mem) \ +#define ims_str_dup(dst, src, mem) \ do { \ if((src).len) { \ (dst).s = mem##_malloc((src).len); \ @@ -102,7 +102,7 @@ enum cscf_dialog_direction * @param x - the str to free * @param mem - type of memory that the content is using (shm/pkg) */ -#define str_free(x, mem) \ +#define ims_str_free(x, mem) \ do { \ if((x).s) \ mem##_free((x).s); \

1 0

git:master:2ba6d4ff: core: check for unexpected long value return by pathconf()
by Daniel-Constantin Mierla 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: 2ba6d4ff2727031e7bca5d3d1da016bfe508b8df URL: https://github.com/kamailio/kamailio/commit/2ba6d4ff2727031e7bca5d3d1da016b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-11T12:41:26+01:00 core: check for unexpected long value return by pathconf() --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/2ba6d4ff2727031e7bca5d3d1da016b… Patch: https://github.com/kamailio/kamailio/commit/2ba6d4ff2727031e7bca5d3d1da016b… --- diff --git a/src/core/ut.h b/src/core/ut.h index f1829f73ca0..3a3d66202b6 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -546,7 +546,8 @@ inline static int pathmax(void) #endif if(pathmax == 0) { /* init */ pathmax = pathconf("/", _PC_PATH_MAX); - pathmax = (pathmax <= 0) ? PATH_MAX_GUESS : pathmax + 1; + pathmax = (pathmax <= 0 || pathmax >= INT_MAX - 1) ? PATH_MAX_GUESS + : pathmax + 1; } return pathmax; }

1 0

git:master:6c12477f: core: pass fd - check for unexpected read size overflow
by Daniel-Constantin Mierla 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: 6c12477f1dad2279431d703d1a4f63fcfc6543b8 URL: https://github.com/kamailio/kamailio/commit/6c12477f1dad2279431d703d1a4f63f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-11T11:30:34+01:00 core: pass fd - check for unexpected read size overflow --- Modified: src/core/pass_fd.c --- Diff: https://github.com/kamailio/kamailio/commit/6c12477f1dad2279431d703d1a4f63f… Patch: https://github.com/kamailio/kamailio/commit/6c12477f1dad2279431d703d1a4f63f… --- diff --git a/src/core/pass_fd.c b/src/core/pass_fd.c index eae20206fd5..77431dbf293 100644 --- a/src/core/pass_fd.c +++ b/src/core/pass_fd.c @@ -35,6 +35,7 @@ #include <sys/socket.h> #include <sys/uio.h> #include <stdlib.h> /* for NULL definition on openbsd */ +#include <limits.h> #include <errno.h> #include <string.h> #ifdef NO_MSG_WAITALL @@ -289,9 +290,14 @@ int receive_fd(int unix_socket, void *data, int data_len, int *fd, int flags) /* blocking recv_all */ n = recv_all( unix_socket, (char *)data + ret, data_len - ret, MSG_WAITALL); - if(n >= 0) + if(n >= 0) { + if(ret >= INT_MAX - n) { + LM_ERR("int size overflowing: %d + %d\n", ret, n); + ret = -1; + goto error; + } ret += n; - else { + } else { ret = n; goto error; }

1 0

git:master:6fb38cb3: tsilo: clean allocated memory on error for append by contact
by Daniel-Constantin Mierla 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: 6fb38cb33095c11a1c90d7b88140ac159b9fd5ca URL: https://github.com/kamailio/kamailio/commit/6fb38cb33095c11a1c90d7b88140ac1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-11T10:25:34+01:00 tsilo: clean allocated memory on error for append by contact --- Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/6fb38cb33095c11a1c90d7b88140ac1… Patch: https://github.com/kamailio/kamailio/commit/6fb38cb33095c11a1c90d7b88140ac1… --- diff --git a/src/modules/tsilo/tsilo.c b/src/modules/tsilo/tsilo.c index 5119b3f5a21..6af49d59dd3 100644 --- a/src/modules/tsilo/tsilo.c +++ b/src/modules/tsilo/tsilo.c @@ -459,19 +459,19 @@ static int w_ts_append_by_contact2( if(ts_check_uri(&ruri) < 0) { LM_ERR("failed to parse R-URI.\n"); - return -1; + goto error; } /* parse Contact header */ if((!_msg->contact && parse_headers(_msg, HDR_CONTACT_F, 0) != 0) || !_msg->contact) { LM_WARN("missing contact header or the value is empty/malformed.\n"); - return -1; + goto error; } if(_msg->contact) { if(parse_contact(_msg->contact) < 0) { LM_WARN("failed to parse Contact header.\n"); - return -1; + goto error; } if(parse_uri(((struct contact_body *)_msg->contact->parsed) ->contacts->uri.s, @@ -481,7 +481,7 @@ static int w_ts_append_by_contact2( != 0) { if(ts_check_uri(&_msg->contact->body) < 0) { /* one more attempt */ LM_WARN("failed to parse Contact header.\n"); - return -1; + goto error; } } @@ -490,7 +490,7 @@ static int w_ts_append_by_contact2( tmp_contact.s = (char *)pkg_malloc(tmp_contact.len + 1); if(tmp_contact.s == NULL) { PKG_MEM_ERROR; - return -1; + goto error; } memcpy(tmp_contact.s, ((struct contact_body *)_msg->contact->parsed)->contacts->uri.s, @@ -502,7 +502,7 @@ static int w_ts_append_by_contact2( < 0) { /* one more attempt */ LM_ERR("problems when calling ts_append_contact(), cannot copy " "Contact parameter.\n"); - return -1; + goto error; } } } @@ -516,6 +516,18 @@ static int w_ts_append_by_contact2( pkg_free(tmp_contact.s); return rc; + +error: + if(ruri.s != NULL) { + pkg_free(ruri.s); + } + if(contact.s != NULL) { + pkg_free(contact.s); + } + if(tmp_contact.s != NULL) { + pkg_free(tmp_contact.s); + } + return -1; } /** @@ -538,11 +550,11 @@ static int ki_ts_append_by_contact(sip_msg_t *_msg, str *_table, str *_ruri) /* parse Contact header */ if((!_msg->contact && parse_headers(_msg, HDR_CONTACT_F, 0) != 0) || !_msg->contact) - return -1; + goto error; if(_msg->contact) { if(parse_contact(_msg->contact) < 0) - return -1; + goto error; if(parse_uri(((struct contact_body *)_msg->contact->parsed) ->contacts->uri.s, ((struct contact_body *)_msg->contact->parsed) @@ -550,7 +562,7 @@ static int ki_ts_append_by_contact(sip_msg_t *_msg, str *_table, str *_ruri) &curi) != 0) { if(ts_check_uri(&_msg->contact->body) < 0) /* one more attempt */ - return -1; + goto error; } tmp_contact.len = ((struct contact_body *)_msg->contact->parsed) @@ -558,7 +570,7 @@ static int ki_ts_append_by_contact(sip_msg_t *_msg, str *_table, str *_ruri) tmp_contact.s = (char *)pkg_malloc(tmp_contact.len + 1); if(tmp_contact.s == NULL) { PKG_MEM_ERROR; - return -1; + goto error; } memcpy(tmp_contact.s, ((struct contact_body *)_msg->contact->parsed)->contacts->uri.s, @@ -568,7 +580,7 @@ static int ki_ts_append_by_contact(sip_msg_t *_msg, str *_table, str *_ruri) if(pkg_str_dup(&contact, &tmp_contact) < 0) { if(pkg_str_dup(&contact, &_msg->contact->body) < 0) /* one more attempt */ - return -1; + goto error; } } @@ -580,6 +592,18 @@ static int ki_ts_append_by_contact(sip_msg_t *_msg, str *_table, str *_ruri) pkg_free(tmp_contact.s); return rc; + +error: + if(ruri.s != NULL) { + pkg_free(ruri.s); + } + if(contact.s != NULL) { + pkg_free(contact.s); + } + if(tmp_contact.s != NULL) { + pkg_free(tmp_contact.s); + } + return -1; } /**

1 0

[kamailio/kamailio] xhttp_prom module with custom tags (Issue #4021)
by Christian Berger 11 Feb '25

11 Feb '25

### Description In Prometheus there is the possibility to tag values with tags. Those tags can then be used provide context to those values, for example to filter them. ### Expected behavior It would be great if there was a way to provide custom tags to the metrics. These would essentially just be a static string between the name of the metric and its value. Example: `system_load15{host="wurst23.dev.sipgate.net",hostname_short="wurst32"} 0.4` This could probably be achieved by having an `xhttp_prom_ending` parameter similar to the `xhttp_prom_beginning` as we essentially just want to append a static string right after the metric name. #### Actual observed behavior `kamailio_sip_lb_de_core_rcv_replies_1xx_invite 1773 1731419851663` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4021 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4021(a)github.com>

4 7

git:master:69086114: utils/kamcmd: cmake fix on custom command
by Victor Seva 11 Feb '25

11 Feb '25

Module: kamailio Branch: master Commit: 69086114ad6eee016d1b7634f37c5ef31d4543e0 URL: https://github.com/kamailio/kamailio/commit/69086114ad6eee016d1b7634f37c5ef… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-02-11T01:35:56+01:00 utils/kamcmd: cmake fix on custom command --- Modified: utils/kamcmd/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/69086114ad6eee016d1b7634f37c5ef… Patch: https://github.com/kamailio/kamailio/commit/69086114ad6eee016d1b7634f37c5ef… --- diff --git a/utils/kamcmd/CMakeLists.txt b/utils/kamcmd/CMakeLists.txt index 0d1ec28b4c5..f984415ed44 100644 --- a/utils/kamcmd/CMakeLists.txt +++ b/utils/kamcmd/CMakeLists.txt @@ -46,7 +46,7 @@ add_custom_command( -e "s#/usr/sbin/#${CMAKE_INSTALL_FULL_SBINDIR}/#g" -e "s#/usr/lib/${CFG_NAME}/modules/#${CMAKE_INSTALL_FULL_LIBDIR}/${MAIN_NAME}/#g" -e "s#/usr/share/doc/${CFG_NAME}/#${CMAKE_INSTALL_FULL_DOCDIR}/#g" -e - "s#$(SRC_NAME)#$(MAIN_NAME)#g" < ${CMAKE_CURRENT_SOURCE_DIR}/kamcmd.8 > + "s#${SRC_NAME}#${MAIN_NAME}#g" < ${CMAKE_CURRENT_SOURCE_DIR}/kamcmd.8 > ${CMAKE_CURRENT_BINARY_DIR}/kamcmd.8 DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kamcmd.8)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev