- sr-dev - kamailio.org

git:5.8:8eff8116: core: add extra params to first via only for generated replies
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: 8eff811614b72fbf80af6d546d65c65e6b59c1a5 URL: https://github.com/kamailio/kamailio/commit/8eff811614b72fbf80af6d546d65c65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:49:34+01:00 core: add extra params to first via only for generated replies (cherry picked from commit 9045c8d537b8960a18451f870effe2255cb4861d) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/8eff811614b72fbf80af6d546d65c65… Patch: https://github.com/kamailio/kamailio/commit/8eff811614b72fbf80af6d546d65c65… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 262ba07a23a..f7590dc5161 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2692,16 +2692,17 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } - if(received_buf) + if(received_buf) { append_str(p, received_buf, received_len); + } + if(xparams.len > 0) { + append_str(p, xparams.s, xparams.len); + } } else { /* normal whole via copy */ append_str_trans(p, hdr->name.s, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } - if(xparams.len > 0) { - append_str(p, xparams.s, xparams.len); - } append_str(p, CRLF, CRLF_LEN); /* if is HTTP, replace Via with Sia * - HTTP Via format is different than SIP Via

1 0

git:5.8:b6360f4d: core: add rport to generated replies after first via branch when no incoming rport
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: b6360f4d8549c18efad507bc37ef599d9e3316d7 URL: https://github.com/kamailio/kamailio/commit/b6360f4d8549c18efad507bc37ef599… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:49:25+01:00 core: add rport to generated replies after first via branch when no incoming rport (cherry picked from commit 09d1ba87f4d37c3e13153229c63698f09ca195bc) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/b6360f4d8549c18efad507bc37ef599… Patch: https://github.com/kamailio/kamailio/commit/b6360f4d8549c18efad507bc37ef599… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 4e81f89cedb..262ba07a23a 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2663,6 +2663,22 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, - msg->via1->rport->start - msg->via1->rport->size, msg); + } else if(msg->via1->branch) { /* add after branch */ + /* copy until after branch */ + append_str_trans(p, hdr->name.s, + msg->via1->branch->start - hdr->name.s + + msg->via1->branch->size, + msg); + /* copy new rport */ + append_str(p, rport_buf, rport_len); + /* copy the rest of the via */ + append_str_trans(p, + msg->via1->branch->start + + msg->via1->branch->size, + hdr->body.s + hdr->body.len + - msg->via1->branch->start + - msg->via1->branch->size, + msg); } else { /* just append the new one */ /* normal whole via copy */ append_str_trans(p, hdr->name.s,

1 0

git:5.8:132e5324: etc/kamailio.org: do record route for REFER
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: 132e5324bf9f794ea82df0f12ef094f6c12ee178 URL: https://github.com/kamailio/kamailio/commit/132e5324bf9f794ea82df0f12ef094f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:49:13+01:00 etc/kamailio.org: do record route for REFER - it creates a subscription dialog - https://datatracker.ietf.org/doc/html/rfc3515#section-2 (cherry picked from commit cfc9d69435b4bbc53dbe6748e0d22603760c48fd) --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/132e5324bf9f794ea82df0f12ef094f… Patch: https://github.com/kamailio/kamailio/commit/132e5324bf9f794ea82df0f12ef094f… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 3f9a5fe793f..d0a3d2754dc 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -561,7 +561,7 @@ request_route { # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); - if (is_method("INVITE|SUBSCRIBE")) { + if (is_method("INVITE|SUBSCRIBE|REFER")) { record_route(); } @@ -678,8 +678,8 @@ route[WITHINDLG] { } else if ( is_method("ACK") ) { # ACK is forwarded statelessly route(NATMANAGE); - } else if ( is_method("NOTIFY") ) { - # Add Record-Route for in-dialog NOTIFY as per RFC 6665. + } else if ( is_method("NOTIFY|REFER") ) { + # Add Record-Route for in-dialog NOTIFY and REFER (RFC6665, RFC3515) record_route(); } route(RELAY);

1 0

git:5.8:76ffc6d3: core: parser/sdp - check if still before end of the value
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: 76ffc6d3d4053bc43b81c3363e837c10360b0089 URL: https://github.com/kamailio/kamailio/commit/76ffc6d3d4053bc43b81c3363e837c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:48:55+01:00 core: parser/sdp - check if still before end of the value (cherry picked from commit b96bc11a54f11ec688429c057bf5a90c40c147b3) --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/76ffc6d3d4053bc43b81c3363e837c1… Patch: https://github.com/kamailio/kamailio/commit/76ffc6d3d4053bc43b81c3363e837c1… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index bad76bcda22..ed34712934d 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -413,7 +413,7 @@ int extract_ice_option(str *body, sdp_stream_cell_t *stream) trim_len(ice_opt->option.len, ice_opt->option.s, ice_opt->option); length = 0; - if(*ptr_src == 32) + if(ptr_src < end && *ptr_src == 32) ptr_src++; /* skip space */ }

1 0

git:5.8:9b26093f: core: socket info - set receive timeout for netlink socket
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: 9b26093fa5cdf05cf664fa3a03619634ed226a47 URL: https://github.com/kamailio/kamailio/commit/9b26093fa5cdf05cf664fa3a0361963… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:48:40+01:00 core: socket info - set receive timeout for netlink socket - GH #4098 (cherry picked from commit 6750e2e2f1d6c10f6b5e66897d38657a576a9732) --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/9b26093fa5cdf05cf664fa3a0361963… Patch: https://github.com/kamailio/kamailio/commit/9b26093fa5cdf05cf664fa3a0361963… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 44f33027c75..8efa594618f 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1332,6 +1332,7 @@ static int nl_bound_sock(void) { int sock = -1; struct sockaddr_nl la; + struct timeval recvtimeout; sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); if(sock < 0) { @@ -1350,6 +1351,15 @@ static int nl_bound_sock(void) goto error; } + recvtimeout.tv_sec = 4; + recvtimeout.tv_usec = 0; + if(setsockopt( + sock, SOL_SOCKET, SO_RCVTIMEO, &recvtimeout, sizeof(recvtimeout)) + < 0) { + LM_ERR("failed to set receive timeout\n"); + goto error; + } + return sock; error: if(sock >= 0) @@ -1402,6 +1412,10 @@ static int get_flags(int family) goto error; } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); + if(rtn <= 0) { + LM_ERR("failed to receive data (%d/%d)\n", rtn, errno); + goto error; + } nlp = (struct nlmsghdr *)p; if(nlp->nlmsg_type == NLMSG_DONE) { LM_DBG("done\n"); @@ -1504,6 +1518,10 @@ static int build_iface_list(void) goto error; } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); + if(rtn <= 0) { + LM_ERR("failed to receive data (%d/%d)\n", rtn, errno); + goto error; + } LM_DBG("received %d byles \n", rtn); nlp = (struct nlmsghdr *)p; if(nlp->nlmsg_type == NLMSG_DONE) {

1 0

git:5.8:59a6a469: parser/sdp: more details in logs for setting fmtp payload
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: 59a6a469d1627de069abb8b7755776a8e87c9008 URL: https://github.com/kamailio/kamailio/commit/59a6a469d1627de069abb8b7755776a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:48:18+01:00 parser/sdp: more details in logs for setting fmtp payload (cherry picked from commit 81b84ef83f59981b6e5f199055e9ab6a94c58b38) --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/59a6a469d1627de069abb8b7755776a… Patch: https://github.com/kamailio/kamailio/commit/59a6a469d1627de069abb8b7755776a… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index 06fc411f502..5eb04b0c047 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -233,7 +233,13 @@ void set_sdp_payload_attr(sdp_payload_attr_t *payload_attr, str *rtp_enc, void set_sdp_payload_fmtp(sdp_payload_attr_t *payload_attr, str *fmtp_string) { if(payload_attr == NULL) { - LM_ERR("Invalid payload location\n"); + if(fmtp_string != NULL && fmtp_string->s != NULL + && fmtp_string->len > 0) { + LM_ERR("Invalid payload location - fmtp: %.*s\n", fmtp_string->len, + fmtp_string->s); + } else { + LM_ERR("Invalid payload location\n"); + } return; } payload_attr->fmtp_string.s = fmtp_string->s; @@ -354,6 +360,8 @@ sdp_payload_attr_t *get_sdp_payload4payload( } } + LM_DBG("payload not found: %.*s\n", rtp_payload->len, rtp_payload->s); + return NULL; }

1 0

git:5.8:f499cb1f: core: tcp - remove level and function name from log message
by Daniel-Constantin Mierla 22 Jan '25

22 Jan '25

Module: kamailio Branch: 5.8 Commit: f499cb1fffb0ec8ef7b659ecde90de303fde0553 URL: https://github.com/kamailio/kamailio/commit/f499cb1fffb0ec8ef7b659ecde90de3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-22T10:47:54+01:00 core: tcp - remove level and function name from log message (cherry picked from commit 5fe61ec6dbcd9d2dde3f2bd978dad5130ac5bff9) --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/f499cb1fffb0ec8ef7b659ecde90de3… Patch: https://github.com/kamailio/kamailio/commit/f499cb1fffb0ec8ef7b659ecde90de3… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index cd7790eb958..77ba6e97cfa 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1522,8 +1522,7 @@ int tcp_read_req(struct tcp_connection *con, int *bytes_read, if(unlikely(bytes < 0)) { LOG(cfg_get(core, core_cfg, corelog), - "ERROR: tcp_read_req: error reading - c: %p r: %p (%d)\n", - con, req, bytes); + "error reading - c: %p r: %p (%d)\n", con, req, bytes); resp = CONN_ERROR; goto end_req; }

1 0

git:master:d613f302: core: reworked how rport, received and extra params are added to first via of generated replies
by Daniel-Constantin Mierla 21 Jan '25

21 Jan '25

Module: kamailio Branch: master Commit: d613f30214782d47ed0aab8bf2fb55329d87862a URL: https://github.com/kamailio/kamailio/commit/d613f30214782d47ed0aab8bf2fb553… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-21T21:43:06+01:00 core: reworked how rport, received and extra params are added to first via of generated replies --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/d613f30214782d47ed0aab8bf2fb553… Patch: https://github.com/kamailio/kamailio/commit/d613f30214782d47ed0aab8bf2fb553… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 7ad113aa955..6cd65716625 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2667,57 +2667,50 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, if(unlikely(httpreq)) pvia = p; if(hdr == msg->h_via1) { - if(rport_buf) { - if(msg->via1->rport) { /* delete the old one */ - /* copy until rport */ - append_str_trans(p, hdr->name.s, - msg->via1->rport->start - hdr->name.s - 1, - msg); - /* copy new rport */ - append_str(p, rport_buf, rport_len); - /* copy the rest of the via */ - append_str_trans(p, - msg->via1->rport->start - + msg->via1->rport->size, - hdr->body.s + hdr->body.len - - msg->via1->rport->start - - msg->via1->rport->size, - msg); - } else if(msg->via1->branch) { /* add after branch */ - /* copy until after branch */ - append_str_trans(p, hdr->name.s, - msg->via1->branch->start - hdr->name.s - + msg->via1->branch->size, - msg); - /* copy new rport */ - append_str(p, rport_buf, rport_len); - /* copy the rest of the via */ - append_str_trans(p, - msg->via1->branch->start - + msg->via1->branch->size, - hdr->body.s + hdr->body.len - - msg->via1->branch->start - - msg->via1->branch->size, - msg); - } else { /* just append the new one */ - /* normal whole via copy */ - append_str_trans(p, hdr->name.s, - (hdr->body.s + hdr->body.len) - hdr->name.s, - msg); - append_str(p, rport_buf, rport_len); - } - } else { - /* normal whole via copy */ + if(rport_buf && msg->via1->rport) { /* replace old rport */ + /* copy until rport */ + append_str_trans(p, hdr->name.s, + msg->via1->rport->start - hdr->name.s - 1, msg); + } else if(msg->via1->branch) { /* add after branch */ + append_str_trans(p, hdr->name.s, + msg->via1->branch->start - hdr->name.s + + msg->via1->branch->size, + msg); + } else { /* append after header */ append_str_trans(p, hdr->name.s, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } + if(rport_buf) { + /* add rport */ + append_str(p, rport_buf, rport_len); + } if(received_buf) { + /* add received */ append_str(p, received_buf, received_len); } if(xparams.len > 0) { + /* add extra parameters */ append_str(p, xparams.s, xparams.len); } + /* copy the rest of the via */ + if(rport_buf && msg->via1->rport) { + append_str_trans(p, + msg->via1->rport->start + + msg->via1->rport->size, + hdr->body.s + hdr->body.len + - msg->via1->rport->start + - msg->via1->rport->size, + msg); + } else if(msg->via1->branch) { + append_str_trans(p, + msg->via1->branch->start + + msg->via1->branch->size, + hdr->body.s + hdr->body.len + - msg->via1->branch->start + - msg->via1->branch->size, + msg); + } } else { /* normal whole via copy */ append_str_trans(p, hdr->name.s,

1 0

git:master:9045c8d5: core: add extra params to first via only for generated replies
by Daniel-Constantin Mierla 21 Jan '25

21 Jan '25

Module: kamailio Branch: master Commit: 9045c8d537b8960a18451f870effe2255cb4861d URL: https://github.com/kamailio/kamailio/commit/9045c8d537b8960a18451f870effe22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-21T21:22:38+01:00 core: add extra params to first via only for generated replies --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/9045c8d537b8960a18451f870effe22… Patch: https://github.com/kamailio/kamailio/commit/9045c8d537b8960a18451f870effe22… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 50e867804be..7ad113aa955 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2712,16 +2712,17 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } - if(received_buf) + if(received_buf) { append_str(p, received_buf, received_len); + } + if(xparams.len > 0) { + append_str(p, xparams.s, xparams.len); + } } else { /* normal whole via copy */ append_str_trans(p, hdr->name.s, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } - if(xparams.len > 0) { - append_str(p, xparams.s, xparams.len); - } append_str(p, CRLF, CRLF_LEN); /* if is HTTP, replace Via with Sia * - HTTP Via format is different than SIP Via

1 0

git:master:09d1ba87: core: add rport to generated replies after first via branch when no incoming rport
by Daniel-Constantin Mierla 21 Jan '25

21 Jan '25

Module: kamailio Branch: master Commit: 09d1ba87f4d37c3e13153229c63698f09ca195bc URL: https://github.com/kamailio/kamailio/commit/09d1ba87f4d37c3e13153229c63698f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-21T19:45:20+01:00 core: add rport to generated replies after first via branch when no incoming rport --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/09d1ba87f4d37c3e13153229c63698f… Patch: https://github.com/kamailio/kamailio/commit/09d1ba87f4d37c3e13153229c63698f… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 8924e8a2609..50e867804be 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -2683,6 +2683,22 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, - msg->via1->rport->start - msg->via1->rport->size, msg); + } else if(msg->via1->branch) { /* add after branch */ + /* copy until after branch */ + append_str_trans(p, hdr->name.s, + msg->via1->branch->start - hdr->name.s + + msg->via1->branch->size, + msg); + /* copy new rport */ + append_str(p, rport_buf, rport_len); + /* copy the rest of the via */ + append_str_trans(p, + msg->via1->branch->start + + msg->via1->branch->size, + hdr->body.s + hdr->body.len + - msg->via1->branch->start + - msg->via1->branch->size, + msg); } else { /* just append the new one */ /* normal whole via copy */ append_str_trans(p, hdr->name.s,

1 0

git:master:cfc9d694: etc/kamailio.org: do record route for REFER
by Daniel-Constantin Mierla 21 Jan '25

21 Jan '25

Module: kamailio Branch: master Commit: cfc9d69435b4bbc53dbe6748e0d22603760c48fd URL: https://github.com/kamailio/kamailio/commit/cfc9d69435b4bbc53dbe6748e0d2260… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-21T18:15:19+01:00 etc/kamailio.org: do record route for REFER - it creates a subscription dialog - https://datatracker.ietf.org/doc/html/rfc3515#section-2 --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/cfc9d69435b4bbc53dbe6748e0d2260… Patch: https://github.com/kamailio/kamailio/commit/cfc9d69435b4bbc53dbe6748e0d2260… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index ea0aa10ca7e..a61227d4173 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -578,7 +578,7 @@ request_route { # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); - if (is_method("INVITE|SUBSCRIBE")) { + if (is_method("INVITE|SUBSCRIBE|REFER")) { record_route(); } @@ -700,8 +700,8 @@ route[WITHINDLG] { } else if ( is_method("ACK") ) { # ACK is forwarded statelessly route(NATMANAGE); - } else if ( is_method("NOTIFY") ) { - # Add Record-Route for in-dialog NOTIFY as per RFC 6665. + } else if ( is_method("NOTIFY|REFER") ) { + # Add Record-Route for in-dialog NOTIFY and REFER (RFC6665, RFC3515) record_route(); } route(RELAY);

1 0

git:master:c994fb8d: ims_qos_npn: fix documentation XML names, it was not adapted after the copy from ims_qos
by Henning Westerholt 21 Jan '25

21 Jan '25

Module: kamailio Branch: master Commit: c994fb8d3906f2199d61302882f3836aa83dd6bb URL: https://github.com/kamailio/kamailio/commit/c994fb8d3906f2199d61302882f3836… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-21T12:23:49Z ims_qos_npn: fix documentation XML names, it was not adapted after the copy from ims_qos --- Added: src/modules/ims_qos_npn/doc/ims_qos_npn.xml Added: src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml Removed: src/modules/ims_qos_npn/doc/ims_qos.xml Removed: src/modules/ims_qos_npn/doc/ims_qos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c994fb8d3906f2199d61302882f3836… Patch: https://github.com/kamailio/kamailio/commit/c994fb8d3906f2199d61302882f3836… --- diff --git a/src/modules/ims_qos_npn/doc/ims_qos.xml b/src/modules/ims_qos_npn/doc/ims_qos_npn.xml similarity index 98% rename from src/modules/ims_qos_npn/doc/ims_qos.xml rename to src/modules/ims_qos_npn/doc/ims_qos_npn.xml index c1a88ad94fe..0cd99dcd0c7 100644 --- a/src/modules/ims_qos_npn/doc/ims_qos.xml +++ b/src/modules/ims_qos_npn/doc/ims_qos_npn.xml @@ -108,6 +108,6 @@ <toc/> - <xi:include href="ims_qos_admin.xml" + <xi:include href="ims_qos_npn_admin.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> </book> diff --git a/src/modules/ims_qos_npn/doc/ims_qos_admin.xml b/src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml similarity index 100% rename from src/modules/ims_qos_npn/doc/ims_qos_admin.xml rename to src/modules/ims_qos_npn/doc/ims_qos_npn_admin.xml

1 0

git:master:13d306dd: cmake: Fix FindBerkeleyDB to correct lib name.
by Xenofon Karamanos 21 Jan '25

21 Jan '25

Module: kamailio Branch: master Commit: 13d306dd97989162bf716fa23342608bce037b9b URL: https://github.com/kamailio/kamailio/commit/13d306dd97989162bf716fa23342608… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-21T10:29:55Z cmake: Fix FindBerkeleyDB to correct lib name. - CMake lint - Search only C version --- Modified: cmake/modules/FindBerkeleyDB.cmake --- Diff: https://github.com/kamailio/kamailio/commit/13d306dd97989162bf716fa23342608… Patch: https://github.com/kamailio/kamailio/commit/13d306dd97989162bf716fa23342608…

1 0

[kamailio/kamailio] kamcmd tls.reload problem (Issue #4033)
by ynasida 21 Jan '25

21 Jan '25

Hello, I am using letsencrypt cert and key and do not want to restart kamailio every 3 months to load new ones. I know that there is: kamcmd tls.reload method but it has an error for me. error: 500 - Error while fixing TLS configuration (consult server log) I am checking the logs and see: kamailio[3865480]: INFO: tls [tls_domain.c:345]: ksr_tls_fill_missing(): TLSs<default>: tls_method=3 kamailio[3865480]: INFO: tls [tls_domain.c:357]: ksr_tls_fill_missing(): TLSs<default>: certificate='/etc/kamailio/certs/my_cert.crt' kamailio[3865480]: INFO: tls [tls_domain.c:364]: ksr_tls_fill_missing(): TLSs<default>: ca_list='(null)' kamailio[3865480]: INFO: tls [tls_domain.c:371]: ksr_tls_fill_missing(): TLSs<default>: ca_path='(null)' kamailio[3865480]: INFO: tls [tls_domain.c:378]: ksr_tls_fill_missing(): TLSs<default>: crl='(null)' kamailio[3865480]: INFO: tls [tls_domain.c:382]: ksr_tls_fill_missing(): TLSs<default>: require_certificate=0 kamailio[3865480]: INFO: tls [tls_domain.c:390]: ksr_tls_fill_missing(): TLSs<default>: cipher_list='(null)' kamailio[3865480]: INFO: tls [tls_domain.c:397]: ksr_tls_fill_missing(): TLSs<default>: private_key='/etc/kamailio/certs/private.key' kamailio[3865480]: INFO: tls [tls_domain.c:401]: ksr_tls_fill_missing(): TLSs<default>: verify_certificate=0 kamailio[3865480]: INFO: tls [tls_domain.c:406]: ksr_tls_fill_missing(): TLSs<default>: verify_depth=9 kamailio[3865480]: INFO: tls [tls_domain.c:410]: ksr_tls_fill_missing(): TLSs<default>: verify_client=0 kamailio[3865480]: NOTICE: tls [tls_domain.c:1168]: ksr_tls_fix_domain(): registered server_name callback handler for socket [:0], server_name='<default>' ... kamailio[3865480]: ERROR: tls [tls_domain.c:590]: load_cert(): TLSs<default>: Unable to load certificate file '/etc/kamailio/certs/my_cert.crt' kamailio[3865480]: ERROR: tls [tls_util.h:49]: tls_err_ret(): load_cert:error:03000072:digital envelope routines::decode error (sni: unknown) kamailio[3865480]: ERROR: tls [tls_util.h:49]: tls_err_ret(): load_cert:error:0A00018F:SSL routines::ee key too small (sni: unknown) Any advice ? It's interesting that there are not any TLS errors in case I restart kamailio. I can make TLS calls without problems. deb 12.5 version: kamailio 5.7.4 (x86_64/linux) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4033 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4033(a)github.com>

4 5

[kamailio/kamailio] Close parenthesis on error description (#2589)
by Javier Valencia 20 Jan '25

20 Jan '25

Close parentheses on error description when *Not enough parameters* on *htable_rpc_delete*. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2589 -- Commit Summary -- * Close parenthesis on error description -- File Changes -- M src/modules/htable/htable.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2589.patch https://github.com/kamailio/kamailio/pull/2589.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/2589

3 4

git:master:024c649c: htable: close parentheses on error description
by Henning Westerholt 20 Jan '25

20 Jan '25

Module: kamailio Branch: master Commit: 024c649c36bbe1d5ba4b306de53102cec4096734 URL: https://github.com/kamailio/kamailio/commit/024c649c36bbe1d5ba4b306de53102c… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-01-20T19:36:11Z htable: close parentheses on error description --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/024c649c36bbe1d5ba4b306de53102c… Patch: https://github.com/kamailio/kamailio/commit/024c649c36bbe1d5ba4b306de53102c… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index bd0a7bf6e57..d458e83141a 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1561,7 +1561,7 @@ static void htable_rpc_delete(rpc_t *rpc, void *c) int res; if(rpc->scan(c, "SS", &htname, &keyname) < 2) { - rpc->fault(c, 500, "Not enough parameters (htable name & key name"); + rpc->fault(c, 500, "Not enough parameters (htable name & key name)"); return; } ht = ht_get_table(&htname);

1 0

git:master:e8389b36: cdp: remove level and function name from log messages
by Victor Seva 20 Jan '25

20 Jan '25

Module: kamailio Branch: master Commit: e8389b36aff772d1a419a5b9d28ede0e86b2109e URL: https://github.com/kamailio/kamailio/commit/e8389b36aff772d1a419a5b9d28ede0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-20T18:37:51+01:00 cdp: remove level and function name from log messages --- Modified: src/modules/cdp/authstatemachine.c Modified: src/modules/cdp/common.c Modified: src/modules/cdp/config.c Modified: src/modules/cdp/configparser.c Modified: src/modules/cdp/diameter_avp.c Modified: src/modules/cdp/diameter_comm.c Modified: src/modules/cdp/diameter_msg.c Modified: src/modules/cdp/diameter_peer.c Modified: src/modules/cdp/peermanager.c Modified: src/modules/cdp/peerstatemachine.c Modified: src/modules/cdp/receiver.c Modified: src/modules/cdp/routing.c Modified: src/modules/cdp/session.c Modified: src/modules/cdp/tcp_accept.c Modified: src/modules/cdp/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/e8389b36aff772d1a419a5b9d28ede0… Patch: https://github.com/kamailio/kamailio/commit/e8389b36aff772d1a419a5b9d28ede0…

1 0

git:master:b96bc11a: core: parser/sdp - check if still before end of the value
by Daniel-Constantin Mierla 20 Jan '25

20 Jan '25

Module: kamailio Branch: master Commit: b96bc11a54f11ec688429c057bf5a90c40c147b3 URL: https://github.com/kamailio/kamailio/commit/b96bc11a54f11ec688429c057bf5a90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-20T17:10:05+01:00 core: parser/sdp - check if still before end of the value --- Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/b96bc11a54f11ec688429c057bf5a90… Patch: https://github.com/kamailio/kamailio/commit/b96bc11a54f11ec688429c057bf5a90… --- diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 5c7076823c4..483cfdec70e 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -413,7 +413,7 @@ int extract_ice_option(str *body, sdp_stream_cell_t *stream) trim_len(ice_opt->option.len, ice_opt->option.s, ice_opt->option); length = 0; - if(*ptr_src == 32) + if(ptr_src < end && *ptr_src == 32) ptr_src++; /* skip space */ }

1 0

git:master:6750e2e2: core: socket info - set receive timeout for netlink socket
by Daniel-Constantin Mierla 20 Jan '25

20 Jan '25

Module: kamailio Branch: master Commit: 6750e2e2f1d6c10f6b5e66897d38657a576a9732 URL: https://github.com/kamailio/kamailio/commit/6750e2e2f1d6c10f6b5e66897d38657… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-20T12:58:18+01:00 core: socket info - set receive timeout for netlink socket - GH #4098 --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/6750e2e2f1d6c10f6b5e66897d38657… Patch: https://github.com/kamailio/kamailio/commit/6750e2e2f1d6c10f6b5e66897d38657… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index b431ea395db..24243fea153 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1378,6 +1378,7 @@ static int nl_bound_sock(void) { int sock = -1; struct sockaddr_nl la; + struct timeval recvtimeout; sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); if(sock < 0) { @@ -1396,6 +1397,15 @@ static int nl_bound_sock(void) goto error; } + recvtimeout.tv_sec = 4; + recvtimeout.tv_usec = 0; + if(setsockopt( + sock, SOL_SOCKET, SO_RCVTIMEO, &recvtimeout, sizeof(recvtimeout)) + < 0) { + LM_ERR("failed to set receive timeout\n"); + goto error; + } + return sock; error: if(sock >= 0) @@ -1448,6 +1458,10 @@ static int get_flags(int family) goto error; } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); + if(rtn <= 0) { + LM_ERR("failed to receive data (%d/%d)\n", rtn, errno); + goto error; + } nlp = (struct nlmsghdr *)p; if(nlp->nlmsg_type == NLMSG_DONE) { LM_DBG("done\n"); @@ -1550,6 +1564,10 @@ static int build_iface_list(void) goto error; } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); + if(rtn <= 0) { + LM_ERR("failed to receive data (%d/%d)\n", rtn, errno); + goto error; + } LM_DBG("received %d byles \n", rtn); nlp = (struct nlmsghdr *)p; if(nlp->nlmsg_type == NLMSG_DONE) {

1 0

[kamailio/kamailio] cmake - make clean deletes readme files from modules source folders (Issue #4084)
by Daniel-Constantin Mierla 20 Jan '25

20 Jan '25

Executing `make clean` in the `build` folder deletes the `README` files from the modules folders. This is probably because the README is an output of a `cmake-make` command. What would be the best option to skip this removing? I found: - https://stackoverflow.com/questions/6259372/cmake-preventing-make-clean-fro… Which indicates adding: ``` SET_DIRECTORY_PROPERTIES(PROPERTIES CLEAN_NO_CUSTOM 1) ``` In the CMakeLists.txt inside the module folders. But maybe it is another place where it can be done once for all modules, or another option... -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4084 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4084(a)github.com>

3 9

git:master:e50a24aa: cmake/os-specific/darwin.cmake: use -undefined dynamic_lookup for OS v24+
by Daniel-Constantin Mierla 20 Jan '25

20 Jan '25

Module: kamailio Branch: master Commit: e50a24aa4a4fcc6c0310f9f2d5f130197372b2f9 URL: https://github.com/kamailio/kamailio/commit/e50a24aa4a4fcc6c0310f9f2d5f1301… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-20T11:05:08+01:00 cmake/os-specific/darwin.cmake: use -undefined dynamic_lookup for OS v24+ - the option -undefined suppress has been deprecated --- Modified: cmake/os-specific/darwin.cmake --- Diff: https://github.com/kamailio/kamailio/commit/e50a24aa4a4fcc6c0310f9f2d5f1301… Patch: https://github.com/kamailio/kamailio/commit/e50a24aa4a4fcc6c0310f9f2d5f1301… --- diff --git a/cmake/os-specific/darwin.cmake b/cmake/os-specific/darwin.cmake index bd02a290b53..a43c075142b 100644 --- a/cmake/os-specific/darwin.cmake +++ b/cmake/os-specific/darwin.cmake @@ -25,11 +25,20 @@ if(NOT ${USE_FAST_LOCK}) target_compile_definitions(common INTERFACE USE_PTHREAD_MUTEX USE_SYSV_SEM) endif() +if (CMAKE_HOST_SYSTEM_VERSION VERSION_LESS 24) + message(STATUS "Running on Big Sur") set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -bundle -flat_namespace -undefined suppress") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -dynamiclib -flat_namespace -undefined suppress" ) +else () +set(CMAKE_MODULE_LINKER_FLAGS + "${CMAKE_MODULE_LINKER_FLAGS} -bundle -flat_namespace -undefined dynamic_lookup") +set(CMAKE_SHARED_LINKER_FLAGS + "${CMAKE_SHARED_LINKER_FLAGS} -dynamiclib -flat_namespace -undefined dynamic_lookup" +) +endif () if(NOT NO_SELECT) target_compile_definitions(common INTERFACE HAVE_SELECT)

1 0

git:master:a1bdef91: cmake: messages about not finding docs-related tools made status
by Daniel-Constantin Mierla 20 Jan '25

20 Jan '25

Module: kamailio Branch: master Commit: a1bdef919414173e8327a8dd65ecaa2fca279d6a URL: https://github.com/kamailio/kamailio/commit/a1bdef919414173e8327a8dd65ecaa2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-20T10:54:14+01:00 cmake: messages about not finding docs-related tools made status - they should not be needed for development and usual installation, warning makes it look like something relevant cannot be done --- Modified: cmake/modules-docs.cmake --- Diff: https://github.com/kamailio/kamailio/commit/a1bdef919414173e8327a8dd65ecaa2… Patch: https://github.com/kamailio/kamailio/commit/a1bdef919414173e8327a8dd65ecaa2… --- diff --git a/cmake/modules-docs.cmake b/cmake/modules-docs.cmake index 10b1b70a8f2..721ba7d0b45 100644 --- a/cmake/modules-docs.cmake +++ b/cmake/modules-docs.cmake @@ -6,12 +6,12 @@ find_program(LYNX_EXECUTABLE lynx QUIET) find_program(DOCBOOK2X_EXECUTABLE docbook2x-man QUIET) if(BUILD_DOC AND (NOT XSLTPROC_EXECUTABLE OR NOT LYNX_EXECUTABLE)) - message(WARNING "xsltproc or lynx not found but required for doc generation.") + message(STATUS "xsltproc or lynx not found but required for doc generation.") set(BUILD_DOC OFF) endif() if(BUILD_DOC AND (NOT DOCBOOK2X_EXECUTABLE)) - message(WARNING "docbook2x-man not found but required for man generation.") + message(STATUS "docbook2x-man not found but required for man generation.") set(BUILD_DOC OFF) endif()

1 0

git:master:09628a8e: cmake: fix typo, missing KRADIUS
by Victor Seva 20 Jan '25

20 Jan '25

Module: kamailio Branch: master Commit: 09628a8e6060a21805fccccc1f530062fca1bb75 URL: https://github.com/kamailio/kamailio/commit/09628a8e6060a21805fccccc1f53006… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-20T09:18:45+01:00 cmake: fix typo, missing KRADIUS --- Modified: .pre-commit-config.yaml Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/09628a8e6060a21805fccccc1f53006… Patch: https://github.com/kamailio/kamailio/commit/09628a8e6060a21805fccccc1f53006… --- diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7892175df39..c5df7975c1f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,4 +16,10 @@ repos: rev: v0.6.13 hooks: - id: cmake-format + verbose: true + args: + - -c cmake/cmake-format.py - id: cmake-lint + verbose: true + args: + - -c cmake/cmake-format.py diff --git a/cmake/groups.cmake b/cmake/groups.cmake index b3562cbbbcc..9cd7ddf77dc 100644 --- a/cmake/groups.cmake +++ b/cmake/groups.cmake @@ -720,7 +720,7 @@ list( KPOSTGRES KCPL KXML - KRAIDUS + KRADIUS KUNIXODBC KPERL KSNMPSTATS

1 0

git:master:0a5db680: cmake: Remove depracated modules from groups
by Xenofon Karamanos 17 Jan '25

17 Jan '25

Module: kamailio Branch: master Commit: 0a5db6808e859e88aae739e277d1647e05a4f4c6 URL: https://github.com/kamailio/kamailio/commit/0a5db6808e859e88aae739e277d1647… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-17T14:56:31Z cmake: Remove depracated modules from groups - cmake lint --- Modified: cmake/groups.cmake --- Diff: https://github.com/kamailio/kamailio/commit/0a5db6808e859e88aae739e277d1647… Patch: https://github.com/kamailio/kamailio/commit/0a5db6808e859e88aae739e277d1647…

1 0

git:master:eeffe798: cmake: Fix ignoring excluded module
by Xenofon Karamanos 17 Jan '25

17 Jan '25

Module: kamailio Branch: master Commit: eeffe798b85d4f8c580c221b0e655b1b49a7420f URL: https://github.com/kamailio/kamailio/commit/eeffe798b85d4f8c580c221b0e655b1… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-01-17T14:56:31Z cmake: Fix ignoring excluded module - When adding groups, we now also check if they contain a user-excluded module. --- Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/eeffe798b85d4f8c580c221b0e655b1… Patch: https://github.com/kamailio/kamailio/commit/eeffe798b85d4f8c580c221b0e655b1… --- diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index 22c1341db8a..be55da5f065 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -4,6 +4,7 @@ set(MODULES_DIR "${CMAKE_CURRENT_SOURCE_DIR}") # Initialize a global property to track added modules set_property(GLOBAL PROPERTY ADDED_MODULES_LIST "") set_property(GLOBAL PROPERTY ALL_MODULE_DOC_TARGETS "") +set_property(GLOBAL PROPERTY EXCLUDED_MODULES_LIST "") include(${CMAKE_SOURCE_DIR}/cmake/groups.cmake) @@ -52,9 +53,12 @@ function(add_module_group group_modules) foreach(module_name IN LISTS group_modules) # Check if the module has already been added get_property(ALREADY_ADDED GLOBAL PROPERTY ADDED_MODULES_LIST) - if(";${ALREADY_ADDED};" MATCHES ";${module_name};") + if("${module_name}" IN_LIST ALREADY_ADDED) message( STATUS "Module ${module_name} has already been added. Skipping...") + elseif("${module_name}" IN_LIST EXCLUDED_MODULES_LIST) + message(STATUS "Module ${module_name} is excluded. Skipping...") + list(REMOVE_ITEM ADDED_MODULES_LIST ${module_name}) else() # Construct the path to the module set(module_path "${MODULES_DIR}/${module_name}") @@ -108,28 +112,6 @@ function(add_module_group group_modules) endforeach() endfunction() -list(APPEND FINAL_MODULES_LIST "") - -# Parse and add extra modules specified by the user -separate_arguments(INCLUDE_MODULES_LIST UNIX_COMMAND "${INCLUDE_MODULES}") -message( - STATUS - "Extra modules (if module already included already from group is ignored): - ${INCLUDE_MODULES_LIST}") -list(APPEND FINAL_MODULES_LIST ${INCLUDE_MODULES_LIST}) - -# Exclude modules that were explicitly excluded by the user -separate_arguments(EXCLUDE_MODULES_LIST UNIX_COMMAND "${EXCLUDE_MODULES}") -message(STATUS "Excluded modules (exlcude even if in included modules): - ${EXCLUDE_MODULES_LIST}") -foreach(module_name IN LISTS EXCLUDE_MODULES_LIST) - # if in list remove it and print a message - if(";${FINAL_MODULES_LIST};" MATCHES ";${module_name};") - list(REMOVE_ITEM FINAL_MODULES_LIST ${module_name}) - message(STATUS "Removed module: ${module_name}") - endif() -endforeach() - # Define targets before adding the groups and modules, so that we can add # dependencies to them. add_custom_target( @@ -140,8 +122,19 @@ add_custom_target( add_custom_target(kamailio_docs_man COMMENT "Generating man pages") +# Parse and add extra modules specified by the user +separate_arguments(INCLUDE_MODULES_LIST UNIX_COMMAND "${INCLUDE_MODULES}") +message( + STATUS + "Extra modules (if module already included already from group is ignored): + ${INCLUDE_MODULES_LIST}") +list(APPEND USER_MODULES_LIST ${INCLUDE_MODULES_LIST}) + +separate_arguments(EXCLUDED_MODULES_LIST UNIX_COMMAND "${EXCLUDE_MODULES}") +message(STATUS "Excluded modules (exlcude even if in included modules): + ${EXCLUDED_MODULES_LIST}") + # Add each group of modules -add_module_group("${FINAL_MODULES_LIST}") foreach(group IN LISTS FULL_MODULE_GROUP_NAMES) get_property(MODULES_IN_GROUP VARIABLE PROPERTY "${group}") if(VERBOSE) @@ -149,10 +142,12 @@ foreach(group IN LISTS FULL_MODULE_GROUP_NAMES) endif() add_module_group("${MODULES_IN_GROUP}") endforeach() +add_module_group("${USER_MODULES_LIST}") get_property(ADDED_MODULES_LIST GLOBAL PROPERTY ADDED_MODULES_LIST) message(STATUS "Modules to be built: ${ADDED_MODULES_LIST}") # TODO: Comment is not showing. probably a bug in CMAKE +# https://gitlab.kitware.com/cmake/cmake/-/issues/26571 add_custom_target(modules COMMENT "Building modules") add_dependencies(modules ${ADDED_MODULES_LIST})

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev