- sr-dev - kamailio.org

git:master:bf863877: ims_ipsec_pcscf: update security params of newly created ipsec tunnel in contact
by Supreeth Herle 17 Jun '24

17 Jun '24

Module: kamailio Branch: master Commit: bf863877f666dd8350e855bf933270b2fd8ad0fd URL: https://github.com/kamailio/kamailio/commit/bf863877f666dd8350e855bf933270b… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Supreeth Herle <herlesupreeth(a)gmail.com> Date: 2024-06-17T13:37:12+02:00 ims_ipsec_pcscf: update security params of newly created ipsec tunnel in contact --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/bf863877f666dd8350e855bf933270b… Patch: https://github.com/kamailio/kamailio/commit/bf863877f666dd8350e855bf933270b… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 05079834252..3ce36d27952 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -900,12 +900,10 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) goto cleanup; } - if(ul.update_pcontact(d, &ci, pcontact) != 0) { - LM_ERR("Error updating contact\n"); - goto cleanup; - } - if(ci.via_port == SIP_PORT) { + if(req_sec_params != NULL) { + pcontact->security_temp->data.ipsec = s; + } // Update temp security parameters if(ul.update_temp_security(d, pcontact->security_temp->type, pcontact->security_temp, pcontact) @@ -914,6 +912,10 @@ int ipsec_create(struct sip_msg *m, udomain_t *d, int _cflags) } } + if(ul.update_pcontact(d, &ci, pcontact) != 0) { + LM_ERR("Error updating contact\n"); + goto cleanup; + } if(add_supported_secagree_header(m) != 0) { goto cleanup;

1 0

git:master:d17b97a8: ims_registrar_pcscf: fix typo in comments
by Supreeth Herle 17 Jun '24

17 Jun '24

Module: kamailio Branch: master Commit: d17b97a864585782e03eedada6d226550630f7bb URL: https://github.com/kamailio/kamailio/commit/d17b97a864585782e03eedada6d2265… Author: herlesupreeth <herlesupreeth(a)gmail.com> Committer: Supreeth Herle <herlesupreeth(a)gmail.com> Date: 2024-06-17T13:37:12+02:00 ims_registrar_pcscf: fix typo in comments --- Modified: src/modules/ims_registrar_pcscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/d17b97a864585782e03eedada6d2265… Patch: https://github.com/kamailio/kamailio/commit/d17b97a864585782e03eedada6d2265… --- diff --git a/src/modules/ims_registrar_pcscf/save.c b/src/modules/ims_registrar_pcscf/save.c index 679abc99ca5..025cb78a5d8 100644 --- a/src/modules/ims_registrar_pcscf/save.c +++ b/src/modules/ims_registrar_pcscf/save.c @@ -289,7 +289,7 @@ static inline int update_contacts(struct sip_msg *req, struct sip_msg *rpl, LM_DBG("Error subscribing for contact\n"); } - // After successful registration try to unregister all callbacks for pending contacts ralated to this contact. + // After successful registration try to unregister all callbacks for pending contacts related to this contact. ul.unreg_pending_contacts_cb( _d, pcontact, PCSCF_CONTACT_EXPIRE); }

1 0

[kamailio/kamailio] Kamailio ims_charging module Ro Interface User-Equipment-Info-Type AVP (Issue #3807)
by svinson1121 17 Jun '24

17 Jun '24

The Kamailio ims_charging module Ro interface is sending: AVP: User-Equipment-Info(458) -> AVP: User-Equipment-Info-Type(459) l=12 f=-M- val=MAC (1) see attached Ro.pcapng packet #7. but (unless I'm not understanding correctly) according to TS 132 299 this AVP should be of type IMEISV and not MAC for the Ro charging interface. also, the MAC is not encoded correctly. again, see the attached pcap at packet #7 from TS 132 299: "User-Equipment-Info-Type This field determines the type of the identifier. The used value is 0 for the international mobile equipment identifier and software version according to TS 23.003[224]. User-Equipment-Info-Value This field contains the user IMEI." "For PS charging, when the User-Equipment-Info-Type AVP (AVP code 459) is set to IMEISV (0), the value within the User-Equipment-Info-Value AVP (AVP code 460) is of type OctetString and shall be a UTF-8 encoded hexadecimal. The composition of the IMEISV follows the definition in TS 23.003 [224] . If only IMEI is received a filler ‘F’ is used to make it 16 digits." "For IMS charging, when the User-Equipment-Info-Type AVP (AVP code 459) is set to IMEISV (0), the value within the User-Equipment-Info-Value AVP (AVP code 460) is of type OctetString and shall be a UTF-8 encoded decimal. The composition of the IMEISV follows the definition in TS 23.003 [224]. If only IMEI is received the number of digits are truncated to 15." I have tested and found this in the following versions: version: kamailio 5.9.0-dev0 (x86_64/linux) 4fb8ac version: kamailio 5.3.2 (x86_64/linux) 87e8a1 Thank you so much for your help with this issue, [Ro.zip](https://github.com/kamailio/kamailio/files/14924042/Ro.zip) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3807 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3807(a)github.com>

4 5

[kamailio/kamailio] 200OK (for deregistration: REGISTER with Expire:0) is not reaching to UE (Issue #3866)
by deepak-git-account 14 Jun '24

14 Jun '24

### Description During de-registration, Kamailio receives REGISTER (with expire 0), and then send Session Termination request, and only after getting Session Termination Answer, Kamailo sends 200OK. This is not sent till UE. The reason is after receiving Session Termination Request, the PCRF sends ReAuthRequest towards PCEF and it followed delete bearer procedure in IMS-PGW and bearer is getting deleted :(.  In the kamailio script, pcscf_save() is used after receiving 200OK from SCSCF. And within this function, STR is sent and STA received. ### Troubleshooting #### Reproduction  RX_SUPPORT flag shall be defined and it can be observed in De-registration procedure. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio --version version: kamailio 5.7.5 (x86_64/linux) 58499a-dirty 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 58499a -dirty compiled on 11:23:55 May 8 2024 with gcc 9.4.0 ``` * **Operating System**:  ``` uname -a Linux openims-tvmcfg-node-focal 5.4.0-181-generic #201-Ubuntu SMP Thu Mar 28 15:39:01 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3866 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3866(a)github.com>

1 1

git:master:d5135ade: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 14 Jun '24

14 Jun '24

Module: kamailio Branch: master Commit: d5135adec7297caa4dca0021dcf33ea1a1897aac URL: https://github.com/kamailio/kamailio/commit/d5135adec7297caa4dca0021dcf33ea… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-14T08:16:10+02:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/d5135adec7297caa4dca0021dcf33ea… Patch: https://github.com/kamailio/kamailio/commit/d5135adec7297caa4dca0021dcf33ea…

1 0

git:master:e5e0412f: siputils: docs for is_http() function
by Daniel-Constantin Mierla 14 Jun '24

14 Jun '24

Module: kamailio Branch: master Commit: e5e0412f61096e82fdaf61b38fe6a219312709d4 URL: https://github.com/kamailio/kamailio/commit/e5e0412f61096e82fdaf61b38fe6a21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-14T08:08:16+02:00 siputils: docs for is_http() function --- Modified: src/modules/siputils/doc/siputils_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e5e0412f61096e82fdaf61b38fe6a21… Patch: https://github.com/kamailio/kamailio/commit/e5e0412f61096e82fdaf61b38fe6a21… --- diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index dbbba7a6db6..cf08771326c 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -1152,6 +1152,27 @@ if (is_sip()) { ... } ... +</programlisting> + </example> + </section> + <section id="siputils.f.is_http"> + <title> + <function moreinfo="none">is_http()</function> + </title> + <para> + Return true if it is a HTTP message. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>is_http</function> usage</title> + <programlisting format="linespecific"> +... +if (is_http()) { + ... +} +... </programlisting> </example> </section>

1 0

git:master:9789b423: siputils: added is_http() function
by Daniel-Constantin Mierla 14 Jun '24

14 Jun '24

Module: kamailio Branch: master Commit: 9789b423da91ecf0d2fad30c90f6ad717884cde7 URL: https://github.com/kamailio/kamailio/commit/9789b423da91ecf0d2fad30c90f6ad7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-14T08:08:16+02:00 siputils: added is_http() function --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/9789b423da91ecf0d2fad30c90f6ad7… Patch: https://github.com/kamailio/kamailio/commit/9789b423da91ecf0d2fad30c90f6ad7… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 19250567479..fa4332ec756 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -131,6 +131,36 @@ int ki_is_sip(sip_msg_t *msg) return -1; } +/** + * return 1 (true) if it is a HTTP message + */ +int w_is_http(sip_msg_t *msg, char *foo, char *bar) +{ + if(msg == NULL) + return -1; + + if(msg->first_line.flags & FLINE_FLAG_PROTO_HTTP) { + return 1; + } + + return -1; +} + +/** + * return 1 (true) if it is a HTTP message + */ +int ki_is_http(sip_msg_t *msg) +{ + if(msg == NULL) + return -1; + + if(msg->first_line.flags & FLINE_FLAG_PROTO_HTTP) { + return 1; + } + + return -1; +} + /* * Checks if From includes a To-tag -- good to identify * if a request creates a new dialog diff --git a/src/modules/siputils/checks.h b/src/modules/siputils/checks.h index 7ce632b6116..8dd0a22b81d 100644 --- a/src/modules/siputils/checks.h +++ b/src/modules/siputils/checks.h @@ -122,6 +122,11 @@ int is_reply(struct sip_msg *msg); int w_is_sip(struct sip_msg *msg, char *foo, char *bar); int ki_is_sip(struct sip_msg *msg); +/* + * Return true (1) if it is a HTTP message, otherwise false (-1) + */ +int w_is_http(sip_msg_t *msg, char *foo, char *bar); +int ki_is_http(sip_msg_t *msg); /* * Find if Request URI has a given parameter with matching value diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index f22f0c8f485..372da25b041 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -175,6 +175,7 @@ static cmd_export_t cmds[] = { {"is_request", (cmd_function)w_is_request, 0, 0, 0, ANY_ROUTE}, {"is_reply", (cmd_function)w_is_reply, 0, 0, 0, ANY_ROUTE}, {"is_sip", (cmd_function)w_is_sip, 0, 0, 0, ANY_ROUTE}, + {"is_http", (cmd_function)w_is_http, 0, 0, 0, ANY_ROUTE}, {"is_gruu", (cmd_function)w_is_gruu, 0, 0, 0, ANY_ROUTE}, {"is_gruu", (cmd_function)w_is_gruu, 1, fixup_spve_null, 0, ANY_ROUTE}, {"is_supported", (cmd_function)w_is_supported, 1, fixup_option, 0, @@ -629,6 +630,11 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("siputils"), str_init("is_http"), + SR_KEMIP_INT, ki_is_http, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("siputils"), str_init("is_first_hop"), SR_KEMIP_INT, is_first_hop, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:856ecb09: siputils: rename internal kemi function for is_sip()
by Daniel-Constantin Mierla 14 Jun '24

14 Jun '24

Module: kamailio Branch: master Commit: 856ecb09711773c6f24831a1a1d8724733541a7e URL: https://github.com/kamailio/kamailio/commit/856ecb09711773c6f24831a1a1d8724… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-14T08:08:16+02:00 siputils: rename internal kemi function for is_sip() --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/856ecb09711773c6f24831a1a1d8724… Patch: https://github.com/kamailio/kamailio/commit/856ecb09711773c6f24831a1a1d8724… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 7caeb809b2f..19250567479 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -119,7 +119,7 @@ int w_is_sip(sip_msg_t *msg, char *foo, char *bar) /** * return 1 (true) if it is a SIP message */ -int is_sip(sip_msg_t *msg) +int ki_is_sip(sip_msg_t *msg) { if(msg == NULL) return -1; diff --git a/src/modules/siputils/checks.h b/src/modules/siputils/checks.h index fa914ecc0da..7ce632b6116 100644 --- a/src/modules/siputils/checks.h +++ b/src/modules/siputils/checks.h @@ -120,7 +120,7 @@ int is_reply(struct sip_msg *msg); * Return true (1) if it is a SIP message, otherwise false (-1) */ int w_is_sip(struct sip_msg *msg, char *foo, char *bar); -int is_sip(struct sip_msg *msg); +int ki_is_sip(struct sip_msg *msg); /* diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 0912c6b132b..f22f0c8f485 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -625,7 +625,7 @@ static sr_kemi_t sr_kemi_siputils_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("siputils"), str_init("is_sip"), - SR_KEMIP_INT, is_sip, + SR_KEMIP_INT, ki_is_sip, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

[kamailio/kamailio] tls: remove confusing error message when trying to print socket for <default> server (PR #3875)
by Victor Seva 14 Jun '24

14 Jun '24

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally #### Description On start: ``` CRITICAL: <core> [core/ip_addr.c:232]: ip_addr2sbuf(): unknown address family 0 NOTICE: tls [tls_domain.c:1176]: ksr_tls_fix_domain(): registered server_name callback handler for socket [:0], server_name='<default>' ... ``` Now it will print: ``` NOTICE: tls [tls_domain.c:1176]: ksr_tls_fix_domain(): registered server_name callback handler for socket [0.0.0.0:0], server_name='<default>' ... ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3875 -- Commit Summary -- * tls: remove confusing error message when trying to print socket for <default> server -- File Changes -- M src/modules/tls/tls_domain.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3875.patch https://github.com/kamailio/kamailio/pull/3875.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3875 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3875(a)github.com>

2 3

git:master:87c8290a: tls: remove confusing error message when trying to print socket for <default> server
by Victor Seva 14 Jun '24

14 Jun '24

Module: kamailio Branch: master Commit: 87c8290ab934fd27f8baebabaf66d1fb4168ba72 URL: https://github.com/kamailio/kamailio/commit/87c8290ab934fd27f8baebabaf66d1f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-14T07:44:33+02:00 tls: remove confusing error message when trying to print socket for <default> server > CRITICAL: <core> [core/ip_addr.c:232]: ip_addr2sbuf(): unknown address family 0 > NOTICE: tls [tls_domain.c:1176]: ksr_tls_fix_domain(): registered server_name callback handler for socket [:0], server_name='<default>' ... --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/87c8290ab934fd27f8baebabaf66d1f… Patch: https://github.com/kamailio/kamailio/commit/87c8290ab934fd27f8baebabaf66d1f… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index e056a70b504..810a7e9589a 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -1155,14 +1155,14 @@ static int ksr_tls_fix_domain(tls_domain_t *d, tls_domain_t *def) d->ctx[i], tls_server_name_cb)) { LM_ERR("register server_name callback handler for socket " "[%s:%d], server_name='%s' failed for proc %d\n", - ip_addr2a(&d->ip), d->port, + (d->ip.af > 0) ? ip_addr2a(&d->ip) : "0.0.0.0", d->port, (d->server_name.s) ? d->server_name.s : "<default>", i); return -1; } if(!SSL_CTX_set_tlsext_servername_arg(d->ctx[i], d)) { LM_ERR("register server_name callback handler data for socket " "[%s:%d], server_name='%s' failed for proc %d\n", - ip_addr2a(&d->ip), d->port, + (d->ip.af > 0) ? ip_addr2a(&d->ip) : "0.0.0.0", d->port, (d->server_name.s) ? d->server_name.s : "<default>", i); return -1; } @@ -1175,7 +1175,7 @@ static int ksr_tls_fix_domain(tls_domain_t *d, tls_domain_t *def) && (d->server_name.len > 0 || (d->type & TLS_DOMAIN_DEF))) { LM_NOTICE("registered server_name callback handler for socket " "[%s:%d], server_name='%s' ...\n", - ip_addr2a(&d->ip), d->port, + (d->ip.af > 0) ? ip_addr2a(&d->ip) : "0.0.0.0", d->port, (d->server_name.s) ? d->server_name.s : "<default>"); } #endif

1 0

[kamailio/kamailio] Siptrace: setting send_sock_name/send_sock_address is ineffective for tcp based transports (PR #3837)
by Dennis 14 Jun '24

14 Jun '24

For tcp based transports it is need to set SND_F_FORCE_SOCKET flag before msg_send_buffer call, or duplicate will send from wrong addr/port.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3837 -- Commit Summary -- * siptrace: add SND_F_FORCE_SOCKET flag if send_sock_name/send_sock_address config parameters are used -- File Changes -- M src/modules/siptrace/siptrace_send.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3837.patch https://github.com/kamailio/kamailio/pull/3837.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3837 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3837(a)github.com>

3 3

git:master:1b97a027: siptrace: add SND_F_FORCE_SOCKET flag if send_sock_name/send_sock_address config parameters are used
by Daniel-Constantin Mierla 14 Jun '24

14 Jun '24

Module: kamailio Branch: master Commit: 1b97a0271b27794263b3eff61f4acfa81e66069f URL: https://github.com/kamailio/kamailio/commit/1b97a0271b27794263b3eff61f4acfa… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-14T07:09:17+02:00 siptrace: add SND_F_FORCE_SOCKET flag if send_sock_name/send_sock_address config parameters are used - send_sock_name/send_sock_address is ineffective for tcp based transports if SND_F_FORCE_SOCKET flag is not set --- Modified: src/modules/siptrace/siptrace_send.c --- Diff: https://github.com/kamailio/kamailio/commit/1b97a0271b27794263b3eff61f4acfa… Patch: https://github.com/kamailio/kamailio/commit/1b97a0271b27794263b3eff61f4acfa… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index d8a5f974bb3..4f9726de254 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -357,6 +357,8 @@ int trace_send_duplicate(char *buf, int len, dest_info_t *dst2) pdst->to.s.sa_family, pdst->proto); goto error; } + } else { + pdst->send_flags.f |= SND_F_FORCE_SOCKET; } if(msg_send_buffer(pdst, buf, len, 1) < 0) {

1 0

git:5.8:bdb3f329: pkg/kamailio/deb: refresh fix for tls_wolfssl
by Victor Seva 13 Jun '24

13 Jun '24

Module: kamailio Branch: 5.8 Commit: bdb3f32991f756b852d4bc695dc44e634e5ffc6c URL: https://github.com/kamailio/kamailio/commit/bdb3f32991f756b852d4bc695dc44e6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-13T18:21:47+02:00 pkg/kamailio/deb: refresh fix for tls_wolfssl --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/bdb3f32991f756b852d4bc695dc44e6… Patch: https://github.com/kamailio/kamailio/commit/bdb3f32991f756b852d4bc695dc44e6…

1 0

git:5.8:65873cd2: pkg/kamailio/deb: fix tls_wolfssl packaging
by Victor Seva 13 Jun '24

13 Jun '24

Module: kamailio Branch: 5.8 Commit: 65873cd2cdd390ce10ec99888fb35b0095a90c65 URL: https://github.com/kamailio/kamailio/commit/65873cd2cdd390ce10ec99888fb35b0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-13T18:21:27+02:00 pkg/kamailio/deb: fix tls_wolfssl packaging * packages can't have '_' in name * distinguish grp module and deb module name '_' => '-' so tls_wolfssl => tls-wolfssl (cherry picked from commit 1d82805ef084d90e5ea14e4894f3e5076e29e2f3) --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules --- Diff: https://github.com/kamailio/kamailio/commit/65873cd2cdd390ce10ec99888fb35b0… Patch: https://github.com/kamailio/kamailio/commit/65873cd2cdd390ce10ec99888fb35b0… --- diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index b454421bff8..ee369ba7ccf 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -661,7 +661,7 @@ Description: TLS support for the Kamailio SIP server (authentication, transport) This package provides TLS support for encrypted and authenticated SIP connections as well as generic TLS support for many Kamailio modules. -Package: kamailio-wolftls-modules +Package: kamailio-tls-wolfssl-modules Architecture: any Multi-Arch: same Pre-Depends: diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index cbf680015ad..1cbace016b9 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -141,24 +141,27 @@ test_install_all-stamp: build $(MAKE) install quiet=verbose LIBDIR=$(LIBDIR) group_include="kstandard" touch test_install_all-stamp +# tls_wolfssl => tls-wolfssl +$(INSTALL_MODULES): module = $(subst _,-,$(subst install_,,$@)) +$(INSTALL_MODULES): grp = $(subst install_,,$@) $(INSTALL_MODULES): test_install_all-stamp $(MAKE) install-modules-all \ quiet=verbose \ LIBDIR=$(LIBDIR) \ - BASEDIR=$(D)-$(subst install_,,$@)-modules \ - cfg_prefix=$(D)-$(subst install_,,$@)-modules \ - doc-dir=share/doc/$(DEB_SOURCE)-$(subst install_,,$@)-modules \ - group_include="k$(subst install_,,$@)" + BASEDIR=$(D)-$(module)-modules \ + cfg_prefix=$(D)-$(module)-modules \ + doc-dir=share/doc/$(DEB_SOURCE)-$(module)-modules \ + group_include="k$(grp)" # Eliminate duplicate libs. for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(D)-$${module}-modules/usr/$(LIBDIR)/kamailio" && \ + test "$$d" != "$(D)-$(module)-modules/usr/$(LIBDIR)/kamailio" && \ for r in `find $$d -name 'lib*' | xargs`; do \ - echo "removing $(subst install_,,$@) lib `basename $$r` present also in $$d"; \ - rm -f $(D)-$(subst install_,,$@)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"`; \ + echo "removing $(module) lib `basename $$r` present also in $$d"; \ + rm -f $(D)-$(module)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"`; \ done ; \ done # clean empty dirs - find $(D)-$(subst install_,,$@)-modules -depth -empty -type d -exec rmdir {} \; + find $(D)-$(module)-modules -depth -empty -type d -exec rmdir {} \; $(INSTALL_EXTRA): test_install_all-stamp $(MAKE) install-modules-all \

1 0

git:master:71e46581: pkg/kamailio/deb: refresh fix for tls_wolfssl
by Victor Seva 13 Jun '24

13 Jun '24

Module: kamailio Branch: master Commit: 71e465818ba3df8a08ee46a728a1b68b5ea647e9 URL: https://github.com/kamailio/kamailio/commit/71e465818ba3df8a08ee46a728a1b68… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-13T17:05:03+02:00 pkg/kamailio/deb: refresh fix for tls_wolfssl --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/bionic/rules Modified: pkg/kamailio/deb/bookworm/control Modified: pkg/kamailio/deb/bookworm/rules Modified: pkg/kamailio/deb/bullseye/control Modified: pkg/kamailio/deb/bullseye/rules Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/buster/rules Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/focal/rules Modified: pkg/kamailio/deb/jammy/control Modified: pkg/kamailio/deb/jammy/rules Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/control Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/71e465818ba3df8a08ee46a728a1b68… Patch: https://github.com/kamailio/kamailio/commit/71e465818ba3df8a08ee46a728a1b68…

1 0

git:master:1d82805e: pkg/kamailio/deb: fix tls_wolfssl packaging
by Victor Seva 13 Jun '24

13 Jun '24

Module: kamailio Branch: master Commit: 1d82805ef084d90e5ea14e4894f3e5076e29e2f3 URL: https://github.com/kamailio/kamailio/commit/1d82805ef084d90e5ea14e4894f3e50… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-06-13T17:04:39+02:00 pkg/kamailio/deb: fix tls_wolfssl packaging * packages can't have '_' in name * distinguish grp module and deb module name '_' => '-' so tls_wolfssl => tls-wolfssl --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/debian/rules --- Diff: https://github.com/kamailio/kamailio/commit/1d82805ef084d90e5ea14e4894f3e50… Patch: https://github.com/kamailio/kamailio/commit/1d82805ef084d90e5ea14e4894f3e50… --- diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index b454421bff8..ee369ba7ccf 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -661,7 +661,7 @@ Description: TLS support for the Kamailio SIP server (authentication, transport) This package provides TLS support for encrypted and authenticated SIP connections as well as generic TLS support for many Kamailio modules. -Package: kamailio-wolftls-modules +Package: kamailio-tls-wolfssl-modules Architecture: any Multi-Arch: same Pre-Depends: diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index cbf680015ad..1cbace016b9 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -141,24 +141,27 @@ test_install_all-stamp: build $(MAKE) install quiet=verbose LIBDIR=$(LIBDIR) group_include="kstandard" touch test_install_all-stamp +# tls_wolfssl => tls-wolfssl +$(INSTALL_MODULES): module = $(subst _,-,$(subst install_,,$@)) +$(INSTALL_MODULES): grp = $(subst install_,,$@) $(INSTALL_MODULES): test_install_all-stamp $(MAKE) install-modules-all \ quiet=verbose \ LIBDIR=$(LIBDIR) \ - BASEDIR=$(D)-$(subst install_,,$@)-modules \ - cfg_prefix=$(D)-$(subst install_,,$@)-modules \ - doc-dir=share/doc/$(DEB_SOURCE)-$(subst install_,,$@)-modules \ - group_include="k$(subst install_,,$@)" + BASEDIR=$(D)-$(module)-modules \ + cfg_prefix=$(D)-$(module)-modules \ + doc-dir=share/doc/$(DEB_SOURCE)-$(module)-modules \ + group_include="k$(grp)" # Eliminate duplicate libs. for d in $(DUP_LIBS_DIRS); do \ - test "$$d" != "$(D)-$${module}-modules/usr/$(LIBDIR)/kamailio" && \ + test "$$d" != "$(D)-$(module)-modules/usr/$(LIBDIR)/kamailio" && \ for r in `find $$d -name 'lib*' | xargs`; do \ - echo "removing $(subst install_,,$@) lib `basename $$r` present also in $$d"; \ - rm -f $(D)-$(subst install_,,$@)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"`; \ + echo "removing $(module) lib `basename $$r` present also in $$d"; \ + rm -f $(D)-$(module)-modules/usr/$(LIBDIR)/kamailio/`basename "$$r"`; \ done ; \ done # clean empty dirs - find $(D)-$(subst install_,,$@)-modules -depth -empty -type d -exec rmdir {} \; + find $(D)-$(module)-modules -depth -empty -type d -exec rmdir {} \; $(INSTALL_EXTRA): test_install_all-stamp $(MAKE) install-modules-all \

1 0

git:master:128604b6: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 13 Jun '24

13 Jun '24

Module: kamailio Branch: master Commit: 128604b6bda0c193fab4d0f2dd5bd6e2927bfdbd URL: https://github.com/kamailio/kamailio/commit/128604b6bda0c193fab4d0f2dd5bd6e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-06-13T13:31:10+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/128604b6bda0c193fab4d0f2dd5bd6e… Patch: https://github.com/kamailio/kamailio/commit/128604b6bda0c193fab4d0f2dd5bd6e… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index fbac75c662d..41f9d7bb812 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1638,8 +1638,9 @@ onreply_route { 4.17. ds_oc_set_attrs(setid, uri, rval, tval, sval) - Sets the overload control rate and time internval limit for the - destination (setid, uri). + Sets the overload control rate, time internval limit and sequence + number for the destination record (setid, uri) following RFC7339 + specifications. Description of parameters: * setid - the set (group) id. The parameter can be an integer or a @@ -1658,7 +1659,7 @@ onreply_route { Example 1.60. ds_oc_set_attrs() usage ... - ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000", "1"); + ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "180000", "1"); ... 5. RPC Commands

1 0

git:master:0666d34f: dispacther: docs - remark about RFC7339 for overload control values
by Daniel-Constantin Mierla 13 Jun '24

13 Jun '24

Module: kamailio Branch: master Commit: 0666d34f8816479724b4bdf4621147ccba156c66 URL: https://github.com/kamailio/kamailio/commit/0666d34f8816479724b4bdf4621147c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T13:24:04+02:00 dispacther: docs - remark about RFC7339 for overload control values --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0666d34f8816479724b4bdf4621147c… Patch: https://github.com/kamailio/kamailio/commit/0666d34f8816479724b4bdf4621147c… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 70a30ed7f7e..e50ea26f518 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2019,8 +2019,8 @@ onreply_route { <function moreinfo="none">ds_oc_set_attrs(setid, uri, rval, tval, sval)</function> </title> <para> - Sets the overload control rate and time internval limit - for the destination (setid, uri). + Sets the overload control rate, time internval limit and sequence number + for the destination record (setid, uri) following RFC7339 specifications. </para> <para>Description of parameters:</para> <itemizedlist> @@ -2055,7 +2055,7 @@ onreply_route { <title><function>ds_oc_set_attrs()</function> usage</title> <programlisting format="linespecific"> ... - ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "1000", "1"); + ds_oc_set_attrs("1", "sip:127.0.0.1:5080", "30", "180000", "1"); ... </programlisting> </example>

1 0

git:master:b3875476: dispatcher: use milliseconds for time validity interval
by Daniel-Constantin Mierla 13 Jun '24

13 Jun '24

Module: kamailio Branch: master Commit: b3875476e02bf2590e857f73367efa4cedfbd328 URL: https://github.com/kamailio/kamailio/commit/b3875476e02bf2590e857f73367efa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T13:09:08+02:00 dispatcher: use milliseconds for time validity interval --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/b3875476e02bf2590e857f73367efa4… Patch: https://github.com/kamailio/kamailio/commit/b3875476e02bf2590e857f73367efa4… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 678352bf62d..ecd0f3a0c9d 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -473,8 +473,8 @@ int ds_oc_set_attrs( timerclear(&tdiff); /* interval set to itval or to default 500 milliseconds */ - tdiff.tv_sec = ((itval > 0) ? itval : 500000) / 1000000; - tdiff.tv_usec = ((itval > 0) ? itval : 500000) % 1000000; + tdiff.tv_sec = (((itval > 0) ? itval : 500) * 1000) / 1000000; + tdiff.tv_usec = (((itval > 0) ? itval : 500) * 1000) % 1000000; for(i = 0; i < idx->nr; i++) { if(idx->dlist[i].uri.len == duri->len

1 0

git:master:736408b3: dispatcher: keep internal oc rate as the received value
by Daniel-Constantin Mierla 13 Jun '24

13 Jun '24

Module: kamailio Branch: master Commit: 736408b3e6e05cffd3978689b10549dc236ccb0d URL: https://github.com/kamailio/kamailio/commit/736408b3e6e05cffd3978689b10549d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T12:52:39+02:00 dispatcher: keep internal oc rate as the received value --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/736408b3e6e05cffd3978689b10549d… Patch: https://github.com/kamailio/kamailio/commit/736408b3e6e05cffd3978689b10549d… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index bab1a5deb31..678352bf62d 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -405,7 +405,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) str2int(&pit->body, &dest->attrs.ocmax); } else if(pit->name.len == 6 && strncasecmp(pit->name.s, "ocrate", 6) == 0) { - str2int(&pit->body, &dest->attrs.ocmin); + str2int(&pit->body, &dest->attrs.ocrate); } } if(dest->attrs.ocmax < 0 || dest->attrs.ocmax > 100) { @@ -435,12 +435,12 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) void ds_oc_prepare(ds_dest_t *dp) { int i; - for(i = 0; i < 100 - dp->attrs.ocrate; i++) { - dp->ocdist[i] = 1; - } - for(i = 100 - dp->attrs.ocrate; i < 100; i++) { + for(i = 0; i < dp->attrs.ocrate; i++) { dp->ocdist[i] = 0; } + for(i = dp->attrs.ocrate; i < 100; i++) { + dp->ocdist[i] = 1; + } shuffle_uint100array(dp->ocdist); } @@ -473,7 +473,8 @@ int ds_oc_set_attrs( timerclear(&tdiff); /* interval set to itval or to default 500 milliseconds */ - tdiff.tv_usec = (itval > 0) ? itval : 500000; + tdiff.tv_sec = ((itval > 0) ? itval : 500000) / 1000000; + tdiff.tv_usec = ((itval > 0) ? itval : 500000) % 1000000; for(i = 0; i < idx->nr; i++) { if(idx->dlist[i].uri.len == duri->len @@ -482,7 +483,7 @@ int ds_oc_set_attrs( LM_DBG("skipping entry %d due to seq condition\n", i); continue; } - idx->dlist[i].attrs.ocrate = 100 - irval; + idx->dlist[i].attrs.ocrate = irval; if(idx->dlist[i].attrs.ocrate < idx->dlist[i].attrs.ocmin) { idx->dlist[i].attrs.ocrate = idx->dlist[i].attrs.ocmin; } @@ -504,6 +505,7 @@ int ds_oc_set_attrs( */ static inline int ds_oc_skip(ds_set_t *dsg, int alg, int n) { + int ret; struct timeval tnow; if(alg != DS_ALG_OVERLOAD) { @@ -514,16 +516,19 @@ static inline int ds_oc_skip(ds_set_t *dsg, int alg, int n) if(timercmp(&dsg->dlist[n].octime, &tnow, <)) { /* over the time interval validity - use it */ + LM_DBG("time validity not matching\n"); return 0; } if(dsg->dlist[n].ocdist[dsg->dlist[n].ocidx] == 1) { /* use it */ - return 0; + ret = 0; + } else { + /* skip it */ + ret = 1; } dsg->dlist[n].ocidx = (dsg->dlist[n].ocidx + 1) % 100; - /* skip it */ - return 1; + return ret; } /**

1 0

git:master:c3ce318e: dispatcher: print oc details in the record group not in attrs
by Daniel-Constantin Mierla 13 Jun '24

13 Jun '24

Module: kamailio Branch: master Commit: c3ce318e01bf0eae70daa109e680a75f3ea71546 URL: https://github.com/kamailio/kamailio/commit/c3ce318e01bf0eae70daa109e680a75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T11:51:46+02:00 dispatcher: print oc details in the record group not in attrs --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/c3ce318e01bf0eae70daa109e680a75… Patch: https://github.com/kamailio/kamailio/commit/c3ce318e01bf0eae70daa109e680a75… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 1e6beef600d..3fd941c21c4 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1869,12 +1869,16 @@ int ds_rpc_print_set( ipbuf[0] = '\0'; ip_addr2sbufz( &node->dlist[j].ip_address, ipbuf, IP_ADDR_MAX_STRZ_SIZE); - if(rpc->struct_add(vh, "Ssddjj", "HOST", &node->dlist[j].host, + if(rpc->struct_add(vh, "Ssddjjujj", "HOST", &node->dlist[j].host, "IPADDR", ipbuf, "PORT", (int)node->dlist[j].port, "PROTOID", (int)node->dlist[j].proto, "DNSTIME_SEC", (unsigned long)node->dlist[j].dnstime.tv_sec, "DNSTIME_USEC", - (unsigned long)node->dlist[j].dnstime.tv_usec) + (unsigned long)node->dlist[j].dnstime.tv_usec, "OCRATE", + node->dlist[j].attrs.ocrate, "OCTIME_SEC", + (unsigned long)node->dlist[j].octime.tv_sec, + "OCTIME_USEC", + (unsigned long)node->dlist[j].octime.tv_usec) < 0) { rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; @@ -1886,7 +1890,7 @@ int ds_rpc_print_set( rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; } - if(rpc->struct_add(wh, "SSdddSSSujj", "BODY", + if(rpc->struct_add(wh, "SSdddSSS", "BODY", &(node->dlist[j].attrs.body), "DUID", (node->dlist[j].attrs.duid.s) ? &(node->dlist[j].attrs.duid) @@ -1904,11 +1908,7 @@ int ds_rpc_print_set( "OBPROXY", (node->dlist[j].attrs.obproxy.s) ? &(node->dlist[j].attrs.obproxy) - : &data, - "OCRATE", node->dlist[j].attrs.ocrate, "OCTIME_SEC", - (unsigned long)node->dlist[j].octime.tv_sec, - "OCTIME_USEC", - (unsigned long)node->dlist[j].octime.tv_usec) + : &data) < 0) { rpc->fault(ctx, 500, "Internal error creating attrs struct"); return -1;

1 0

git:5.7:f8fa74e7: core: tcp - change log levels for failing to set source for tcp connections
by Daniel-Constantin Mierla 13 Jun '24

13 Jun '24

Module: kamailio Branch: 5.7 Commit: f8fa74e7b2901ecae8bbb851250d8b28452b18da URL: https://github.com/kamailio/kamailio/commit/f8fa74e7b2901ecae8bbb851250d8b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T10:53:36+02:00 core: tcp - change log levels for failing to set source for tcp connections - it is not possible always and it can fill the logs (cherry picked from commit 15403a543d83e337ee578ad37dc1d84316e4cf16) (cherry picked from commit 8a027b99cf8dc4f7e889aa7644f1f7699c7cb08e) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/f8fa74e7b2901ecae8bbb851250d8b2… Patch: https://github.com/kamailio/kamailio/commit/f8fa74e7b2901ecae8bbb851250d8b2… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 955eb4b6e19..593f1a3be57 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1284,7 +1284,7 @@ inline static int find_listening_sock_info( if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&optval, sizeof(optval)) == -1) { - LM_ERR("setsockopt SO_REUSEADDR %s\n", strerror(errno)); + LM_NOTICE("setsockopt SO_REUSEADDR [%s]\n", strerror(errno)); /* continue, not critical */ } #endif @@ -1293,19 +1293,19 @@ inline static int find_listening_sock_info( if(setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (void *)&optval, sizeof(optval)) == -1) { - LM_ERR("setsockopt SO_REUSEPORT %s\n", strerror(errno)); + LM_NOTICE("setsockopt SO_REUSEPORT [%s]\n", strerror(errno)); /* continue, not critical */ } #endif if(unlikely(bind(s, &si->su.s, sockaddru_len(si->su)) != 0)) { - LM_WARN("binding to source address %s failed: %s [%d]\n", + LM_DBG("binding to source address %s failed: [%s] [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno); return -1; } } } else { if(unlikely(bind(s, &(*from)->s, sockaddru_len(**from)) != 0)) { - LM_WARN("binding to source address %s failed: %s [%d]\n", + LM_DBG("binding to source address %s failed: [%s] [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno); return -1; }

1 0

git:5.8:8a027b99: core: tcp - change log levels for failing to set source for tcp connections
by Daniel-Constantin Mierla 13 Jun '24

13 Jun '24

Module: kamailio Branch: 5.8 Commit: 8a027b99cf8dc4f7e889aa7644f1f7699c7cb08e URL: https://github.com/kamailio/kamailio/commit/8a027b99cf8dc4f7e889aa7644f1f76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-13T10:53:09+02:00 core: tcp - change log levels for failing to set source for tcp connections - it is not possible always and it can fill the logs (cherry picked from commit 15403a543d83e337ee578ad37dc1d84316e4cf16) --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/8a027b99cf8dc4f7e889aa7644f1f76… Patch: https://github.com/kamailio/kamailio/commit/8a027b99cf8dc4f7e889aa7644f1f76… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 2456459cfa2..d5a46030cf4 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1288,7 +1288,7 @@ inline static int find_listening_sock_info( if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&optval, sizeof(optval)) == -1) { - LM_ERR("setsockopt SO_REUSEADDR %s\n", strerror(errno)); + LM_NOTICE("setsockopt SO_REUSEADDR [%s]\n", strerror(errno)); /* continue, not critical */ } #endif @@ -1297,19 +1297,19 @@ inline static int find_listening_sock_info( if(setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (void *)&optval, sizeof(optval)) == -1) { - LM_ERR("setsockopt SO_REUSEPORT %s\n", strerror(errno)); + LM_NOTICE("setsockopt SO_REUSEPORT [%s]\n", strerror(errno)); /* continue, not critical */ } #endif if(unlikely(bind(s, &si->su.s, sockaddru_len(si->su)) != 0)) { - LM_WARN("binding to source address %s failed: %s [%d]\n", + LM_DBG("binding to source address %s failed: [%s] [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno); return -1; } } } else { if(unlikely(bind(s, &(*from)->s, sockaddru_len(**from)) != 0)) { - LM_WARN("binding to source address %s failed: %s [%d]\n", + LM_DBG("binding to source address %s failed: [%s] [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno); return -1; }

1 0

git:master:15403a54: core: tcp - change log levels for failing to set source for tcp connections
by Daniel-Constantin Mierla 12 Jun '24

12 Jun '24

Module: kamailio Branch: master Commit: 15403a543d83e337ee578ad37dc1d84316e4cf16 URL: https://github.com/kamailio/kamailio/commit/15403a543d83e337ee578ad37dc1d84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-12T16:21:34+02:00 core: tcp - change log levels for failing to set source for tcp connections - it is not possible always and it can fill the logs --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/15403a543d83e337ee578ad37dc1d84… Patch: https://github.com/kamailio/kamailio/commit/15403a543d83e337ee578ad37dc1d84… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 2456459cfa2..d5a46030cf4 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1288,7 +1288,7 @@ inline static int find_listening_sock_info( if(setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&optval, sizeof(optval)) == -1) { - LM_ERR("setsockopt SO_REUSEADDR %s\n", strerror(errno)); + LM_NOTICE("setsockopt SO_REUSEADDR [%s]\n", strerror(errno)); /* continue, not critical */ } #endif @@ -1297,19 +1297,19 @@ inline static int find_listening_sock_info( if(setsockopt(s, SOL_SOCKET, SO_REUSEPORT, (void *)&optval, sizeof(optval)) == -1) { - LM_ERR("setsockopt SO_REUSEPORT %s\n", strerror(errno)); + LM_NOTICE("setsockopt SO_REUSEPORT [%s]\n", strerror(errno)); /* continue, not critical */ } #endif if(unlikely(bind(s, &si->su.s, sockaddru_len(si->su)) != 0)) { - LM_WARN("binding to source address %s failed: %s [%d]\n", + LM_DBG("binding to source address %s failed: [%s] [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno); return -1; } } } else { if(unlikely(bind(s, &(*from)->s, sockaddru_len(**from)) != 0)) { - LM_WARN("binding to source address %s failed: %s [%d]\n", + LM_DBG("binding to source address %s failed: [%s] [%d]\n", su2a(&si->su, sizeof(si->su)), strerror(errno), errno); return -1; }

1 0

git:master:40d65759: dispatcher: internally keep the selecting instead of skipping rate
by Daniel-Constantin Mierla 12 Jun '24

12 Jun '24

Module: kamailio Branch: master Commit: 40d657592d1be9975deae6052132c458d6485fd9 URL: https://github.com/kamailio/kamailio/commit/40d657592d1be9975deae6052132c45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-06-12T13:35:05+02:00 dispatcher: internally keep the selecting instead of skipping rate --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/40d657592d1be9975deae6052132c45… Patch: https://github.com/kamailio/kamailio/commit/40d657592d1be9975deae6052132c45… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 84166540a37..bab1a5deb31 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -412,7 +412,7 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) dest->attrs.ocmax = 100; } if(dest->attrs.ocmin < 0 || dest->attrs.ocmin > 100) { - dest->attrs.ocmin = 10; + dest->attrs.ocmin = 0; } if(dest->attrs.ocrate <= 0 || dest->attrs.ocrate > 100) { dest->attrs.ocrate = 0; @@ -482,7 +482,7 @@ int ds_oc_set_attrs( LM_DBG("skipping entry %d due to seq condition\n", i); continue; } - idx->dlist[i].attrs.ocrate = irval; + idx->dlist[i].attrs.ocrate = 100 - irval; if(idx->dlist[i].attrs.ocrate < idx->dlist[i].attrs.ocmin) { idx->dlist[i].attrs.ocrate = idx->dlist[i].attrs.ocmin; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev