瀏覽代碼

topoh: clang-format for coherent indentation and coding style

Victor Seva 2 年之前
父節點
當前提交
963f301a08
共有 6 個文件被更改,包括 428 次插入524 次删除
  1. 5 5
      src/modules/topoh/api.h
  2. 45 43
      src/modules/topoh/th_mask.c
  3. 2 2
      src/modules/topoh/th_mask.h
  4. 230 299
      src/modules/topoh/th_msg.c
  5. 2 2
      src/modules/topoh/th_msg.h
  6. 144 173
      src/modules/topoh/topoh_mod.c

+ 5 - 5
src/modules/topoh/api.h

@@ -33,13 +33,14 @@ typedef int (*topoh_mask_callid_f)(str *icallid, str *ocallid);
 typedef int (*topoh_unmask_callid_f)(str *icallid, str *ocallid);
 
 
-typedef struct topoh_api {
+typedef struct topoh_api
+{
 	topoh_mask_callid_f mask_callid;
 	topoh_unmask_callid_f unmask_callid;
 } topoh_api_t;
 
-typedef int (*bind_topoh_f)(topoh_api_t* api);
-int bind_topoh(topoh_api_t* api);
+typedef int (*bind_topoh_f)(topoh_api_t *api);
+int bind_topoh(topoh_api_t *api);
 
 /**
  * @brief Load the topoh API
@@ -53,8 +54,7 @@ static inline int topoh_load_api(topoh_api_t *api)
 		LM_ERR("cannot find bind_topoh\n");
 		return -1;
 	}
-	if(bindtopoh(api)<0)
-	{
+	if(bindtopoh(api) < 0) {
 		LM_ERR("cannot bind topoh api\n");
 		return -1;
 	}

+ 45 - 43
src/modules/topoh/th_mask.c

@@ -32,7 +32,7 @@
 #include "th_mask.h"
 
 #define TH_EB64I \
-		"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789.-"
+	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789.-"
 
 char _th_EB64[65];
 int _th_DB64[256];
@@ -55,13 +55,13 @@ void th_shuffle(char *in, int size)
 	MD5Update(&ctx, _th_key.s, _th_key.len);
 	U_MD5Final(md5, &ctx);
 
-	md5i = (unsigned int*)md5;
+	md5i = (unsigned int *)md5;
 
 	crc = (unsigned int)crcitt_string(_th_key.s, _th_key.len);
-	for (last = size; last > 1; last--)
-	{
-		r = (md5i[(crc+last+_th_key.len)%4]
-				+ _th_key.s[(crc+last+_th_key.len)%_th_key.len]) % last;
+	for(last = size; last > 1; last--) {
+		r = (md5i[(crc + last + _th_key.len) % 4]
+					+ _th_key.s[(crc + last + _th_key.len) % _th_key.len])
+			% last;
 		tmp = in[r];
 		in[r] = in[last - 1];
 		in[last - 1] = tmp;
@@ -76,57 +76,58 @@ void th_mask_init(void)
 	th_shuffle(_th_EB64, 64);
 	LM_DBG("original table: %s\n", TH_EB64I);
 	LM_DBG("updated table: %s\n", _th_EB64);
-	for(i=0; i<256; i++)
+	for(i = 0; i < 256; i++)
 		_th_DB64[i] = -1;
-	for(i=0; i<64; i++)
+	for(i = 0; i < 64; i++)
 		_th_DB64[(int)_th_EB64[i]] = i;
 
 	return;
 }
 
-char* th_mask_encode(char *in, int ilen, str *prefix, int *olen)
+char *th_mask_encode(char *in, int ilen, str *prefix, int *olen)
 {
 	char *out;
-	int  left;
-	int  idx;
-	int  i;
-	int  r;
+	int left;
+	int idx;
+	int i;
+	int r;
 	char *p;
-	int  block;
+	int block;
 
-	*olen = (((ilen+2)/3)<<2) + ((prefix!=NULL&&prefix->len>0)?prefix->len:0);
-	out = (char*)pkg_malloc((*olen+1)*sizeof(char));
-	if(out==NULL) {
+	*olen = (((ilen + 2) / 3) << 2)
+			+ ((prefix != NULL && prefix->len > 0) ? prefix->len : 0);
+	out = (char *)pkg_malloc((*olen + 1) * sizeof(char));
+	if(out == NULL) {
 		PKG_MEM_ERROR;
 		*olen = 0;
 		return NULL;
 	}
 
 	/* set 0 at the end of the value */
-	memset(out, 0, (*olen+1)*sizeof(char));
-	if(prefix!=NULL&&prefix->len>0) {
+	memset(out, 0, (*olen + 1) * sizeof(char));
+	if(prefix != NULL && prefix->len > 0) {
 		memcpy(out, prefix->s, prefix->len);
 	}
 
-	p = out + (int)((prefix!=NULL&&prefix->len>0)?prefix->len:0);
-	for(idx=0; idx<ilen; idx+=3) {
-		left = ilen - idx - 1 ;
-		left = (left>1)?2:left;
+	p = out + (int)((prefix != NULL && prefix->len > 0) ? prefix->len : 0);
+	for(idx = 0; idx < ilen; idx += 3) {
+		left = ilen - idx - 1;
+		left = (left > 1) ? 2 : left;
 
 		block = 0;
-		for(i=0, r=16; i<=left; i++, r-=8)
-			block += ((unsigned char)in[idx+i]) << r;
+		for(i = 0, r = 16; i <= left; i++, r -= 8)
+			block += ((unsigned char)in[idx + i]) << r;
 
 		*(p++) = _th_EB64[(block >> 18) & 0x3f];
 		*(p++) = _th_EB64[(block >> 12) & 0x3f];
-		*(p++) = (left>0)?_th_EB64[(block >> 6) & 0x3f]:_th_PD64[0];
-		*(p++) = (left>1)?_th_EB64[block & 0x3f]:_th_PD64[0];
+		*(p++) = (left > 0) ? _th_EB64[(block >> 6) & 0x3f] : _th_PD64[0];
+		*(p++) = (left > 1) ? _th_EB64[block & 0x3f] : _th_PD64[0];
 	}
 
 	return out;
 }
 
-char* th_mask_decode(char *in, int ilen, str *prefix, int extra, int *olen)
+char *th_mask_decode(char *in, int ilen, str *prefix, int extra, int *olen)
 {
 	char *out;
 	int n;
@@ -137,47 +138,48 @@ char* th_mask_decode(char *in, int ilen, str *prefix, int extra, int *olen)
 	int end;
 	char c;
 
-	for(n=0,i=ilen-1; in[i]==_th_PD64[0]; i--)
+	for(n = 0, i = ilen - 1; in[i] == _th_PD64[0]; i--)
 		n++;
 
-	*olen = (((ilen-((prefix!=NULL&&prefix->len>0)?prefix->len:0)) * 6) >> 3)
-				- n;
+	*olen = (((ilen - ((prefix != NULL && prefix->len > 0) ? prefix->len : 0))
+					 * 6)
+					>> 3)
+			- n;
 
-	if (*olen<=0) {
+	if(*olen <= 0) {
 		LM_ERR("invalid olen parameter calculated, can't continue %d\n", *olen);
 		return NULL;
 	}
 
-	out = (char*)pkg_malloc((*olen+1+extra)*sizeof(char));
+	out = (char *)pkg_malloc((*olen + 1 + extra) * sizeof(char));
 
-	if(out==NULL) {
+	if(out == NULL) {
 		PKG_MEM_ERROR;
 		*olen = 0;
 		return NULL;
 	}
 	/* set 0 at the end of the value */
-	memset(out, 0, (*olen+1+extra)*sizeof(char));
+	memset(out, 0, (*olen + 1 + extra) * sizeof(char));
 
 	end = ilen - n;
-	i = (prefix!=NULL&&prefix->len>0)?prefix->len:0;
-	for(idx=0; i<end; idx+=3) {
+	i = (prefix != NULL && prefix->len > 0) ? prefix->len : 0;
+	for(idx = 0; i < end; idx += 3) {
 		block = 0;
-		for(j=0; j<4 && i<end ; j++) {
+		for(j = 0; j < 4 && i < end; j++) {
 			c = _th_DB64[(int)in[i++]];
-			if(c<0) {
+			if(c < 0) {
 				LM_ERR("invalid input string\"%.*s\"\n", ilen, in);
 				pkg_free(out);
 				*olen = 0;
 				return NULL;
 			}
-			block += c << (18 - 6*j);
+			block += c << (18 - 6 * j);
 		}
 
-		for(j=0, n=16; j<3 && idx+j< *olen; j++, n-=8) {
-			out[idx+j] = (char)((block >> n) & 0xff);
+		for(j = 0, n = 16; j < 3 && idx + j < *olen; j++, n -= 8) {
+			out[idx + j] = (char)((block >> n) & 0xff);
 		}
 	}
 
 	return out;
 }
-

+ 2 - 2
src/modules/topoh/th_mask.h

@@ -30,7 +30,7 @@
 #include "../../core/str.h"
 
 void th_mask_init(void);
-char* th_mask_encode(char *in, int ilen, str *prefix, int *olen);
-char* th_mask_decode(char *in, int ilen, str *prefix, int extra, int *olen);
+char *th_mask_encode(char *in, int ilen, str *prefix, int *olen);
+char *th_mask_decode(char *in, int ilen, str *prefix, int extra, int *olen);
 
 #endif

File diff suppressed because it is too large
+ 230 - 299
src/modules/topoh/th_msg.c


+ 2 - 2
src/modules/topoh/th_msg.h

@@ -42,13 +42,13 @@ int th_unmask_ruri(sip_msg_t *msg);
 int th_unmask_route(sip_msg_t *msg);
 int th_unmask_refer_to(sip_msg_t *msg);
 int th_update_hdr_replaces(sip_msg_t *msg);
-char* th_msg_update(sip_msg_t *msg, unsigned int *olen);
+char *th_msg_update(sip_msg_t *msg, unsigned int *olen);
 int th_add_via_cookie(sip_msg_t *msg, struct via_body *via);
 int th_add_hdr_cookie(sip_msg_t *msg);
 hdr_field_t *th_get_hdr_cookie(sip_msg_t *msg);
 int th_add_cookie(sip_msg_t *msg);
 int th_route_direction(sip_msg_t *msg);
-char* th_get_cookie(sip_msg_t *msg, int *clen);
+char *th_get_cookie(sip_msg_t *msg, int *clen);
 int th_del_cookie(sip_msg_t *msg);
 int th_skip_msg(sip_msg_t *msg);
 

+ 144 - 173
src/modules/topoh/topoh_mod.c

@@ -65,7 +65,7 @@ MODULE_VERSION
 /** module parameters */
 str _th_key = str_init("aL9.n8~Hm]Z");
 str th_cookie_name = str_init("TH"); /* lost parameter? */
-str th_cookie_value = {0, 0};        /* lost parameter? */
+str th_cookie_value = {0, 0};		 /* lost parameter? */
 str th_ip = str_init("127.0.0.8");
 str th_uparam_name = str_init("line");
 str th_uparam_prefix = str_init("sr-");
@@ -88,14 +88,14 @@ sanity_api_t scb;
 
 int th_msg_received(sr_event_param_t *evp);
 int th_msg_sent(sr_event_param_t *evp);
-int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp,
-		int evtype, int evidx, str *evname);
+int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, int evtype,
+		int evidx, str *evname);
 
 /** module functions */
 static int mod_init(void);
 
 #define TH_EVENTRT_OUTGOING 1
-#define TH_EVENTRT_SENDING  2
+#define TH_EVENTRT_SENDING 2
 static int _th_eventrt_mode = TH_EVENTRT_OUTGOING | TH_EVENTRT_SENDING;
 static int _th_eventrt_outgoing = -1;
 static str _th_eventrt_callback = STR_NULL;
@@ -103,42 +103,37 @@ static str _th_eventrt_outgoing_name = str_init("topoh:msg-outgoing");
 static int _th_eventrt_sending = -1;
 static str _th_eventrt_sending_name = str_init("topoh:msg-sending");
 
-static param_export_t params[]={
-	{"mask_key",		PARAM_STR, &_th_key},
-	{"mask_ip",			PARAM_STR, &th_ip},
-	{"mask_callid",		PARAM_INT, &th_param_mask_callid},
-	{"mask_mode",		PARAM_INT, &th_param_mask_mode},
-	{"uparam_name",		PARAM_STR, &th_uparam_name},
-	{"uparam_prefix",	PARAM_STR, &th_uparam_prefix},
-	{"vparam_name",		PARAM_STR, &th_vparam_name},
-	{"vparam_prefix",	PARAM_STR, &th_vparam_prefix},
-	{"callid_prefix",	PARAM_STR, &th_callid_prefix},
-	{"sanity_checks",	PARAM_INT, &th_sanity_checks},
-	{"uri_prefix_checks",	PARAM_INT, &th_uri_prefix_checks},
-	{"event_callback",	PARAM_STR, &_th_eventrt_callback},
-	{"event_mode",		PARAM_INT, &_th_eventrt_mode},
-	{"use_mode",		PARAM_INT, &_th_use_mode},
-	{0,0,0}
-};
-
-static cmd_export_t cmds[]={
-	{"bind_topoh",   (cmd_function)bind_topoh,  0,
-		0, 0, 0},
-	{0, 0, 0, 0, 0, 0}
-};
+static param_export_t params[] = {{"mask_key", PARAM_STR, &_th_key},
+		{"mask_ip", PARAM_STR, &th_ip},
+		{"mask_callid", PARAM_INT, &th_param_mask_callid},
+		{"mask_mode", PARAM_INT, &th_param_mask_mode},
+		{"uparam_name", PARAM_STR, &th_uparam_name},
+		{"uparam_prefix", PARAM_STR, &th_uparam_prefix},
+		{"vparam_name", PARAM_STR, &th_vparam_name},
+		{"vparam_prefix", PARAM_STR, &th_vparam_prefix},
+		{"callid_prefix", PARAM_STR, &th_callid_prefix},
+		{"sanity_checks", PARAM_INT, &th_sanity_checks},
+		{"uri_prefix_checks", PARAM_INT, &th_uri_prefix_checks},
+		{"event_callback", PARAM_STR, &_th_eventrt_callback},
+		{"event_mode", PARAM_INT, &_th_eventrt_mode},
+		{"use_mode", PARAM_INT, &_th_use_mode}, {0, 0, 0}};
+
+static cmd_export_t cmds[] = {
+		{"bind_topoh", (cmd_function)bind_topoh, 0, 0, 0, 0},
+		{0, 0, 0, 0, 0, 0}};
 
 /** module exports */
-struct module_exports exports= {
-	"topoh",         /* module name */
-	DEFAULT_DLFLAGS, /* dlopen flags */
-	cmds,            /* exported functions */
-	params,          /* exported parameters */
-	0,               /* exported rpc functions */
-	0,               /* exported pseudo-variables */
-	0,               /* response handling function */
-	mod_init,        /* module init function */
-	0,               /* per-child init function */
-	0                /* module destroy function */
+struct module_exports exports = {
+		"topoh",		 /* module name */
+		DEFAULT_DLFLAGS, /* dlopen flags */
+		cmds,			 /* exported functions */
+		params,			 /* exported parameters */
+		0,				 /* exported rpc functions */
+		0,				 /* exported pseudo-variables */
+		0,				 /* response handling function */
+		mod_init,		 /* module init function */
+		0,				 /* per-child init function */
+		0				 /* module destroy function */
 };
 
 /**
@@ -149,38 +144,34 @@ static int mod_init(void)
 	sip_uri_t puri;
 	char buri[MAX_URI_SIZE];
 
-	if(_th_use_mode==1) {
+	if(_th_use_mode == 1) {
 		/* use in library mode, not for processing sip messages */
 		th_mask_init();
 		return 0;
 	}
 
 	_th_eventrt_outgoing = route_lookup(&event_rt, _th_eventrt_outgoing_name.s);
-	if(_th_eventrt_outgoing<0
-			|| event_rt.rlist[_th_eventrt_outgoing]==NULL) {
+	if(_th_eventrt_outgoing < 0
+			|| event_rt.rlist[_th_eventrt_outgoing] == NULL) {
 		_th_eventrt_outgoing = -1;
 	}
 	_th_eventrt_sending = route_lookup(&event_rt, _th_eventrt_sending_name.s);
-	if(_th_eventrt_sending<0
-			|| event_rt.rlist[_th_eventrt_sending]==NULL) {
+	if(_th_eventrt_sending < 0 || event_rt.rlist[_th_eventrt_sending] == NULL) {
 		_th_eventrt_sending = -1;
 	}
 
-	if(faked_msg_init()<0) {
+	if(faked_msg_init() < 0) {
 		LM_ERR("failed to init fmsg\n");
 		return -1;
 	}
 
-	if(th_sanity_checks!=0)
-	{
-		if(sanity_load_api(&scb)<0)
-		{
+	if(th_sanity_checks != 0) {
+		if(sanity_load_api(&scb) < 0) {
 			LM_ERR("cannot bind to sanity module\n");
 			goto error;
 		}
 	}
-	if(th_ip.len<=0)
-	{
+	if(th_ip.len <= 0) {
 		LM_ERR("mask IP parameter is invalid\n");
 		goto error;
 	}
@@ -190,57 +181,54 @@ static int mod_init(void)
 		goto error;
 	}
 	memcpy(buri, "sip:", 4);
-	memcpy(buri+4, th_ip.s, th_ip.len);
-	buri[th_ip.len+8] = '\0';
+	memcpy(buri + 4, th_ip.s, th_ip.len);
+	buri[th_ip.len + 8] = '\0';
 
-	if(parse_uri(buri, th_ip.len+4, &puri)<0) {
+	if(parse_uri(buri, th_ip.len + 4, &puri) < 0) {
 		LM_ERR("mask uri is invalid\n");
 		goto error;
 	}
-	if(check_self(&puri.host, puri.port_no, 0)==1)
-	{
+	if(check_self(&puri.host, puri.port_no, 0) == 1) {
 		th_mask_addr_myself = 1;
-		LM_INFO("mask address matches myself [%.*s]\n",
-				th_ip.len, th_ip.s);
+		LM_INFO("mask address matches myself [%.*s]\n", th_ip.len, th_ip.s);
 	}
 
 	/* 'SIP/2.0/UDP ' + ip + ';' + param + '=' + prefix (+ '\0') */
-	th_via_prefix.len = 12 + th_ip.len + 1 + th_vparam_name.len + 1
-		+ th_vparam_prefix.len;
-	th_via_prefix.s = (char*)pkg_malloc(th_via_prefix.len+1);
-	if(th_via_prefix.s==NULL)
-	{
+	th_via_prefix.len =
+			12 + th_ip.len + 1 + th_vparam_name.len + 1 + th_vparam_prefix.len;
+	th_via_prefix.s = (char *)pkg_malloc(th_via_prefix.len + 1);
+	if(th_via_prefix.s == NULL) {
 		PKG_MEM_ERROR_FMT("via prefix parameter\n");
 		goto error;
 	}
 	/* 'sip:' + ip + ';' + param + '=' + prefix (+ '\0') */
-	th_uri_prefix.len = 4 + th_ip.len + 1 + th_uparam_name.len + 1
-		+ th_uparam_prefix.len;
-	th_uri_prefix.s = (char*)pkg_malloc(th_uri_prefix.len+1);
-	if(th_uri_prefix.s==NULL)
-	{
+	th_uri_prefix.len =
+			4 + th_ip.len + 1 + th_uparam_name.len + 1 + th_uparam_prefix.len;
+	th_uri_prefix.s = (char *)pkg_malloc(th_uri_prefix.len + 1);
+	if(th_uri_prefix.s == NULL) {
 		pkg_free(th_via_prefix.s);
 		PKG_MEM_ERROR_FMT("uri prefix parameter\n");
 		goto error;
 	}
 	/* build via prefix */
 	memcpy(th_via_prefix.s, "SIP/2.0/UDP ", 12);
-	memcpy(th_via_prefix.s+12, th_ip.s, th_ip.len);
-	th_via_prefix.s[12+th_ip.len] = ';';
-	memcpy(th_via_prefix.s+12+th_ip.len+1, th_vparam_name.s,
+	memcpy(th_via_prefix.s + 12, th_ip.s, th_ip.len);
+	th_via_prefix.s[12 + th_ip.len] = ';';
+	memcpy(th_via_prefix.s + 12 + th_ip.len + 1, th_vparam_name.s,
 			th_vparam_name.len);
-	th_via_prefix.s[12+th_ip.len+1+th_vparam_name.len] = '=';
-	memcpy(th_via_prefix.s+12+th_ip.len+1+th_vparam_name.len+1,
+	th_via_prefix.s[12 + th_ip.len + 1 + th_vparam_name.len] = '=';
+	memcpy(th_via_prefix.s + 12 + th_ip.len + 1 + th_vparam_name.len + 1,
 			th_vparam_prefix.s, th_vparam_prefix.len);
 	th_via_prefix.s[th_via_prefix.len] = '\0';
 	LM_DBG("VIA prefix: [%s]\n", th_via_prefix.s);
 	/* build uri prefix */
 	memcpy(th_uri_prefix.s, "sip:", 4);
-	memcpy(th_uri_prefix.s+4, th_ip.s, th_ip.len);
-	th_uri_prefix.s[4+th_ip.len] = ';';
-	memcpy(th_uri_prefix.s+4+th_ip.len+1, th_uparam_name.s, th_uparam_name.len);
-	th_uri_prefix.s[4+th_ip.len+1+th_uparam_name.len] = '=';
-	memcpy(th_uri_prefix.s+4+th_ip.len+1+th_uparam_name.len+1,
+	memcpy(th_uri_prefix.s + 4, th_ip.s, th_ip.len);
+	th_uri_prefix.s[4 + th_ip.len] = ';';
+	memcpy(th_uri_prefix.s + 4 + th_ip.len + 1, th_uparam_name.s,
+			th_uparam_name.len);
+	th_uri_prefix.s[4 + th_ip.len + 1 + th_uparam_name.len] = '=';
+	memcpy(th_uri_prefix.s + 4 + th_ip.len + 1 + th_uparam_name.len + 1,
 			th_uparam_prefix.s, th_uparam_prefix.len);
 	th_uri_prefix.s[th_uri_prefix.len] = '\0';
 	LM_DBG("URI prefix: [%s]\n", th_uri_prefix.s);
@@ -261,22 +249,18 @@ error:
  */
 int th_prepare_msg(sip_msg_t *msg)
 {
-	if (parse_msg(msg->buf, msg->len, msg)!=0)
-	{
+	if(parse_msg(msg->buf, msg->len, msg) != 0) {
 		LM_DBG("outbuf buffer parsing failed!");
 		return 1;
 	}
 
-	if(msg->first_line.type==SIP_REQUEST)
-	{
-		if(!IS_SIP(msg))
-		{
+	if(msg->first_line.type == SIP_REQUEST) {
+		if(!IS_SIP(msg)) {
 			LM_DBG("non sip request message\n");
 			return 1;
 		}
-	} else if(msg->first_line.type==SIP_REPLY) {
-		if(!IS_SIP_REPLY(msg))
-		{
+	} else if(msg->first_line.type == SIP_REPLY) {
+		if(!IS_SIP_REPLY(msg)) {
 			LM_DBG("non sip reply message\n");
 			return 1;
 		}
@@ -285,41 +269,35 @@ int th_prepare_msg(sip_msg_t *msg)
 		return 1;
 	}
 
-	if (parse_headers(msg, HDR_EOH_F, 0)==-1)
-	{
-		LM_DBG("parsing headers failed [[%.*s]]\n",
-				msg->len, msg->buf);
+	if(parse_headers(msg, HDR_EOH_F, 0) == -1) {
+		LM_DBG("parsing headers failed [[%.*s]]\n", msg->len, msg->buf);
 		return 2;
 	}
 
 	/* force 2nd via parsing here - it helps checking it later */
-	if (parse_headers(msg, HDR_VIA2_F, 0)==-1
-		|| (msg->via2==0) || (msg->via2->error!=PARSE_OK))
-	{
+	if(parse_headers(msg, HDR_VIA2_F, 0) == -1 || (msg->via2 == 0)
+			|| (msg->via2->error != PARSE_OK)) {
 		LM_DBG("no second via in this message \n");
 	}
 
-	if(parse_from_header(msg)<0)
-	{
+	if(parse_from_header(msg) < 0) {
 		LM_ERR("cannot parse FROM header\n");
 		return 3;
 	}
 
-	if(parse_to_header(msg)<0 || msg->to==NULL)
-	{
+	if(parse_to_header(msg) < 0 || msg->to == NULL) {
 		LM_ERR("cannot parse TO header\n");
 		return 3;
 	}
 
-	if(get_to(msg)==NULL)
-	{
+	if(get_to(msg) == NULL) {
 		LM_ERR("cannot get TO header\n");
 		return 3;
 	}
 
-	if(msg->via1==NULL || msg->callid==NULL) {
-		LM_ERR("mandatory headers missing - via1: %p callid: %p\n",
-				msg->via1, msg->callid);
+	if(msg->via1 == NULL || msg->callid == NULL) {
+		LM_ERR("mandatory headers missing - via1: %p callid: %p\n", msg->via1,
+				msg->callid);
 		return 4;
 	}
 
@@ -337,72 +315,61 @@ int th_msg_received(sr_event_param_t *evp)
 	int direction;
 	int dialog;
 
-	obuf = (str*)evp->data;
+	obuf = (str *)evp->data;
 	memset(&msg, 0, sizeof(sip_msg_t));
 	msg.buf = obuf->s;
 	msg.len = obuf->len;
 
-	if(th_prepare_msg(&msg)!=0)
-	{
+	if(th_prepare_msg(&msg) != 0) {
 		goto done;
 	}
 
-	if(th_skip_msg(&msg))
-	{
+	if(th_skip_msg(&msg)) {
 		goto done;
 	}
 
 	direction = 0;
 	th_cookie_value.s = "xx";
 	th_cookie_value.len = 2;
-	if(msg.first_line.type==SIP_REQUEST)
-	{
-		if(th_sanity_checks!=0)
-		{
-			if(scb.check_defaults(&msg)<1)
-			{
+	if(msg.first_line.type == SIP_REQUEST) {
+		if(th_sanity_checks != 0) {
+			if(scb.check_defaults(&msg) < 1) {
 				LM_ERR("sanity checks failed\n");
 				goto done;
 			}
 		}
-		dialog = (get_to(&msg)->tag_value.len>0)?1:0;
-		if(dialog)
-		{
+		dialog = (get_to(&msg)->tag_value.len > 0) ? 1 : 0;
+		if(dialog) {
 			direction = th_route_direction(&msg);
-			if(direction<0)
-			{
+			if(direction < 0) {
 				LM_ERR("not able to detect direction\n");
 				goto done;
 			}
-			th_cookie_value.s = (direction==0)?"dc":"uc";
+			th_cookie_value.s = (direction == 0) ? "dc" : "uc";
 		} else {
 			th_cookie_value.s = "di";
 		}
-		if(dialog)
-		{
+		if(dialog) {
 			/* dialog request */
 			th_unmask_ruri(&msg);
 			th_unmask_route(&msg);
 			th_unmask_refer_to(&msg);
-			if(direction==1)
-			{
+			if(direction == 1) {
 				th_unmask_callid(&msg);
 			}
 		}
 	} else {
 		/* reply */
-		if(msg.via2==0)
-		{
+		if(msg.via2 == 0) {
 			/* one Via in received reply -- it is for local generated request
 			 * - nothing to unhide unless is CANCEL/ACK */
-			if(!((get_cseq(&msg)->method_id)&(METHOD_CANCEL)))
+			if(!((get_cseq(&msg)->method_id) & (METHOD_CANCEL)))
 				goto done;
 		}
 
 		th_unmask_via(&msg, &th_cookie_value);
 		th_flip_record_route(&msg, 0);
-		if(th_cookie_value.s[0]=='u')
-		{
+		if(th_cookie_value.s[0] == 'u') {
 			th_cookie_value.s = "dc";
 		} else {
 			th_cookie_value.s = "uc";
@@ -414,10 +381,9 @@ int th_msg_received(sr_event_param_t *evp)
 	LM_DBG("adding cookie: %.*s\n", th_cookie_value.len, th_cookie_value.s);
 
 	th_add_cookie(&msg);
-	nbuf = th_msg_update(&msg, (unsigned int*)&obuf->len);
+	nbuf = th_msg_update(&msg, (unsigned int *)&obuf->len);
 
-	if(obuf->len>=BUF_SIZE)
-	{
+	if(obuf->len >= BUF_SIZE) {
 		LM_ERR("new buffer overflow (%d)\n", obuf->len);
 		pkg_free(nbuf);
 		return -1;
@@ -426,7 +392,7 @@ int th_msg_received(sr_event_param_t *evp)
 	obuf->s[obuf->len] = '\0';
 
 done:
-	if(nbuf!=NULL)
+	if(nbuf != NULL)
 		pkg_free(nbuf);
 	free_sip_msg(&msg);
 	return 0;
@@ -444,10 +410,11 @@ int th_msg_sent(sr_event_param_t *evp)
 	int local;
 	str nbuf = STR_NULL;
 
-	obuf = (str*)evp->data;
+	obuf = (str *)evp->data;
 
 	if(th_execute_event_route(NULL, evp, TH_EVENTRT_OUTGOING,
-				_th_eventrt_outgoing, &_th_eventrt_outgoing_name)==1) {
+			   _th_eventrt_outgoing, &_th_eventrt_outgoing_name)
+			== 1) {
 		return 0;
 	}
 
@@ -455,7 +422,7 @@ int th_msg_sent(sr_event_param_t *evp)
 	msg.buf = obuf->s;
 	msg.len = obuf->len;
 
-	if(th_prepare_msg(&msg)!=0) {
+	if(th_prepare_msg(&msg) != 0) {
 		goto done;
 	}
 
@@ -465,35 +432,39 @@ int th_msg_sent(sr_event_param_t *evp)
 
 	th_cookie_value.s = th_get_cookie(&msg, &th_cookie_value.len);
 	LM_DBG("the COOKIE is [%.*s]\n", th_cookie_value.len, th_cookie_value.s);
-	if(th_cookie_value.s[0]!='x') {
+	if(th_cookie_value.s[0] != 'x') {
 		th_del_cookie(&msg);
 	}
 
 	if(th_execute_event_route(&msg, evp, TH_EVENTRT_SENDING,
-				_th_eventrt_sending, &_th_eventrt_sending_name)==1) {
+			   _th_eventrt_sending, &_th_eventrt_sending_name)
+			== 1) {
 		goto done;
 	}
 
-	if(msg.first_line.type==SIP_REQUEST) {
-		direction = (th_cookie_value.s[0]=='u')?1:0; /* upstream/downstram */
-		dialog = (get_to(&msg)->tag_value.len>0)?1:0;
+	if(msg.first_line.type == SIP_REQUEST) {
+		direction =
+				(th_cookie_value.s[0] == 'u') ? 1 : 0; /* upstream/downstram */
+		dialog = (get_to(&msg)->tag_value.len > 0) ? 1 : 0;
 
-		if(msg.via2==0) {
+		if(msg.via2 == 0) {
 			local = 1;
-			if(direction==0 && th_cookie_value.s[1]=='l') {
+			if(direction == 0 && th_cookie_value.s[1] == 'l') {
 				/* downstream local request (e.g., dlg bye) */
 				local = 2;
 			}
 		} else {
 			/* more than one Via, but no received th cookie */
-			local = (th_cookie_value.s[0]!='d' && th_cookie_value.s[0]!='u')?1:0;
+			local = (th_cookie_value.s[0] != 'd' && th_cookie_value.s[0] != 'u')
+							? 1
+							: 0;
 		}
 		/* local generated requests */
 		if(local) {
 			/* ACK and CANCEL go downstream */
-			if(get_cseq(&msg)->method_id==METHOD_ACK
-					|| get_cseq(&msg)->method_id==METHOD_CANCEL
-					|| local==2) {
+			if(get_cseq(&msg)->method_id == METHOD_ACK
+					|| get_cseq(&msg)->method_id == METHOD_CANCEL
+					|| local == 2) {
 				th_mask_callid(&msg);
 				goto ready;
 			} else {
@@ -506,7 +477,7 @@ int th_msg_sent(sr_event_param_t *evp)
 		th_mask_record_route(&msg);
 		if(dialog) {
 			/* dialog request */
-			if(direction==0) {
+			if(direction == 0) {
 				/* downstream */
 				th_mask_callid(&msg);
 			}
@@ -517,13 +488,13 @@ int th_msg_sent(sr_event_param_t *evp)
 		}
 	} else {
 		/* reply */
-		if(th_cookie_value.s[th_cookie_value.len-1]=='x') {
+		if(th_cookie_value.s[th_cookie_value.len - 1] == 'x') {
 			/* ?!?! - we should have a cookie in any reply case */
 			goto done;
 		}
-		if(th_cookie_value.s[th_cookie_value.len-1]=='v') {
+		if(th_cookie_value.s[th_cookie_value.len - 1] == 'v') {
 			/* reply generated locally - direction was set by request */
-			if(th_cookie_value.s[0]=='u') {
+			if(th_cookie_value.s[0] == 'u') {
 				th_mask_callid(&msg);
 			}
 		} else {
@@ -533,15 +504,15 @@ int th_msg_sent(sr_event_param_t *evp)
 					|| msg.first_line.u.reply.statuscode > 399) {
 				th_mask_contact(&msg);
 			}
-			if(th_cookie_value.s[0]=='d') {
+			if(th_cookie_value.s[0] == 'd') {
 				th_mask_callid(&msg);
 			}
 		}
 	}
 
 ready:
-	nbuf.s = th_msg_update(&msg, (unsigned int*)&nbuf.len);
-	if(nbuf.s!=NULL) {
+	nbuf.s = th_msg_update(&msg, (unsigned int *)&nbuf.len);
+	if(nbuf.s != NULL) {
 		LM_DBG("new outbound buffer generated\n");
 		pkg_free(obuf->s);
 		obuf->s = nbuf.s;
@@ -558,8 +529,8 @@ done:
 /**
  *
  */
-int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp,
-		int evtype, int evidx, str *evname)
+int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp, int evtype,
+		int evidx, str *evname)
 {
 	struct sip_msg *fmsg;
 	struct run_act_ctx ctx;
@@ -571,10 +542,10 @@ int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp,
 		return 0;
 	}
 
-	if(evidx<0) {
-		if(_th_eventrt_callback.s!=NULL || _th_eventrt_callback.len>0) {
+	if(evidx < 0) {
+		if(_th_eventrt_callback.s != NULL || _th_eventrt_callback.len > 0) {
 			keng = sr_kemi_eng_get();
-			if(keng==NULL) {
+			if(keng == NULL) {
 				LM_DBG("event callback (%s) set, but no cfg engine\n",
 						_th_eventrt_callback.s);
 				goto done;
@@ -582,17 +553,16 @@ int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp,
 		}
 	}
 
-	if(evidx<0 && keng==NULL) {
+	if(evidx < 0 && keng == NULL) {
 		return 0;
 	}
 
-	LM_DBG("executing event_route[topoh:...] (%d)\n",
-			_th_eventrt_outgoing);
+	LM_DBG("executing event_route[topoh:...] (%d)\n", _th_eventrt_outgoing);
 	fmsg = faked_msg_next();
 
 	onsnd_info.to = &evp->dst->to;
 	onsnd_info.send_sock = evp->dst->send_sock;
-	if(msg!=NULL) {
+	if(msg != NULL) {
 		onsnd_info.buf = msg->buf;
 		onsnd_info.len = msg->len;
 		onsnd_info.msg = msg;
@@ -606,36 +576,37 @@ int th_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp,
 	rtb = get_route_type();
 	set_route_type(REQUEST_ROUTE);
 	init_run_actions_ctx(&ctx);
-	if(evidx>=0) {
-		run_top_route(event_rt.rlist[evidx], (msg)?msg:fmsg, &ctx);
+	if(evidx >= 0) {
+		run_top_route(event_rt.rlist[evidx], (msg) ? msg : fmsg, &ctx);
 	} else {
-		if(keng!=NULL) {
-			if(sr_kemi_ctx_route(keng, &ctx, (msg)?msg:fmsg, EVENT_ROUTE,
-						&_th_eventrt_callback, evname)<0) {
+		if(keng != NULL) {
+			if(sr_kemi_ctx_route(keng, &ctx, (msg) ? msg : fmsg, EVENT_ROUTE,
+					   &_th_eventrt_callback, evname)
+					< 0) {
 				LM_ERR("error running event route kemi callback\n");
-				p_onsend=NULL;
+				p_onsend = NULL;
 				return -1;
 			}
 		}
 	}
 	set_route_type(rtb);
-	if(ctx.run_flags&DROP_R_F) {
+	if(ctx.run_flags & DROP_R_F) {
 		LM_DBG("exit due to 'drop' in event route\n");
-		p_onsend=NULL;
+		p_onsend = NULL;
 		return 1;
 	}
 
 done:
-	p_onsend=NULL;
+	p_onsend = NULL;
 	return 0;
 }
 
 /**
  *
  */
-int bind_topoh(topoh_api_t* api)
+int bind_topoh(topoh_api_t *api)
 {
-	if (!api) {
+	if(!api) {
 		ERR("Invalid parameter value\n");
 		return -1;
 	}

Some files were not shown because too many files changed in this diff