- sr-dev - kamailio.org

[kamailio/kamailio] Misleading source IP of 1.0.0.127 in event routes (Issue #3817)
by Jukka Väisänen 23 Apr '24

23 Apr '24

### Description Event routes that are executed without a real SIP message available use the default "fake SIP message". The fake message has a source IPv4 address of 1.0.0.127 which belongs to CloudFlare (1.0.0.0/24).. and this led us to believe that traffic is coming from CF but could not find the messages on tcpdumps or HEP exports. Had a bit of a wild goose chase there trying to find the source. I believe the original intention has been to use 127.0.0.1 loopback address but the bytes are reversed at: https://github.com/kamailio/kamailio/blob/master/src/core/fmsg.c#L78 It would be best to change this address to well ANYTHING that doesn't imply CloudFlare is pinging you 😂 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3817 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3817(a)github.com>

3 4

git:master:66b3c04a: core: fmsg - parse loopback ip when initializing faked msg structure
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 66b3c04a9653425b1602c82dd2456a7eb7cf59d1 URL: https://github.com/kamailio/kamailio/commit/66b3c04a9653425b1602c82dd2456a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T11:19:30+02:00 core: fmsg - parse loopback ip when initializing faked msg structure - GH #3817 --- Modified: src/core/fmsg.c --- Diff: https://github.com/kamailio/kamailio/commit/66b3c04a9653425b1602c82dd2456a7… Patch: https://github.com/kamailio/kamailio/commit/66b3c04a9653425b1602c82dd2456a7… --- diff --git a/src/core/fmsg.c b/src/core/fmsg.c index 7a4f9ba87e5..b30ca9f69cf 100644 --- a/src/core/fmsg.c +++ b/src/core/fmsg.c @@ -25,6 +25,7 @@ #include "dprint.h" #include "globals.h" #include "dset.h" +#include "resolve.h" #include "fmsg.h" @@ -57,6 +58,8 @@ static void faked_msg_buf_init(void) static int faked_msg_init_new(sip_msg_t *fmsg) { + str loip = str_init("127.0.0.1"); + faked_msg_buf_init(); /* init faked sip msg */ @@ -75,13 +78,9 @@ static int faked_msg_init_new(sip_msg_t *fmsg) fmsg->rcv.proto = PROTO_UDP; fmsg->rcv.src_port = 5060; - fmsg->rcv.src_ip.u.addr32[0] = 0x7f000001; - fmsg->rcv.src_ip.af = AF_INET; - fmsg->rcv.src_ip.len = 4; + str2ipbuf(&loip, &fmsg->rcv.src_ip); fmsg->rcv.dst_port = 5060; - fmsg->rcv.dst_ip.u.addr32[0] = 0x7f000001; - fmsg->rcv.dst_ip.af = AF_INET; - fmsg->rcv.dst_ip.len = 4; + str2ipbuf(&loip, &fmsg->rcv.dst_ip); return 0; }

1 0

git:master:f5c05a68: pv: use global tcp connection callback for event route on $conid
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: f5c05a68ae72881ab0691bb8488112356fc67c79 URL: https://github.com/kamailio/kamailio/commit/f5c05a68ae72881ab0691bb84881123… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:42:02+02:00 pv: use global tcp connection callback for event route on $conid --- Modified: src/modules/pv/pv_core.c Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/f5c05a68ae72881ab0691bb84881123… Patch: https://github.com/kamailio/kamailio/commit/f5c05a68ae72881ab0691bb84881123… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 40557ba4628..b10b7513a6f 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2927,6 +2927,13 @@ int pv_get_tcpconn_id(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if(msg == NULL) return -1; + /* use first the connection set for event_route[tcp:...] */ + con = ksr_tcpcon_evcb_get(); + if(con != NULL) { + return pv_get_sintval(msg, param, res, con->id); + } + + /* find connection from sip message structure */ if((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) == NULL) return pv_get_null(msg, param, res); diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 97068c627bb..9c648c1f2a3 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -248,6 +248,7 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sip_msg_t *fmsg; sr_kemi_eng_t *keng = NULL; str *evname; + int bkconid = -1; LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) {

1 0

git:master:d114d117: core: tcp - set a global shortcut to tcp connection for event route
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: d114d11724dc4157e7e5809504531d26da6bcc57 URL: https://github.com/kamailio/kamailio/commit/d114d11724dc4157e7e5809504531d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:36:35+02:00 core: tcp - set a global shortcut to tcp connection for event route --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/d114d11724dc4157e7e5809504531d2… Patch: https://github.com/kamailio/kamailio/commit/d114d11724dc4157e7e5809504531d2… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index 5b579b2ffb9..57dff5a291b 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -434,4 +434,6 @@ typedef struct ws_event_info int id; } ws_event_info_t; +tcp_connection_t *ksr_tcpcon_evcb_get(void); + #endif diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 957a9b97c0f..2456459cfa2 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3670,6 +3670,12 @@ int _tcpconn_write_nb( return n; } +static tcp_connection_t *_ksr_tcpcon_evcb = NULL; + +tcp_connection_t *ksr_tcpcon_evcb_get(void) +{ + return _ksr_tcpcon_evcb; +} static int tcp_emit_closed_event(struct tcp_connection *con) { @@ -3692,7 +3698,9 @@ static int tcp_emit_closed_event(struct tcp_connection *con) tev.id = con->id; tev.con = con; evp.data = (void *)(&tev); + _ksr_tcpcon_evcb = con; ret = sr_event_exec(SREV_TCP_CLOSED, &evp); + _ksr_tcpcon_evcb = NULL; } else { LM_DBG("no callback registering for handling TCP closed event\n"); }

1 0

git:master:27e3b7f3: tcpops: reworked some debug messages
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 27e3b7f3f82957c6dc80f2ff89c40bdd87cecb81 URL: https://github.com/kamailio/kamailio/commit/27e3b7f3f82957c6dc80f2ff89c40bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:21:20+02:00 tcpops: reworked some debug messages --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/27e3b7f3f82957c6dc80f2ff89c40bd… Patch: https://github.com/kamailio/kamailio/commit/27e3b7f3f82957c6dc80f2ff89c40bd… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 2b767a9470e..97068c627bb 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -249,6 +249,7 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sr_kemi_eng_t *keng = NULL; str *evname; + LM_DBG("event reason id: %d\n", tev->reason); if(tcpops_event_callback.len > 0) { rt = -1; keng = sr_kemi_eng_get(); @@ -258,9 +259,10 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) } } else { rt = tcp_closed_routes[tev->reason]; - LM_DBG("event reason id: %d rt: %d\n", tev->reason, rt); - if(rt == -1) + if(rt == -1) { + LM_DBG("event reason id: %d - event route not set\n", tev->reason); return; + } } if(faked_msg_init() < 0) {

1 0

git:master:11e7d71e: core: tcp - keep connection id on event route cb structure
by Daniel-Constantin Mierla 23 Apr '24

23 Apr '24

Module: kamailio Branch: master Commit: 11e7d71e5c2ee9428298658ed3b9a0f625d40f00 URL: https://github.com/kamailio/kamailio/commit/11e7d71e5c2ee9428298658ed3b9a0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-23T10:19:29+02:00 core: tcp - keep connection id on event route cb structure --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/11e7d71e5c2ee9428298658ed3b9a0f… Patch: https://github.com/kamailio/kamailio/commit/11e7d71e5c2ee9428298658ed3b9a0f… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index 13301563945..5b579b2ffb9 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -422,6 +422,7 @@ typedef struct tcp_event_info typedef struct tcp_closed_event_info { enum tcp_closed_reason reason; + int id; struct tcp_connection *con; } tcp_closed_event_info_t; diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index b71e7ad37f2..957a9b97c0f 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3689,6 +3689,7 @@ static int tcp_emit_closed_event(struct tcp_connection *con) if(likely(sr_event_enabled(SREV_TCP_CLOSED))) { memset(&tev, 0, sizeof(tcp_closed_event_info_t)); tev.reason = reason; + tev.id = con->id; tev.con = con; evp.data = (void *)(&tev); ret = sr_event_exec(SREV_TCP_CLOSED, &evp);

1 0

git:master:6e6b4f06: xhttp_prom: use %lu for printing pkg fields
by Daniel-Constantin Mierla 22 Apr '24

22 Apr '24

Module: kamailio Branch: master Commit: 6e6b4f06546a0d9ad942847ee745b17a5aeb7f6a URL: https://github.com/kamailio/kamailio/commit/6e6b4f06546a0d9ad942847ee745b17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-22T21:54:26+02:00 xhttp_prom: use %lu for printing pkg fields --- Modified: src/modules/xhttp_prom/prom.c --- Diff: https://github.com/kamailio/kamailio/commit/6e6b4f06546a0d9ad942847ee745b17… Patch: https://github.com/kamailio/kamailio/commit/6e6b4f06546a0d9ad942847ee745b17… --- diff --git a/src/modules/xhttp_prom/prom.c b/src/modules/xhttp_prom/prom.c index efe111b752a..71accf21845 100644 --- a/src/modules/xhttp_prom/prom.c +++ b/src/modules/xhttp_prom/prom.c @@ -253,7 +253,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) for(; i < pkg_proc_stats_no; i++) { if(prom_body_printf(ctx, "%.*spkgmem_used{pid=\"%u\", rank=\"%d\", desc=\"%s\"} " - "%d %" PRIu64 "\n", + "%lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].used, ts) @@ -263,7 +263,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_available{pid=\"%u\", rank=\"%d\", " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].available, ts) @@ -273,7 +273,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_real_used{pid=\"%u\", rank=\"%d\", " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].real_used, ts) @@ -283,7 +283,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_total_frags{pid=\"%u\", rank=\"%d\", " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_frags, ts) @@ -293,7 +293,7 @@ static int prom_metric_pkgmem_print(prom_ctx_t *ctx) } if(prom_body_printf(ctx, "%.*spkgmem_total_size{pid=\"%u\", rank=\"%d\" " - "desc=\"%s\"} %d %" PRIu64 "\n", + "desc=\"%s\"} %lu %" PRIu64 "\n", xhttp_prom_beginning.len, xhttp_prom_beginning.s, pkg_proc_stats[i].pid, pkg_proc_stats[i].rank, pt[i].desc, pkg_proc_stats[i].total_size, ts)

1 0

git:master:b96de87a: ipops: define hostname size for ptr structure
by Daniel-Constantin Mierla 22 Apr '24

22 Apr '24

Module: kamailio Branch: master Commit: b96de87ae94db2285d7a5f022c38a746d69ae5ef URL: https://github.com/kamailio/kamailio/commit/b96de87ae94db2285d7a5f022c38a74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-04-22T21:43:40+02:00 ipops: define hostname size for ptr structure - replace the strncpy with strlen with straight strcpy --- Modified: src/modules/ipops/ipops_pv.c Modified: src/modules/ipops/ipops_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/b96de87ae94db2285d7a5f022c38a74… Patch: https://github.com/kamailio/kamailio/commit/b96de87ae94db2285d7a5f022c38a74… --- diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 034ec696594..acbe08a4283 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -429,7 +429,7 @@ int ptr_update_pv(str *ip_address, str *name) sr_dns_item_t *dr = NULL; struct sockaddr_in sa; struct sockaddr_in6 sa6; - char hostname[256]; + char hostname[SR_DNS_HOSTNAME_SIZE]; int result; int ip_type; if(ip_address->len > INET6_ADDRSTRLEN) { @@ -499,8 +499,7 @@ int ptr_update_pv(str *ip_address, str *name) } /* Store the hostname in the sr_dns_item_t structure. */ - strncpy(dr->hostname, hostname, strlen(hostname)); - dr->hostname[strlen(hostname)] = '\0'; + strcpy(dr->hostname, hostname); dr->count = 1; LM_DBG("reverse dns PV updated for: %s (%d)\n", dr->r[0].addr, dr->count); diff --git a/src/modules/ipops/ipops_pv.h b/src/modules/ipops/ipops_pv.h index 5e9a19be1da..cede3b4217c 100644 --- a/src/modules/ipops/ipops_pv.h +++ b/src/modules/ipops/ipops_pv.h @@ -27,7 +27,7 @@ #define PV_DNS_ADDR 64 #define PV_DNS_RECS 32 #define SR_DNS_PVIDX 1 - +#define SR_DNS_HOSTNAME_SIZE 256 typedef struct _sr_dns_record { int type; @@ -38,7 +38,7 @@ typedef struct _sr_dns_item { str name; unsigned int hashid; - char hostname[256]; + char hostname[SR_DNS_HOSTNAME_SIZE]; int count; int ipv4; int ipv6;

1 0

[kamailio/kamailio] tools/kemi: add dockstrings to the mocking (PR #3818)
by tsearle 22 Apr '24

22 Apr '24

kemi_mock.py can now optionally consume documentation information generated by the vscode-kamailio-hover project   #### 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) - [ ] 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/3818 -- Commit Summary -- * tools/kemi: add dockstrings to the mocking -- File Changes -- M misc/tools/kemi/python_mock/README.md (15) M misc/tools/kemi/python_mock/kemi_mock.py (31) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3818.patch https://github.com/kamailio/kamailio/pull/3818.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3818 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3818(a)github.com>

1 1

git:master:6b29df73: tools/kemi: add dockstrings to the mocking (#3818)
by GitHub 22 Apr '24

22 Apr '24

Module: kamailio Branch: master Commit: 6b29df73115682424daf7b276d0138f004e274f7 URL: https://github.com/kamailio/kamailio/commit/6b29df73115682424daf7b276d0138f… Author: tsearle <torrey.searle(a)wavecrest.com> Committer: GitHub <noreply(a)github.com> Date: 2024-04-22T12:53:48+02:00 tools/kemi: add dockstrings to the mocking (#3818) kemi_mock.py can now optionally consume documentation information generated by the vscode-kamailio-hover project --- Modified: misc/tools/kemi/python_mock/README.md Modified: misc/tools/kemi/python_mock/kemi_mock.py --- Diff: https://github.com/kamailio/kamailio/commit/6b29df73115682424daf7b276d0138f… Patch: https://github.com/kamailio/kamailio/commit/6b29df73115682424daf7b276d0138f… --- diff --git a/misc/tools/kemi/python_mock/README.md b/misc/tools/kemi/python_mock/README.md index 5e72e738c58..385cbd5656a 100644 --- a/misc/tools/kemi/python_mock/README.md +++ b/misc/tools/kemi/python_mock/README.md @@ -2,7 +2,7 @@ Generate a mocking framework base on the output of app_python.api_list -Usage: +### Usage: ``` /usr/sbin/kamctl rpc app_python.api_list > api.json ./kemi_mock.py api.json > KSR.py @@ -15,6 +15,19 @@ the Union type add the --no-union flag ./kemi_mock.py api.json --no-union > KSR.py ``` +### Usage with Documentation: +run the generate.py from the following project + +https://github.com/braams/vscode-kamailio-hover + +this creates a modules.json file in a tmp directory. This file can be used to generate the KSR.py file with documentation + +pass the modules.json as a 2nd parameter to kemi_mock.py +``` +./kemi_mock.py api.json modules.json > KSR.py +``` + +## Mocking Return values can be injected through the dictionary \_mock\_data ```python diff --git a/misc/tools/kemi/python_mock/kemi_mock.py b/misc/tools/kemi/python_mock/kemi_mock.py index 48a73efa232..145fcb34b3a 100755 --- a/misc/tools/kemi/python_mock/kemi_mock.py +++ b/misc/tools/kemi/python_mock/kemi_mock.py @@ -113,21 +113,41 @@ def printFunction(module_name, func, indent): else: print(prefix + "def " + func['name'] +"("+params+"):") + generate_function_doc(module_name, func, prefix) + print(prefix + "\tprint(\"Calling " + log_format_params + "\" % "+log_params+")") printMocReturn(module_name, func, indent+1) print("") +def generate_function_doc(module_name, func, prefix): + if documentation is not None and module_name in documentation: + function_parts = func['name'].split("_") + for i in range(len(function_parts), 0, -1): + function_prefix = "_".join(function_parts[:i]) + if function_prefix in documentation[module_name]["functions"]: + print(prefix + "\t\"\"\"") + documentation_lines = documentation[module_name]["functions"][function_prefix].split("\n") + for line in documentation_lines: + print(prefix + "\t" + line) + print(prefix + "\t\"\"\"") + break + + classes = defaultdict(list) if len(sys.argv) < 2: print("Please specify the json file to parse") sys.exit(-1) +documentation = None if len(sys.argv) > 2: for i in range(2,len(sys.argv)): if sys.argv[i] == "--no-union": noUnion = True + else: + with open(sys.argv[i]) as f: + documentation = json.load(f) if not noUnion: print("from typing import Union") @@ -193,12 +213,23 @@ def printFunction(module_name, func, indent): print("") printFunction('', func, 0) + +def document_module(module_name): + if documentation is not None and module_name in documentation: + print("\"\"\"") + documentation_lines = documentation[module_name]["overview"].split("\n") + for line in documentation_lines: + print("" + line) + print("\"\"\"") + + for module_name in classes.keys(): if module_name != "": if module_name in reserved_keywords: print("setattr(sys.modules[__name__], '" + module_name + "', " + module_name.capitalize() + "())") else: print(module_name + " = "+module_name.capitalize()+"()") + document_module(module_name) print("")

1 0

[kamailio/kamailio] usrloc: check on db delete the return value of memchr (PR #3815)
by Rick Barenthin 20 Apr '24

20 Apr '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 - [ ] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When inserting into the database the AOR is split at the @ sign and if there is no @ sign in the AOR only the domain part is filled and the user part is left empty. But for deleting this is not done and the query failed to be executed and the AOR is not deleted. This PR add this behaviour of only comparing against the domain part if the AOR doesn't contain a @ sign. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3815 -- Commit Summary -- * usrloc: check on db delete the return value of memchr -- File Changes -- M src/modules/usrloc/urecord.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3815.patch https://github.com/kamailio/kamailio/pull/3815.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3815 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3815(a)github.com>

3 5

git:master:49276a1f: usrloc: check on db delete the return value of memchr
by Henning Westerholt 20 Apr '24

20 Apr '24

Module: kamailio Branch: master Commit: 49276a1f43b1a3bf4a8d681888df964000360c79 URL: https://github.com/kamailio/kamailio/commit/49276a1f43b1a3bf4a8d681888df964… Author: Rick Barenthin <rick(a)ng-voice.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-20T06:35:51+02:00 usrloc: check on db delete the return value of memchr When inserting into the database the AOR is split at the @ sign and if there is no @ sign in the AOR only the domain part is filled and the user part is left empty. But for deleting this is not done and the query failed to be executed and the AOR is not deleted. This PR add this behaviour of only comparing against the domain part if the AOR doesn't contain a @ sign. --- Modified: src/modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/49276a1f43b1a3bf4a8d681888df964… Patch: https://github.com/kamailio/kamailio/commit/49276a1f43b1a3bf4a8d681888df964… --- diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index e027affc8aa..3c394a24a10 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -491,13 +491,17 @@ int db_delete_urecord(urecord_t *_r) vals[0].val.str_val.len = _r->aor.len; if(ul_use_domain) { - dom = memchr(_r->aor.s, '@', _r->aor.len); - vals[0].val.str_val.len = dom - _r->aor.s; - vals[1].type = DB1_STR; vals[1].nul = 0; - vals[1].val.str_val.s = dom + 1; - vals[1].val.str_val.len = _r->aor.s + _r->aor.len - dom - 1; + dom = memchr(_r->aor.s, '@', _r->aor.len); + if(dom == 0) { + vals[0].val.str_val.len = 0; + vals[1].val.str_val = _r->aor; + } else { + vals[0].val.str_val.len = dom - _r->aor.s; + vals[1].val.str_val.s = dom + 1; + vals[1].val.str_val.len = _r->aor.s + _r->aor.len - dom - 1; + } } if(ul_dbf.use_table(ul_dbh, _r->domain) < 0) {

1 0

[kamailio/kamailio] Core parameters user_agent_header fail to take effect (Issue #3816)
by suiyuemanbu 19 Apr '24

19 Apr '24

I want kamailio use User-Agent header, not Server head My setup is as follows: kamailio.cfg server_signature=no user_agent_header="User-Agent: carrierroute-kam" the result is : SIP/2.0 100 trying -- your call is important to us Via: SIP/2.0/UDP xxx From: xxxxxxtag=N856ZmNXa4S6D To: xxx Call-ID: 5ab0 CSeq: 82194 INVITE Content-Length: 0 **not have User-Agent header** please help me,How to make it appear the User-Agent field? thank you version: kamailio 5.7.0 (x86_64/linux) f1e91d -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3816 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3816(a)github.com>

2 2

git:master:d4c23324: cfgutils: initialize the optional key
by Victor Seva 18 Apr '24

18 Apr '24

Module: kamailio Branch: master Commit: d4c23324a84d9727653e0b67c4455f9cf6be3d0c URL: https://github.com/kamailio/kamailio/commit/d4c23324a84d9727653e0b67c4455f9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-18T16:12:33+02:00 cfgutils: initialize the optional key * bug introduced at 424769743c93dea5a4d2c21f7a0ef8ea8779a5bb --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/d4c23324a84d9727653e0b67c4455f9… Patch: https://github.com/kamailio/kamailio/commit/d4c23324a84d9727653e0b67c4455f9… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index f7aea690e88..487f68aaab0 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -691,7 +691,7 @@ static int cfg_lock_helper(str *lkey, str *lkey2, int mode) unsigned int pos; str *key2 = NULL; - if(lkey2 && lkey2->len > 0) { + if(lkey2 && lkey2->s && lkey2->len > 0) { key2 = lkey2; } @@ -770,7 +770,8 @@ static int cfg_trylock_key2(sip_msg_t *msg, str *lkey, str *lkey2) static int w_cfg_lock_wrapper( struct sip_msg *msg, gparam_p key, gparam_p key2, int mode) { - str s1, s2; + str s1; + str s2 = STR_NULL; if(key == NULL) { return -1; }

1 0

git:master:38226473: cfgutils: reformat exported structures
by Victor Seva 18 Apr '24

18 Apr '24

Module: kamailio Branch: master Commit: 382264730393afac09a319df46044c6ac0753ea7 URL: https://github.com/kamailio/kamailio/commit/382264730393afac09a319df46044c6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-04-18T14:25:45+02:00 cfgutils: reformat exported structures --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/382264730393afac09a319df46044c6… Patch: https://github.com/kamailio/kamailio/commit/382264730393afac09a319df46044c6…

1 0

git:master:175d755c: tcp_main: Match wss protocol
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 175d755c40bc50b78b2cf4f18ad22429289af90d URL: https://github.com/kamailio/kamailio/commit/175d755c40bc50b78b2cf4f18ad2242… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Match wss protocol --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/175d755c40bc50b78b2cf4f18ad2242… Patch: https://github.com/kamailio/kamailio/commit/175d755c40bc50b78b2cf4f18ad2242… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index e3323736cc0..b71e7ad37f2 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -5435,7 +5435,7 @@ int wss_send(dest_info_t *dst, const char *buf, unsigned len) if(tcp_connection_match == TCPCONN_MATCH_STRICT) { con = tcpconn_lookup(dst->id, &ip, port, from, (dst->send_sock) ? dst->send_sock->port_no : 0, 0, - PROTO_NONE); + dst->proto); } else { con = tcpconn_get(dst->id, &ip, port, from, 0); }

1 0

git:master:d81e5113: core/forward: Match protocol when forwarding
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: d81e5113884b933251499630d112ec5b1150b8a4 URL: https://github.com/kamailio/kamailio/commit/d81e5113884b933251499630d112ec5… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 core/forward: Match protocol when forwarding --- Modified: src/core/forward.h --- Diff: https://github.com/kamailio/kamailio/commit/d81e5113884b933251499630d112ec5… Patch: https://github.com/kamailio/kamailio/commit/d81e5113884b933251499630d112ec5… --- diff --git a/src/core/forward.h b/src/core/forward.h index 46bd3a36171..7b51e1a5559 100644 --- a/src/core/forward.h +++ b/src/core/forward.h @@ -189,7 +189,7 @@ static inline int msg_send_buffer( if(tcp_connection_match == TCPCONN_MATCH_STRICT) { con = tcpconn_lookup(dst->id, &ip, port, from, (dst->send_sock) ? dst->send_sock->port_no : 0, 0, - PROTO_NONE); + dst->proto); } else { con = tcpconn_get(dst->id, &ip, port, from, 0); }

1 0

git:master:0a28a93c: tcp_main: Update comment docs
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 0a28a93c6e060081267dc686e342d45ef03358e7 URL: https://github.com/kamailio/kamailio/commit/0a28a93c6e060081267dc686e342d45… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Update comment docs --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/0a28a93c6e060081267dc686e342d45… Patch: https://github.com/kamailio/kamailio/commit/0a28a93c6e060081267dc686e342d45… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 0ea1b541ea6..e3323736cc0 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1697,8 +1697,8 @@ void tcpconn_rm(struct tcp_connection *c) /* finds a connection, if id=0 uses the ip addr, port, local_ip and local port * (host byte order) and tries to find the connection that matches all of - * them. Wild cards can be used for local_ip and local_port (a 0 filled - * ip address and/or a 0 local port). + * them. Wild cards can be used for local_ip, local_port and proto (a 0 filled + * ip address and/or a 0 local port and/or PROTO_NONE). * WARNING: unprotected (locks) use tcpconn_get unless you really * know what you are doing */ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, @@ -1754,7 +1754,7 @@ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, /** - * find if a tcp connection exits by id or remote+local address/port + * find if a tcp connection exits by id or remote+local address/port and protocol * - return: 1 if found; 0 if not found */ int tcpconn_exists(int conn_id, ip_addr_t *peer_ip, int peer_port, @@ -1774,6 +1774,7 @@ int tcpconn_exists(int conn_id, ip_addr_t *peer_ip, int peer_port, /* TCP connection find with locks and timeout * - local_addr contains the desired local ip:port. If null any local address * will be used. IN*ADDR_ANY or 0 port are wild cards. + * - proto is the protocol to match (PROTO_NONE for any) * - try_local_port makes the search use it first, instead of port from local_addr * If found, the connection's reference counter will be incremented, you might * want to decrement it after use.

1 0

git:master:6779efd4: tcp_main: Add proto argument to tcpconn_exists function
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 6779efd430178adff0ae438d178e38c003e4e05c URL: https://github.com/kamailio/kamailio/commit/6779efd430178adff0ae438d178e38c… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Add proto argument to tcpconn_exists function --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/6779efd430178adff0ae438d178e38c… Patch: https://github.com/kamailio/kamailio/commit/6779efd430178adff0ae438d178e38c… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 73e2ef6163d..0ea1b541ea6 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1758,13 +1758,12 @@ struct tcp_connection *_tcpconn_find(int id, struct ip_addr *ip, int port, * - return: 1 if found; 0 if not found */ int tcpconn_exists(int conn_id, ip_addr_t *peer_ip, int peer_port, - ip_addr_t *local_ip, int local_port) + ip_addr_t *local_ip, int local_port, sip_protos_t proto) { tcp_connection_t *c; TCPCONN_LOCK; - c = _tcpconn_find( - conn_id, peer_ip, peer_port, local_ip, local_port, PROTO_NONE); + c = _tcpconn_find(conn_id, peer_ip, peer_port, local_ip, local_port, proto); TCPCONN_UNLOCK; if(c) { return 1; @@ -4497,7 +4496,8 @@ static inline int handle_new_connect(struct socket_info *si) if(likely(tcpconn)) { if(tcp_accept_unique) { if(tcpconn_exists(0, &tcpconn->rcv.dst_ip, tcpconn->rcv.dst_port, - &tcpconn->rcv.src_ip, tcpconn->rcv.src_port)) { + &tcpconn->rcv.src_ip, tcpconn->rcv.src_port, + si->proto)) { LM_ERR("duplicated connection by local and remote addresses\n"); _tcpconn_free(tcpconn); tcp_safe_close(new_sock);

1 0

git:master:4a40b16d: tcp_main: Add protocol argument for searching tcp/tls connections
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 4a40b16d4f9bef9bc75d3272c83878e6348aa0b8 URL: https://github.com/kamailio/kamailio/commit/4a40b16d4f9bef9bc75d3272c83878e… Author: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:42:20+02:00 tcp_main: Add protocol argument for searching tcp/tls connections --- Modified: src/core/forward.h Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/4a40b16d4f9bef9bc75d3272c83878e… Patch: https://github.com/kamailio/kamailio/commit/4a40b16d4f9bef9bc75d3272c83878e…

1 0

[kamailio/kamailio] tcp/docs: Added tcp_accept_iplimit config sample (PR #3792)
by Arnis Voitkāns 16 Apr '24

16 Apr '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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description We noticed that configuration option tcp_accept_iplimit was included in newer kamailio versions (most notably 5.7.4), and it was a breaking change for us. Added sample configuration value in /etc/kamailio.cfg file - already tested in our production deployment. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3792 -- Commit Summary -- * tcp/docs: Added tcp_accept_iplimit config sample -- File Changes -- M etc/kamailio.cfg (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3792.patch https://github.com/kamailio/kamailio/pull/3792.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3792 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3792(a)github.com>

3 5

git:master:30a0fe2e: etc/kamailio.cfg: added tcp_accept_iplimit config sample
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: 30a0fe2ea4b1b59bb8e552f9abd3a65e1c7226ec URL: https://github.com/kamailio/kamailio/commit/30a0fe2ea4b1b59bb8e552f9abd3a65… Author: Arnis Voitkans <a.voitkans(a)dynatech.lv> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T12:40:09Z etc/kamailio.cfg: added tcp_accept_iplimit config sample --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/30a0fe2ea4b1b59bb8e552f9abd3a65… Patch: https://github.com/kamailio/kamailio/commit/30a0fe2ea4b1b59bb8e552f9abd3a65… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 3f9a5fe793f..cd2ecd0109f 100755 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -211,6 +211,9 @@ tcp_connection_lifetime=3605 /* upper limit for TCP connections (it includes the TLS connections) */ tcp_max_connections=2048 +/* upper limit for TCP connections for one ip address - default 1024 */ +#tcp_accept_iplimit=1024 + #!ifdef WITH_JSONRPC tcp_accept_no_cl=yes #!endif

1 0

[kamailio/kamailio] rtpengine: fix pkg mem leak in send_rtpp_command() (PR #3813)
by vijaykumar-exotel 16 Apr '24

16 Apr '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 - [x] Related to issue #3777 #### Description  - freed request.s after sending request to websocket in send_rtpp_command method. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3813 -- Commit Summary -- * rtpengine: fix pkg mem leak in send_rtpp_command() -- File Changes -- M src/modules/rtpengine/rtpengine.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3813.patch https://github.com/kamailio/kamailio/pull/3813.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3813 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3813(a)github.com>

2 5

git:master:b4753ae4: rtpengine: fix pkg mem leak in send_rtpp_command()
by Henning Westerholt 16 Apr '24

16 Apr '24

Module: kamailio Branch: master Commit: b4753ae4216b0c960ac094f4be8232fb4d0147b0 URL: https://github.com/kamailio/kamailio/commit/b4753ae4216b0c960ac094f4be8232f… Author: vijay kumar <vijay.kumar(a)exotel.in> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2024-04-16T14:38:27+02:00 rtpengine: fix pkg mem leak in send_rtpp_command() - freed request.s after sending request to websocket --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/b4753ae4216b0c960ac094f4be8232f… Patch: https://github.com/kamailio/kamailio/commit/b4753ae4216b0c960ac094f4be8232f… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index c51b4742081..6d62b92900d 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3672,6 +3672,7 @@ static char *send_rtpp_command( len = _rtpe_lwscb.request(&node->rn_url, (str *)&rtpe_proto, &request, &response, rtpengine_tout_ms * 1000); + pkg_free(request.s); if(len < 0) { LM_ERR("failed to do websocket request\n");

1 0

git:master:f4332447: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 15 Apr '24

15 Apr '24

Module: kamailio Branch: master Commit: f43324473bfd9b6c5db59c5691e316d32c15be81 URL: https://github.com/kamailio/kamailio/commit/f43324473bfd9b6c5db59c5691e316d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-04-15T21:31:23+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/f43324473bfd9b6c5db59c5691e316d… Patch: https://github.com/kamailio/kamailio/commit/f43324473bfd9b6c5db59c5691e316d… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 666f8844a52..bbe356a17d5 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -1150,7 +1150,7 @@ modparam("acc", "cdr_facility", "LOG_DAEMON") Example 1.35. cdr_extra example ... -modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)" +modparam("acc", "cdr_extra", "c1=$dlg_var(caller);c2=$dlg_var(callee)") ... 6.36. cdr_extra_nullable (integer)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev