[sr-dev] git:master:608145da: siptrace: check trace flag for current traced message

[Henning Westerholt]

Module: kamailio
Branch: master
Commit: 608145da87cbb38e37e8a5d3e901d266cfc9f2ae
URL: https://github.com/kamailio/kamailio/commit/608145da87cbb38e37e8a5d3e901d266cfc9f2ae

Author: iionita <ionut-razvan.ionita at 1and1.ro>
Committer: Henning Westerholt <henningw at users.noreply.github.com>
Date: 2019-04-09T21:25:53+02:00

siptrace: check trace flag for current traced message

---

Modified: src/modules/siptrace/siptrace.c

---

Diff:  https://github.com/kamailio/kamailio/commit/608145da87cbb38e37e8a5d3e901d266cfc9f2ae.diff
Patch: https://github.com/kamailio/kamailio/commit/608145da87cbb38e37e8a5d3e901d266cfc9f2ae.patch

---

diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c
index 9af3b522bf..86318b8860 100644
--- a/src/modules/siptrace/siptrace.c
+++ b/src/modules/siptrace/siptrace.c
@@ -63,6 +63,10 @@ MODULE_VERSION
 #define SIPTRACE_ANYADDR "any:255.255.255.255:5060"
 #define SIPTRACE_ANYADDR_LEN (sizeof(SIPTRACE_ANYADDR) - 1)
 
+#define trace_is_off(_msg)                        \
+	 ((((_msg)->msg_flags & FL_SIPTRACE) == 0) \
+		|| ((_msg->flags & trace_flag) == 0))
+
 struct tm_binds tmb;
 struct dlg_binds dlgb;
 
@@ -984,6 +988,11 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char *
 		}
 	}
 
+	if(trace_is_off(msg)) {
+		LM_DBG("trace off...\n");
+		return 1;
+	}
+
 trace_current:
 	return sip_trace(msg, &dest_info, &correlation_id_str, NULL);
 }
@@ -1130,10 +1139,6 @@ static int sip_trace(sip_msg_t *msg, dest_info_t *dst,
 	return sip_trace_store(&sto, dst, correlation_id_str);
 }
 
-#define trace_is_off(_msg)                        \
-	 ((((_msg)->msg_flags & FL_SIPTRACE) == 0) \
-		|| ((_msg->flags & trace_flag) == 0))
-
 static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps)
 {
 	siptrace_data_t sto;