First working version of one way topology hiding with binary encoding and auto route

Author: davidtrihy-genesys

modules/compression/gz_helpers.c

@@ -109,6 +109,14 @@ int gzip_compress(unsigned char* in, unsigned long ilen, str* out, unsigned long
 	return -1;
 }
 
+static inline int is_gzip_compressed(unsigned char *data, int len)
+{
+    if (len < 3)
+        return 0;
+    
+    return (data[0] == 0x1f && data[1] == 0x8b && data[2] == 0x08);
+}
+
 /*
  *
  */
@@ -122,6 +130,11 @@ int gzip_uncompress(unsigned char* in, unsigned long ilen, str* out, unsigned lo
 		return -1;
 	}
 
+	if (is_gzip_compressed(in, ilen) != 1) {
+		LM_ERR("Not gzip decompressable\n");
+		return -1;
+	}
+
 	/* Gzip holds the length of the original message
 		in the last 4 bytes */
 	*olen =	((unsigned long)in[ilen-1] << 24) +

modules/rr/api.c

@@ -37,6 +37,7 @@
 #include "rr_cb.h"
 
 extern int append_fromtag;
+extern int enable_double_rr;
 
 int load_rr( struct rr_binds *rrb )
 {
@@ -50,6 +51,7 @@ int load_rr( struct rr_binds *rrb )
 	rrb->loose_route       = loose_route;
 	rrb->record_route      = record_route;
 	rrb->append_fromtag    = append_fromtag;
+	rrb->enable_double_rr  = enable_double_rr;
 
 	return 1;
 }

modules/rr/api.h

@@ -63,6 +63,7 @@ struct rr_binds {
 	loose_route_t       loose_route;
 	record_route_t      record_route;
 	int                 append_fromtag;
+	int                 enable_double_rr;
 };
 
 typedef  int (*load_rr_f)( struct rr_binds* );

modules/rr/loose.c

@@ -137,89 +137,6 @@ static inline int find_first_route(struct sip_msg* _m)
 	}
 }
 
-
-/*
- * Find out if a URI contains r2 parameter which indicates
- * that we put 2 record routes
- */
-static inline int is_2rr(str* _params)
-{
-	str s;
-	int i, state = 0;
-
-	if (_params->len == 0) return 0;
-	s = *_params;
-
-	for(i = 0; i < s.len; i++) {
-		switch(state) {
-		case 0:
-			switch(s.s[i]) {
-			case ' ':
-			case '\r':
-			case '\n':
-			case '\t':           break;
-			case 'r':
-			case 'R': state = 1; break;
-			default:  state = 4; break;
-			}
-			break;
-
-		case 1:
-			switch(s.s[i]) {
-			case '2': state = 2; break;
-			default:  state = 4; break;
-			}
-			break;
-
-		case 2:
-			switch(s.s[i]) {
-			case ';':  return 1;
-			case '=':  return 1;
-			case ' ':
-			case '\r':
-			case '\n':
-			case '\t': state = 3; break;
-			default:   state = 4; break;
-			}
-			break;
-
-		case 3:
-			switch(s.s[i]) {
-			case ';':  return 1;
-			case '=':  return 1;
-			case ' ':
-			case '\r':
-			case '\n':
-			case '\t': break;
-			default:   state = 4; break;
-			}
-			break;
-
-		case 4:
-			switch(s.s[i]) {
-			case '\"': state = 5; break;
-			case ';':  state = 0; break;
-			default:              break;
-			}
-			break;
-
-		case 5:
-			switch(s.s[i]) {
-			case '\\': state = 6; break;
-			case '\"': state = 4; break;
-			default:              break;
-			}
-			break;
-
-		case 6: state = 5; break;
-		}
-	}
-
-	if ((state == 2) || (state == 3)) return 1;
-	else return 0;
-}
-
-
 /*
  * Check if URI is myself
  */

modules/rr/loose.h

@@ -159,5 +159,87 @@ static inline int is_strict(str* _params)
 	else return 1;
 }
 
+/*
+ * Find out if a URI contains r2 parameter which indicates
+ * that we put 2 record routes
+ */
+static inline int is_2rr(str* _params)
+{
+	str s;
+	int i, state = 0;
+
+	if (_params->len == 0) return 0;
+	s = *_params;
+
+	for(i = 0; i < s.len; i++) {
+		switch(state) {
+		case 0:
+			switch(s.s[i]) {
+			case ' ':
+			case '\r':
+			case '\n':
+			case '\t':           break;
+			case 'r':
+			case 'R': state = 1; break;
+			default:  state = 4; break;
+			}
+			break;
+
+		case 1:
+			switch(s.s[i]) {
+			case '2': state = 2; break;
+			default:  state = 4; break;
+			}
+			break;
+
+		case 2:
+			switch(s.s[i]) {
+			case ';':  return 1;
+			case '=':  return 1;
+			case ' ':
+			case '\r':
+			case '\n':
+			case '\t': state = 3; break;
+			default:   state = 4; break;
+			}
+			break;
+
+		case 3:
+			switch(s.s[i]) {
+			case ';':  return 1;
+			case '=':  return 1;
+			case ' ':
+			case '\r':
+			case '\n':
+			case '\t': break;
+			default:   state = 4; break;
+			}
+			break;
+
+		case 4:
+			switch(s.s[i]) {
+			case '\"': state = 5; break;
+			case ';':  state = 0; break;
+			default:              break;
+			}
+			break;
+
+		case 5:
+			switch(s.s[i]) {
+			case '\\': state = 6; break;
+			case '\"': state = 4; break;
+			default:              break;
+			}
+			break;
+
+		case 6: state = 5; break;
+		}
+	}
+
+	if ((state == 2) || (state == 3)) return 1;
+	else return 0;
+}
+
+
 
 #endif /* LOOSE_H */

modules/rr/record.c

@@ -245,6 +245,7 @@ int record_route(struct sip_msg* _m, str *params)
 	str user = STR_NULL;
 	struct to_body* from;
 	str* tag;
+	char *anchor_pos;
 
 	from = 0; /* Makes gcc happy */
 	lp = lp2 = NULL;
@@ -267,8 +268,11 @@ int record_route(struct sip_msg* _m, str *params)
 		tag = 0;
 	}
 
-	l = anchor_lump(_m, _m->headers->name.s - _m->buf, HDR_RECORDROUTE_T);
-	l2 = anchor_lump(_m, _m->headers->name.s - _m->buf, HDR_RECORDROUTE_T);
+	/* Get the anchor position relative to other Record-Routes if existing */
+	anchor_pos = _m->record_route != NULL ? _m->record_route->name.s : _m->headers->name.s;
+
+	l = anchor_lump(_m, anchor_pos - _m->buf, HDR_RECORDROUTE_T);
+	l2 = anchor_lump(_m, anchor_pos - _m->buf, HDR_RECORDROUTE_T);
 	if (!l || !l2) {
 		LM_ERR("failed to create an anchor\n");
 		return -3;
@@ -299,8 +303,8 @@ int record_route(struct sip_msg* _m, str *params)
 	}
 
 	if (enable_double_rr) {
-		l = anchor_lump(_m, _m->headers->name.s - _m->buf,HDR_RECORDROUTE_T);
-		l2 = anchor_lump(_m, _m->headers->name.s - _m->buf, HDR_RECORDROUTE_T);
+		l = anchor_lump(_m, anchor_pos - _m->buf,HDR_RECORDROUTE_T);
+		l2 = anchor_lump(_m, anchor_pos - _m->buf, HDR_RECORDROUTE_T);
 		if (!l || !l2) {
 			LM_ERR("failed to create an anchor\n");
 			return -5;

modules/tm/t_hooks.c

@@ -88,6 +88,10 @@ void destroy_tmcb_lists(void)
 	}
 }
 
+static unsigned int tmcb_flags = 0;
+void set_tmcb_flags(unsigned int flags) {
+	tmcb_flags |= flags;
+}
 
 int insert_tmcb(struct tmcb_head_list *cb_list, int types,
 				transaction_cb f, void *param, release_tmcb_param release_func )
@@ -109,6 +113,7 @@ int insert_tmcb(struct tmcb_head_list *cb_list, int types,
 	cbp->param = param;
 	cbp->release = release_func;
 	cbp->types = types;
+	cbp->flags = tmcb_flags;
 	if (cbp->next)
 		cbp->id = cbp->next->id+1;
 	else
@@ -211,6 +216,7 @@ static void run_any_trans_callbacks(struct tmcb_head_list *list, unsigned int ty
 			LM_DBG("trans=%p, callback type %d, id %d entered\n",
 				trans, type, cbp->id );
 			params.param = &(cbp->param);
+			params.flags = cbp->flags;
 			cbp->callback( trans, type, &params );
 			if ((cbp->types)&(TMCB_REQUEST_IN|TMCB_LOCAL_TRANS_NEW)) {
 				if (req && req->dst_uri.len==-1) {
@@ -224,6 +230,7 @@ static void run_any_trans_callbacks(struct tmcb_head_list *list, unsigned int ty
 	/* env cleanup */
 	set_avp_list( backup );
 	tmcb_extra1 = tmcb_extra2 = 0;
+	tmcb_flags = 0;
 	set_t(trans_backup);
 }
 

modules/tm/t_hooks.h

@@ -204,6 +204,7 @@ struct tmcb_params {
 	struct sip_msg* req;
 	struct sip_msg* rpl;
 	int code;
+	unsigned int flags;
 	void **param;
 	void *extra1;
 	void *extra2;
@@ -216,14 +217,15 @@ typedef void (release_tmcb_param) (void *param);
 /* register callback function prototype */
 typedef int (*register_tmcb_f)(struct sip_msg* p_msg, struct cell *t,
 		int cb_types, transaction_cb f, void *param, release_tmcb_param func);
-
+typedef void (*set_tmcb_flags_f)(unsigned int flags);
 
 struct tm_callback {
 	int id;                      /* id of this callback - useless */
 	int types;                   /* types of events that trigger the callback*/
 	transaction_cb* callback;    /* callback function */
 	void *param;                 /* param to be passed to callback function */
 	release_tmcb_param *release; /* function to release the callback param when the callback is deleted */
+	unsigned int flags;          /* flags to be passed into the callback*/
 	struct tm_callback* next;
 };
 
@@ -264,6 +266,9 @@ int insert_tmcb(struct tmcb_head_list *cb_list, int types,
 /* set extra params for callbacks */
 void set_extra_tmcb_params(void *extra1, void *extra2);
 
+/* set extra params for callbacks */
+void set_tmcb_flags(unsigned int flags);
+
 /* run all transaction callbacks for an event type */
 void run_trans_callbacks( int type , struct cell *trans,
 						struct sip_msg *req, struct sip_msg *rpl, int code );

modules/tm/tm.c

@@ -767,6 +767,7 @@ static int fixup_inject_flags(void **param)
 int load_tm( struct tm_binds *tmb)
 {
 	tmb->register_tmcb = register_tmcb;
+	tmb->set_tmcb_flags = set_tmcb_flags;
 
 	/* relay function */
 	tmb->t_relay = w_t_relay;

modules/tm/tm_load.h

@@ -47,6 +47,8 @@
 
 struct tm_binds {
 	register_tmcb_f  register_tmcb;
+	set_tmcb_flags_f set_tmcb_flags;
+
 	trelay_f         t_relay;
 	tcheck_trans_f   t_check_trans;