[sr-dev] git:master:4e759906: tm: cleaned always enabled TM_UAC_FLAGS define

[Daniel-Constantin Mierla]

Module: kamailio
Branch: master
Commit: 4e7599064a75b8e6d0e6fbf228690cd628bfd508
URL: https://github.com/kamailio/kamailio/commit/4e7599064a75b8e6d0e6fbf228690cd628bfd508

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2016-06-20T19:16:26+02:00

tm: cleaned always enabled TM_UAC_FLAGS define

---

Modified: modules/tm/h_table.h
Modified: modules/tm/t_fwd.c

---

Diff:  https://github.com/kamailio/kamailio/commit/4e7599064a75b8e6d0e6fbf228690cd628bfd508.diff
Patch: https://github.com/kamailio/kamailio/commit/4e7599064a75b8e6d0e6fbf228690cd628bfd508.patch

---

diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h
index 0cbe24c..3cef444 100644
--- a/modules/tm/h_table.h
+++ b/modules/tm/h_table.h
@@ -182,13 +182,10 @@ typedef struct ua_server
 
 /* User Agent Client content */
 
-#define TM_UAC_FLAGS
-#ifdef TM_UAC_FLAGS
 /* UAC internal flags */
 #define TM_UAC_FLAG_RR	1	/* Record-Route applied */
 #define TM_UAC_FLAG_R2	2	/* 2nd Record-Route applied */
 #define TM_UAC_FLAG_FB	4	/* Mark first entry in new branch set */
-#endif
 
 typedef struct ua_client
 {
@@ -216,10 +213,8 @@ typedef struct ua_client
 	/* if we don't store, we at least want to know the status */
 	int             last_received;
 
-#ifdef TM_UAC_FLAGS
 	/* internal flags per tm uac */
 	unsigned int flags;
-#endif
 	/* per branch flags */
 	flag_t branch_flags;
 	/* internal processing code - (mapping over sip warning codes)
diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c
index ba0b6d6..7f6faa0 100644
--- a/modules/tm/t_fwd.c
+++ b/modules/tm/t_fwd.c
@@ -550,13 +550,11 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req,
 		memcpy( t->uac[branch].location_ua.s, i_req->location_ua.s, i_req->location_ua.len);
 	}
 
-#ifdef TM_UAC_FLAGS
 	len = count_applied_lumps(i_req->add_rm, HDR_RECORDROUTE_T);
 	if(len==1)
 		t->uac[branch].flags = TM_UAC_FLAG_RR;
 	else if(len==2)
 		t->uac[branch].flags = TM_UAC_FLAG_RR|TM_UAC_FLAG_R2;
-#endif
 
 	ret=0;
 
@@ -1728,10 +1726,8 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg ,
 		return lowest_ret;
 	}
 
-#ifdef TM_UAC_FLAGS
 	/* mark the fist branch in this fwd step */
 	t->uac[first_branch].flags |= TM_UAC_FLAG_FB;
-#endif
 
 	ser_error=0; /* clear branch adding errors */
 	/* send them out now */