deleted file mode 100644

@@ -1,450 +0,0 @@

-/*

- * ip address & address family related functions

- *

- * Copyright (C) 2001-2003 FhG Fokus

- *

- * 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

- */

-

-/** Kamailio core :: internal ip addresses representation functions.

- * @file ip_addr.c

- * @ingroup core

- * Module: @ref core

- */

-

-

-#include <stdlib.h>

-#include <stdio.h>

-

-#include "ip_addr.h"

-#include "dprint.h"

-#include "mem/mem.h"

-#include "resolve.h"

-#include "trim.h"

-

-

-struct net* mk_new_net(struct ip_addr* ip, struct ip_addr* mask)

-{

-	struct net* n;

-	int warning;

-	int r;

-	

-	warning=0;

-	if ((ip->af != mask->af) || (ip->len != mask->len)){

-		LM_CRIT("trying to use a different mask family"

-				" (eg. ipv4/ipv6mask or ipv6/ipv4mask)\n");

-		goto error;

-	}

-	n=(struct net*)pkg_malloc(sizeof(struct net));

-	if (n==0){ 

-		LM_CRIT("memory allocation failure\n");

-		goto error;

-	}

-	n->ip=*ip;

-	n->mask=*mask;

-	for (r=0; r<n->ip.len/4; r++) { /*ipv4 & ipv6 addresses are multiple of 4*/

-		n->ip.u.addr32[r] &= n->mask.u.addr32[r];

-		if (n->ip.u.addr32[r]!=ip->u.addr32[r]) warning=1;

-	};

-	if (warning){

-		LM_WARN("invalid network address/netmask "

-					"combination fixed...\n");

-		print_ip("original network address:", ip, "/");

-		print_ip("", mask, "\n");

-		print_ip("fixed    network address:", &(n->ip), "/");

-		print_ip("", &(n->mask), "\n");

-	};

-	return n;

-error:

-	return 0;

-}

-

-

-

-struct net* mk_new_net_bitlen(struct ip_addr* ip, unsigned int bitlen)

-{

-	struct ip_addr mask;

-	int r;

-	

-	if (bitlen>ip->len*8){

-		LM_CRIT("bad bitlen number %d\n", bitlen);

-		goto error;

-	}

-	memset(&mask,0, sizeof(mask));

-	for (r=0;r<bitlen/8;r++) mask.u.addr[r]=0xff;

-	if (bitlen%8) mask.u.addr[r]=  ~((1<<(8-(bitlen%8)))-1);

-	mask.af=ip->af;

-	mask.len=ip->len;

-	

-	return mk_new_net(ip, &mask);

-error:

-	return 0;

-}

-

-

-

-/** fills a net structure from an ip and a mask.

- *

- * This function will not print any error messages or allocate

- * memory (as opposed to mk_new_net() above).

- *

- * @param n - destination net structure

- * @param ip

- * @param mask

- * @return -1 on error (af mismatch), 0 on success

- */

-int mk_net(struct net* n, struct ip_addr* ip, struct ip_addr* mask)

-{

-	int r;

-	

-	if (unlikely((ip->af != mask->af) || (ip->len != mask->len))) {

-		return -1;

-	}

-	n->ip=*ip;

-	n->mask=*mask;

-	/* fix the network part of the mask */

-	for (r=0; r<n->ip.len/4; r++) { /*ipv4 & ipv6 addresses are multiple of 4*/

-		n->ip.u.addr32[r] &= n->mask.u.addr32[r];

-	};

-	return 0;

-}

-

-

-

-/** fills a net structure from an ip and a bitlen.

- *

- * This function will not print any error messages or allocate

- * memory (as opposed to mk_new_net_bitlen() above).

- *

- * @param n - destination net structure

- * @param ip

- * @param bitlen

- * @return -1 on error (af mismatch), 0 on success

- */

-int mk_net_bitlen(struct net* n, struct ip_addr* ip, unsigned int bitlen)

-{

-	struct ip_addr mask;

-	int r;

-	

-	if (unlikely(bitlen>ip->len*8))

-		/* bitlen too big */

-		return -1;

-	memset(&mask,0, sizeof(mask));

-	for (r=0;r<bitlen/8;r++) mask.u.addr[r]=0xff;

-	if (bitlen%8) mask.u.addr[r]=  ~((1<<(8-(bitlen%8)))-1);

-	mask.af=ip->af;

-	mask.len=ip->len;

-	

-	return mk_net(n, ip, &mask);

-}

-

-

-

-/** initializes a net structure from a string.

- * @param dst - net structure that will be filled

- * @param s - string of the form "ip", "ip/mask_len" or "ip/ip_mak".

- * @return -1 on error, 0 on succes

- */

-int mk_net_str(struct net* dst, str* s)

-{

-	struct ip_addr* t;

-	char* p;

-	struct ip_addr ip;

-	str addr;

-	str mask;

-	unsigned int bitlen;

-	

-	/* test for ip only */

-	t = str2ip(s);

-	if (unlikely(t == 0))

-		t = str2ip6(s);

-	if (likely(t))

-		return mk_net_bitlen(dst, t, t->len*8);

-	/* not a simple ip, maybe an ip/netmask pair */

-	p = q_memchr(s->s, '/', s->len);

-	if (likely(p)) {

-		addr.s = s->s;

-		addr.len = (int)(long)(p - s->s);

-		mask.s = p + 1;

-		mask.len = s->len - (addr.len + 1);

-		/* allow '/' enclosed by whitespace */

-		trim_trailing(&addr);

-		trim_leading(&mask);

-		t = str2ip(&addr);

-		if (likely(t)) {

-			/* it can be a number */

-			if (str2int(&mask, &bitlen) == 0)

-				return mk_net_bitlen(dst, t, bitlen);

-			ip = *t;

-			t = str2ip(&mask);

-			if (likely(t))

-				return mk_net(dst, &ip, t);

-			/* error */

-			return -1;

-		}

-		else {

-			t = str2ip6(&addr);

-			if (likely(t)) {

-				/* it can be a number */

-				if (str2int(&mask, &bitlen) == 0)

-					return mk_net_bitlen(dst, t, bitlen);

-				ip = *t;

-				t = str2ip6(&mask);

-				if (likely(t))

-					return mk_net(dst, &ip, t);

-				/* error */

-				return -1;

-			}

-		}

-	}

-	return -1;

-}

-

-

-

-void print_ip(char* p, struct ip_addr* ip, char *s)

-{

-	switch(ip->af){

-		case AF_INET:

-			DBG("%s%d.%d.%d.%d%s", (p)?p:"",

-								ip->u.addr[0],

-								ip->u.addr[1],

-								ip->u.addr[2],

-								ip->u.addr[3],

-								(s)?s:""

-								);

-			break;

-		case AF_INET6:

-			DBG("%s%x:%x:%x:%x:%x:%x:%x:%x%s", (p)?p:"",

-											htons(ip->u.addr16[0]),

-											htons(ip->u.addr16[1]),

-											htons(ip->u.addr16[2]),

-											htons(ip->u.addr16[3]),

-											htons(ip->u.addr16[4]),

-											htons(ip->u.addr16[5]),

-											htons(ip->u.addr16[6]),

-											htons(ip->u.addr16[7]),

-											(s)?s:""

-				);

-			break;

-		default:

-			DBG("print_ip: warning unknown address family %d\n", ip->af);

-	}

-}

-

-

-

-void stdout_print_ip(struct ip_addr* ip)

-{

-	switch(ip->af){

-		case AF_INET:

-			printf("%d.%d.%d.%d",	ip->u.addr[0],

-								ip->u.addr[1],

-								ip->u.addr[2],

-								ip->u.addr[3]);

-			break;

-		case AF_INET6:

-			printf("%x:%x:%x:%x:%x:%x:%x:%x",	htons(ip->u.addr16[0]),

-											htons(ip->u.addr16[1]),

-											htons(ip->u.addr16[2]),

-											htons(ip->u.addr16[3]),

-											htons(ip->u.addr16[4]),

-											htons(ip->u.addr16[5]),

-											htons(ip->u.addr16[6]),

-											htons(ip->u.addr16[7])

-				);

-			break;

-		default:

-			DBG("print_ip: warning unknown address family %d\n", ip->af);

-	}

-}

-

-

-

-void print_net(struct net* net)

-{

-	if (net==0){

-		LM_WARN("null pointer\n");

-		return;

-	}

-	print_ip("", &net->ip, "/"); print_ip("", &net->mask, "");

-}

-

-

-#ifdef USE_MCAST

-

-/* Returns 1 if the given address is a multicast address */

-int is_mcast(struct ip_addr* ip)

-{

-	if (!ip){

-		LM_ERR("Invalid parameter value\n");

-		return -1;

-	}

-

-	if (ip->af==AF_INET){

-		return IN_MULTICAST(htonl(ip->u.addr32[0]));

-	} else if (ip->af==AF_INET6){

-		return IN6_IS_ADDR_MULTICAST((struct in6_addr*)ip->u.addr32);

-	} else {

-		LM_ERR("Unsupported protocol family\n");

-		return -1;

-	}

-}

-

-#endif /* USE_MCAST */

-

-/** get string for known protocols.

- * @param iproto - protocol number

- * @param utype  - 1 if result is used for URI, or 0

- * @param vtype  - 1 if result is wanted uppercase, or 0 for lowercase

- * @param sproto - the string for the proto

- * @return  0 if it is a valid and supported protocol, negative otherwise

- */

-int get_valid_proto_string(unsigned int iproto, int utype, int vtype,

-		str *sproto)

-{

-	switch(iproto){

-		case PROTO_NONE:

-			return -1;

-		case PROTO_UDP:

-			sproto->len = 3;

-			sproto->s = (vtype)?"UDP":"udp";

-			return 0;

-		case PROTO_TCP:

-			sproto->len = 3;

-			sproto->s = (vtype)?"TCP":"tcp";

-			return 0;

-		case PROTO_TLS:

-			sproto->len = 3;

-			sproto->s = (vtype)?"TLS":"tls";

-			return 0;

-		case PROTO_SCTP:

-			sproto->len = 4;

-			sproto->s = (vtype)?"SCTP":"sctp";

-			return 0;

-		case PROTO_WS:

-		case PROTO_WSS:

-			if(iproto==PROTO_WS || utype) {

-				/* ws-only in SIP URI */

-				sproto->len = 2;

-				sproto->s = (vtype)?"WS":"ws";

-			} else {

-				sproto->len = 3;

-				sproto->s = (vtype)?"WSS":"wss";

-			}

-			return 0;

-		default:

-			return -2;

-	}

-}

-

-/** get protocol name (asciiz).

- * @param proto - protocol number

- * @return  string with the protocol name or "unknown".

- */

-char* get_proto_name(unsigned int proto)

-{

-	str sproto;

-	switch(proto){

-		case PROTO_NONE:

-			return "*";

-		default:

-			if(get_valid_proto_string(proto, 1, 0, &sproto)<0)

-				return "unknown";

-			return sproto.s;

-	}

-}

-

-

-/**

- * match ip address with net address and bitmask

- * - return 0 on match, -1 otherwise

- */

-int ip_addr_match_net(ip_addr_t *iaddr, ip_addr_t *naddr,

-		int mask)

-{

-	unsigned char ci;

-	unsigned char cn;

-	int i;

-	int mbytes;

-	int mbits;

-

-	if(mask==0)

-		return 0;

-	if(iaddr==NULL || naddr==NULL || mask<0)

-		return -1;

-	if(iaddr->af != naddr->af)

-		return -1;

-

-	if(iaddr->af == AF_INET)

-	{

-		if(mask>32)

-			return -1;

-		if(mask==32)

-		{

-			if(ip_addr_cmp(iaddr, naddr))

-				return 0;

-			return -1;

-		}

-	} else if(iaddr->af ==  AF_INET6) {

-		if(mask>128)

-			return -1;

-

-		if(mask==128)

-		{

-			if(ip_addr_cmp(iaddr, naddr))

-				return 0;

-			return -1;

-		}

-	}

-

-	mbytes = mask / 8;

-	for(i=0; i<mbytes; i++)

-	{

-		if(iaddr->u.addr[i] != naddr->u.addr[i])

-			return -1;

-	}

-	mbits = mask % 8;

-	if(mbits==0)

-		return 0;

-	ci = iaddr->u.addr[i] & (~((1 << (8 - mbits)) - 1));

-	cn = naddr->u.addr[i] & (~((1 << (8 - mbits)) - 1));

-	if(ci == cn)

-		return 0;

-	return -1;

-}

-

-int si_get_signaling_data(struct socket_info *si, str **addr, str **port)

-{

-	if(si==NULL)

-		return -1;

-	if(addr) {

-		if(si->useinfo.name.len>0) {

-			*addr = &si->useinfo.name;

-		} else {

-			*addr = &si->address_str;

-		}

-	}

-	if(port) {

-		if(si->useinfo.port_no>0) {

-			*port = &si->useinfo.port_no_str;

-		} else {

-			*port = &si->port_no_str;

-		}

-	}

-	return 0;

-}

@@ -377,7 +377,8 @@ char* get_proto_name(unsigned int proto)

 int ip_addr_match_net(ip_addr_t *iaddr, ip_addr_t *naddr,

 		int mask)

 {

-	unsigned char c;

+	unsigned char ci;

+	unsigned char cn;

 	int i;

 	int mbytes;

 	int mbits;

@@ -420,8 +421,9 @@ int ip_addr_match_net(ip_addr_t *iaddr, ip_addr_t *naddr,

 	mbits = mask % 8;

 	if(mbits==0)

 		return 0;

-	c = naddr->u.addr[i] & (~((1 << (8 - mbits)) - 1));

-	if((iaddr->u.addr[i] & c) == c)

+	ci = iaddr->u.addr[i] & (~((1 << (8 - mbits)) - 1));

+	cn = naddr->u.addr[i] & (~((1 << (8 - mbits)) - 1));

+	if(ci == cn)

 		return 0;

 	return -1;

 }

@@ -307,7 +307,50 @@ int is_mcast(struct ip_addr* ip)

 #endif /* USE_MCAST */

-

+/** get string for known protocols.

+ * @param iproto - protocol number

+ * @param utype  - 1 if result is used for URI, or 0

+ * @param vtype  - 1 if result is wanted uppercase, or 0 for lowercase

+ * @param sproto - the string for the proto

+ * @return  0 if it is a valid and supported protocol, negative otherwise

+ */

+int get_valid_proto_string(unsigned int iproto, int utype, int vtype,

+		str *sproto)

+{

+	switch(iproto){

+		case PROTO_NONE:

+			return -1;

+		case PROTO_UDP:

+			sproto->len = 3;

+			sproto->s = (vtype)?"UDP":"udp";

+			return 0;

+		case PROTO_TCP:

+			sproto->len = 3;

+			sproto->s = (vtype)?"TCP":"tcp";

+			return 0;

+		case PROTO_TLS:

+			sproto->len = 3;

+			sproto->s = (vtype)?"TLS":"tls";

+			return 0;

+		case PROTO_SCTP:

+			sproto->len = 4;

+			sproto->s = (vtype)?"SCTP":"sctp";

+			return 0;

+		case PROTO_WS:

+		case PROTO_WSS:

+			if(iproto==PROTO_WS || utype) {

+				/* ws-only in SIP URI */

+				sproto->len = 2;

+				sproto->s = (vtype)?"WS":"ws";

+			} else {

+				sproto->len = 3;

+				sproto->s = (vtype)?"WSS":"wss";

+			}

+			return 0;

+		default:

+			return -2;

+	}

+}

 /** get protocol name (asciiz).

  * @param proto - protocol number

@@ -315,22 +358,14 @@ int is_mcast(struct ip_addr* ip)

  */

 char* get_proto_name(unsigned int proto)

 {

+	str sproto;

 	switch(proto){

 		case PROTO_NONE:

 			return "*";

-		case PROTO_UDP:

-			return "udp";

-		case PROTO_TCP:

-			return "tcp";

-		case PROTO_TLS:

-			return "tls";

-		case PROTO_SCTP:

-			return "sctp";

-		case PROTO_WS:

-		case PROTO_WSS:

-			return "ws";

 		default:

-			return "unknown";

+			if(get_valid_proto_string(proto, 1, 0, &sproto)<0)

+				return "unknown";

+			return sproto.s;

 	}

 }

@@ -10,11 +10,6 @@

  * the Free Software Foundation; either version 2 of the License, or

  * (at your option) any later version

  *

- * For a license to use the ser software under conditions

- * other than those described here, or to purchase support for this

- * software, please contact iptel.org by e-mail at the following addresses:

- *    info@iptel.org

- *

  * 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

@@ -1,14 +1,11 @@

 /*

- * $Id$

- *

- *

  * ip address & address family related functions

  *

  * Copyright (C) 2001-2003 FhG Fokus

  *

- * This file is part of ser, a free SIP server.

+ * This file is part of Kamailio, a free SIP server.

  *

- * ser is free software; you can redistribute it and/or modify

+ * 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

@@ -18,7 +15,7 @@

  * software, please contact iptel.org by e-mail at the following addresses:

  *    info@iptel.org

  *

- * ser is distributed in the hope that it will be useful,

+ * 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.

@@ -27,14 +24,8 @@

  * along with this program; if not, write to the Free Software 

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

-/*

- * History:

- * --------

- *  2003-03-19  replaced all mallocs/frees w/ pkg_malloc/pkg_free

- *  2004-10-01  mk_net fixes bad network addresses now (andrei)

- */

-/** inernal ip addresses representation functions.

+/** Kamailio core :: internal ip addresses representation functions.

  * @file ip_addr.c

  * @ingroup core

  * Module: @ref core

@@ -59,13 +59,13 @@ struct net* mk_new_net(struct ip_addr* ip, struct ip_addr* mask)

 	warning=0;

 	if ((ip->af != mask->af) || (ip->len != mask->len)){

-		LOG(L_CRIT, "ERROR: mk_net: trying to use a different mask family"

+		LM_CRIT("trying to use a different mask family"

 				" (eg. ipv4/ipv6mask or ipv6/ipv4mask)\n");

 		goto error;

 	}

 	n=(struct net*)pkg_malloc(sizeof(struct net));

 	if (n==0){ 

-		LOG(L_CRIT, "ERROR: mk_net: memory allocation failure\n");

+		LM_CRIT("memory allocation failure\n");

 		goto error;

 	}

 	n->ip=*ip;

@@ -75,7 +75,7 @@ struct net* mk_new_net(struct ip_addr* ip, struct ip_addr* mask)

 		if (n->ip.u.addr32[r]!=ip->u.addr32[r]) warning=1;

 	};

 	if (warning){

-		LOG(L_WARN, "WARNING: mk_net: invalid network address/netmask "

+		LM_WARN("invalid network address/netmask "

 					"combination fixed...\n");

 		print_ip("original network address:", ip, "/");

 		print_ip("", mask, "\n");

@@ -95,7 +95,7 @@ struct net* mk_new_net_bitlen(struct ip_addr* ip, unsigned int bitlen)

 	int r;

 	if (bitlen>ip->len*8){

-		LOG(L_CRIT, "ERROR: mk_net_bitlen: bad bitlen number %d\n", bitlen);

+		LM_CRIT("bad bitlen number %d\n", bitlen);

 		goto error;

 	}

 	memset(&mask,0, sizeof(mask));

@@ -292,7 +292,7 @@ void stdout_print_ip(struct ip_addr* ip)

 void print_net(struct net* net)

 {

 	if (net==0){

-		LOG(L_WARN, "ERROR: print net: null pointer\n");

+		LM_WARN("null pointer\n");

 		return;

 	}

 	print_ip("", &net->ip, "/"); print_ip("", &net->mask, "");

@@ -305,7 +305,7 @@ void print_net(struct net* net)

 int is_mcast(struct ip_addr* ip)

 {

 	if (!ip){

-		LOG(L_ERR, "ERROR: is_mcast: Invalid parameter value\n");

+		LM_ERR("Invalid parameter value\n");

 		return -1;

 	}

@@ -314,7 +314,7 @@ int is_mcast(struct ip_addr* ip)

 	} else if (ip->af==AF_INET6){

 		return IN6_IS_ADDR_MULTICAST((struct in6_addr*)ip->u.addr32);

 	} else {

-		LOG(L_ERR, "ERROR: is_mcast: Unsupported protocol family\n");

+		LM_ERR("Unsupported protocol family\n");

 		return -1;

 	}

 }

@@ -404,3 +404,24 @@ int ip_addr_match_net(ip_addr_t *iaddr, ip_addr_t *naddr,

 		return 0;

 	return -1;

 }

+

+int si_get_signaling_data(struct socket_info *si, str **addr, str **port)

+{

+	if(si==NULL)

+		return -1;

+	if(addr) {

+		if(si->useinfo.name.len>0) {

+			*addr = &si->useinfo.name;

+		} else {

+			*addr = &si->address_str;

+		}

+	}

+	if(port) {

+		if(si->useinfo.port_no>0) {

+			*port = &si->useinfo.port_no_str;

+		} else {

+			*port = &si->port_no_str;

+		}

+	}

+	return 0;

+}

@@ -25,7 +25,7 @@

  *

  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

  */

 /*

  * History:

@@ -184,10 +184,8 @@ int mk_net_str(struct net* dst, str* s)

 	/* test for ip only */

 	t = str2ip(s);

-#ifdef USE_IPV6

 	if (unlikely(t == 0))

 		t = str2ip6(s);

-#endif /* USE_IPV6 */

 	if (likely(t))

 		return mk_net_bitlen(dst, t, t->len*8);

 	/* not a simple ip, maybe an ip/netmask pair */

@@ -212,7 +210,6 @@ int mk_net_str(struct net* dst, str* s)

 			/* error */

 			return -1;

 		}

-#ifdef USE_IPV6

 		else {

 			t = str2ip6(&addr);

 			if (likely(t)) {

@@ -227,7 +224,6 @@ int mk_net_str(struct net* dst, str* s)

 				return -1;

 			}

 		}

-#endif /* USE_IPV6 */

 	}

 	return -1;

 }

@@ -246,7 +242,6 @@ void print_ip(char* p, struct ip_addr* ip, char *s)

 								(s)?s:""

 								);

 			break;

-#ifdef USE_IPV6

 		case AF_INET6:

 			DBG("%s%x:%x:%x:%x:%x:%x:%x:%x%s", (p)?p:"",

 											htons(ip->u.addr16[0]),

@@ -260,7 +255,6 @@ void print_ip(char* p, struct ip_addr* ip, char *s)

 											(s)?s:""

 				);

 			break;

-#endif /* USE_IPV6 */

 		default:

 			DBG("print_ip: warning unknown address family %d\n", ip->af);

 	}

@@ -277,7 +271,6 @@ void stdout_print_ip(struct ip_addr* ip)

 								ip->u.addr[2],

 								ip->u.addr[3]);

 			break;

-#ifdef USE_IPV6

 		case AF_INET6:

 			printf("%x:%x:%x:%x:%x:%x:%x:%x",	htons(ip->u.addr16[0]),

 											htons(ip->u.addr16[1]),

@@ -289,7 +282,6 @@ void stdout_print_ip(struct ip_addr* ip)

 											htons(ip->u.addr16[7])

 				);

 			break;

-#endif /* USE_IPV6 */

 		default:

 			DBG("print_ip: warning unknown address family %d\n", ip->af);

 	}

@@ -319,10 +311,8 @@ int is_mcast(struct ip_addr* ip)

 	if (ip->af==AF_INET){

 		return IN_MULTICAST(htonl(ip->u.addr32[0]));

-#ifdef USE_IPV6

 	} else if (ip->af==AF_INET6){

 		return IN6_IS_ADDR_MULTICAST((struct in6_addr*)ip->u.addr32);

-#endif /* USE_IPV6 */

 	} else {

 		LOG(L_ERR, "ERROR: is_mcast: Unsupported protocol family\n");

 		return -1;

@@ -351,9 +351,8 @@ char* get_proto_name(unsigned int proto)

 		case PROTO_SCTP:

 			return "sctp";

 		case PROTO_WS:

-			return "ws";

 		case PROTO_WSS:

-			return "wss";

+			return "ws";

 		default:

 			return "unknown";

 	}

@@ -350,6 +350,10 @@ char* get_proto_name(unsigned int proto)

 			return "tls";

 		case PROTO_SCTP:

 			return "sctp";

+		case PROTO_WS:

+			return "ws";

+		case PROTO_WSS:

+			return "wss";

 		default:

 			return "unknown";

 	}

@@ -354,3 +354,60 @@ char* get_proto_name(unsigned int proto)

 			return "unknown";

 	}

 }

+

+

+/**

+ * match ip address with net address and bitmask

+ * - return 0 on match, -1 otherwise

+ */

+int ip_addr_match_net(ip_addr_t *iaddr, ip_addr_t *naddr,

+		int mask)

+{

+	unsigned char c;

+	int i;

+	int mbytes;

+	int mbits;

+

+	if(mask==0)

+		return 0;

+	if(iaddr==NULL || naddr==NULL || mask<0)

+		return -1;

+	if(iaddr->af != naddr->af)

+		return -1;

+

+	if(iaddr->af == AF_INET)

+	{

+		if(mask>32)

+			return -1;

+		if(mask==32)

+		{

+			if(ip_addr_cmp(iaddr, naddr))

+				return 0;

+			return -1;

+		}

+	} else if(iaddr->af ==  AF_INET6) {

+		if(mask>128)

+			return -1;

+

+		if(mask==128)

+		{

+			if(ip_addr_cmp(iaddr, naddr))

+				return 0;

+			return -1;

+		}

+	}

+

+	mbytes = mask / 8;

+	for(i=0; i<mbytes; i++)

+	{

+		if(iaddr->u.addr[i] != naddr->u.addr[i])

+			return -1;

+	}

+	mbits = mask % 8;

+	if(mbits==0)

+		return 0;

+	c = naddr->u.addr[i] & (~((1 << (8 - mbits)) - 1));

+	if((iaddr->u.addr[i] & c) == c)

+		return 0;

+	return -1;

+}

@@ -337,7 +337,7 @@ int is_mcast(struct ip_addr* ip)

  * @param proto - protocol number

  * @return  string with the protocol name or "unknown".