### Description
In Prometheus there is the possibility to tag values with tags. Those tags can then be used provide context to those values, for example to filter them.
### Expected behavior
It would be great if there was a way to provide custom tags to the metrics. These would essentially just be a static string between the name of the metric and its value.
Example:
`system_load15{host="wurst23.dev.sipgate.net",hostname_short="wurst32"} 0.4`
This could probably be achieved by having an `xhttp_prom_ending` parameter similar to the `xhttp_prom_beginning` as we essentially just want to append a static string right after the metric name.
#### Actual observed behavior
`kamailio_sip_lb_de_core_rcv_replies_1xx_invite 1773 1731419851663`
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/4021
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/issues/4021(a)github.com>
#### 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
latest `make` version does not evaluate variables immediately. PR explicitly evaluates the LIBS makefile variable.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/4085
-- Commit Summary --
* app_python3: evaluate LIBS variable imediately in Makefile
-- File Changes --
M src/modules/app_python3/Makefile (4)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/4085.patchhttps://github.com/kamailio/kamailio/pull/4085.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/4085
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/4085(a)github.com>
related #3886
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3978
-- Commit Summary --
* geoip: module relocated to archive
-- File Changes --
M src/Makefile.groups (8)
D src/modules/geoip/Makefile (9)
D src/modules/geoip/README (166)
D src/modules/geoip/doc/Makefile (4)
D src/modules/geoip/doc/geoip.xml (42)
D src/modules/geoip/doc/geoip_admin.xml (199)
D src/modules/geoip/geoip_mod.c (157)
D src/modules/geoip/geoip_pv.c (421)
D src/modules/geoip/geoip_pv.h (40)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3978.patchhttps://github.com/kamailio/kamailio/pull/3978.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3978
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/3978(a)github.com>
### Description
From the cmake timeline 3.0(2014) is called "modern cmake" and ~3.12/3.13(2018) is "more modern cmake" : https://www.youtube.com/watch?v=y7ndUhdQuU8
Since we are doing a major renovation on the kamailio build system should we target the "more modern" generation (that is already > 5 years old). This will encourage the project to follow cmake best practices.
Ping @xkaraman @miconda
Versions in debian: buster(3.13) bullseye(3.25) bookworm/trixie(3.30)
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/4078
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/issues/4078(a)github.com>
Considering that it hasn't been much activity around the internal libraries for long time, I was wondering if it still makes sense to keep them like they are or merge them in the core.
Recently, during the devel meeting, I relocated a couple of them to the archive. The `lib/binrpc` (and `print`) can have the same fate, being not actually used.
The srdb1 is very common and I guess it is very rare the case when a deployment is used without a module not depending on it (e.g., even if dispatcher is used with a list file, the code is still linked to this library).
The `trie` library is small and `ims` is actually a set of getter functions for message attribtues/headers.
The `srdb2` is not used much, but I think the right approach for it is to change the modules using it to `libsrdb1` and get rid of it completely sometime in the future. Till then the code is not big and can reside as part of the core.
The benefits I see are in simplifying the build system (current makefiles and hopefully soon-to-be-merged the one based on cmake), reducing also the time to compute compile and link dependencies; getting rid of packaging complexity (same library may be needed by different modules, which, when packaged separately, the library has to be in a 3rd package, or have dependency of the other module's package -- probably now the libs are shipped with the core package).
The code for libs can stay at the same location, so source code for modules doesn't need to be updated, just that they are compiled with the core, removing internal libs from makefiles.
Thinking that we go for 6.0.x, clarifying the plans for this component and cleaning it, if decided so, should fit well in such version number jump.
Opinions?
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/4041
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/issues/4041(a)github.com>
<!--
Kamailio Project uses GitHub Issues only for bugs in the code or feature requests. Please use this template only for bug reports.
If you have questions about using Kamailio or related to its configuration file, ask on sr-users mailing list:
* https://lists.kamailio.org/mailman3/postorius/lists/sr-users.lists.kamailio…
If you have questions about developing extensions to Kamailio or its existing C code, ask on sr-dev mailing list:
* https://lists.kamailio.org/mailman3/postorius/lists/sr-dev.lists.kamailio.o…
Please try to fill this template as much as possible for any issue. It helps the developers to troubleshoot the issue.
Note that an issue report may be closed automatically after about 2 months
if there is no interest from developers or community users on pursuing it, being
considered expired. In such case, it can be reopened by writing a comment that includes
the token `/notexpired`. About two weeks before considered expired, the issue is
marked with the label `stale`, trying to notify the submitter and everyone else
that might be interested in it. To remove the label `stale`, write a comment that
includes the token `/notstale`. Also, any comment postpone the `expire` timeline,
being considered that there is interest in pursuing the issue.
If there is no content to be filled in a section, the entire section can be removed.
You can delete the comments from the template sections when filling.
You can delete next line and everything above before submitting (it is a comment).
-->
### Description
I see unexpected return code from route if there is no explicit `return` and switch-case block.
<!--
Explain what you did, what you expected to happen, and what actually happened.
-->
#### Reproduction
Here is simple configuration part:
```
route(TEST_ROUTE_WITH_SWITCH);
xlog("L_WARN", "TEST_ROUTE_WITH_SWITCH result $rc\n");
...
route[TEST_ROUTE_WITH_SWITCH] {
$var(a) = "a";
switch ($var(a)) {
case "a":
case "b":
$var(b) = $var(a);
break;
default:
$var(c) = $var(a);
}
# must be optional according to documentation:
# https://www.kamailio.org/wiki/cookbooks/5.3.x/core#return
# > If no value is specified, or a route reaches its end without executing a return statement, it returns 1.
#
# return 1;
}
```
Log:
```
WARNING: <script>: TEST_ROUTE_WITH_SWITCH result 0
```
At the same time if there is no switch-block, return code is 1 as expected:
```
route[TEST_ROUTE_WITH_SWITCH] {
$var(a) = "a";
}
```
Log:
```
WARNING: <script>: TEST_ROUTE_WITH_SWITCH w/o switch-case result 1
```
### Additional Information
* **Kamailio Version** - output of `kamailio -v`
```
$ ./build/sbin/kamailio -v
version: kamailio 5.7.5 (x86_64/linux) b47500-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: b47500 -dirty
compiled on 22:02:13 Nov 9 2024 with /usr/bin/gcc 11.3.1
```
* **Operating System**:
<!--
Details about the operating system, the type: Linux (e.g.,: Debian 8.4, Ubuntu 16.04, CentOS 7.1, ...), MacOS, xBSD, Solaris, ...;
Kernel details (output of `lsb_release -a` and `uname -a`)
-->
```
Oracle Linux 9
```
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/4088
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/issues/4088(a)github.com>
#### Kamailo 5.8
### Description
I use ```ds_is_active function()``` in ```dispatcher``` module.
```
$var(sip_url) = $sht(conf_fs=>$var(conf_id)); # sip:192.168.1.44:5060
if(ds_is_active("1", "$var(sip_url)")){
#### is allways run
}
```
or
```ds_is_active("1", $var(sip_url))```
#### Debugging Data
When I check dispatcher:
```
"DEST": {
"URI": "sip:192.168.1.44:5060",
"FLAGS": "IP",
"PRIORITY": 0,
"ATTRS": {
"BODY": "rweight=50;weight=50;cc=1",
"DUID": null,
"MAXLOAD": 0,
"WEIGHT": 50,
"RWEIGHT": 50,
"SOCKET": null,
"SOCKNAME": null,
"OBPROXY": null
}
}
```
Why is the flag set to ```IP```, but ```ds_is_active()``` returns true?
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/4001
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/issues/4001(a)github.com>
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>
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>
- allows custom tags to be added to prometheus metrics
- Addresses GH issue #4021
<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [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)
- [X] New feature (non-breaking change which adds new functionality)
- [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [X] PR should be backported to stable branches
- [X] Tested changes locally
- [X] Related to issue #4021
#### Description
<!-- Describe your changes in detail -->
This change adds a new parameter `xhttp_prom_tags`. It allows the user to append tags to the prometheus metrics. This makes those metrics a lot more useful when having multiple kamailio instances running on a single host.
This is done by 2 shared memory helper variables which contain the parameter in different formats. This way it is easy to print them out with minimal changes.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/4073
-- Commit Summary --
* xhttp_prom: new xhttp_prom_tags paramete
-- File Changes --
M src/modules/xhttp_prom/doc/xhttp_prom_admin.xml (25)
M src/modules/xhttp_prom/prom.c (30)
M src/modules/xhttp_prom/xhttp_prom.c (50)
M src/modules/xhttp_prom/xhttp_prom.h (15)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/4073.patchhttps://github.com/kamailio/kamailio/pull/4073.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/4073
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/4073(a)github.com>
<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [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:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [ ] Tested changes locally
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
<!-- Describe your changes in detail -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/4090
-- Commit Summary --
* examples: fix kamailio ims cfg file for basic volte call
-- File Changes --
M misc/examples/ims/icscf/icscf.cfg.sample (12)
M misc/examples/ims/icscf/icscf.xml.sample (6)
M misc/examples/ims/icscf/kamailio.cfg (32)
M misc/examples/ims/pcscf/kamailio.cfg (182)
M misc/examples/ims/pcscf/pcscf.cfg.sample (55)
M misc/examples/ims/pcscf/pcscf.xml.sample (6)
M misc/examples/ims/pcscf/route/mo.cfg (99)
M misc/examples/ims/pcscf/route/mt.cfg (101)
M misc/examples/ims/pcscf/route/register.cfg (198)
M misc/examples/ims/pcscf/route/rtp.cfg (90)
M misc/examples/ims/scscf/kamailio.cfg (115)
M misc/examples/ims/scscf/scscf.cfg.sample (24)
M misc/examples/ims/scscf/scscf.xml.sample (6)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/4090.patchhttps://github.com/kamailio/kamailio/pull/4090.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/4090
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/4090(a)github.com>
Update item expiration value during de-/incrementation for htables that are configured with autoexpire and updateexpire disabled. Otherwise an item cannot be used until timer cleaned it up.
<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [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:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [x] PR should be backported to stable branches
- [x] Tested changes locally
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
Using following configuration
```
#!KAMAILIO
listen=udp:127.0.0.1:9999
log_stderror=yes
loadmodule "xlog.so"
loadmodule "pv.so"
loadmodule "sl.so"
loadmodule "htable.so"
modparam("htable", "htable", "foo=>autoexpire=1;updateexpire=0")
request_route {
if ($sht(foo=>bar) == $null) {
$sht(foo=>bar) = 0;
}
$var(foo) = $shtdec(foo=>bar);
xlog("$Ts single value $sht(foo=>bar)\texpire $shtex(foo=>bar)\n");
sl_send_reply("200", "Hello");
}
```
running
```
while true; do sleep 0.3; sipsak -vs sip:localhost:9999 ; done
```
produces following output
```
0(1414153) ERROR: <script>: 1734539304 single value -1 expire 1
0(1414153) ERROR: <script>: 1734539305 single value -2 expire 0
0(1414153) ERROR: <script>: 1734539305 single value -3 expire 0
0(1414153) ERROR: <script>: 1734539305 single value -4 expire 0
0(1414153) ERROR: <script>: 1734539306 single value <null> expire 4294967295
0(1414153) ERROR: <script>: 1734539306 single value <null> expire 4294967295
0(1414153) ERROR: <script>: 1734539306 single value <null> expire 4294967295
0(1414153) ERROR: <script>: 1734539306 single value <null> expire 4294967295
0(1414153) ERROR: <script>: 1734539307 single value <null> expire 4294967294
0(1414153) ERROR: <script>: 1734539307 single value <null> expire 4294967294
0(1414153) ERROR: <script>: 1734539307 single value <null> expire 4294967294
0(1414153) ERROR: <script>: 1734539308 single value <null> expire 4294967293
0(1414153) ERROR: <script>: 1734539308 single value <null> expire 4294967293
0(1414153) ERROR: <script>: 1734539308 single value <null> expire 4294967293
0(1414153) ERROR: <script>: 1734539309 single value <null> expire 4294967292
0(1414153) ERROR: <script>: 1734539309 single value <null> expire 4294967292
0(1414153) ERROR: <script>: 1734539309 single value <null> expire 4294967292
0(1414153) ERROR: <script>: 1734539310 single value <null> expire 4294967291
0(1414153) ERROR: <script>: 1734539310 single value <null> expire 4294967291
0(1414153) ERROR: <script>: 1734539310 single value <null> expire 4294967291
0(1414153) ERROR: <script>: 1734539311 single value <null> expire 4294967290
0(1414153) ERROR: <script>: 1734539311 single value <null> expire 4294967290
0(1414153) ERROR: <script>: 1734539311 single value <null> expire 4294967290
0(1414153) ERROR: <script>: 1734539312 single value <null> expire 4294967289
0(1414153) ERROR: <script>: 1734539312 single value <null> expire 4294967289
0(1414153) ERROR: <script>: 1734539312 single value <null> expire 4294967289
0(1414153) ERROR: <script>: 1734539313 single value <null> expire 4294967288
0(1414153) ERROR: <script>: 1734539313 single value <null> expire 4294967288
0(1414153) ERROR: <script>: 1734539313 single value <null> expire 4294967288
0(1414153) ERROR: <script>: 1734539314 single value <null> expire 4294967287
0(1414153) ERROR: <script>: 1734539314 single value <null> expire 4294967287
0(1414153) ERROR: <script>: 1734539314 single value <null> expire 4294967287
0(1414153) ERROR: <script>: 1734539315 single value <null> expire 4294967286
0(1414153) ERROR: <script>: 1734539315 single value <null> expire 4294967286
0(1414153) ERROR: <script>: 1734539315 single value <null> expire 4294967286
0(1414153) ERROR: <script>: 1734539316 single value <null> expire 4294967285
0(1414153) ERROR: <script>: 1734539316 single value <null> expire 4294967285
0(1414153) ERROR: <script>: 1734539316 single value <null> expire 4294967285
0(1414153) ERROR: <script>: 1734539316 single value <null> expire 4294967285
0(1414153) ERROR: <script>: 1734539317 single value <null> expire 4294967284
0(1414153) ERROR: <script>: 1734539317 single value <null> expire 4294967284
0(1414153) ERROR: <script>: 1734539317 single value <null> expire 4294967284
0(1414153) ERROR: <script>: 1734539318 single value <null> expire 4294967283
0(1414153) ERROR: <script>: 1734539318 single value <null> expire 4294967283
0(1414153) ERROR: <script>: 1734539318 single value <null> expire 4294967283
0(1414153) ERROR: <script>: 1734539319 single value <null> expire 4294967282
0(1414153) ERROR: <script>: 1734539319 single value <null> expire 4294967282
0(1414153) ERROR: <script>: 1734539319 single value <null> expire 4294967282
0(1414153) ERROR: <script>: 1734539320 single value <null> expire 4294967281
0(1414153) ERROR: <script>: 1734539320 single value <null> expire 4294967281
0(1414153) ERROR: <script>: 1734539320 single value <null> expire 4294967281
0(1414153) ERROR: <script>: 1734539321 single value <null> expire 4294967280
0(1414153) ERROR: <script>: 1734539321 single value <null> expire 4294967280
0(1414153) ERROR: <script>: 1734539321 single value <null> expire 4294967280
0(1414153) ERROR: <script>: 1734539322 single value <null> expire 4294967279
0(1414153) ERROR: <script>: 1734539322 single value <null> expire 4294967279
0(1414153) ERROR: <script>: 1734539322 single value <null> expire 4294967279
0(1414153) ERROR: <script>: 1734539323 single value <null> expire 4294967278
0(1414153) ERROR: <script>: 1734539323 single value <null> expire 4294967278
0(1414153) ERROR: <script>: 1734539323 single value <null> expire 4294967278
0(1414153) ERROR: <script>: 1734539324 single value <null> expire 4294967277
0(1414153) ERROR: <script>: 1734539324 single value <null> expire 4294967277
0(1414153) ERROR: <script>: 1734539324 single value -1 expire 1
0(1414153) ERROR: <script>: 1734539325 single value -2 expire 0
0(1414153) ERROR: <script>: 1734539325 single value -3 expire 0
0(1414153) ERROR: <script>: 1734539325 single value -4 expire 0
```
When adding `initval=0` to `htable` configuration log output changes `<null>` to `0`
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/4079
-- Commit Summary --
* htable: Fix de-/increment w/ auto expire
-- File Changes --
M src/modules/htable/ht_api.c (4)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/4079.patchhttps://github.com/kamailio/kamailio/pull/4079.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/4079
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/4079(a)github.com>
<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [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:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [x] PR should be backported to stable branches
- [ ] Tested changes locally
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
<!-- Describe your changes in detail -->
This PR fixes a logic error where "flow failed" could also be triggered, when the call was ringing and has not been answered...
(according to https://www.kamailio.org/docs/modules/stable/modules/tm.html#tm.f.t_branch_… )
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/4087
-- Commit Summary --
* outbound/doc: Fix logic error
-- File Changes --
M src/modules/outbound/doc/outbound_admin.xml (3)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/4087.patchhttps://github.com/kamailio/kamailio/pull/4087.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/4087
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/4087(a)github.com>
Module: kamailio
Branch: master
Commit: 2692148d92bb8b17709eb4cbddd8e653bbf5c14a
URL: https://github.com/kamailio/kamailio/commit/2692148d92bb8b17709eb4cbddd8e65…
Author: Xenofon Karamanos <xk(a)gilawa.com>
Committer: Xenofon Karamanos <xk(a)gilawa.com>
Date: 2024-12-30T15:57:40Z
cmake: Install README from source tree
- module_name_doc target will only produce the formats found in the build folder.
- module_name_readme target that modifies the source tree needs to be called explicitly
---
Modified: cmake/modules-docs.cmake
---
Diff: https://github.com/kamailio/kamailio/commit/2692148d92bb8b17709eb4cbddd8e65…
Patch: https://github.com/kamailio/kamailio/commit/2692148d92bb8b17709eb4cbddd8e65…
---
diff --git a/cmake/modules-docs.cmake b/cmake/modules-docs.cmake
index b24ae061af2..edd7e8451d7 100644
--- a/cmake/modules-docs.cmake
+++ b/cmake/modules-docs.cmake
@@ -95,7 +95,6 @@ function(docs_add_module module_name)
add_custom_target(
${module_name}_doc
DEPENDS ${module_name}_doc_text ${module_name}_doc_html
- ${module_name}_readme
COMMENT "Processing target ${module_name}_doc")
# Each version has seperate custon commands for not recompiling all if 1 gets
@@ -146,13 +145,9 @@ function(docs_add_module module_name)
endif()
install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${module_name}/${module_name}.txt
+ FILES ${CMAKE_CURRENT_SOURCE_DIR}/${module_name}/README
RENAME README.${module_name}
DESTINATION ${CMAKE_INSTALL_DOCDIR}/modules
- COMPONENT kamailio_docs
- # Since the depepndencies might not have been build as they are not in the
- # default target and required to build explicitly using `make
- # kamailio_docs`, allow them to be optional.
- OPTIONAL)
+ COMPONENT kamailio_docs)
endif()
endfunction()
Module: kamailio
Branch: master
Commit: ad35c24196c921a3e870f4a48b6d286748d78d48
URL: https://github.com/kamailio/kamailio/commit/ad35c24196c921a3e870f4a48b6d286…
Author: Xenofon Karamanos <xk(a)gilawa.com>
Committer: Xenofon Karamanos <xk(a)gilawa.com>
Date: 2024-12-30T15:48:15Z
cmake: Update min version required to 3.10
---
Modified: cmake/compiler-specific.cmake
Modified: cmake/defs.cmake
Modified: cmake/os-specific.cmake
Modified: src/modules/CMakeLists.txt
Modified: src/modules/presence/CMakeLists.txt
Modified: src/modules/presence_xml/CMakeLists.txt
Modified: utils/kamctl/CMakeLists.txt
---
Diff: https://github.com/kamailio/kamailio/commit/ad35c24196c921a3e870f4a48b6d286…
Patch: https://github.com/kamailio/kamailio/commit/ad35c24196c921a3e870f4a48b6d286…
---
diff --git a/cmake/compiler-specific.cmake b/cmake/compiler-specific.cmake
index 7ecd87b75ad..950b64941ab 100644
--- a/cmake/compiler-specific.cmake
+++ b/cmake/compiler-specific.cmake
@@ -2,7 +2,6 @@
# common flags and options for the project The flags are defined as INTERFACE
# properties of the common library The flags are then used by the other
# libraries and executables
-cmake_minimum_required(VERSION 3.10)
# Define the common flags and options for GCC
option(PROFILE "Enable profiling" OFF)
diff --git a/cmake/defs.cmake b/cmake/defs.cmake
index bc08b2ce4ac..a01a43eaf65 100644
--- a/cmake/defs.cmake
+++ b/cmake/defs.cmake
@@ -2,7 +2,6 @@
# common flags and options for the project The flags are defined as INTERFACE
# properties of the common library The flags are then used by the other
# libraries and executables
-cmake_minimum_required(VERSION 3.10)
add_library(common INTERFACE)
diff --git a/cmake/os-specific.cmake b/cmake/os-specific.cmake
index 7fbbd4763a2..d70a44cf379 100644
--- a/cmake/os-specific.cmake
+++ b/cmake/os-specific.cmake
@@ -1,8 +1,7 @@
-# Quite analogous to the Makefile.defs file
-# This file is used to define the common flags and options for the project
-# The flags are defined as INTERFACE properties of the common library
-# The flags are then used by the other libraries and executables
-cmake_minimum_required(VERSION 3.10)
+# Quite analogous to the Makefile.defs file This file is used to define the
+# common flags and options for the project The flags are defined as INTERFACE
+# properties of the common library The flags are then used by the other
+# libraries and executables
set(OS_SPECIFIC_DIR "${CMAKE_SOURCE_DIR}/cmake/os-specific")
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index a1b474a4502..6570b4afdf2 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -73,6 +73,7 @@ function(add_module_group group_modules)
if(POLICY CMP0079)
cmake_policy(SET CMP0079 NEW)
endif()
+
target_link_libraries(${module_name} PRIVATE common_modules)
target_compile_definitions(
${module_name} PRIVATE MOD_NAMEID=${module_name}
diff --git a/src/modules/presence/CMakeLists.txt b/src/modules/presence/CMakeLists.txt
index dbac5d4862e..ef19545fcb2 100644
--- a/src/modules/presence/CMakeLists.txt
+++ b/src/modules/presence/CMakeLists.txt
@@ -1,6 +1,3 @@
-# 3.12 For libxml2 target
-cmake_minimum_required(VERSION 3.12)
-
file(GLOB MODULE_SOURCES "*.c")
add_library(${module_name} SHARED ${MODULE_SOURCES})
diff --git a/src/modules/presence_xml/CMakeLists.txt b/src/modules/presence_xml/CMakeLists.txt
index dbac5d4862e..ef19545fcb2 100644
--- a/src/modules/presence_xml/CMakeLists.txt
+++ b/src/modules/presence_xml/CMakeLists.txt
@@ -1,6 +1,3 @@
-# 3.12 For libxml2 target
-cmake_minimum_required(VERSION 3.12)
-
file(GLOB MODULE_SOURCES "*.c")
add_library(${module_name} SHARED ${MODULE_SOURCES})
diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt
index 2b017836025..75208d63222 100644
--- a/utils/kamctl/CMakeLists.txt
+++ b/utils/kamctl/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.10)
-
project(kamailio_utils)
# if(NOT basedir) set(KAMCTL_TMP_DIR "/tmp") else() set(KAMCTL_TMP_DIR
<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [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)
- [x] New feature (non-breaking change which adds new functionality)
- [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [x] Tested changes locally
- [ ] Related to issue #XXXX (replace XXXX with an open issue number)
#### Description
##### **Summary**
This update introduces new functionality to the `secfilter` module, enabling the removal of entries from both the Blacklist and Whitelist. It also includes automatic detection and removal of duplicate values from these lists.
##### **Details**
* Users can now remove specific entries from the Blacklist or Whitelist based on type (e.g., IP, domain, user) and a given value.
* Supports removal of single or multiple matching entries in one operation.
##### **Benefits**
- Improves the usability and flexibility of the `secfilter` module by allowing fine-grained control over list management.
- Ensures that the Blacklist and Whitelist are kept clean and free from redundant entries.
- Enhances performance by reducing unnecessary duplication in the lists.
##### Testing
This feature was tested using `kmcmd` commands in various scenarios:
- Removing the **first element** in the list.
- Removing an element from the **middle** of the list.
- Removing the **last element** in the list.
- Removing **all matching elements** in the list.
In all cases, the commands worked correctly, and the lists were updated and cleaned as expected.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/4086
-- Commit Summary --
* secfilter: support remove rule in Whitelist and Blacklist
* Merge remote-tracking branch 'origin/master' into Feature/5-support-remove-rule-in-Whitelist-Blacklist
* secfilter: support remove rule in Whitelist and Blacklist
* edit end of file
-- File Changes --
M src/modules/secfilter/secfilter.c (8)
M src/modules/secfilter/secfilter.h (3)
M src/modules/secfilter/secfilter_db.c (106)
M src/modules/secfilter/secfilter_rpc.c (94)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/4086.patchhttps://github.com/kamailio/kamailio/pull/4086.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/4086
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/4086(a)github.com>