Revert "GCVCALLP-2234: Checking maddr before overwriting ruri during loose route"

This reverts commit a6d07e0.

Author: davidtrihy-genesys

modules/rr/api.h

@@ -49,7 +49,7 @@ typedef  int (*is_direction_t)(struct sip_msg*, int);
 typedef  int (*get_route_param_t)(struct sip_msg*, str*, str*);
 typedef  str* (*get_remote_target_t)(struct sip_msg*);
 typedef  str* (*get_route_set_t)(struct sip_msg*,int *nr_routes);
-typedef  int (*loose_route_t)(struct sip_msg*);
+typedef  int (*loose_route_t)(struct sip_msg*, void*);
 typedef  int (*record_route_t)(struct sip_msg*, str*);
 
 struct rr_binds {

modules/rr/loose.c

@@ -62,10 +62,6 @@
 #define RR_DRIVEN 1       /* The next hop is determined from the route set */
 #define NOT_RR_DRIVEN -1  /* The next hop is not determined from the route set */
 
-#define MADDR_ERROR     -1
-#define MADDR_FOUND      0
-#define MADDR_NOT_FOUND  1
-
 #define ROUTE_PREFIX "Route: <"
 #define ROUTE_PREFIX_LEN (sizeof(ROUTE_PREFIX)-1)
 
@@ -228,11 +224,7 @@ static inline int is_2rr(str* _params)
 /*
  * Check if URI is myself
  */
-#ifdef ENABLE_USER_CHECK
-static inline int is_myself(str *_user, struct sip_uri* _uri)
-#else
 static inline int is_myself(struct sip_uri* _uri)
-#endif
 {
 	int ret;
 	unsigned short port;
@@ -247,6 +239,7 @@ static inline int is_myself(struct sip_uri* _uri)
 	if (ret < 0) return 0;
 
 #ifdef ENABLE_USER_CHECK
+	str *_user = _uri->user;
 	if(i_user.len && i_user.len==_user->len
 			&& !strncmp(i_user.s, _user->s, _user->len))
 	{
@@ -352,6 +345,7 @@ static inline int save_ruri(struct sip_msg* _m)
 	return 0;
 }
 
+
 /*
  * input: uri - uri to be checked if has maddr
  * input: puri - parsed uri
@@ -364,25 +358,25 @@ static inline int get_maddr_uri(str *uri, struct sip_uri *puri)
 	struct sip_uri turi;
 
 	if(uri==NULL || uri->s==NULL)
-		return MADDR_ERROR;
+		return RR_ERROR;
 	if(puri==NULL)
 	{
 		if (parse_uri(uri->s, uri->len, &turi) < 0)
 		{
 			LM_ERR("failed to parse the URI\n");
-			return MADDR_ERROR;
+			return RR_ERROR;
 		}
 		puri = &turi;
 	}
 
 	if(puri->maddr.s==NULL)
-		return MADDR_NOT_FOUND;
+		return 0;
 
 	/* sip: + maddr + : + port */
 	if( (puri->maddr_val.len) > ( RH_MADDR_PARAM_MAX_LEN - 10 ) )
 	{
 		LM_ERR( "Too long maddr parameter\n");
-		return MADDR_ERROR;
+		return RR_ERROR;
 	}
 	memcpy( builturi, "sip:", 4 );
 	memcpy( builturi+4, puri->maddr_val.s, puri->maddr_val.len );
@@ -400,7 +394,7 @@ static inline int get_maddr_uri(str *uri, struct sip_uri *puri)
 	uri->s = builturi;
 
 	LM_DBG("uri is %s\n", builturi );
-	return MADDR_FOUND;
+	return 0;
 }
 
 
@@ -424,7 +418,7 @@ static inline int handle_sr(struct sip_msg* _m, struct hdr_field* _hdr, rr_t* _r
 	/* Put the first Route in Request-URI */
 
 	uri = _r->nameaddr.uri;
-	if (get_maddr_uri(&uri, 0) < 0) {
+	if(get_maddr_uri(&uri, 0)!=0) {
 		LM_ERR("failed to check maddr\n");
 		return RR_ERROR;
 	}
@@ -499,7 +493,7 @@ static inline int find_rem_target(struct sip_msg* _m, struct hdr_field** _h, rr_
  */
 static inline int after_strict(struct sip_msg* _m)
 {
-	int res, rem_len, maddr_found;
+	int res, rem_len;
 	struct hdr_field* hdr;
 	struct sip_uri puri;
 	rr_t* rt, *prev, *del_rt;
@@ -518,13 +512,7 @@ static inline int after_strict(struct sip_msg* _m)
 		return RR_ERROR;
 	}
 
-	if ( enable_double_rr && is_2rr(&puri.params) &&
-#ifdef ENABLE_USER_CHECK
-	is_myself(&puri.user, &puri)
-#else
-	is_myself(&puri)
-#endif
-	) {
+	if (enable_double_rr && is_2rr(&puri.params) && is_myself(&puri)) {
 		/* double route may occure due different IP and port, so force as
 		 * send interface the one advertise in second Route */
 		set_sip_defaults( puri.port_no, puri.proto);
@@ -593,7 +581,7 @@ static inline int after_strict(struct sip_msg* _m)
 		 * always be a strict router because endpoints don't use ;lr parameter
 		 * In this case we will simply put the URI in R-URI and forward it,
 		 * which will work perfectly */
-		if (get_maddr_uri(&uri, &puri) < 0) {
+		if(get_maddr_uri(&uri, &puri)!=0) {
 			LM_ERR("failed to check maddr\n");
 			return RR_ERROR;
 		}
@@ -659,17 +647,13 @@ static inline int after_strict(struct sip_msg* _m)
 		}
 
 		uri = rt->nameaddr.uri;
-		maddr_found = get_maddr_uri(&uri, &puri);
-		if (maddr_found == MADDR_ERROR) {
+		if(get_maddr_uri(&uri, 0)!=0) {
 			LM_ERR("checking maddr failed\n");
 			return RR_ERROR;
 		}
-
-		if (maddr_found == MADDR_FOUND) {
-			if (set_ruri(_m, &uri) < 0) {
-				LM_ERR("failed to rewrite R-URI\n");
-				return RR_ERROR;
-			}
+		if (set_ruri(_m, &uri) < 0) {
+			LM_ERR("failed to rewrite R-URI\n");
+			return RR_ERROR;
 		}
 
 		/* mark remote contact route as deleted */
@@ -717,9 +701,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded)
 	rr_t* rt;
 	int res;
 	int status;
-#ifdef ENABLE_USER_CHECK
 	int ret;
-#endif
 	str uri;
 	const struct socket_info *si;
 	int force_ss = 0;
@@ -734,13 +716,8 @@ static inline int after_loose(struct sip_msg* _m, int preloaded)
 	}
 
 	/* IF the URI was added by me, remove it */
-#ifdef ENABLE_USER_CHECK
-	ret=is_myself(&puri.user, &puri);
-	if (ret>0)
-#else
-	if (is_myself(&puri))
-#endif
-	{
+	ret = is_myself(&puri);
+	if (ret > 0) {
 		LM_DBG("Topmost route URI: '%.*s' is me\n",
 			uri.len, ZSW(uri.s));
 		/* set the hooks for the params -bogdan */
@@ -889,13 +866,13 @@ static inline int after_loose(struct sip_msg* _m, int preloaded)
 	return status;
 }
 
-
 /*
  * Do loose routing as defined in RFC3261
  */
-int loose_route(struct sip_msg* _m)
+int loose_route(struct sip_msg* _m, void *func_flags)
 {
-	int ret;
+	int preloaded;
+	int flags = (long) func_flags;
 
 	ctx_routing_set(0);
 
@@ -909,20 +886,14 @@ int loose_route(struct sip_msg* _m)
 		return -1;
 	}
 
-	ret = is_preloaded(_m);
-	if (ret < 0) {
+	preloaded = is_preloaded(_m);
+	if (preloaded < 0) {
 		return -1;
-	} else if (ret == 1) {
-		return after_loose(_m, 1);
 	} else {
-#ifdef ENABLE_USER_CHECK
-		if (is_myself(&_m->parsed_uri.user, &_m->parsed_uri) && !(_m->parsed_uri.gr.s && _m->parsed_uri.gr.len)) {
-#else
-		if (is_myself(&_m->parsed_uri) && !(_m->parsed_uri.gr.s && _m->parsed_uri.gr.len)) {
-#endif
+		if (!(flags & LR_ON_SELF) && is_myself(&_m->parsed_uri) && !(_m->parsed_uri.gr.s && _m->parsed_uri.gr.len)) {
 			return after_strict(_m);
 		} else {
-			return after_loose(_m, 0);
+			return after_loose(_m, preloaded);
 		}
 	}
 }

modules/rr/loose.h

@@ -38,14 +38,17 @@
 #define RR_FLOW_DOWNSTREAM  (1<<0)
 #define RR_FLOW_UPSTREAM    (1<<1)
 
+#define LR_NO_FLAGS 0
+#define LR_ON_SELF  1	
+
 extern int ctx_rrparam_idx;
 extern int ctx_routing_idx;
 
 
 /*! \brief
  * Do loose routing as per RFC3261
  */
-int loose_route(struct sip_msg* _m);
+int loose_route(struct sip_msg* _m, void* func_flags);
 
 
 /*! \brief
@@ -159,5 +162,28 @@ static inline int is_strict(str* _params)
 	else return 1;
 }
 
+static inline int fixup_lr_flags(void** param)
+{
+	int index, ret = LR_NO_FLAGS;
+	str *flags = (str *)*param;
+
+	for (index=0; index < flags->len; index++) {
+		switch (flags->s[index]) {
+			case ' ':
+				break;
+			case 'l':
+			case 'L':
+				ret |= LR_ON_SELF;
+				break;
+			default:
+				LM_ERR("Invalid flag\n");
+				return -1;
+		}
+	}
+
+	*param = (void *)(long)ret;
+	return 0;
+}
+
 
 #endif /* LOOSE_H */

modules/rr/rr_mod.c

@@ -89,12 +89,12 @@ static int w_is_direction(struct sip_msg *,void *);
 static int pv_get_rr_params(struct sip_msg *msg, pv_param_t *param,
 	pv_value_t *res);
 
-
 /*! \brief
  * Exported functions
  */
 static const cmd_export_t cmds[] = {
-	{"loose_route", (cmd_function)loose_route, {{0,0,0}},
+	{"loose_route", (cmd_function)loose_route, {
+		{CMD_PARAM_STR | CMD_PARAM_OPT,fixup_lr_flags,0}},
 		REQUEST_ROUTE},
 	{"record_route", (cmd_function)w_record_route, {
 		{CMD_PARAM_STR | CMD_PARAM_OPT ,0, 0}, {0,0,0}},

modules/script_helper/script_helper.c

@@ -172,7 +172,7 @@ int run_helper_logic(struct sip_msg *msg, void *param)
 			rr_api.record_route(msg, NULL);
 
 		/* if not RR_DRIVEN */
-		if (rr_api.loose_route(msg) < 0) {
+		if (rr_api.loose_route(msg, (void *)0) < 0) {
 
 			/* attempt a full dialog search (not the usual quick did lookup) */
 			if (use_dialog && dlg_api.match_dialog(msg, SEQ_MATCH_DEFAULT) < 0)