@@ -7,8 +7,8 @@

 #version number

 VERSION = 0

 PATCHLEVEL = 8

-SUBLEVEL = 7

-EXTRAVERSION = -7-ipaq-viadbg

+SUBLEVEL = 8

+EXTRAVERSION = -1-ipv6

 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

 OS = $(shell uname -s)

@@ -74,9 +74,11 @@ ARCH = $(shell uname -m |sed -e s/i.86/i386/ -e s/sun4u/sparc64/ )

 # -DNEW_HNAME

 #		32-bit header name parsing; turn off for lower speed ;-) or debugging;

 #		to become non-optional if fast and stable

-# -SILENT_FR

+# -DSILENT_FR

 #		if defined, when FR timer hits (in tm) cancel is sent only if forking

 #		if used; otherwise, just delete the transaction without doing anything

+# -DUSE_IPV6

+#		compiles ipv6 support

 DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \

 	 -DOS='"$(OS)"' -DCOMPILER='"$(CC_VER)"'\

@@ -85,10 +87,9 @@ DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \

 	 -DSHM_MEM  -DSHM_MMAP \

 	 -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 \

 	 -DWAIT -DNEW_HNAME \

-	 -DNOISY_REPLIES \

-	 -DVERY_NOISY_REPLIES\

-	 -DSILENT_FR \

- 	 #-DUSE_SYNONIM\

+	 -DUSE_IPV6 \

+	 #-DVERY_NOISY_REPLIES\

+	 #-DSILENT_FR \

 	 #-DNO_DEBUG \

 	 #-DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=0 \

 	 #-DNOSMP \

@@ -102,8 +103,8 @@ DEFS+= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \

 #PROFILE=  -pg #set this if you want profiling

-mode = debug

-#mode = release

+#mode = debug

+mode = release

 # platform dependent settings

@@ -37,7 +37,7 @@ int do_action(struct action* a, struct sip_msg* msg)

 {

 	int ret;

 	int v;

-	struct sockaddr_in* to;

+	union sockaddr_union* to;

 	struct proxy_l* p;

 	char* tmp;

 	char *new_uri, *end, *crt;

@@ -77,8 +77,8 @@ int do_action(struct action* a, struct sip_msg* msg)

 										/*if ((end)&&(*end)){*/

 										if (err){

 											LOG(L_ERR, "ERROR: do_action: "

-													"forward: bad port in "

-													"uri: <%s>\n", uri.port.s);

+												"forward: bad port in "

+												"uri: <%s>\n", uri.port.s);

 											ret=E_UNSPEC;

 											goto error_fwd_uri;

 										}

@@ -116,24 +116,22 @@ int do_action(struct action* a, struct sip_msg* msg)

 			}

 			break;

 		case SEND_T:

-			to=(struct sockaddr_in*) malloc(sizeof(struct sockaddr_in));

-			if (to==0){

-				LOG(L_ERR, "ERROR: do_action: "

-							"memory allocation failure\n");

-				ret=E_OUT_OF_MEM;

-				break;

-			}

 			if ((a->p1_type!= PROXY_ST)|(a->p2_type!=NUMBER_ST)){

 				LOG(L_CRIT, "BUG: do_action: bad send() types %d, %d\n",

 						a->p1_type, a->p2_type);

 				ret=E_BUG;

 				break;

 			}

+			to=(union sockaddr_union*) malloc(sizeof(union sockaddr_union));

+			if (to==0){

+				LOG(L_ERR, "ERROR: do_action: "

+							"memory allocation failure\n");

+				ret=E_OUT_OF_MEM;

+				break;

+			}

 			p=(struct proxy_l*)a->p1.data;

-			to->sin_family = AF_INET;

-			to->sin_port=(p->port)?htons(p->port):htons(SIP_PORT);

 			if (p->ok==0){

 				if (p->host.h_addr_list[p->addr_idx+1])

 					p->addr_idx++;

@@ -141,15 +139,14 @@ int do_action(struct action* a, struct sip_msg* msg)

 					p->addr_idx=0;

 				p->ok=1;

 			}

-			memcpy(&(to->sin_addr.s_addr), p->host.h_addr_list[p->addr_idx],

-					sizeof(to->sin_addr.s_addr));

-			/*

-			to->sin_addr.s_addr=*((long*)p->host.h_addr_list[p->addr_idx]);

-			*/

-			p->tx++;

-			p->tx_bytes+=msg->len;

-			ret=udp_send(msg->orig, msg->len, (struct sockaddr*)to,

-					sizeof(struct sockaddr_in));

+			ret=hostent2su(	to, &p->host, p->addr_idx,

+						(p->port)?htons(p->port):htons(SIP_PORT) );

+			if (ret==0){

+				p->tx++;

+				p->tx_bytes+=msg->len;

+				ret=udp_send(msg->orig, msg->len, to,

+								sizeof(union sockaddr_union));

+			}

 			free(to);

 			if (ret<0){

 				p->errors++;

@@ -8,6 +8,7 @@

 %{

 	#include "cfg.tab.h"

 	#include "dprint.h"

+	#include "globals.h"

 	#include <string.h>

 	#include <stdlib.h>

@@ -107,6 +108,9 @@ DIGIT		[0-9]

 ALPHANUM	{LETTER}|{DIGIT}|[_]

 NUMBER		{DIGIT}+

 ID			{LETTER}{ALPHANUM}*

+HEX			[0-9a-fA-F]

+HEX4		{HEX}{1,4}

+IPV6ADDR	({HEX4}":"){7}{HEX4}|({HEX4}":"){1,7}(":"{HEX4}){1,7}|":"(":"{HEX4}){1,7}|({HEX4}":"){1,7}":"|"::"

 QUOTES		\"

 TICK		\'

 SLASH		"/"

@@ -188,8 +192,10 @@ EAT_ABLE	[\ \t\b\r]

 <INITIAL>{AND}		{ count(); return AND; }

 <INITIAL>{OR}		{ count(); return OR;  }

-<INITIAL>{NUMBER}		{ count(); yylval.intval=atoi(yytext);

-							return NUMBER; }

+

+

+<INITIAL>{IPV6ADDR}		{ count(); yylval.strval=yytext; return IPV6ADDR; }

+<INITIAL>{NUMBER}		{ count(); yylval.intval=atoi(yytext);return NUMBER; }

 <INITIAL>{YES}			{ count(); yylval.intval=1; return NUMBER; }

 <INITIAL>{NO}			{ count(); yylval.intval=0; return NUMBER; }

@@ -13,12 +13,14 @@

 #include <netinet/in.h>

 #include <arpa/inet.h>

 #include <string.h>

+#include <errno.h>

 #include "route_struct.h"

 #include "globals.h"

 #include "route.h"

 #include "dprint.h"

 #include "sr_module.h"

 #include "modparam.h"

+#include "ip_addr.h"

 #include "config.h"

@@ -40,7 +42,8 @@ void* f_tmp;

 	char* strval;

 	struct expr* expr;

 	struct action* action;

-	struct net* net;

+	struct net* ipnet;

+	struct ip_addr* ipaddr;

 }

 /* terminals */

@@ -106,6 +109,7 @@ void* f_tmp;

 %token <intval> NUMBER

 %token <strval> ID

 %token <strval> STRING

+%token <strval> IPV6ADDR

 /* other */

 %token COMMA

@@ -124,8 +128,8 @@ void* f_tmp;

 /*non-terminals */

 %type <expr> exp, exp_elem /*, condition*/

 %type <action> action, actions, cmd, if_cmd, stm

-%type <uval> ipv4

-%type <net> net4

+%type <ipaddr> ipv4, ipv6, ip

+%type <ipnet> ipnet

 %type <strval> host

 /*%type <route_el> rules;

   %type <route_el> rule;

@@ -175,18 +179,25 @@ assign_stm:	DEBUG EQUAL NUMBER { debug=$3; }

 		| CHECK_VIA EQUAL error { yyerror("boolean value expected"); }

 		| LOOP_CHECKS EQUAL NUMBER { loop_checks=$3; }

 		| LOOP_CHECKS EQUAL error { yyerror("boolean value expected"); }

-		| LISTEN EQUAL ipv4  {

+		| LISTEN EQUAL ip  {

 								if (addresses_no < MAX_LISTEN){

-									tmp=inet_ntoa(*(struct in_addr*)&$3);

-									names[addresses_no]=

-												(char*)malloc(strlen(tmp)+1);

-									if (names[addresses_no]==0){

+									tmp=ip_addr2a($3);

+								/*	tmp=inet_ntoa(*(struct in_addr*)&$3);*/

+									if (tmp==0){

 										LOG(L_CRIT, "ERROR: cfg. parser: "

-														"out of memory.\n");

+											" bad ip address: %s\n",

+											strerror(errno));

 									}else{

-										strncpy(names[addresses_no], tmp,

-												strlen(tmp)+1);

-										addresses_no++;

+										names[addresses_no]=

+												(char*)malloc(strlen(tmp)+1);

+										if (names[addresses_no]==0){

+											LOG(L_CRIT, "ERROR: cfg. parser: "

+														"out of memory.\n");

+										}else{

+											strncpy(names[addresses_no], tmp,

+													strlen(tmp)+1);

+											addresses_no++;

+										}

 									}

 								}else{

 									LOG(L_CRIT, "ERROR: cfg. parser:"

@@ -255,21 +266,63 @@ module_stm:	LOADMODULE STRING	{ DBG("loading module %s\n", $2);

 		 ;

+ip:		 ipv4  { $$=$1; }

+		|ipv6  { $$=$1; }

+		;

+

 ipv4:	NUMBER DOT NUMBER DOT NUMBER DOT NUMBER { 

-											if (($1>255) || ($1<0) ||

-												($3>255) || ($3<0) ||

-												($5>255) || ($5<0) ||

-												($7>255) || ($7<0)){

-												yyerror("invalid ipv4"

-														"address");

-												$$=0;

+											$$=malloc(sizeof(struct ip_addr));

+											if ($$==0){

+												LOG(L_CRIT, "ERROR: cfg. "

+													"parser: out of memory.\n"

+													);

 											}else{

-												$$=htonl( ($1<<24)|

+												memset($$, 0, 

+													sizeof(struct ip_addr));

+												$$->af=AF_INET;

+												$$->len=4;

+												if (($1>255) || ($1<0) ||

+													($3>255) || ($3<0) ||

+													($5>255) || ($5<0) ||

+													($7>255) || ($7<0)){

+													yyerror("invalid ipv4"

+															"address");

+													$$->u.addr32[0]=0;

+													/* $$=0; */

+												}else{

+													$$->u.addr[0]=$1;

+													$$->u.addr[1]=$3;

+													$$->u.addr[2]=$5;

+													$$->u.addr[3]=$7;

+													/*

+													$$=htonl( ($1<<24)|

 													($3<<16)| ($5<<8)|$7 );

+													*/

+												}

 											}

 												}

 	;

+ipv6:	IPV6ADDR {

+					$$=malloc(sizeof(struct ip_addr));

+					if ($$==0){

+						LOG(L_CRIT, "ERROR: cfg. parser: out of memory.\n");

+					}else{

+						memset($$, 0, sizeof(struct ip_addr));

+						$$->af=AF_INET6;

+						$$->len=16;

+					#ifndef USE_IPV6

+						yyerror("ipv6 address & no ipv6 support compiled in");

+						YYABORT;

+					#endif

+						if (inet_pton(AF_INET6, $1, $$->u.addr)<=0){

+							yyerror("bad ipv6 address");

+						}

+					}

+				}

+	;

+

+

 route_stm:	ROUTE LBRACE actions RBRACE { push($3, &rlist[DEFAULT_RT]); }

 		| ROUTE LBRACK NUMBER RBRACK LBRACE actions RBRACE { 

@@ -343,7 +396,7 @@ exp_elem:	METHOD EQUAL_T STRING	{$$= mk_elem(	EQUAL_OP, STRING_ST,

 		| URI error	{ $$=0; yyerror("invalid operator,"

 				  					" == or =~ expected");

 					}

-		| SRCIP EQUAL_T net4	{ $$=mk_elem(	EQUAL_OP, NET_ST,

+		| SRCIP EQUAL_T ipnet	{ $$=mk_elem(	EQUAL_OP, NET_ST,

 												SRCIP_O, $3);

 								}

 		| SRCIP EQUAL_T STRING	{ $$=mk_elem(	EQUAL_OP, STRING_ST,

@@ -363,7 +416,7 @@ exp_elem:	METHOD EQUAL_T STRING	{$$= mk_elem(	EQUAL_OP, STRING_ST,

 		| SRCIP MATCH error  { $$=0; yyerror( "hostname expected"); }

 		| SRCIP error  { $$=0; 

 						 yyerror("invalid operator, == or =~ expected");}

-		| DSTIP EQUAL_T net4	{ $$=mk_elem(	EQUAL_OP, NET_ST,

+		| DSTIP EQUAL_T ipnet	{ $$=mk_elem(	EQUAL_OP, NET_ST,

 												DSTIP_O, $3);

 								}

 		| DSTIP EQUAL_T STRING	{ $$=mk_elem(	EQUAL_OP, STRING_ST,

@@ -387,18 +440,22 @@ exp_elem:	METHOD EQUAL_T STRING	{$$= mk_elem(	EQUAL_OP, STRING_ST,

 		| NUMBER		{$$=mk_elem( NO_OP, NUMBER_ST, NUMBER_O, (void*)$1 ); }

 	;

-net4:	ipv4 SLASH ipv4	{ $$=mk_net($1, $3); } 

-	| ipv4 SLASH NUMBER {	if (($3>32)|($3<0)){

+ipnet:	ip SLASH ip	{ $$=mk_net($1, $3); } 

+	| ip SLASH NUMBER 	{	if (($3<0) || ($3>$1->len*8)){

 								yyerror("invalid bit number in netmask");

 								$$=0;

 							}else{

+								$$=mk_net_bitlen($1, $3);

+							/*

 								$$=mk_net($1, 

 										htonl( ($3)?~( (1<<(32-$3))-1 ):0 ) );

+							*/

 							}

 						}

-	| ipv4				{ $$=mk_net($1, 0xffffffff); }

-	| ipv4 SLASH error { $$=0;

-						 yyerror("netmask (eg:255.0.0.0 or 8) expected");}

+	| ip				{ $$=mk_net_bitlen($1, $1->len*8); }

+	| ip SLASH error	{ $$=0;

+						 yyerror("netmask (eg:255.0.0.0 or 8) expected");

+						}

 	;

 host:	ID				{ $$=$1; }

@@ -462,7 +519,7 @@ cmd:		FORWARD LPAREN host RPAREN	{ $$=mk_action(	FORWARD_T,

 														$3,

 														0);

 										}

-		| FORWARD LPAREN ipv4 RPAREN	{ $$=mk_action(	FORWARD_T,

+		| FORWARD LPAREN ip RPAREN	{ $$=mk_action(	FORWARD_T,

 														IP_ST,

 														NUMBER_ST,

 														(void*)$3,

@@ -480,7 +537,7 @@ cmd:		FORWARD LPAREN host RPAREN	{ $$=mk_action(	FORWARD_T,

 																$3,

 																(void*)$5);

 													}

-		| FORWARD LPAREN ipv4 COMMA NUMBER RPAREN { $$=mk_action(FORWARD_T,

+		| FORWARD LPAREN ip COMMA NUMBER RPAREN { $$=mk_action(FORWARD_T,

 																 IP_ST,

 																 NUMBER_ST,

 																 (void*)$3,

@@ -524,7 +581,7 @@ cmd:		FORWARD LPAREN host RPAREN	{ $$=mk_action(	FORWARD_T,

 													$3,

 													0);

 									}

-		| SEND LPAREN ipv4 RPAREN	{ $$=mk_action(	SEND_T,

+		| SEND LPAREN ip RPAREN		{ $$=mk_action(	SEND_T,

 													IP_ST,

 													NUMBER_ST,

 													(void*)$3,

@@ -542,7 +599,7 @@ cmd:		FORWARD LPAREN host RPAREN	{ $$=mk_action(	FORWARD_T,

 																$3,

 																(void*)$5);

 												}

-		| SEND LPAREN ipv4 COMMA NUMBER RPAREN { $$=mk_action(	SEND_T,

+		| SEND LPAREN ip COMMA NUMBER RPAREN { $$=mk_action(	SEND_T,

 																IP_ST,

 																NUMBER_ST,

 																(void*)$3,

@@ -8,7 +8,6 @@

 #include <syslog.h>

-#include "globals.h"

 #define L_ALERT -3

 #define L_CRIT  -2

@@ -18,6 +17,10 @@

 #define L_INFO   3

 #define L_DBG    4

+/* vars:*/

+

+extern int debug;

+extern int log_stderr;

 #define DPRINT_LEV	1

@@ -9,7 +9,7 @@

 enum { FL_WHITE=1, FL_YELLOW, FL_GREEN, FL_RED, FL_BLUE, FL_MAGENTA,

 	   FL_BROWN, FL_BLACK, FL_ACC, FL_MAX };

-typedef unsigned long flag_t;

+typedef unsigned int flag_t;

 #define MAX_FLAG  ( sizeof(flag_t) * CHAR_BIT - 1 )

@@ -25,6 +25,8 @@

 #include "msg_translator.h"

 #include "sr_module.h"

 #include "stats.h"

+#include "ip_addr.h"

+#include "resolve.h"

 #ifdef DEBUG_DMALLOC

 #include <dmalloc.h>

@@ -36,7 +38,7 @@ int forward_request( struct sip_msg* msg, struct proxy_l * p)

 {

 	unsigned int len;

 	char* buf;

-	struct sockaddr_in* to;

+	union sockaddr_union* to;

 	to=0;

 	buf = build_req_buf_from_sip_req( msg, &len);

@@ -45,7 +47,7 @@ int forward_request( struct sip_msg* msg, struct proxy_l * p)

 		goto error;

 	}

-	to=(struct sockaddr_in*)malloc(sizeof(struct sockaddr_in));

+	to=(union sockaddr_union*)malloc(sizeof(union sockaddr_union));

 	if (to==0){

 		LOG(L_ERR, "ERROR: forward_request: out of memory\n");

 		goto error;

@@ -55,26 +57,20 @@ int forward_request( struct sip_msg* msg, struct proxy_l * p)

 	DBG("Sending:\n%s.\n", buf);

 	DBG("orig. len=%d, new_len=%d\n", msg->len, len );

-	to->sin_family = AF_INET;

-	to->sin_port = (p->port)?htons(p->port):htons(SIP_PORT);

 	/* if error try next ip address if possible */

 	if (p->ok==0){

 		if (p->host.h_addr_list[p->addr_idx+1])

 			p->addr_idx++;

+		else p->addr_idx=0;

 		p->ok=1;

 	}

-	

-	memcpy(&(to->sin_addr.s_addr), p->host.h_addr_list[p->addr_idx],

-			sizeof(to->sin_addr.s_addr));

-	/* 

-	to->sin_addr.s_addr=*((long*)p->host.h_addr_list[p->addr_idx]);

-	*/

+	hostent2su(to, &p->host, p->addr_idx, 

+				(p->port)?htons(p->port):htons(SIP_PORT));

 	p->tx++;

 	p->tx_bytes+=len;

-	if (udp_send( buf, len, (struct sockaddr*) to,

-				sizeof(struct sockaddr_in))==-1){

+	if (udp_send( buf, len,  to, sizeof(union sockaddr_union))==-1){

 			p->errors++;

 			p->ok=0;

 			STATS_TX_DROPS;

@@ -93,43 +89,50 @@ error:

 }

-int update_sock_struct_from_via( struct sockaddr_in* to,  struct via_body* via )

+int update_sock_struct_from_via( union sockaddr_union* to,  

+								 struct via_body* via )

 {

 	int err;

 	struct hostent* he;

+	unsigned int ip;

 	char *host_copy;

-	to->sin_family = AF_INET;

-	to->sin_port = (via->port)?htons(via->port): htons(SIP_PORT);

 #ifdef DNS_IP_HACK

-	to->sin_addr.s_addr=str2ip((unsigned char*)via->host.s,via->host.len,&err);

-	if (err)

+	ip=str2ip((unsigned char*)via->host.s,via->host.len,&err);

+	if (err==0){

+		to->sin.sin_family=AF_INET;

+		to->sin.sin_port=(via->port)?htons(via->port): htons(SIP_PORT);

+		memcpy(&to->sin.sin_addr, (char*)&ip, 4);

+	}else

 #endif

 	{

-		/* fork? gethostbyname will probably block... */

 		/* we do now a malloc/memcpy because gethostbyname loves \0-terminated 

-		   strings; -jiri */

-		if (!(host_copy=pkg_malloc( via->host.len+1 ))) {

-			LOG(L_NOTICE, "ERROR: update_sock_struct_from_via: not enough memory\n");

-			return -1;

+		   strings; -jiri 

+		   but only if host is not null terminated

+		   (host.s[len] will always be ok for a via)

+           BTW: when is via->host.s non null terminated? tm copy?

+		   - andrei 

+		*/

+		if (via->host.s[via->host.len]){

+			if (!(host_copy=pkg_malloc( via->host.len+1 ))) {

+				LOG(L_NOTICE, "ERROR: update_sock_struct_from_via: not enough memory\n");

+				return -1;

+			}

+			memcpy(host_copy, via->host.s, via->host.len );

+			host_copy[via->host.len]=0;

+			he=resolvehost(host_copy);

+			pkg_free( host_copy );

+		}else{

+			he=resolvehost(via->host.s);

 		}

-		memcpy(host_copy, via->host.s, via->host.len );

-		host_copy[via->host.len]=0;

-		he=gethostbyname(host_copy);

-		/* he=gethostbyname(via->host.s); */

-		pkg_free( host_copy );

 		if (he==0){

 			LOG(L_NOTICE, "ERROR:forward_reply:gethostbyname(%s) failure\n",

 					via->host.s);

 			return -1;

 		}

-		memcpy(&(to->sin_addr.s_addr), he->h_addr_list[0], 

-				sizeof(to->sin_addr.s_addr));

-		/*

-		to->sin_addr.s_addr=*((long*)he->h_addr_list[0]);

-		*/

+		hostent2su(to, he, 0, (via->port)?htons(via->port): htons(SIP_PORT));

 	}

 	return 1;

 }

@@ -140,7 +143,7 @@ int forward_reply(struct sip_msg* msg)

 {

 	int  r;

 	char* new_buf;

-	struct sockaddr_in* to;

+	union sockaddr_union* to;

 	unsigned int new_len;

 	struct sr_module *mod;

@@ -158,7 +161,6 @@ int forward_reply(struct sip_msg* msg)

 		}

 	}

-	/* here will be called the T Module !!!!!!  */

 	/* quick hack, slower for mutliple modules*/

 	for (mod=modules;mod;mod=mod->next){

 		if ((mod->exports) && (mod->exports->response_f)){

@@ -176,7 +178,7 @@ int forward_reply(struct sip_msg* msg)

 		goto error;

 	}

-	to=(struct sockaddr_in*)malloc(sizeof(struct sockaddr_in));

+	to=(union sockaddr_union*)malloc(sizeof(union sockaddr_union));

 	if (to==0){

 		LOG(L_ERR, "ERROR: forward_reply: out of memory\n");

 		goto error;

@@ -190,8 +192,8 @@ int forward_reply(struct sip_msg* msg)

 	if (update_sock_struct_from_via( to, msg->via2 )==-1) goto error;

-	if (udp_send(new_buf,new_len, (struct sockaddr*) to,

-					sizeof(struct sockaddr_in))==-1)

+	if (udp_send(new_buf,new_len,  to,

+				sizeof(union sockaddr_union))==-1)

 	{

 		STATS_TX_DROPS;

 		goto error;

@@ -12,7 +12,8 @@

 int forward_request( struct sip_msg* msg,  struct proxy_l* p);

-int update_sock_struct_from_via( struct sockaddr_in* to,  struct via_body* via );

+int update_sock_struct_from_via( union sockaddr_union* to,

+								struct via_body* via );

 int forward_reply( struct sip_msg* msg);

 #endif

@@ -10,6 +10,7 @@

 #define globals_h

 #include "types.h"

+#include "ip_addr.h"

 #define NO_DNS     0

 #define DO_DNS     1

@@ -24,17 +25,17 @@ extern int port_no_str_len;

 extern unsigned int maxbuffer;

 extern char * names[];

 extern int names_len[];

-extern unsigned int addresses[];

+extern struct ip_addr addresses[];

 extern int addresses_no;

-extern unsigned int bind_address;

+extern struct ip_addr* bind_address;

 extern int children_no;

-extern int debug;

 extern int dont_fork;

-extern int log_stderr;

 extern int check_via;

 extern int received_dns;

 extern int loop_checks;

 extern int process_no;

+/*

+ * debug & log_stderr moved to dprint.h*/

 extern process_bm_t process_bit;

 extern int *pids;

new file mode 100644

@@ -0,0 +1,126 @@

+/*

+ * $Id$

+ *

+ *

+ * ip address & address family related functions

+ */

+

+#include <stdio.h>

+

+#include "ip_addr.h"

+#include "dprint.h"

+

+

+struct net* mk_net(struct ip_addr* ip, struct ip_addr* mask)

+{

+	struct net* n;

+	

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

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

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

+		goto error;

+	}

+	n=(struct net*)malloc(sizeof(struct net));

+	if (n==0){ 

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

+		goto error;

+	}

+	n->ip=*ip;

+	n->mask=*mask;

+	return n;

+error:

+	return 0;

+}

+

+

+

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

+{

+	struct net* n;

+	int r;

+	

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

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

+		goto error;

+	}

+	n=(struct net*)malloc(sizeof(struct net));

+	if (n==0){

+		LOG(L_CRIT, "ERROR: mk_net_bitlen: memory allocation failure\n"); 

+		goto error;

+	}

+	memset(n,0, sizeof(struct net));

+	n->ip=*ip;

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

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

+	n->mask.af=ip->af;

+	n->mask.len=ip->len;

+	

+	return n;

+error:

+	return 0;

+}

+

+

+

+void print_ip(struct ip_addr* ip)

+{

+	switch(ip->af){

+		case AF_INET:

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

+								ip->u.addr[1],

+								ip->u.addr[2],

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

+			break;

+		case AF_INET6:

+			DBG("%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 adress 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 adress family %d\n", ip->af);

+	}

+}

+

+

+

+void print_net(struct net* net)

+{

+	if (net==0){

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

+		return;

+	}

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

+}

new file mode 100644

@@ -0,0 +1,336 @@

+/* $Id$

+ *

+ * ip address family realted structures

+ */

+

+#ifndef ip_addr_h

+#define ip_addr_h

+

+#include <string.h>

+#include <netinet/in.h>

+#include <netdb.h>

+

+#ifdef USE_IPV6

+	#ifdef FreeBSD			/* freebsd is brain damaged and needs a different

+							   include */

+#include <netinet6/in6.h>

+	#endif

+#endif

+

+#include "dprint.h"

+

+

+

+struct ip_addr{

+	unsigned int af; /* address family: AF_INET6 or AF_INET */

+	unsigned int len;    /* address len, 16 or 4 */

+	

+	/* 64 bits alligned address */

+	union {

+		unsigned int   addr32[4];

+		unsigned short addr16[8];

+		unsigned char  addr[16];

+	}u;

+};

+

+

+

+struct net{

+	struct ip_addr ip;

+	struct ip_addr mask;

+};

+

+union sockaddr_union{

+		struct sockaddr     s;

+		struct sockaddr_in  sin;

+	#ifdef USE_IPV6

+		struct sockaddr_in6 sin6;

+	#endif

+};

+

+

+

+

+/* inits an ip_addr with the addr. info from a hostent structure

+ * ip = struct ip_addr*

+ * he= struct hostent*

+ */

+#define hostent2ip_addr(ip, he, addr_no) \

+	do{ \

+		(ip)->af=(he)->h_addrtype; \

+		(ip)->len=(he)->h_length;  \

+		memcpy((ip)->u.addr, (he)->h_addr_list[(addr_no)], (ip)->len); \

+	}while(0)

+	

+

+

+

+/* gets the protocol family corresponding to a specific address family

+ * ( PF_INET - AF_INET, PF_INET6 - AF_INET6, af for others)

+ */

+#ifdef USE_IPV6

+#define AF2PF(af)   (((af)==AF_INET)?PF_INET:((af)==AF_INET6)?PF_INET6:(af))

+#else

+#define AF2PF(af)   (((af)==AF_INET)?PF_INET:(af))

+#endif

+

+

+

+

+struct net* mk_net(struct ip_addr* ip, struct ip_addr* mask);

+struct net* mk_net_bitlen(struct ip_addr* ip, unsigned int bitlen);

+

+void print_ip(struct ip_addr* ip);

+void stdout_print_ip(struct ip_addr* ip);

+void print_net(struct net* net);

+

+

+

+

+/* returns 1 if ip & net.mask == net.ip ; 0 otherwise & -1 on error 

+	[ diff. adress fams ]) */

+inline static int matchnet(struct ip_addr* ip, struct net* net)

+{

+	int r;

+	int ret;

+	

+	ret=-1;

+	if (ip->af == net->ip.af){

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

+									   all multiple of 4*/

+			if ((ip->u.addr32[r]&net->mask.u.addr32[r])!=

+														 net->ip.u.addr32[r]){

+				return 0;

+			}

+		}

+		return 1;

+	};

+	return -1;

+}

+

+

+

+/* inits an ip_addr pointer from a sockaddr_union ip address */

+static inline void su2ip_addr(struct ip_addr* ip, union sockaddr_union* su)

+{

+	switch(su->s.sa_family){

+	case AF_INET: 

+					ip->af=AF_INET;