tinc/src net.h,1.9.4.60,1.9.4.61 route.c,1.1.2.55,1.1.2.56

[Guus Sliepen <guus@nl.linux.org>]

Update of /home/CVS/tinc/src
In directory humbolt:/tmp/cvs-serv27912/src

Modified Files:
      Tag: CABAL
	net.h route.c 
Log Message:
Provide all missing IPv6 definitions in lib/ipv6.h.


Index: net.h
===================================================================
RCS file: /home/CVS/tinc/src/Attic/net.h,v
retrieving revision 1.9.4.60
retrieving revision 1.9.4.61
diff -u -r1.9.4.60 -r1.9.4.61
--- net.h	2003/07/06 23:16:28	1.9.4.60
+++ net.h	2003/07/07 11:11:33	1.9.4.61
@@ -56,11 +56,6 @@
 	uint8_t x[4];
 } ipv4_t;
 
-typedef struct ip_mask_t {
-	ipv4_t address;
-	ipv4_t mask;
-} ip_mask_t;
-
 typedef struct ipv6_t {
 	uint16_t x[8];
 } ipv6_t;
@@ -70,19 +65,16 @@
 typedef union {
 	struct sockaddr sa;
 	struct sockaddr_in in;
-#ifdef HAVE_STRUCT_SOCKADDR_IN6
 	struct sockaddr_in6 in6;
+#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
+	struct sockaddr_storage storage;
 #endif
 } sockaddr_t;
 
 #ifdef SA_LEN
 #define SALEN(s) SA_LEN(&s)
 #else
-#ifdef HAVE_STRUCT_SOCKADDR_IN6
 #define SALEN(s) (s.sa_family==AF_INET?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6))
-#else
-#define SALEN(s) (sizeof sockaddr_in)
-#endif
 #endif
 
 typedef struct vpn_packet_t {

Index: route.c
===================================================================
RCS file: /home/CVS/tinc/src/route.c,v
retrieving revision 1.1.2.55
retrieving revision 1.1.2.56
diff -u -r1.1.2.55 -r1.1.2.56
--- route.c	2003/07/06 23:16:29	1.1.2.55
+++ route.c	2003/07/07 11:11:33	1.1.2.56
@@ -286,8 +286,6 @@
 	return subnet->owner;
 }
 
-#ifdef HAVE_NETINET_IP6_H
-
 /* RFC 2463 */
 
 static void route_ipv6_unreachable(vpn_packet_t *packet, uint8_t code)
@@ -356,8 +354,6 @@
 	write_packet(packet);
 }
 
-#endif
-
 static node_t *route_ipv6(vpn_packet_t *packet)
 {
 	subnet_t *subnet;
@@ -376,23 +372,17 @@
 				   ntohs(*(uint16_t *) & packet->data[48]),
 				   ntohs(*(uint16_t *) & packet->data[50]),
 				   ntohs(*(uint16_t *) & packet->data[52]));
-#ifdef HAVE_NETINET_IP6_H
 		route_ipv6_unreachable(packet, ICMP6_DST_UNREACH_ADDR);
-#endif
 
 		return NULL;
 	}
 
-#ifdef HAVE_NETINET_IP6_H
 	if(!subnet->owner->status.reachable)
 		route_ipv6_unreachable(packet, ICMP6_DST_UNREACH_NOROUTE);
-#endif
 	
 	return subnet->owner;
 }
 
-#ifdef HAVE_NETINET_IP6_H
-
 /* RFC 2461 */
 
 static void route_neighborsol(vpn_packet_t *packet)
@@ -504,8 +494,6 @@
 	write_packet(packet);
 }
 
-#endif
-
 /* RFC 826 */
 
 static void route_arp(vpn_packet_t *packet)
@@ -584,12 +572,10 @@
 					break;
 
 				case 0x86DD:
-#ifdef HAVE_NETINET_IP6_H
 					if(packet->data[20] == IPPROTO_ICMPV6 && packet->data[54] == ND_NEIGHBOR_SOLICIT) {
 						route_neighborsol(packet);
 						return;
 					}
-#endif
 					n = route_ipv6(packet);
 					break;
 

--
Tinc-cvs:     CVS changelog list for the tinc VPN daemon
Archive:      http://mail.nl.linux.org/tinc-cvs/
Tinc site:    http://tinc.nl.linux.org/