Add option to get and use P-Access-Network-Info for the terminating scenario, for use of billing in roaming cases where the PANI header is already known. Currently PANI is only used for the originating scenario.
Fixed partly implemented config option to specific role of diameter client. It was currently hardcoded to S-CSCF.
<!--
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)
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3726
-- Commit Summary --
* ims_charging: Add option to get and use P-Access-Network-Info for terminating scenario
-- File Changes --
M src/modules/ims_charging/Ro_data.c (2)
M src/modules/ims_charging/config.h (2)
M src/modules/ims_charging/doc/ims_charging_admin.xml (41)
M src/modules/ims_charging/ims_charging_mod.c (10)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3726.patchhttps://github.com/kamailio/kamailio/pull/3726.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3726
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/3726(a)github.com>
Module: kamailio
Branch: master
Commit: 33b2e513aefe00bf166cdcae360e305615b223da
URL: https://github.com/kamailio/kamailio/commit/33b2e513aefe00bf166cdcae360e305…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2024-01-23T21:05:41+01:00
tm: release transaction on kill if a final response was sent
- do not send another final response for error cases
---
Modified: src/modules/tm/t_funcs.c
---
Diff: https://github.com/kamailio/kamailio/commit/33b2e513aefe00bf166cdcae360e305…
Patch: https://github.com/kamailio/kamailio/commit/33b2e513aefe00bf166cdcae360e305…
---
diff --git a/src/modules/tm/t_funcs.c b/src/modules/tm/t_funcs.c
index b9f9949d0fb..5515a4aba6f 100644
--- a/src/modules/tm/t_funcs.c
+++ b/src/modules/tm/t_funcs.c
@@ -177,6 +177,11 @@ int kill_transaction(struct cell *trans, int error)
int reply_ret;
int ret;
+ if((trans->uas.request != NULL)
+ && (trans->uas.request->msg_flags & FL_FINAL_REPLY)) {
+ return t_release_transaction(trans);
+ }
+
/* we reply statefully and enter WAIT state since error might
have occurred in middle of forking and we do not
want to put the forking burden on upstream client;
@@ -205,6 +210,11 @@ int kill_transaction_unsafe(struct cell *trans, int error)
int reply_ret;
int ret;
+ if((trans->uas.request != NULL)
+ && (trans->uas.request->msg_flags & FL_FINAL_REPLY)) {
+ return t_release_transaction(trans);
+ }
+
/* we reply statefully and enter WAIT state since error might
have occurred in middle of forking and we do not
want to put the forking burden on upstream client;
With GNU make 4.4 building Kamailio prints many “make: --libs: No such file or directory” and similar warnings. This changeset utilizes immediate variables and silences the warnings on my systems.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3475
-- Commit Summary --
* lib/ims: Aviod “make: --libs: No such file or directory” warnings
* auth_identity: Aviod “make: --libs: No such file or directory” warnings
* auth_ephemeral: Aviod “make: --libs: No such file or directory” warnings
* app_python3: Avoid “/bin/sh: line 1: --ldflags: command not found” warnings
* app_python3s: Avoid “/bin/sh: line 1: --ldflags: command not found” warnings
* cdp: Aviod “make: --libs: No such file or directory” warnings
* cnxcc: Avoid “make: --libs-only-L: No such file or directory” warnings
* cplc: Avoid “make: --libs-only-L: No such file or directory” warnings
* crypto: Aviod “make: --libs: No such file or directory” warnings
* db_postgres: Avoid “make: --libs-only-L: No such file or directory” warnings
* db_redis: Avoid “make: --libs-only-L: No such file or directory” warning
* dialplan: Avoid “make: --libs-only-L: No such file or directory” warning
* gzcompress: Aviod “make: --libs: No such file or directory” warnings
* http_async_client: Aviod “make: --libs: No such file or directory” warnings
* http_client: Aviod “make: --libs: No such file or directory” warning
* ims_auth: Avoid “make: --libs-only-L: No such file or directory” warning
* ims_icscf: Aviod “make: --libs: No such file or directory” warning
* ims_registrar_scscf: Avoid “make: --libs-only-L: No such file or directory” warnings
* ims_registrar_pcscf: Aviod “make: --libs: No such file or directory” warning
* ims_isc: Avoid “make: --libs-only-L: No such file or directory” warnings
* jansson: Aviod “make: --libs: No such file or directory” warning
* kazoo: Avoid “make: --libs: No such file or directory’ warning
* lcr: Aviod “make: --libs: No such file or directory” warning
* log_systemd: Aviod “make: --libs: No such file or directory” warning
* lost: Aviod “make: --libs: No such file or directory” warnings
* lwsc: Aviod “make: --libs: No such file or directory” warning
* ndb_redis: Aviod “make: --libs: No such file or directory” warning
* osp: Avoid “make: --libs: No such file or directory’ warning
* outbound: Aviod “make: --libs: No such file or directory” warnings
* presence: Avoid “make: --libs-only-L: No such file or directory” warnings
* presence_conference: Aviod “make: --libs: No such file or directory” warning
* presence_dialog: Aviod “make: --libs: No such file or directory” warning
* presence_reginfo: Aviod “make: --libs: No such file or directory” warning
* presence_xml: Avoid “make: --libs-only-L: No such file or directory” warnings
* pua: Avoid “make: --libs-only-L: No such file or directory” warnings
* pua_bla: Aviod “make: --libs: No such file or directory” warning
* pua_dialoginfo: Aviod “make: --libs: No such file or directory” warning
* pua_reginfo: Aviod “make: --libs: No such file or directory” warning
* pua_usrloc: Aviod “make: --libs: No such file or directory” warning
* pua_xmpp: Aviod “make: --libs: No such file or directory” warning
* regex: Aviod “make: --libs: No such file or directory” warning
* rls: Avoid “make: --libs-only-L: No such file or directory” warnings
* slack: Aviod “make: --libs: No such file or directory” warning
* systemdops: Avoid “make: --libs-only-L: No such file or directory” warning
* tls: Aviod “make: --libs: No such file or directory” warnings
* tlsa: Avoid “make: --libs-only-L: No such file or directory” warning
* topos_redis: Aviod “make: --libs: No such file or directory” warning
* utils: Avoid “make: --libs-only-L: No such file or directory” warnings
* uuid: Aviod “make: --libs: No such file or directory” warning
* websocket: Aviod “make: --libs: No such file or directory” warnings
* xcap_server: Avoid “make: --libs-only-L: No such file or directory” warnings
* xhttp_pi: Avoid “make: --libs-only-L: No such file or directory” warnings
* xmlops: Aviod “make: --libs: No such file or directory” warning
* xmlrpc: Aviod “make: --libs: No such file or directory” warning
-- File Changes --
M src/lib/ims/Makefile (4)
M src/modules/app_python3/Makefile (6)
M src/modules/app_python3s/Makefile (6)
M src/modules/auth_ephemeral/Makefile (2)
M src/modules/auth_identity/Makefile (4)
M src/modules/cdp/Makefile (4)
M src/modules/cnxcc/Makefile (4)
M src/modules/cplc/Makefile (4)
M src/modules/crypto/Makefile (2)
M src/modules/db_postgres/Makefile (2)
M src/modules/db_redis/Makefile (2)
M src/modules/dialplan/Makefile (2)
M src/modules/gzcompress/Makefile (2)
M src/modules/http_async_client/Makefile (6)
M src/modules/http_client/Makefile (2)
M src/modules/ims_auth/Makefile (4)
M src/modules/ims_icscf/Makefile (4)
M src/modules/ims_isc/Makefile (4)
M src/modules/ims_registrar_pcscf/Makefile (4)
M src/modules/ims_registrar_scscf/Makefile (4)
M src/modules/jansson/Makefile (2)
M src/modules/kazoo/Makefile (2)
M src/modules/lcr/Makefile (2)
M src/modules/log_systemd/Makefile (2)
M src/modules/lost/Makefile (6)
M src/modules/lwsc/Makefile (2)
M src/modules/ndb_redis/Makefile (2)
M src/modules/osp/Makefile (2)
M src/modules/outbound/Makefile (7)
M src/modules/presence/Makefile (4)
M src/modules/presence_conference/Makefile (4)
M src/modules/presence_dialoginfo/Makefile (4)
M src/modules/presence_reginfo/Makefile (4)
M src/modules/presence_xml/Makefile (4)
M src/modules/pua/Makefile (4)
M src/modules/pua_bla/Makefile (4)
M src/modules/pua_dialoginfo/Makefile (4)
M src/modules/pua_reginfo/Makefile (4)
M src/modules/pua_usrloc/Makefile (4)
M src/modules/pua_xmpp/Makefile (4)
M src/modules/regex/Makefile (2)
M src/modules/rls/Makefile (4)
M src/modules/slack/Makefile (2)
M src/modules/systemdops/Makefile (2)
M src/modules/tls/Makefile (4)
M src/modules/tlsa/Makefile (4)
M src/modules/topos_redis/Makefile (2)
M src/modules/utils/Makefile (4)
M src/modules/uuid/Makefile (2)
M src/modules/websocket/Makefile (2)
M src/modules/xcap_server/Makefile (4)
M src/modules/xhttp_pi/Makefile (4)
M src/modules/xmlops/Makefile (4)
M src/modules/xmlrpc/Makefile (4)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3475.patchhttps://github.com/kamailio/kamailio/pull/3475.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3475
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/3475(a)github.com>
Actual implementation doesn't work with async. Need to investigate how to support it
---
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/684
### Description
We have updated one system from a Ubuntu Focal 5.6.x container to a Ubuntu Jammy 5.7.2 container. In the last 24 hours, we saw three crashes. The logs of the last crash say:
```
Nov 09 20:39:34 sipproxy /usr/sbin/kamailio[4332]: CRITICAL: <core> [core/mem/q_malloc.c:519]: qm_free(): BUG: freeing already freed pointer (0x7f[4434056180](tel:4434056180)), called from tls: tls_init.c: ser_free>
Nov 09 20:39:34 sipproxy /usr/sbin/kamailio[4331]: CRITICAL: <core> [core/mem/q_malloc.c:123]: qm_debug_check_frag(): BUG: qm: fragm. 0x7f[44340561](tel:44340561)d0 (address 0x7f[4434056208](tel:4434056208)) beginning overwritten >
Nov 09 20:39:43 sipproxy /usr/sbin/kamailio[4273]: ALERT: <core> [main.c:776]: handle_sigs(): child process 4331 exited by a signal 6
Nov 09 20:39:43 sipproxy /usr/sbin/kamailio[4273]: ALERT: <core> [main.c:779]: handle_sigs(): core was generated
```
#### Debugging Data
Backtraces of the three crashes are attached.
[kamailio-crash1.log](https://github.com/kamailio/kamailio/files/13313115/ka…
[kamailio-crash2.log](https://github.com/kamailio/kamailio/files/13313116/ka…
[kamailio-crash3.log](https://github.com/kamailio/kamailio/files/13313117/ka…
### Additional Information
We are using the official Kamailio debian packages.
* **Kamailio Version** - output of `kamailio -v`
```
version: kamailio 5.7.2 (x86_64/linux)
flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, MEM_JOIN_FREE, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED
ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB
poll method support: poll, epoll_lt, epoll_et, sigio_rt, select.
id: unknown
compiled with gcc 11.4.0
```
* **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`)
-->
```
root@sipproxy:/WORKSPACE/sipproxy-container# lsb_release -a
No LSB modules are available.
Distributor ID: Ubuntu
Description: Ubuntu 22.04.3 LTS
Release: 22.04
Codename: jammy
root@sipproxy:/WORKSPACE/sipproxy-container# uname -a
Linux sipproxy 5.15.0-87-generic #97-Ubuntu SMP Mon Oct 2 21:09:21 UTC 2023 x86_64 x86_64 x86_64 GNU/Linux
```
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/issues/3635
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/issues/3635(a)github.com>