sipcapture: clang format the code, added missing copyright header

src/modules/sipcapture/hash_mode.c

@@ -1,3 +1,26 @@
+/*
+ * sipcapture module - helper module to capture sip messages
+ *
+ * Copyright (C) 2011-2015 Alexandr Dubovikov ([email protected])
+ *
+ * This file is part of Kamailio, a free SIP server.
+ *
+ * Kamailio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version
+ *
+ * Kamailio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
 #include "../../core/sr_module.h"
 #include "../../core/crc.h"
 
@@ -7,22 +30,23 @@
 #include "hash_mode.h"
 
 static int get_source(struct _sipcapture_object *sco, enum hash_source source,
-                            str *source_string);
-static int get_call_id (struct _sipcapture_object *sco, str *source_string);
-static int get_from_user (struct _sipcapture_object *sco, str *source_string);
-static int get_to_user (struct _sipcapture_object *sco, str *source_string);
+		str *source_string);
+static int get_call_id(struct _sipcapture_object *sco, str *source_string);
+static int get_from_user(struct _sipcapture_object *sco, str *source_string);
+static int get_to_user(struct _sipcapture_object *sco, str *source_string);
 
 
-static int first_token (str *source_string);
+static int first_token(str *source_string);
 
 
-int hash_func (struct _sipcapture_object * sco,
-                         enum hash_source source, int denominator) {
+int hash_func(struct _sipcapture_object *sco, enum hash_source source,
+		int denominator)
+{
 	int ret;
 	unsigned int hash;
 	str source_string;
 
-	if(get_source (sco, source, &source_string) == -1) {
+	if(get_source(sco, source, &source_string) == -1) {
 		return -1;
 	}
 
@@ -33,41 +57,41 @@ int hash_func (struct _sipcapture_object * sco,
 	return ret;
 }
 
-static int get_source (struct _sipcapture_object *sco, enum hash_source source,
-                             str *source_string) {
+static int get_source(struct _sipcapture_object *sco, enum hash_source source,
+		str *source_string)
+{
 	source_string->s = NULL;
 	source_string->len = 0;
 
-	switch (source) {
-			case hs_call_id:
-			return get_call_id (sco, source_string);
-			case hs_from_user:
+	switch(source) {
+		case hs_call_id:
+			return get_call_id(sco, source_string);
+		case hs_from_user:
 			return get_from_user(sco, source_string);
-			case hs_to_user:
+		case hs_to_user:
 			return get_to_user(sco, source_string);
-			default:
-			LM_ERR("unknown hash source %i.\n",
-			     (int) source);
+		default:
+			LM_ERR("unknown hash source %i.\n", (int)source);
 			return -1;
 	}
 }
 
-static int get_call_id (struct _sipcapture_object * sco, str *source_string) {
+static int get_call_id(struct _sipcapture_object *sco, str *source_string)
+{
 
-	if (!sco->callid.s || !sco->callid.len)
-	{
+	if(!sco->callid.s || !sco->callid.len) {
 		return -1;
 	}
 	source_string->s = sco->callid.s;
 	source_string->len = sco->callid.len;
-	first_token (source_string);
+	first_token(source_string);
 	return 0;
 }
 
-static int get_from_user (struct _sipcapture_object * sco, str *source_string) {
+static int get_from_user(struct _sipcapture_object *sco, str *source_string)
+{
 
-	if (!sco->from_user.s || !sco->from_user.len)
-	{
+	if(!sco->from_user.s || !sco->from_user.len) {
 		return -1;
 	}
 	source_string->s = sco->from_user.s;
@@ -76,10 +100,10 @@ static int get_from_user (struct _sipcapture_object * sco, str *source_string) {
 }
 
 
-static int get_to_user (struct _sipcapture_object * sco, str *source_string) {
+static int get_to_user(struct _sipcapture_object *sco, str *source_string)
+{
 
-	if (!sco->to_user.s || !sco->to_user.len)
-	{
+	if(!sco->to_user.s || !sco->to_user.len) {
 		return -1;
 	}
 	source_string->s = sco->to_user.s;
@@ -88,19 +112,20 @@ static int get_to_user (struct _sipcapture_object * sco, str *source_string) {
 }
 
 
-static int first_token (str *source_string) {
+static int first_token(str *source_string)
+{
 	size_t len;
 
-	if (source_string->s == NULL || source_string->len == 0) {
+	if(source_string->s == NULL || source_string->len == 0) {
 		return 0;
 	}
 
-	while (source_string->len > 0 && isspace (*source_string->s)) {
+	while(source_string->len > 0 && isspace(*source_string->s)) {
 		++source_string->s;
 		--source_string->len;
 	}
-	for (len = 0; len < source_string->len; ++len) {
-		if (isspace (source_string->s[len])) {
+	for(len = 0; len < source_string->len; ++len) {
+		if(isspace(source_string->s[len])) {
 			source_string->len = len;
 			break;
 		}
@@ -109,21 +134,16 @@ static int first_token (str *source_string) {
 }
 
 
-enum hash_source get_hash_source (const char *hash_source){
+enum hash_source get_hash_source(const char *hash_source)
+{
 
-	if (strcasecmp ("call_id", hash_source) == 0){
+	if(strcasecmp("call_id", hash_source) == 0) {
 		return hs_call_id;
-	}
-	else if (strcasecmp("from_user", hash_source) == 0)
-	{
+	} else if(strcasecmp("from_user", hash_source) == 0) {
 		return hs_from_user;
-	}
-	else if (strcasecmp("to_user", hash_source) == 0)
-	{
+	} else if(strcasecmp("to_user", hash_source) == 0) {
 		return hs_to_user;
-	}
-	else {
+	} else {
 		return hs_error;
 	}
-
 }

src/modules/sipcapture/hash_mode.h

@@ -13,8 +13,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License 
- * along with this program; if not, write to the Free Software 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
@@ -24,18 +24,17 @@
 #define HASH_MODE_H 1
 
 
-
-
 /*
  * Determines from which part of a message will be used to calculate the hash
  * Possible values are:
- * 
+ *
  * hs_call_id     the content of the Call-ID header field
  * hs_from_user   the username part of the URI in the From header field
  * hs_to_user     the username part of the URI in the To header field
  * hs_error       no hash specified
 */
-enum hash_source {
+enum hash_source
+{
 	hs_call_id = 1,
 	hs_from_user,
 	hs_to_user,
@@ -48,12 +47,12 @@ enum hash_source {
  * Returns an integer number between 0 and denominator - 1 based on
  * the hash source from the msg. The hash algorithm is CRC32.
 */
-int hash_func (struct _sipcapture_object * sco,
-                         enum hash_source source, int denominator);
+int hash_func(struct _sipcapture_object *sco, enum hash_source source,
+		int denominator);
 
 /*
  * Gets the hash source type.
 */
-enum hash_source get_hash_source (const char *hash_source);
+enum hash_source get_hash_source(const char *hash_source);
 
 #endif

src/modules/sipcapture/hep.c

@@ -1,7 +1,7 @@
 /*
  * hep related functions
  *
- * Copyright (C) 2011-14 Alexandr Dubovikov <[email protected]>
+ * Copyright (C) 2011-2014 Alexandr Dubovikov <[email protected]>
  *
  * This file is part of Kamailio, a free SIP server.
  *
@@ -35,10 +35,9 @@
 #include "sipcapture.h"
 
 
-
 static int count = 0;
 
-struct hep_timeinfo* heptime;
+struct hep_timeinfo *heptime;
 
 /* HEPv2 HEPv3 */
 int hepv2_received(char *buf, unsigned int len, struct receive_info *ri);
@@ -51,162 +50,170 @@ int parsing_hepv3_message(char *buf, unsigned int len);
 /* int hep_msg_received(char * buf, unsigned int len, struct receive_info * ri) */
 int hep_msg_received(sr_event_param_t *evp)
 {
-        void **srevp;
-        char *buf;
-        unsigned *len;
-        struct receive_info *ri;
-
-        if(!hep_capture_on) {
-                LOG(L_ERR, "sipcapture:hep_msg_received HEP is not enabled\n");
-                return -1;
-        }
+	void **srevp;
+	char *buf;
+	unsigned *len;
+	struct receive_info *ri;
+
+	if(!hep_capture_on) {
+		LOG(L_ERR, "sipcapture:hep_msg_received HEP is not enabled\n");
+		return -1;
+	}
 
-        srevp = (void**)evp->data;
+	srevp = (void **)evp->data;
 
-        buf = (char *)srevp[0];
-        len = (unsigned *)srevp[1];
-        ri = (struct receive_info *)srevp[2];
+	buf = (char *)srevp[0];
+	len = (unsigned *)srevp[1];
+	ri = (struct receive_info *)srevp[2];
 
 	correlation_id = NULL;
 	authkey = NULL;
 
 	count++;
-        struct hep_hdr *heph;
-        /* hep_hdr */
-        heph = (struct hep_hdr*) buf;
+	struct hep_hdr *heph;
+	/* hep_hdr */
+	heph = (struct hep_hdr *)buf;
 
-        /* Check version */
-        if(heph->hp_v == 1 || heph->hp_v == 2)  {
+	/* Check version */
+	if(heph->hp_v == 1 || heph->hp_v == 2) {
 
-                return hepv2_received(buf, *len, ri);
-        }
-        else if(!memcmp(buf, "\x48\x45\x50\x33",4)) {
+		return hepv2_received(buf, *len, ri);
+	} else if(!memcmp(buf, "\x48\x45\x50\x33", 4)) {
 
-                return hepv3_received(buf, *len, ri);
-        }
-        else {
+		return hepv3_received(buf, *len, ri);
+	} else {
 
-                LOG(L_ERR, "ERROR: sipcapture:hep_msg_received: not supported version or bad length: v:[%d] l:[%d]\n",
-                                                heph->hp_v, heph->hp_l);
-                return -1;
-        }
+		LOG(L_ERR, "ERROR: sipcapture:hep_msg_received: not supported version "
+				   "or bad length: v:[%d] l:[%d]\n",
+				heph->hp_v, heph->hp_l);
+		return -1;
+	}
 }
 
-int hepv2_received(char *buf, unsigned int len, struct receive_info *ri){
+int hepv2_received(char *buf, unsigned int len, struct receive_info *ri)
+{
 
 	int hl;
-        struct hep_hdr *heph;
-        struct ip_addr dst_ip, src_ip;
-        char *hep_payload, *end, *hep_ip;
-        struct hep_iphdr *hepiph = NULL;
+	struct hep_hdr *heph;
+	struct ip_addr dst_ip, src_ip;
+	char *hep_payload, *end, *hep_ip;
+	struct hep_iphdr *hepiph = NULL;
+
+	struct hep_timehdr *heptime_tmp = NULL;
+	memset(heptime, 0, sizeof(struct hep_timeinfo));
 
-	struct hep_timehdr* heptime_tmp = NULL;
-        memset(heptime, 0, sizeof(struct hep_timeinfo));
+	struct hep_ip6hdr *hepip6h = NULL;
 
-        struct hep_ip6hdr *hepip6h = NULL;
-            	        
 	correlation_id = NULL;
 	authkey = NULL;
 
-	hep_offset = 0; 
-	
+	hep_offset = 0;
+
 	hl = hep_offset = sizeof(struct hep_hdr);
-        end = buf + len;
-        if (unlikely(len<hep_offset)) {
-        	LOG(L_ERR, "ERROR: sipcapture:hep_msg_received len less than offset [%i] vs [%i]\n", len, hep_offset);
-                return -1;
-        }
+	end = buf + len;
+	if(unlikely(len < hep_offset)) {
+		LOG(L_ERR, "ERROR: sipcapture:hep_msg_received len less than offset "
+				   "[%i] vs [%i]\n",
+				len, hep_offset);
+		return -1;
+	}
 
 	/* hep_hdr */
-        heph = (struct hep_hdr*) buf;
+	heph = (struct hep_hdr *)buf;
 
-        switch(heph->hp_f){
-        	case AF_INET:
-                	hl += sizeof(struct hep_iphdr);
-                        break;
+	switch(heph->hp_f) {
+		case AF_INET:
+			hl += sizeof(struct hep_iphdr);
+			break;
 		case AF_INET6:
-                	hl += sizeof(struct hep_ip6hdr);
-                        break;
+			hl += sizeof(struct hep_ip6hdr);
+			break;
 		default:
-                        LOG(L_ERR, "ERROR: sipcapture:hep_msg_received:  unsupported family [%d]\n", heph->hp_f);
-                        return -1;
+			LOG(L_ERR, "ERROR: sipcapture:hep_msg_received:  unsupported "
+					   "family [%d]\n",
+					heph->hp_f);
+			return -1;
 	}
 
-        /* PROTO */
-        if(heph->hp_p == IPPROTO_UDP) ri->proto=PROTO_UDP;
-        else if(heph->hp_p == IPPROTO_TCP) ri->proto=PROTO_TCP;
-        else if(heph->hp_p == IPPROTO_IDP) ri->proto=PROTO_TLS; /* fake protocol */
+	/* PROTO */
+	if(heph->hp_p == IPPROTO_UDP)
+		ri->proto = PROTO_UDP;
+	else if(heph->hp_p == IPPROTO_TCP)
+		ri->proto = PROTO_TCP;
+	else if(heph->hp_p == IPPROTO_IDP)
+		ri->proto = PROTO_TLS; /* fake protocol */
 #ifdef USE_SCTP
-        else if(heph->hp_p == IPPROTO_SCTP) ri->proto=PROTO_SCTP;
+	else if(heph->hp_p == IPPROTO_SCTP)
+		ri->proto = PROTO_SCTP;
 #endif
-        else {
-        	LOG(L_ERR, "ERROR: sipcapture:hep_msg_received: unknown protocol [%d]\n",heph->hp_p);
-                ri->proto = PROTO_NONE;
+	else {
+		LOG(L_ERR,
+				"ERROR: sipcapture:hep_msg_received: unknown protocol [%d]\n",
+				heph->hp_p);
+		ri->proto = PROTO_NONE;
 	}
 
-        hep_ip = buf + sizeof(struct hep_hdr);
+	hep_ip = buf + sizeof(struct hep_hdr);
 
-        if (unlikely(hep_ip>end)){
-                LOG(L_ERR,"hep_ip is over buf+len\n");
-                return -1;
-        }
+	if(unlikely(hep_ip > end)) {
+		LOG(L_ERR, "hep_ip is over buf+len\n");
+		return -1;
+	}
 
-	switch(heph->hp_f){
+	switch(heph->hp_f) {
 		case AF_INET:
-                	hep_offset+=sizeof(struct hep_iphdr);
-                        hepiph = (struct hep_iphdr*) hep_ip;
-                        break;
+			hep_offset += sizeof(struct hep_iphdr);
+			hepiph = (struct hep_iphdr *)hep_ip;
+			break;
 
 		case AF_INET6:
-                	hep_offset+=sizeof(struct hep_ip6hdr);
-                        hepip6h = (struct hep_ip6hdr*) hep_ip;
-                        break;
-
+			hep_offset += sizeof(struct hep_ip6hdr);
+			hepip6h = (struct hep_ip6hdr *)hep_ip;
+			break;
 	}
 
 	/* VOIP payload */
-        hep_payload = buf + hep_offset;
+	hep_payload = buf + hep_offset;
 
-        if (unlikely(hep_payload>end)){
-        	LOG(L_ERR,"hep_payload is over buf+len\n");
-                return -1;
+	if(unlikely(hep_payload > end)) {
+		LOG(L_ERR, "hep_payload is over buf+len\n");
+		return -1;
 	}
 
 	/* timming */
-        if(heph->hp_v == 2) {
-                hep_offset+=sizeof(struct hep_timehdr);
-                heptime_tmp = (struct hep_timehdr*) hep_payload;
+	if(heph->hp_v == 2) {
+		hep_offset += sizeof(struct hep_timehdr);
+		heptime_tmp = (struct hep_timehdr *)hep_payload;
 
-                heptime->tv_sec = to_le(heptime_tmp->tv_sec);
-                heptime->tv_usec = to_le(heptime_tmp->tv_usec);
-                heptime->captid = heptime_tmp->captid;
-        }
+		heptime->tv_sec = to_le(heptime_tmp->tv_sec);
+		heptime->tv_usec = to_le(heptime_tmp->tv_usec);
+		heptime->captid = heptime_tmp->captid;
+	}
 
 
 	/* fill ip from the packet to dst_ip && to */
-        switch(heph->hp_f){
+	switch(heph->hp_f) {
 
 		case AF_INET:
-                	dst_ip.af = src_ip.af = AF_INET;
-                        dst_ip.len = src_ip.len = 4 ;
-                        memcpy(&dst_ip.u.addr, &hepiph->hp_dst, 4);
-                        memcpy(&src_ip.u.addr, &hepiph->hp_src, 4);
-                        break;
+			dst_ip.af = src_ip.af = AF_INET;
+			dst_ip.len = src_ip.len = 4;
+			memcpy(&dst_ip.u.addr, &hepiph->hp_dst, 4);
+			memcpy(&src_ip.u.addr, &hepiph->hp_src, 4);
+			break;
 
 		case AF_INET6:
-                	dst_ip.af = src_ip.af = AF_INET6;
-                        dst_ip.len = src_ip.len = 16 ;
-                        memcpy(&dst_ip.u.addr, &hepip6h->hp6_dst, 16);
-                        memcpy(&src_ip.u.addr, &hepip6h->hp6_src, 16);
-                        break;
-
+			dst_ip.af = src_ip.af = AF_INET6;
+			dst_ip.len = src_ip.len = 16;
+			memcpy(&dst_ip.u.addr, &hepip6h->hp6_dst, 16);
+			memcpy(&src_ip.u.addr, &hepip6h->hp6_src, 16);
+			break;
 	}
 
-        ri->src_ip = src_ip;
-        ri->src_port = ntohs(heph->hp_sport);
+	ri->src_ip = src_ip;
+	ri->src_port = ntohs(heph->hp_sport);
 
-        ri->dst_ip = dst_ip;
-        ri->dst_port = ntohs(heph->hp_dport);
+	ri->dst_ip = dst_ip;
+	ri->dst_port = ntohs(heph->hp_dport);
 
 	/* cut off the offset */
 	/* 
@@ -215,10 +222,10 @@ int hepv2_received(char *buf, unsigned int len, struct receive_info *ri){
 	 *  memmove(buf, p, BUF_SIZE+1); 
 	*/
 
-        hep_payload = buf + hep_offset;
+	hep_payload = buf + hep_offset;
+
+	receive_msg(hep_payload, (unsigned int)(len - hep_offset), ri);
 
-        receive_msg(hep_payload,(unsigned int)(len - hep_offset), ri);
-	
 	return -1;
 }
 
@@ -230,44 +237,45 @@ int hepv3_received(char *buf, unsigned int len, struct receive_info *ri)
 {
 	if(!parsing_hepv3_message(buf, len)) {
 		LM_ERR("couldn't parse hepv3 message\n");
-        	return -2;
-        }
+		return -2;
+	}
 
 	return -1;
 }
 
-int parsing_hepv3_message(char *buf, unsigned int len) {
+int parsing_hepv3_message(char *buf, unsigned int len)
+{
 
 	union sockaddr_union from;
 	union sockaddr_union to;
-        struct receive_info ri;
+	struct receive_info ri;
 	char *tmp;
 	struct ip_addr dst_ip, src_ip;
-	struct socket_info* si = 0;
+	struct socket_info *si = 0;
 	int tmp_len, i;
 	char *payload = NULL;
 	unsigned int payload_len = 0;
-        struct hep_chunk *chunk;	
-        struct hep_generic_recv *hg;
-        int totelem = 0;
-        int chunk_vendor=0, chunk_type=0, chunk_length=0;
-        int total_length = 0;
-
-
-	hg = (struct hep_generic_recv*)pkg_malloc(sizeof(struct hep_generic_recv));
-	if(hg==NULL) {
-	        LM_ERR("no more pkg memory left for hg\n");
-	        return -1;
-        }
-	                                                 		
+	struct hep_chunk *chunk;
+	struct hep_generic_recv *hg;
+	int totelem = 0;
+	int chunk_vendor = 0, chunk_type = 0, chunk_length = 0;
+	int total_length = 0;
+
+
+	hg = (struct hep_generic_recv *)pkg_malloc(sizeof(struct hep_generic_recv));
+	if(hg == NULL) {
+		LM_ERR("no more pkg memory left for hg\n");
+		return -1;
+	}
+
 	memset(hg, 0, sizeof(struct hep_generic_recv));
 
-	
-        memset(heptime, 0, sizeof(struct hep_timeinfo));	
-	        
+
+	memset(heptime, 0, sizeof(struct hep_timeinfo));
+
 
 	/* HEADER */
-	hg->header  = (hep_ctrl_t *) (buf);
+	hg->header = (hep_ctrl_t *)(buf);
 
 	/*Packet size */
 	total_length = ntohs(hg->header->length);
@@ -275,761 +283,796 @@ int parsing_hepv3_message(char *buf, unsigned int len) {
 	ri.src_port = 0;
 	ri.dst_port = 0;
 	dst_ip.af = 0;
-        src_ip.af = 0;
-                	        
+	src_ip.af = 0;
+
 	payload = NULL;
 	correlation_id = NULL;
 	authkey = NULL;
 
-	i = sizeof(hep_ctrl_t);	        
-	        
+	i = sizeof(hep_ctrl_t);
+
 	while(i < total_length) {
-                
-	        /*OUR TMP DATA */                                  
-                tmp = buf+i;
-
-                chunk = (struct hep_chunk*) tmp;
-                             
-                chunk_vendor = ntohs(chunk->vendor_id);                             
-                chunk_type = ntohs(chunk->type_id);
-                chunk_length = ntohs(chunk->length);
-                       
-
-
-                /* if chunk_length */
-                if(chunk_length == 0) {
-                        /* BAD LEN we drop this packet */
-                        goto error;
-                }
-
-                /* SKIP not general Chunks */
-                if(chunk_vendor != 0) {
-                        i+=chunk_length;
-                }
-                else {                                                                                                                               
-                        switch(chunk_type) {
-                                     
-                                case 0:
-                                        goto error;
-                                        break;
-                                     
-                                case 1:                                                                          
-                                        hg->ip_family  = (hep_chunk_uint8_t *) (tmp);
-                                        i+=chunk_length;
-                                        totelem++;
-                                        break;
-                                case 2:
-                                        hg->ip_proto  = (hep_chunk_uint8_t *) (tmp);
-                                        i+=chunk_length;
-                                        totelem++;
-                                        break;                                                     
-                                case 3:
-                                        hg->hep_src_ip4  = (hep_chunk_ip4_t *) (tmp);
-                                        i+=chunk_length;
-                                        src_ip.af=AF_INET;
-				        src_ip.len=4;
-				        src_ip.u.addr32[0] = hg->hep_src_ip4->data.s_addr;
-				        totelem++;
-				        break;
-                                case 4:
-                                        hg->hep_dst_ip4  = (hep_chunk_ip4_t *) (tmp);
-                                        i+=chunk_length;                                                     
-					dst_ip.af=AF_INET;
-				        dst_ip.len=4;
-				        dst_ip.u.addr32[0] = hg->hep_dst_ip4->data.s_addr;
-                                        totelem++;
-
-                                        break;
-                                case 5:
-                                        hg->hep_src_ip6  = (hep_chunk_ip6_t *) (tmp);
-                                        i+=chunk_length;
-                                        src_ip.af=AF_INET6;
-				        src_ip.len=16;
-				        memcpy(src_ip.u.addr, &hg->hep_src_ip6->data, 16);
-				        totelem++;
-                                        break;
-                                case 6:
-                                        hg->hep_dst_ip6  = (hep_chunk_ip6_t *) (tmp);
-                                        i+=chunk_length;                                                     
-                                        dst_ip.af=AF_INET6;
-				        dst_ip.len=16;
-				        memcpy(dst_ip.u.addr, &hg->hep_dst_ip6->data, 16);
-				        totelem++;
-                                        break;
-        
-                                case 7:
-                                        hg->src_port  = (hep_chunk_uint16_t *) (tmp);
-                                        ri.src_port = ntohs(hg->src_port->data);
-                                        i+=chunk_length;                      
-                                        totelem++;
-                                        break;
-
-                                case 8:
-                                        hg->dst_port  = (hep_chunk_uint16_t *) (tmp);
-                                        ri.dst_port = ntohs(hg->dst_port->data);
-                                        i+=chunk_length;
-                                        totelem++;
-                                        break;
-                                case 9:
-                                        hg->time_sec  = (hep_chunk_uint32_t *) (tmp);
-                                        heptime->tv_sec = ntohl(hg->time_sec->data);
-                                        i+=chunk_length;
-                                        totelem++;
-                                        break;
-
-                                case 10:
-                                        hg->time_usec  = (hep_chunk_uint32_t *) (tmp);
-                                        heptime->tv_usec = ntohl(hg->time_usec->data);
-                                        i+=chunk_length;
-                                        totelem++;
-                                        break;      
-
-                                case 11:
-                                        hg->proto_t  = (hep_chunk_uint8_t *) (tmp);
-                                        i+=chunk_length;
-                                        totelem++;
-                                        break;                                                                                                                                                         
-
-                                case 12:
-                                        hg->capt_id  = (hep_chunk_uint32_t *) (tmp);
-                                        heptime->captid = ntohl(hg->capt_id->data);
-                                        i+=chunk_length;
-                                        totelem++;
-                                        break;
-
-                                case 13:
-                                        hg->keep_tm  = (hep_chunk_uint16_t *) (tmp);
-                                        i+=chunk_length;
-                                        break;                                                     
-
-                                case 14:
-                                        authkey = (char *) tmp + sizeof(hep_chunk_t);
-                                        i+=chunk_length;                                                                             
-                                        break;
-                                                     
-                                case 15:
-                                        hg->payload_chunk  = (hep_chunk_t *) (tmp);
-                                        payload = (char *) tmp+sizeof(hep_chunk_t);
-                                        payload_len = chunk_length - sizeof(hep_chunk_t);
-                                        i+=chunk_length;
-                                        totelem++;
-                                        break;
-                                case 17:
-                                
-                                        correlation_id = (char *) tmp + sizeof(hep_chunk_t);
-                                        i+=chunk_length;                                                                            
+
+		/*OUR TMP DATA */
+		tmp = buf + i;
+
+		chunk = (struct hep_chunk *)tmp;
+
+		chunk_vendor = ntohs(chunk->vendor_id);
+		chunk_type = ntohs(chunk->type_id);
+		chunk_length = ntohs(chunk->length);
+
+
+		/* if chunk_length */
+		if(chunk_length == 0) {
+			/* BAD LEN we drop this packet */
+			goto error;
+		}
+
+		/* SKIP not general Chunks */
+		if(chunk_vendor != 0) {
+			i += chunk_length;
+		} else {
+			switch(chunk_type) {
+
+				case 0:
+					goto error;
+					break;
+
+				case 1:
+					hg->ip_family = (hep_chunk_uint8_t *)(tmp);
+					i += chunk_length;
+					totelem++;
 					break;
+				case 2:
+					hg->ip_proto = (hep_chunk_uint8_t *)(tmp);
+					i += chunk_length;
+					totelem++;
+					break;
+				case 3:
+					hg->hep_src_ip4 = (hep_chunk_ip4_t *)(tmp);
+					i += chunk_length;
+					src_ip.af = AF_INET;
+					src_ip.len = 4;
+					src_ip.u.addr32[0] = hg->hep_src_ip4->data.s_addr;
+					totelem++;
+					break;
+				case 4:
+					hg->hep_dst_ip4 = (hep_chunk_ip4_t *)(tmp);
+					i += chunk_length;
+					dst_ip.af = AF_INET;
+					dst_ip.len = 4;
+					dst_ip.u.addr32[0] = hg->hep_dst_ip4->data.s_addr;
+					totelem++;
 
-                                                     
-                                default:
-                                        i+=chunk_length;
-                                        break;
-                        }                                        
-                }
-        }	                                                                                                          
-                        
-        /* CHECK how much elements */
-        if(totelem < 9) {                        
-                LM_ERR("Not all elements [%d]\n", totelem);                        
-                goto done;
-        }                 
-
-        if ( dst_ip.af == 0 || src_ip.af == 0)  {
-                LM_ERR("NO IP's set\n");
-                goto done;
-        }
-
-                        
-        ip_addr2su(&to, &dst_ip, ri.dst_port);
-        ip_addr2su(&from, &src_ip, ri.src_port);
-                        
-        ri.src_su=from;
-        su2ip_addr(&ri.src_ip, &from);
-        su2ip_addr(&ri.dst_ip, &to);
-
-	if(hg->ip_proto->data == IPPROTO_TCP) ri.proto=PROTO_TCP;
-	else if(hg->ip_proto->data == IPPROTO_UDP) ri.proto=PROTO_UDP;
+					break;
+				case 5:
+					hg->hep_src_ip6 = (hep_chunk_ip6_t *)(tmp);
+					i += chunk_length;
+					src_ip.af = AF_INET6;
+					src_ip.len = 16;
+					memcpy(src_ip.u.addr, &hg->hep_src_ip6->data, 16);
+					totelem++;
+					break;
+				case 6:
+					hg->hep_dst_ip6 = (hep_chunk_ip6_t *)(tmp);
+					i += chunk_length;
+					dst_ip.af = AF_INET6;
+					dst_ip.len = 16;
+					memcpy(dst_ip.u.addr, &hg->hep_dst_ip6->data, 16);
+					totelem++;
+					break;
+
+				case 7:
+					hg->src_port = (hep_chunk_uint16_t *)(tmp);
+					ri.src_port = ntohs(hg->src_port->data);
+					i += chunk_length;
+					totelem++;
+					break;
+
+				case 8:
+					hg->dst_port = (hep_chunk_uint16_t *)(tmp);
+					ri.dst_port = ntohs(hg->dst_port->data);
+					i += chunk_length;
+					totelem++;
+					break;
+				case 9:
+					hg->time_sec = (hep_chunk_uint32_t *)(tmp);
+					heptime->tv_sec = ntohl(hg->time_sec->data);
+					i += chunk_length;
+					totelem++;
+					break;
+
+				case 10:
+					hg->time_usec = (hep_chunk_uint32_t *)(tmp);
+					heptime->tv_usec = ntohl(hg->time_usec->data);
+					i += chunk_length;
+					totelem++;
+					break;
+
+				case 11:
+					hg->proto_t = (hep_chunk_uint8_t *)(tmp);
+					i += chunk_length;
+					totelem++;
+					break;
+
+				case 12:
+					hg->capt_id = (hep_chunk_uint32_t *)(tmp);
+					heptime->captid = ntohl(hg->capt_id->data);
+					i += chunk_length;
+					totelem++;
+					break;
+
+				case 13:
+					hg->keep_tm = (hep_chunk_uint16_t *)(tmp);
+					i += chunk_length;
+					break;
+
+				case 14:
+					authkey = (char *)tmp + sizeof(hep_chunk_t);
+					i += chunk_length;
+					break;
+
+				case 15:
+					hg->payload_chunk = (hep_chunk_t *)(tmp);
+					payload = (char *)tmp + sizeof(hep_chunk_t);
+					payload_len = chunk_length - sizeof(hep_chunk_t);
+					i += chunk_length;
+					totelem++;
+					break;
+				case 17:
+
+					correlation_id = (char *)tmp + sizeof(hep_chunk_t);
+					i += chunk_length;
+					break;
+
+
+				default:
+					i += chunk_length;
+					break;
+			}
+		}
+	}
+
+	/* CHECK how much elements */
+	if(totelem < 9) {
+		LM_ERR("Not all elements [%d]\n", totelem);
+		goto done;
+	}
+
+	if(dst_ip.af == 0 || src_ip.af == 0) {
+		LM_ERR("NO IP's set\n");
+		goto done;
+	}
+
+
+	ip_addr2su(&to, &dst_ip, ri.dst_port);
+	ip_addr2su(&from, &src_ip, ri.src_port);
+
+	ri.src_su = from;
+	su2ip_addr(&ri.src_ip, &from);
+	su2ip_addr(&ri.dst_ip, &to);
+
+	if(hg->ip_proto->data == IPPROTO_TCP)
+		ri.proto = PROTO_TCP;
+	else if(hg->ip_proto->data == IPPROTO_UDP)
+		ri.proto = PROTO_UDP;
 
 	/* a little bit memory */
-        si=(struct socket_info*) pkg_malloc(sizeof(struct socket_info));
-        if (si==0) {
-                LOG(L_ERR, "ERROR: new_sock_info: memory allocation error\n");
-                goto error;
-        }
+	si = (struct socket_info *)pkg_malloc(sizeof(struct socket_info));
+	if(si == 0) {
+		LOG(L_ERR, "ERROR: new_sock_info: memory allocation error\n");
+		goto error;
+	}
 
 	memset(si, 0, sizeof(struct socket_info));
-        si->address = ri.dst_ip;
-        si->socket=-1;
-
-        /* set port & proto */
-        si->port_no = ri.dst_port;
+	si->address = ri.dst_ip;
+	si->socket = -1;
 
-        if(hg->ip_proto->data == IPPROTO_TCP) si->proto=PROTO_TCP;
-        else if(hg->ip_proto->data == IPPROTO_UDP) si->proto=PROTO_UDP;
+	/* set port & proto */
+	si->port_no = ri.dst_port;
 
-        si->flags=0;
-        si->addr_info_lst=0;
+	if(hg->ip_proto->data == IPPROTO_TCP)
+		si->proto = PROTO_TCP;
+	else if(hg->ip_proto->data == IPPROTO_UDP)
+		si->proto = PROTO_UDP;
 
-        si->address_str.s = ip_addr2a(&si->address);;
-        si->address_str.len = strlen(si->address_str.s);                                                
+	si->flags = 0;
+	si->addr_info_lst = 0;
 
-        si->port_no_str.s = int2str(si->port_no, &tmp_len);
-        si->port_no_str.len = tmp_len;
+	si->address_str.s = ip_addr2a(&si->address);
+	;
 	si->address_str.len = strlen(si->address_str.s);
 
-        si->name.len = si->address_str.len;
-        si->name.s = si->address_str.s;
-        ri.bind_address=si;
+	si->port_no_str.s = int2str(si->port_no, &tmp_len);
+	si->port_no_str.len = tmp_len;
+	si->address_str.len = strlen(si->address_str.s);
 
-        if(payload != NULL ) {
-                /* and now recieve message */
-                if (hg->proto_t->data == 5) receive_logging_json_msg(payload, payload_len, hg, "rtcp_capture");
-                else if (hg->proto_t->data == 32) receive_logging_json_msg(payload, payload_len, hg, "report_capture");
-                else if (hg->proto_t->data == 99) receive_logging_json_msg(payload, payload_len, hg, "report_capture");
-                else if (hg->proto_t->data == 100) receive_logging_json_msg(payload, payload_len, hg, "logs_capture");
-                else receive_msg(payload, payload_len, &ri);
-        }
+	si->name.len = si->address_str.len;
+	si->name.s = si->address_str.s;
+	ri.bind_address = si;
+
+	if(payload != NULL) {
+		/* and now recieve message */
+		if(hg->proto_t->data == 5)
+			receive_logging_json_msg(payload, payload_len, hg, "rtcp_capture");
+		else if(hg->proto_t->data == 32)
+			receive_logging_json_msg(
+					payload, payload_len, hg, "report_capture");
+		else if(hg->proto_t->data == 99)
+			receive_logging_json_msg(
+					payload, payload_len, hg, "report_capture");
+		else if(hg->proto_t->data == 100)
+			receive_logging_json_msg(payload, payload_len, hg, "logs_capture");
+		else
+			receive_msg(payload, payload_len, &ri);
+	}
 
 done:
-        if(si) pkg_free(si);
-        if(hg) pkg_free(hg);                     
+	if(si)
+		pkg_free(si);
+	if(hg)
+		pkg_free(hg);
+
+	return 1;
 
-        return 1;
-        
 error:
 
-        if(si) pkg_free(si);
-        if(hg) pkg_free(hg);
-                
-        return -1;           
-        
+	if(si)
+		pkg_free(si);
+	if(hg)
+		pkg_free(hg);
+
+	return -1;
 }
 
 
-int hepv3_message_parse(char *buf, unsigned int len, sip_msg_t* msg) {
+int hepv3_message_parse(char *buf, unsigned int len, sip_msg_t *msg)
+{
 
 	union sockaddr_union from;
 	union sockaddr_union to;
 	char *tmp;
 	struct ip_addr dst_ip, src_ip;
-	struct socket_info* si = 0;
+	struct socket_info *si = 0;
 	int i;
 	char *payload = NULL;
 	unsigned int payload_len = 0;
-        struct hep_chunk *chunk;	
-        struct hep_generic_recv *hg;
-        int totelem = 0;
-        int chunk_vendor=0, chunk_type=0, chunk_length=0;
-        int total_length = 0;
-        int ret = 0;
-        
-	hg = (struct hep_generic_recv*)pkg_malloc(sizeof(struct hep_generic_recv));
-	if(hg==NULL) {
-	        LM_ERR("no more pkg memory left for hg\n");
-	        return -1;
-        }
-	                                                 		
+	struct hep_chunk *chunk;
+	struct hep_generic_recv *hg;
+	int totelem = 0;
+	int chunk_vendor = 0, chunk_type = 0, chunk_length = 0;
+	int total_length = 0;
+	int ret = 0;
+
+	hg = (struct hep_generic_recv *)pkg_malloc(sizeof(struct hep_generic_recv));
+	if(hg == NULL) {
+		LM_ERR("no more pkg memory left for hg\n");
+		return -1;
+	}
+
 	memset(hg, 0, sizeof(struct hep_generic_recv));
 
-	
-        memset(heptime, 0, sizeof(struct hep_timeinfo));	
-	        
+
+	memset(heptime, 0, sizeof(struct hep_timeinfo));
+
 
 	/* HEADER */
-	hg->header  = (hep_ctrl_t *) (buf);
+	hg->header = (hep_ctrl_t *)(buf);
 
 	/*Packet size */
 	total_length = ntohs(hg->header->length);
 
 	dst_ip.af = 0;
-        src_ip.af = 0;
-                	        
+	src_ip.af = 0;
+
 	payload = NULL;
 	correlation_id = NULL;
 	authkey = NULL;
 
-	i = sizeof(hep_ctrl_t);	        
-	        
+	i = sizeof(hep_ctrl_t);
+
 	while(i < total_length) {
-                
-	        /*OUR TMP DATA */                                  
-                tmp = buf+i;
-
-                chunk = (struct hep_chunk*) tmp;
-                             
-                chunk_vendor = ntohs(chunk->vendor_id);                             
-                chunk_type = ntohs(chunk->type_id);
-                chunk_length = ntohs(chunk->length);
-                       
-                /* if chunk_length */
-                if(chunk_length == 0) {
-                        /* BAD LEN we drop this packet */
-                        goto error;
-                }
-
-                /* SKIP not general Chunks */
-                if(chunk_vendor != 0) {
-                        i+=chunk_length;
-                }
-                else {                                                                                                                               
-                        switch(chunk_type) {
-                                     
-                                case 0:
-                                        goto error;
-                                        break;
-                                     
-                                case 1:                                                                          
-                                        hg->ip_family  = (hep_chunk_uint8_t *) (tmp);
-                                        i+=chunk_length;
-                                        totelem++;
-                                        break;
-                                case 2:
-                                        hg->ip_proto  = (hep_chunk_uint8_t *) (tmp);
-                                        i+=chunk_length;
-                                        totelem++;
-                                        break;                                                     
-                                case 3:
-                                        hg->hep_src_ip4  = (hep_chunk_ip4_t *) (tmp);
-                                        i+=chunk_length;
-                                        src_ip.af=AF_INET;
-				        src_ip.len=4;
-				        src_ip.u.addr32[0] = hg->hep_src_ip4->data.s_addr;
-				        totelem++;
-				        break;
-                                case 4:
-                                        hg->hep_dst_ip4  = (hep_chunk_ip4_t *) (tmp);
-                                        i+=chunk_length;                                                     
-					dst_ip.af=AF_INET;
-				        dst_ip.len=4;
-				        dst_ip.u.addr32[0] = hg->hep_dst_ip4->data.s_addr;
-                                        totelem++;
-
-                                        break;
-                                case 5:
-                                        hg->hep_src_ip6  = (hep_chunk_ip6_t *) (tmp);
-                                        i+=chunk_length;
-                                        src_ip.af=AF_INET6;
-				        src_ip.len=16;
-				        memcpy(src_ip.u.addr, &hg->hep_src_ip6->data, 16);
-				        totelem++;
-                                        break;
-                                case 6:
-                                        hg->hep_dst_ip6  = (hep_chunk_ip6_t *) (tmp);
-                                        i+=chunk_length;                                                     
-                                        dst_ip.af=AF_INET6;
-				        dst_ip.len=16;
-				        memcpy(dst_ip.u.addr, &hg->hep_dst_ip6->data, 16);
-				        totelem++;
-                                        break;
-        
-                                case 7:
-                                        hg->src_port  = (hep_chunk_uint16_t *) (tmp);
-                                        msg->rcv.src_port = ntohs(hg->src_port->data);
-                                        i+=chunk_length;                      
-                                        totelem++;
-                                        break;
-
-                                case 8:
-                                        hg->dst_port  = (hep_chunk_uint16_t *) (tmp);
-                                        msg->rcv.dst_port = ntohs(hg->dst_port->data);
-                                        i+=chunk_length;
-                                        totelem++;
-                                        break;
-                                case 9:
-                                        hg->time_sec  = (hep_chunk_uint32_t *) (tmp);
-                                        heptime->tv_sec = ntohl(hg->time_sec->data);
-                                        i+=chunk_length;
-                                        totelem++;
-                                        break;
-
-                                case 10:
-                                        hg->time_usec  = (hep_chunk_uint32_t *) (tmp);
-                                        heptime->tv_usec = ntohl(hg->time_usec->data);
-                                        i+=chunk_length;
-                                        totelem++;
-                                        break;
-
-                                case 11:
-                                        hg->proto_t  = (hep_chunk_uint8_t *) (tmp);
-                                        i+=chunk_length;
-                                        totelem++;
-                                        break;                                                                                                                                                         
-
-                                case 12:
-                                        hg->capt_id  = (hep_chunk_uint32_t *) (tmp);
-                                        i+=chunk_length;
-                                        heptime->captid = ntohl(hg->capt_id->data);
-                                        totelem++;
-                                        break;
-
-                                case 13:
-                                        hg->keep_tm  = (hep_chunk_uint16_t *) (tmp);
-                                        i+=chunk_length;
-                                        break;                                                     
-
-                                case 14:
-                                        authkey = (char *) tmp + sizeof(hep_chunk_t);
-                                        i+=chunk_length;                                                                             
-                                        break;
-                                                     
-                                case 15:
-                                        hg->payload_chunk  = (hep_chunk_t *) (tmp);
-                                        payload = (char *) tmp+sizeof(hep_chunk_t);
-                                        payload_len = chunk_length - sizeof(hep_chunk_t);
-                                        i+=chunk_length;
-                                        totelem++;
-                                        break;
-                                case 17:
-                                
-                                        correlation_id = (char *) tmp + sizeof(hep_chunk_t);
-                                        i+=chunk_length;                                                                            
+
+		/*OUR TMP DATA */
+		tmp = buf + i;
+
+		chunk = (struct hep_chunk *)tmp;
+
+		chunk_vendor = ntohs(chunk->vendor_id);
+		chunk_type = ntohs(chunk->type_id);
+		chunk_length = ntohs(chunk->length);
+
+		/* if chunk_length */
+		if(chunk_length == 0) {
+			/* BAD LEN we drop this packet */
+			goto error;
+		}
+
+		/* SKIP not general Chunks */
+		if(chunk_vendor != 0) {
+			i += chunk_length;
+		} else {
+			switch(chunk_type) {
+
+				case 0:
+					goto error;
+					break;
+
+				case 1:
+					hg->ip_family = (hep_chunk_uint8_t *)(tmp);
+					i += chunk_length;
+					totelem++;
+					break;
+				case 2:
+					hg->ip_proto = (hep_chunk_uint8_t *)(tmp);
+					i += chunk_length;
+					totelem++;
+					break;
+				case 3:
+					hg->hep_src_ip4 = (hep_chunk_ip4_t *)(tmp);
+					i += chunk_length;
+					src_ip.af = AF_INET;
+					src_ip.len = 4;
+					src_ip.u.addr32[0] = hg->hep_src_ip4->data.s_addr;
+					totelem++;
+					break;
+				case 4:
+					hg->hep_dst_ip4 = (hep_chunk_ip4_t *)(tmp);
+					i += chunk_length;
+					dst_ip.af = AF_INET;
+					dst_ip.len = 4;
+					dst_ip.u.addr32[0] = hg->hep_dst_ip4->data.s_addr;
+					totelem++;
+
+					break;
+				case 5:
+					hg->hep_src_ip6 = (hep_chunk_ip6_t *)(tmp);
+					i += chunk_length;
+					src_ip.af = AF_INET6;
+					src_ip.len = 16;
+					memcpy(src_ip.u.addr, &hg->hep_src_ip6->data, 16);
+					totelem++;
+					break;
+				case 6:
+					hg->hep_dst_ip6 = (hep_chunk_ip6_t *)(tmp);
+					i += chunk_length;
+					dst_ip.af = AF_INET6;
+					dst_ip.len = 16;
+					memcpy(dst_ip.u.addr, &hg->hep_dst_ip6->data, 16);
+					totelem++;
+					break;
+
+				case 7:
+					hg->src_port = (hep_chunk_uint16_t *)(tmp);
+					msg->rcv.src_port = ntohs(hg->src_port->data);
+					i += chunk_length;
+					totelem++;
+					break;
+
+				case 8:
+					hg->dst_port = (hep_chunk_uint16_t *)(tmp);
+					msg->rcv.dst_port = ntohs(hg->dst_port->data);
+					i += chunk_length;
+					totelem++;
+					break;
+				case 9:
+					hg->time_sec = (hep_chunk_uint32_t *)(tmp);
+					heptime->tv_sec = ntohl(hg->time_sec->data);
+					i += chunk_length;
+					totelem++;
+					break;
+
+				case 10:
+					hg->time_usec = (hep_chunk_uint32_t *)(tmp);
+					heptime->tv_usec = ntohl(hg->time_usec->data);
+					i += chunk_length;
+					totelem++;
+					break;
+
+				case 11:
+					hg->proto_t = (hep_chunk_uint8_t *)(tmp);
+					i += chunk_length;
+					totelem++;
+					break;
+
+				case 12:
+					hg->capt_id = (hep_chunk_uint32_t *)(tmp);
+					i += chunk_length;
+					heptime->captid = ntohl(hg->capt_id->data);
+					totelem++;
+					break;
+
+				case 13:
+					hg->keep_tm = (hep_chunk_uint16_t *)(tmp);
+					i += chunk_length;
+					break;
+
+				case 14:
+					authkey = (char *)tmp + sizeof(hep_chunk_t);
+					i += chunk_length;
+					break;
+
+				case 15:
+					hg->payload_chunk = (hep_chunk_t *)(tmp);
+					payload = (char *)tmp + sizeof(hep_chunk_t);
+					payload_len = chunk_length - sizeof(hep_chunk_t);
+					i += chunk_length;
+					totelem++;
+					break;
+				case 17:
+
+					correlation_id = (char *)tmp + sizeof(hep_chunk_t);
+					i += chunk_length;
 					break;
 
-                                                     
-                                default:
-                                        i+=chunk_length;
-                                        break;
-                        }                                        
-                }
-        }	                                                                                                          
-                        
-        /* CHECK how much elements */
-        if(totelem < 9) {                        
-                LM_ERR("Not all elements [%d]\n", totelem);                        
-                goto done;
-        }                 
 
-        if ( dst_ip.af == 0 || src_ip.af == 0)  {
-                LM_ERR("NO IP's set\n");
-                goto done;
-        }
+				default:
+					i += chunk_length;
+					break;
+			}
+		}
+	}
 
-                        
-        ip_addr2su(&to, &dst_ip, msg->rcv.dst_port);
-        ip_addr2su(&from, &src_ip, msg->rcv.src_port);
-                        
-        msg->rcv.src_su=from;
-        su2ip_addr(&msg->rcv.src_ip, &from);
-        su2ip_addr(&msg->rcv.dst_ip, &to);
+	/* CHECK how much elements */
+	if(totelem < 9) {
+		LM_ERR("Not all elements [%d]\n", totelem);
+		goto done;
+	}
 
-	if(hg->ip_proto->data == IPPROTO_TCP) msg->rcv.proto=PROTO_TCP;
-	else if(hg->ip_proto->data == IPPROTO_UDP) msg->rcv.proto=PROTO_UDP;
+	if(dst_ip.af == 0 || src_ip.af == 0) {
+		LM_ERR("NO IP's set\n");
+		goto done;
+	}
 
-        if(payload != NULL) ret = len - payload_len;
 
+	ip_addr2su(&to, &dst_ip, msg->rcv.dst_port);
+	ip_addr2su(&from, &src_ip, msg->rcv.src_port);
 
+	msg->rcv.src_su = from;
+	su2ip_addr(&msg->rcv.src_ip, &from);
+	su2ip_addr(&msg->rcv.dst_ip, &to);
 
+	if(hg->ip_proto->data == IPPROTO_TCP)
+		msg->rcv.proto = PROTO_TCP;
+	else if(hg->ip_proto->data == IPPROTO_UDP)
+		msg->rcv.proto = PROTO_UDP;
 
+	if(payload != NULL)
+		ret = len - payload_len;
 
 
 done:
-          
-        //if(si) pkg_free(si);
-        if(hg) pkg_free(hg);                     
 
-        return ret;
-        
+	//if(si) pkg_free(si);
+	if(hg)
+		pkg_free(hg);
+
+	return ret;
+
 error:
 
-        if(si) pkg_free(si);
-        if(hg) pkg_free(hg);
-                
-        return -1;           
-        
+	if(si)
+		pkg_free(si);
+	if(hg)
+		pkg_free(hg);
+
+	return -1;
 }
 
-int hepv2_message_parse(char *buf, unsigned int len, sip_msg_t* msg) {
+int hepv2_message_parse(char *buf, unsigned int len, sip_msg_t *msg)
+{
 
 	int hl;
-        struct hep_hdr *heph;
-        struct ip_addr dst_ip, src_ip;
-        char *hep_payload, *end, *hep_ip;
-        struct hep_iphdr *hepiph = NULL;
+	struct hep_hdr *heph;
+	struct ip_addr dst_ip, src_ip;
+	char *hep_payload, *end, *hep_ip;
+	struct hep_iphdr *hepiph = NULL;
 
-	struct hep_timehdr* heptime_tmp = NULL;
-        memset(heptime, 0, sizeof(struct hep_timeinfo));
+	struct hep_timehdr *heptime_tmp = NULL;
+	memset(heptime, 0, sizeof(struct hep_timeinfo));
+
+	struct hep_ip6hdr *hepip6h = NULL;
 
-        struct hep_ip6hdr *hepip6h = NULL;
-            	        
 	correlation_id = NULL;
 	authkey = NULL;
 
-	hep_offset = 0; 
-	
+	hep_offset = 0;
+
 	hl = hep_offset = sizeof(struct hep_hdr);
-        end = buf + len;
-        if (unlikely(len<hep_offset)) {
-        	LOG(L_ERR, "ERROR: sipcapture:hep_msg_received len less than offset [%i] vs [%i]\n", len, hep_offset);
-                return -1;
-        }
+	end = buf + len;
+	if(unlikely(len < hep_offset)) {
+		LOG(L_ERR, "ERROR: sipcapture:hep_msg_received len less than offset "
+				   "[%i] vs [%i]\n",
+				len, hep_offset);
+		return -1;
+	}
 
 	/* hep_hdr */
-        heph = (struct hep_hdr*) buf;
+	heph = (struct hep_hdr *)buf;
 
-        switch(heph->hp_f){
-        	case AF_INET:
-                	hl += sizeof(struct hep_iphdr);
-                        break;
+	switch(heph->hp_f) {
+		case AF_INET:
+			hl += sizeof(struct hep_iphdr);
+			break;
 		case AF_INET6:
-                	hl += sizeof(struct hep_ip6hdr);
-                        break;
+			hl += sizeof(struct hep_ip6hdr);
+			break;
 		default:
-                        LOG(L_ERR, "ERROR: sipcapture:hep_msg_received:  unsupported family [%d]\n", heph->hp_f);
-                        return -1;
+			LOG(L_ERR, "ERROR: sipcapture:hep_msg_received:  unsupported "
+					   "family [%d]\n",
+					heph->hp_f);
+			return -1;
 	}
 
-        /* PROTO */
-        if(heph->hp_p == IPPROTO_UDP) msg->rcv.proto=PROTO_UDP;
-        else if(heph->hp_p == IPPROTO_TCP) msg->rcv.proto=PROTO_TCP;
-        else if(heph->hp_p == IPPROTO_IDP) msg->rcv.proto=PROTO_TLS; /* fake protocol */
+	/* PROTO */
+	if(heph->hp_p == IPPROTO_UDP)
+		msg->rcv.proto = PROTO_UDP;
+	else if(heph->hp_p == IPPROTO_TCP)
+		msg->rcv.proto = PROTO_TCP;
+	else if(heph->hp_p == IPPROTO_IDP)
+		msg->rcv.proto = PROTO_TLS; /* fake protocol */
 #ifdef USE_SCTP
-        else if(heph->hp_p == IPPROTO_SCTP) msg->rcv.proto=PROTO_SCTP;
+	else if(heph->hp_p == IPPROTO_SCTP)
+		msg->rcv.proto = PROTO_SCTP;
 #endif
-        else {
-        	LOG(L_ERR, "ERROR: sipcapture:hep_msg_received: unknown protocol [%d]\n",heph->hp_p);
-                msg->rcv.proto = PROTO_NONE;
+	else {
+		LOG(L_ERR,
+				"ERROR: sipcapture:hep_msg_received: unknown protocol [%d]\n",
+				heph->hp_p);
+		msg->rcv.proto = PROTO_NONE;
 	}
 
-        hep_ip = buf + sizeof(struct hep_hdr);
+	hep_ip = buf + sizeof(struct hep_hdr);
 
-        if (unlikely(hep_ip>end)){
-                LOG(L_ERR,"hep_ip is over buf+len\n");
-                return -1;
-        }
+	if(unlikely(hep_ip > end)) {
+		LOG(L_ERR, "hep_ip is over buf+len\n");
+		return -1;
+	}
 
-	switch(heph->hp_f){
+	switch(heph->hp_f) {
 		case AF_INET:
-                	hep_offset+=sizeof(struct hep_iphdr);
-                        hepiph = (struct hep_iphdr*) hep_ip;
-                        break;
+			hep_offset += sizeof(struct hep_iphdr);
+			hepiph = (struct hep_iphdr *)hep_ip;
+			break;
 
 		case AF_INET6:
-                	hep_offset+=sizeof(struct hep_ip6hdr);
-                        hepip6h = (struct hep_ip6hdr*) hep_ip;
-                        break;
-
+			hep_offset += sizeof(struct hep_ip6hdr);
+			hepip6h = (struct hep_ip6hdr *)hep_ip;
+			break;
 	}
 
 	/* VOIP payload */
-        hep_payload = buf + hep_offset;
+	hep_payload = buf + hep_offset;
 
-        if (unlikely(hep_payload>end)){
-        	LOG(L_ERR,"hep_payload is over buf+len\n");
-                return -1;
+	if(unlikely(hep_payload > end)) {
+		LOG(L_ERR, "hep_payload is over buf+len\n");
+		return -1;
 	}
 
 	/* timming */
-        if(heph->hp_v == 2) {
-                hep_offset+=sizeof(struct hep_timehdr);
-                heptime_tmp = (struct hep_timehdr*) hep_payload;
+	if(heph->hp_v == 2) {
+		hep_offset += sizeof(struct hep_timehdr);
+		heptime_tmp = (struct hep_timehdr *)hep_payload;
 
-                heptime->tv_sec = to_le(heptime_tmp->tv_sec);
-                heptime->tv_usec = to_le(heptime_tmp->tv_usec);
-                heptime->captid = heptime_tmp->captid;
-        }
+		heptime->tv_sec = to_le(heptime_tmp->tv_sec);
+		heptime->tv_usec = to_le(heptime_tmp->tv_usec);
+		heptime->captid = heptime_tmp->captid;
+	}
 
 
 	/* fill ip from the packet to dst_ip && to */
-        switch(heph->hp_f){
+	switch(heph->hp_f) {
 
 		case AF_INET:
-                	dst_ip.af = src_ip.af = AF_INET;
-                        dst_ip.len = src_ip.len = 4 ;
-                        memcpy(&dst_ip.u.addr, &hepiph->hp_dst, 4);
-                        memcpy(&src_ip.u.addr, &hepiph->hp_src, 4);
-                        break;
+			dst_ip.af = src_ip.af = AF_INET;
+			dst_ip.len = src_ip.len = 4;
+			memcpy(&dst_ip.u.addr, &hepiph->hp_dst, 4);
+			memcpy(&src_ip.u.addr, &hepiph->hp_src, 4);
+			break;
 
 		case AF_INET6:
-                	dst_ip.af = src_ip.af = AF_INET6;
-                        dst_ip.len = src_ip.len = 16 ;
-                        memcpy(&dst_ip.u.addr, &hepip6h->hp6_dst, 16);
-                        memcpy(&src_ip.u.addr, &hepip6h->hp6_src, 16);
-                        break;
-
+			dst_ip.af = src_ip.af = AF_INET6;
+			dst_ip.len = src_ip.len = 16;
+			memcpy(&dst_ip.u.addr, &hepip6h->hp6_dst, 16);
+			memcpy(&src_ip.u.addr, &hepip6h->hp6_src, 16);
+			break;
 	}
 
-        msg->rcv.src_ip = src_ip;
-        msg->rcv.src_port = ntohs(heph->hp_sport);
+	msg->rcv.src_ip = src_ip;
+	msg->rcv.src_port = ntohs(heph->hp_sport);
 
-        msg->rcv.dst_ip = dst_ip;
-        msg->rcv.dst_port = ntohs(heph->hp_dport);
+	msg->rcv.dst_ip = dst_ip;
+	msg->rcv.dst_port = ntohs(heph->hp_dport);
 
 	return hep_offset;
 }
 
 
-int hepv3_get_chunk(struct sip_msg *msg, char *buf, unsigned int len, int req_chunk, pv_param_t *param, pv_value_t *res) {
+int hepv3_get_chunk(struct sip_msg *msg, char *buf, unsigned int len,
+		int req_chunk, pv_param_t *param, pv_value_t *res)
+{
 
 	str tmpstr;
 	char *tmp;
 	int i;
-        struct hep_chunk *chunk;	
-        struct hep_generic_recv *hg;
-        int chunk_vendor=0, chunk_type=0, chunk_length=0;
-        int total_length = 0;
-        int ret = 0;
-        static char ipstr[INET6_ADDRSTRLEN];
-
-        if(memcmp(buf, "\x48\x45\x50\x33",4) && !memcmp(buf, "\x45\x45\x50\x31",4)) {
-        
-                LM_ERR("not hep 3 protocol");
-                pv_get_uintval(msg, param, res, -1);
-                return -1;        
-        }
-        
-	hg = (struct hep_generic_recv*)pkg_malloc(sizeof(struct hep_generic_recv));
-	if(hg==NULL) {
-	        LM_ERR("no more pkg memory left for hg\n");
-	        return -1;
-        }
-	                                                 		
+	struct hep_chunk *chunk;
+	struct hep_generic_recv *hg;
+	int chunk_vendor = 0, chunk_type = 0, chunk_length = 0;
+	int total_length = 0;
+	int ret = 0;
+	static char ipstr[INET6_ADDRSTRLEN];
+
+	if(memcmp(buf, "\x48\x45\x50\x33", 4)
+			&& !memcmp(buf, "\x45\x45\x50\x31", 4)) {
+
+		LM_ERR("not hep 3 protocol");
+		pv_get_uintval(msg, param, res, -1);
+		return -1;
+	}
+
+	hg = (struct hep_generic_recv *)pkg_malloc(sizeof(struct hep_generic_recv));
+	if(hg == NULL) {
+		LM_ERR("no more pkg memory left for hg\n");
+		return -1;
+	}
+
 	memset(hg, 0, sizeof(struct hep_generic_recv));
-	
+
 	/* HEADER */
-	hg->header  = (hep_ctrl_t *) (buf);
+	hg->header = (hep_ctrl_t *)(buf);
 
 	/*Packet size */
 	total_length = ntohs(hg->header->length);
 
-	i = sizeof(hep_ctrl_t);	        
-	        
+	i = sizeof(hep_ctrl_t);
+
 	while(i < total_length) {
-                
-	        /*OUR TMP DATA */                                  
-                tmp = buf+i;
-
-                chunk = (struct hep_chunk*) tmp;
-                             
-                chunk_vendor = ntohs(chunk->vendor_id);                             
-                chunk_type = ntohs(chunk->type_id);
-                chunk_length = ntohs(chunk->length);
-                       
-                /* if chunk_length */
-                if(chunk_length == 0) {
-                        /* BAD LEN we drop this packet */
-                        goto error;
-                }
-
-                /* SKIP not general Chunks */
-                if(chunk_vendor != 0) {
-                        i+=chunk_length;
-                }
-                else {                 
-                        if(chunk_type != req_chunk)
-                        {
-                                i+=chunk_length;
-                                continue;                        
-                        }              
-                                                                                                                              
-                        switch(chunk_type) {
-                                     
-                                case 0:
-                                        goto error;
-                                        break;
-                                     
-                                case 1:                                                                          
-                                        hg->ip_family  = (hep_chunk_uint8_t *) (tmp);
-                                        ret = pv_get_uintval(msg, param, res, hg->ip_family->data);
-                                        goto done;
-                                case 2:
-                                        hg->ip_proto  = (hep_chunk_uint8_t *) (tmp);
-                                        ret = pv_get_uintval(msg, param, res, hg->ip_proto->data);
-                                        goto done;
-                                case 3:
-                                        hg->hep_src_ip4  = (hep_chunk_ip4_t *) (tmp);
-                                        inet_ntop(AF_INET, &(hg->hep_src_ip4->data), ipstr, INET_ADDRSTRLEN);
-                                        tmpstr.s = ipstr;
-                                        tmpstr.len = strlen(ipstr);
-                                        ret = pv_get_strval(msg, param, res, &tmpstr);
-                                        goto done;
-                                case 4:
-                                        hg->hep_dst_ip4  = (hep_chunk_ip4_t *) (tmp);
-                                        inet_ntop(AF_INET, &(hg->hep_dst_ip4->data), ipstr, INET_ADDRSTRLEN);
-                                        tmpstr.s = ipstr;
-                                        tmpstr.len = strlen(ipstr);
-                                        ret = pv_get_strval(msg, param, res, &tmpstr);
-                                        goto done;
-                                case 5:
-                                        hg->hep_src_ip6  = (hep_chunk_ip6_t *) (tmp);
-                                        inet_ntop(AF_INET6, &(hg->hep_src_ip6->data), ipstr, INET6_ADDRSTRLEN);                                                        
-                                        tmpstr.s = ipstr;
-                                        tmpstr.len = strlen(ipstr);
-                                        ret = pv_get_strval(msg, param, res, &tmpstr);
-                                        goto done;                                                                                
-                                case 6:
-                                        hg->hep_dst_ip6  = (hep_chunk_ip6_t *) (tmp);
-                                        inet_ntop(AF_INET6, &(hg->hep_dst_ip6->data), ipstr, INET6_ADDRSTRLEN);                                                        
-                                        tmpstr.s = ipstr;
-                                        tmpstr.len = strlen(ipstr);
-                                        ret = pv_get_strval(msg, param, res, &tmpstr);
-                                        goto done;
-                                case 7:
-                                        hg->src_port  = (hep_chunk_uint16_t *) (tmp);
-                                        ret = pv_get_uintval(msg, param, res, ntohs(hg->src_port->data));
-                                        goto done;
-                                case 8:
-                                        hg->dst_port  = (hep_chunk_uint16_t *) (tmp);
-                                        ret = pv_get_uintval(msg, param, res, ntohs(hg->dst_port->data));
-                                        goto done;
-                                case 9:
-                                        hg->time_sec  = (hep_chunk_uint32_t *) (tmp);
-                                        ret = pv_get_uintval(msg, param, res, ntohl(hg->time_sec->data));
-                                        goto done;
-
-                                case 10:
-                                        hg->time_usec  = (hep_chunk_uint32_t *) (tmp);
-                                        ret = pv_get_uintval(msg, param, res, ntohl(hg->time_usec->data));
-                                        goto done;
-
-                                case 11:
-                                        hg->proto_t  = (hep_chunk_uint8_t *) (tmp);
-                                        ret = pv_get_uintval(msg, param, res, hg->proto_t->data);
-                                        goto done;
-
-                                case 12:
-                                        hg->capt_id  = (hep_chunk_uint32_t *) (tmp);
-                                        ret = pv_get_uintval(msg, param, res, ntohl(hg->capt_id->data));
-                                        goto done;
-
-                                case 13:
-                                        hg->keep_tm  = (hep_chunk_uint16_t *) (tmp);
-                                        ret = pv_get_uintval(msg, param, res, ntohs(hg->keep_tm->data));
-                                        goto done;
-
-                                case 14:
-                                        tmpstr.s = (char *) tmp + sizeof(hep_chunk_t);
-                                        tmpstr.len = chunk_length - sizeof(hep_chunk_t); 
-                                        ret = pv_get_strval(msg, param, res, &tmpstr);
-                                        goto done;
-                                                     
-                                case 15:
-                                        hg->payload_chunk  = (hep_chunk_t *) (tmp);
-                                        tmpstr.s = (char *) tmp+sizeof(hep_chunk_t);
-                                        tmpstr.len = chunk_length - sizeof(hep_chunk_t);
-                                        ret = pv_get_strval(msg, param, res, &tmpstr);
-                                        goto done;
-                                case 17:                                        
-                                        tmpstr.s = (char *) tmp + sizeof(hep_chunk_t);
-                                        tmpstr.len = chunk_length - sizeof(hep_chunk_t); 
-                                        ret = pv_get_strval(msg, param, res, &tmpstr);                                                                                 
-                                        goto done;
-                                default:
-                                        ret = pv_get_uintval(msg, param, res, -1);
-                                        goto done;                                        
-                        }                                        
-                }
-        }	                                                                                                          
+
+		/*OUR TMP DATA */
+		tmp = buf + i;
+
+		chunk = (struct hep_chunk *)tmp;
+
+		chunk_vendor = ntohs(chunk->vendor_id);
+		chunk_type = ntohs(chunk->type_id);
+		chunk_length = ntohs(chunk->length);
+
+		/* if chunk_length */
+		if(chunk_length == 0) {
+			/* BAD LEN we drop this packet */
+			goto error;
+		}
+
+		/* SKIP not general Chunks */
+		if(chunk_vendor != 0) {
+			i += chunk_length;
+		} else {
+			if(chunk_type != req_chunk) {
+				i += chunk_length;
+				continue;
+			}
+
+			switch(chunk_type) {
+
+				case 0:
+					goto error;
+					break;
+
+				case 1:
+					hg->ip_family = (hep_chunk_uint8_t *)(tmp);
+					ret = pv_get_uintval(msg, param, res, hg->ip_family->data);
+					goto done;
+				case 2:
+					hg->ip_proto = (hep_chunk_uint8_t *)(tmp);
+					ret = pv_get_uintval(msg, param, res, hg->ip_proto->data);
+					goto done;
+				case 3:
+					hg->hep_src_ip4 = (hep_chunk_ip4_t *)(tmp);
+					inet_ntop(AF_INET, &(hg->hep_src_ip4->data), ipstr,
+							INET_ADDRSTRLEN);
+					tmpstr.s = ipstr;
+					tmpstr.len = strlen(ipstr);
+					ret = pv_get_strval(msg, param, res, &tmpstr);
+					goto done;
+				case 4:
+					hg->hep_dst_ip4 = (hep_chunk_ip4_t *)(tmp);
+					inet_ntop(AF_INET, &(hg->hep_dst_ip4->data), ipstr,
+							INET_ADDRSTRLEN);
+					tmpstr.s = ipstr;
+					tmpstr.len = strlen(ipstr);
+					ret = pv_get_strval(msg, param, res, &tmpstr);
+					goto done;
+				case 5:
+					hg->hep_src_ip6 = (hep_chunk_ip6_t *)(tmp);
+					inet_ntop(AF_INET6, &(hg->hep_src_ip6->data), ipstr,
+							INET6_ADDRSTRLEN);
+					tmpstr.s = ipstr;
+					tmpstr.len = strlen(ipstr);
+					ret = pv_get_strval(msg, param, res, &tmpstr);
+					goto done;
+				case 6:
+					hg->hep_dst_ip6 = (hep_chunk_ip6_t *)(tmp);
+					inet_ntop(AF_INET6, &(hg->hep_dst_ip6->data), ipstr,
+							INET6_ADDRSTRLEN);
+					tmpstr.s = ipstr;
+					tmpstr.len = strlen(ipstr);
+					ret = pv_get_strval(msg, param, res, &tmpstr);
+					goto done;
+				case 7:
+					hg->src_port = (hep_chunk_uint16_t *)(tmp);
+					ret = pv_get_uintval(
+							msg, param, res, ntohs(hg->src_port->data));
+					goto done;
+				case 8:
+					hg->dst_port = (hep_chunk_uint16_t *)(tmp);
+					ret = pv_get_uintval(
+							msg, param, res, ntohs(hg->dst_port->data));
+					goto done;
+				case 9:
+					hg->time_sec = (hep_chunk_uint32_t *)(tmp);
+					ret = pv_get_uintval(
+							msg, param, res, ntohl(hg->time_sec->data));
+					goto done;
+
+				case 10:
+					hg->time_usec = (hep_chunk_uint32_t *)(tmp);
+					ret = pv_get_uintval(
+							msg, param, res, ntohl(hg->time_usec->data));
+					goto done;
+
+				case 11:
+					hg->proto_t = (hep_chunk_uint8_t *)(tmp);
+					ret = pv_get_uintval(msg, param, res, hg->proto_t->data);
+					goto done;
+
+				case 12:
+					hg->capt_id = (hep_chunk_uint32_t *)(tmp);
+					ret = pv_get_uintval(
+							msg, param, res, ntohl(hg->capt_id->data));
+					goto done;
+
+				case 13:
+					hg->keep_tm = (hep_chunk_uint16_t *)(tmp);
+					ret = pv_get_uintval(
+							msg, param, res, ntohs(hg->keep_tm->data));
+					goto done;
+
+				case 14:
+					tmpstr.s = (char *)tmp + sizeof(hep_chunk_t);
+					tmpstr.len = chunk_length - sizeof(hep_chunk_t);
+					ret = pv_get_strval(msg, param, res, &tmpstr);
+					goto done;
+
+				case 15:
+					hg->payload_chunk = (hep_chunk_t *)(tmp);
+					tmpstr.s = (char *)tmp + sizeof(hep_chunk_t);
+					tmpstr.len = chunk_length - sizeof(hep_chunk_t);
+					ret = pv_get_strval(msg, param, res, &tmpstr);
+					goto done;
+				case 17:
+					tmpstr.s = (char *)tmp + sizeof(hep_chunk_t);
+					tmpstr.len = chunk_length - sizeof(hep_chunk_t);
+					ret = pv_get_strval(msg, param, res, &tmpstr);
+					goto done;
+				default:
+					ret = pv_get_uintval(msg, param, res, -1);
+					goto done;
+			}
+		}
+	}
 
 done:
-          
-        //if(si) pkg_free(si);
-        if(hg) pkg_free(hg);                             
-        return ret;
-        
+
+	//if(si) pkg_free(si);
+	if(hg)
+		pkg_free(hg);
+	return ret;
+
 error:
 
-        if(hg) pkg_free(hg);
-        ret = pv_get_uintval(msg, param, res, -1);                
-        return -1;                   
+	if(hg)
+		pkg_free(hg);
+	ret = pv_get_uintval(msg, param, res, -1);
+	return -1;
 }
-

src/modules/sipcapture/hep.h

@@ -49,106 +49,120 @@ extern char *correlation_id;
 int hep_msg_received(sr_event_param_t *evp);
 
 /* new method for events */
-int hepv3_message_parse(char *buf, unsigned int len, sip_msg_t* msg);
-int hepv2_message_parse(char *buf, unsigned int len, sip_msg_t* msg);
-int hepv3_get_chunk(struct sip_msg *msg, char *buf, unsigned int len, int req_chunk, pv_param_t *param, pv_value_t *res);
-
-
-
-struct hep_hdr{
-    u_int8_t hp_v;            /* version */
-    u_int8_t hp_l;            /* length */
-    u_int8_t hp_f;            /* family */
-    u_int8_t hp_p;            /* protocol */
-    u_int16_t hp_sport;       /* source port */
-    u_int16_t hp_dport;       /* destination port */
+int hepv3_message_parse(char *buf, unsigned int len, sip_msg_t *msg);
+int hepv2_message_parse(char *buf, unsigned int len, sip_msg_t *msg);
+int hepv3_get_chunk(struct sip_msg *msg, char *buf, unsigned int len,
+		int req_chunk, pv_param_t *param, pv_value_t *res);
+
+
+struct hep_hdr
+{
+	u_int8_t hp_v;		/* version */
+	u_int8_t hp_l;		/* length */
+	u_int8_t hp_f;		/* family */
+	u_int8_t hp_p;		/* protocol */
+	u_int16_t hp_sport; /* source port */
+	u_int16_t hp_dport; /* destination port */
 };
 
-struct hep_iphdr{
-        struct in_addr hp_src;
-        struct in_addr hp_dst;      /* source and dest address */
+struct hep_iphdr
+{
+	struct in_addr hp_src;
+	struct in_addr hp_dst; /* source and dest address */
 };
 
-struct hep_timehdr{
-   u_int32_t tv_sec;         /* seconds */
-   u_int32_t tv_usec;        /* useconds */
-   u_int16_t captid;          /* Capture ID node */
+struct hep_timehdr
+{
+	u_int32_t tv_sec;  /* seconds */
+	u_int32_t tv_usec; /* useconds */
+	u_int16_t captid;  /* Capture ID node */
 };
 
-struct hep_timeinfo{
-   u_int32_t tv_sec;         /* seconds */
-   u_int32_t tv_usec;        /* useconds */
-   u_int32_t captid;          /* Capture ID node */
+struct hep_timeinfo
+{
+	u_int32_t tv_sec;  /* seconds */
+	u_int32_t tv_usec; /* useconds */
+	u_int32_t captid;  /* Capture ID node */
 };
 
-struct hep_ip6hdr {
-        struct in6_addr hp6_src;        /* source address */
-        struct in6_addr hp6_dst;        /* destination address */
+struct hep_ip6hdr
+{
+	struct in6_addr hp6_src; /* source address */
+	struct in6_addr hp6_dst; /* destination address */
 };
 
 /* HEPv3 types */
 
-struct hep_chunk {
-       u_int16_t vendor_id;
-       u_int16_t type_id;
-       u_int16_t length;
+struct hep_chunk
+{
+	u_int16_t vendor_id;
+	u_int16_t type_id;
+	u_int16_t length;
 } __attribute__((packed));
 
 typedef struct hep_chunk hep_chunk_t;
 
-struct hep_chunk_uint8 {
-       hep_chunk_t chunk;
-       u_int8_t data;
+struct hep_chunk_uint8
+{
+	hep_chunk_t chunk;
+	u_int8_t data;
 } __attribute__((packed));
 
 typedef struct hep_chunk_uint8 hep_chunk_uint8_t;
 
-struct hep_chunk_uint16 {
-       hep_chunk_t chunk;
-       u_int16_t data;
+struct hep_chunk_uint16
+{
+	hep_chunk_t chunk;
+	u_int16_t data;
 } __attribute__((packed));
 
 typedef struct hep_chunk_uint16 hep_chunk_uint16_t;
 
-struct hep_chunk_uint32 {
-       hep_chunk_t chunk;
-       u_int32_t data;
+struct hep_chunk_uint32
+{
+	hep_chunk_t chunk;
+	u_int32_t data;
 } __attribute__((packed));
 
 typedef struct hep_chunk_uint32 hep_chunk_uint32_t;
 
-struct hep_chunk_str {
-       hep_chunk_t chunk;
-       char *data;
+struct hep_chunk_str
+{
+	hep_chunk_t chunk;
+	char *data;
 } __attribute__((packed));
 
 typedef struct hep_chunk_str hep_chunk_str_t;
 
-struct hep_chunk_ip4 {
-       hep_chunk_t chunk;
-       struct in_addr data;
+struct hep_chunk_ip4
+{
+	hep_chunk_t chunk;
+	struct in_addr data;
 } __attribute__((packed));
 
 typedef struct hep_chunk_ip4 hep_chunk_ip4_t;
 
-struct hep_chunk_ip6 {
-       hep_chunk_t chunk;
-       struct in6_addr data;
+struct hep_chunk_ip6
+{
+	hep_chunk_t chunk;
+	struct in6_addr data;
 } __attribute__((packed));
 
 typedef struct hep_chunk_ip6 hep_chunk_ip6_t;
 
-struct hep_chunk_payload {
-    hep_chunk_t chunk;
-    char *data;
+struct hep_chunk_payload
+{
+	hep_chunk_t chunk;
+	char *data;
 } __attribute__((packed));
 
 typedef struct hep_chunk_payload hep_chunk_payload_t;
 
 
-struct hep_ctrl {
-    char id[4];
-    u_int16_t length;
+struct hep_ctrl
+{
+	char id[4];
+	u_int16_t length;
 } __attribute__((packed));
 
 typedef struct hep_ctrl hep_ctrl_t;
@@ -156,74 +170,85 @@ typedef struct hep_ctrl hep_ctrl_t;
 
 /* Structure of HEP */
 
-struct hep_generic_recv {
-        hep_ctrl_t         *header;
-        hep_chunk_uint8_t  *ip_family;
-        hep_chunk_uint8_t  *ip_proto;
-        hep_chunk_uint16_t *src_port;
-        hep_chunk_uint16_t *dst_port;
-        hep_chunk_uint32_t *time_sec;
-        hep_chunk_uint32_t *time_usec;
-        hep_chunk_ip4_t    *hep_src_ip4;
-        hep_chunk_ip4_t	    *hep_dst_ip4;
-        hep_chunk_ip6_t    *hep_src_ip6;
-        hep_chunk_ip6_t    *hep_dst_ip6;
-        hep_chunk_uint8_t  *proto_t;
-        hep_chunk_uint32_t *capt_id;
-        hep_chunk_uint16_t *keep_tm;
-        hep_chunk_str_t    *auth_key;
-        hep_chunk_str_t    *correlation_id;
-        hep_chunk_t   *payload_chunk;
+struct hep_generic_recv
+{
+	hep_ctrl_t *header;
+	hep_chunk_uint8_t *ip_family;
+	hep_chunk_uint8_t *ip_proto;
+	hep_chunk_uint16_t *src_port;
+	hep_chunk_uint16_t *dst_port;
+	hep_chunk_uint32_t *time_sec;
+	hep_chunk_uint32_t *time_usec;
+	hep_chunk_ip4_t *hep_src_ip4;
+	hep_chunk_ip4_t *hep_dst_ip4;
+	hep_chunk_ip6_t *hep_src_ip6;
+	hep_chunk_ip6_t *hep_dst_ip6;
+	hep_chunk_uint8_t *proto_t;
+	hep_chunk_uint32_t *capt_id;
+	hep_chunk_uint16_t *keep_tm;
+	hep_chunk_str_t *auth_key;
+	hep_chunk_str_t *correlation_id;
+	hep_chunk_t *payload_chunk;
 } __attribute__((packed));
 
 typedef struct hep_generic_recv hep_generic_recv_t;
 
-#define HEP3_PACK_INIT(buf) \
-		union { \
-			hep_chunk_uint8_t chunk8; \
-			hep_chunk_uint16_t chunk16; \
-			hep_chunk_uint32_t chunk32; \
-			hep_chunk_t chunkpl; \
-			uint16_t len; \
-		} _tmpu; \
-		char *_tmp_p = (buf); \
-		memcpy(_tmp_p, "HEP3", 4); \
-		_tmp_p += 4 + 2/* skip length */;
-
-#define HEP3_PACK_FINALIZE(buf, lenp) \
-		do { \
-			_tmpu.len = htons(_tmp_p - (char *)(buf)); \
-			memcpy((void *)(&(((hep_ctrl_t *)(buf))->length)), (void*)&_tmpu.len, 2); \
-			*lenp = _tmp_p - (char *)(buf); \
-		} while (0)
+#define HEP3_PACK_INIT(buf)         \
+	union                           \
+	{                               \
+		hep_chunk_uint8_t chunk8;   \
+		hep_chunk_uint16_t chunk16; \
+		hep_chunk_uint32_t chunk32; \
+		hep_chunk_t chunkpl;        \
+		uint16_t len;               \
+	} _tmpu;                        \
+	char *_tmp_p = (buf);           \
+	memcpy(_tmp_p, "HEP3", 4);      \
+	_tmp_p += 4 + 2 /* skip length */;
+
+#define HEP3_PACK_FINALIZE(buf, lenp)                                          \
+	do {                                                                       \
+		_tmpu.len = htons(_tmp_p - (char *)(buf));                             \
+		memcpy((void *)(&(((hep_ctrl_t *)(buf))->length)), (void *)&_tmpu.len, \
+				2);                                                            \
+		*lenp = _tmp_p - (char *)(buf);                                        \
+	} while(0)
 
 #define _HEP3_PACK_CHUNK_GENERIC(type, tmpvar, vid, tid, val) \
-		do { \
-			(tmpvar).chunk.vendor_id = htons(vid); \
-			(tmpvar).chunk.type_id = htons(tid); \
-			(tmpvar).chunk.length = htons(sizeof(type)); \
-			(tmpvar).data = (val); \
-			memcpy(_tmp_p, (void *) &(tmpvar), sizeof(type)); \
-			_tmp_p += sizeof(type); \
-		} while (0)
-
-#define HEP3_PACK_CHUNK_UINT8(vid, tid, val) _HEP3_PACK_CHUNK_GENERIC(hep_chunk_uint8_t, _tmpu.chunk8, vid, tid, val)
-#define HEP3_PACK_CHUNK_UINT16(vid, tid, val) _HEP3_PACK_CHUNK_GENERIC(hep_chunk_uint16_t, _tmpu.chunk16, vid, tid, htons(val))
-#define HEP3_PACK_CHUNK_UINT16_NBO(vid, tid, val) _HEP3_PACK_CHUNK_GENERIC(hep_chunk_uint16_t, _tmpu.chunk16, vid, tid, (val))
-#define HEP3_PACK_CHUNK_UINT32(vid, tid, val) _HEP3_PACK_CHUNK_GENERIC(hep_chunk_uint32_t, _tmpu.chunk32, vid, tid, htonl(val))
-#define HEP3_PACK_CHUNK_UINT32_NBO(vid, tid, val) _HEP3_PACK_CHUNK_GENERIC(hep_chunk_uint32_t, _tmpu.chunk32, vid, tid, (val))
-
-#define HEP3_PACK_CHUNK_DATA(vid, tid, val, len) \
-		do { \
-			_tmpu.chunkpl.vendor_id = htons(vid); \
-			_tmpu.chunkpl.type_id = htons(tid); \
-			_tmpu.chunkpl.length = htons(sizeof(hep_chunk_t) + (len)); \
-			memcpy(_tmp_p, (void *) &_tmpu.chunkpl, sizeof(hep_chunk_t)); \
-			_tmp_p += sizeof(hep_chunk_t); \
-			memcpy(_tmp_p, (void *) (val), len); \
-			_tmp_p += len; \
-		} while (0)
-
-#define HEP3_PACK_CHUNK_IP6(vid, tid, paddr) HEP3_PACK_CHUNK_DATA(vid, tid, paddr, sizeof(struct in6_addr))
+	do {                                                      \
+		(tmpvar).chunk.vendor_id = htons(vid);                \
+		(tmpvar).chunk.type_id = htons(tid);                  \
+		(tmpvar).chunk.length = htons(sizeof(type));          \
+		(tmpvar).data = (val);                                \
+		memcpy(_tmp_p, (void *)&(tmpvar), sizeof(type));      \
+		_tmp_p += sizeof(type);                               \
+	} while(0)
+
+#define HEP3_PACK_CHUNK_UINT8(vid, tid, val) \
+	_HEP3_PACK_CHUNK_GENERIC(hep_chunk_uint8_t, _tmpu.chunk8, vid, tid, val)
+#define HEP3_PACK_CHUNK_UINT16(vid, tid, val) \
+	_HEP3_PACK_CHUNK_GENERIC(                 \
+			hep_chunk_uint16_t, _tmpu.chunk16, vid, tid, htons(val))
+#define HEP3_PACK_CHUNK_UINT16_NBO(vid, tid, val) \
+	_HEP3_PACK_CHUNK_GENERIC(hep_chunk_uint16_t, _tmpu.chunk16, vid, tid, (val))
+#define HEP3_PACK_CHUNK_UINT32(vid, tid, val) \
+	_HEP3_PACK_CHUNK_GENERIC(                 \
+			hep_chunk_uint32_t, _tmpu.chunk32, vid, tid, htonl(val))
+#define HEP3_PACK_CHUNK_UINT32_NBO(vid, tid, val) \
+	_HEP3_PACK_CHUNK_GENERIC(hep_chunk_uint32_t, _tmpu.chunk32, vid, tid, (val))
+
+#define HEP3_PACK_CHUNK_DATA(vid, tid, val, len)                     \
+	do {                                                             \
+		_tmpu.chunkpl.vendor_id = htons(vid);                        \
+		_tmpu.chunkpl.type_id = htons(tid);                          \
+		_tmpu.chunkpl.length = htons(sizeof(hep_chunk_t) + (len));   \
+		memcpy(_tmp_p, (void *)&_tmpu.chunkpl, sizeof(hep_chunk_t)); \
+		_tmp_p += sizeof(hep_chunk_t);                               \
+		memcpy(_tmp_p, (void *)(val), len);                          \
+		_tmp_p += len;                                               \
+	} while(0)
+
+#define HEP3_PACK_CHUNK_IP6(vid, tid, paddr) \
+	HEP3_PACK_CHUNK_DATA(vid, tid, paddr, sizeof(struct in6_addr))
 
 #endif

src/modules/sipcapture/sipcapture.h

@@ -24,7 +24,8 @@
 #ifndef _sipcapture_h
 #define _sipcapture_h
 
-struct _sipcapture_object {
+struct _sipcapture_object
+{
 	str method;
 	str reply_reason;
 	str ruri;
@@ -75,6 +76,7 @@ struct _sipcapture_object {
 
 
 struct hep_generic_recv;
-int receive_logging_json_msg(char * buf, unsigned int len, struct hep_generic_recv *hg, char *log_table);
+int receive_logging_json_msg(char *buf, unsigned int len,
+		struct hep_generic_recv *hg, char *log_table);
 
 #endif /* _sipcapture_h */