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>