j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Provide all missing IPv6 definitions in lib/ipv6.h.

Browse source
This commit is contained in:
Guus Sliepen 2003-07-07 11:11:33 +00:00
parent 1401faf608
commit 30c0381d71
4 changed files with 7 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.in
View file

@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl $Id: configure.in,v 1.13.2.64 2003/07/06 22:11:31 guus Exp $ dnl $Id: configure.in,v 1.13.2.65 2003/07/07 11:11:33 guus Exp $
AC_PREREQ(2.53) AC_PREREQ(2.53)
AC_INIT(src/tincd.c) AC_INIT(src/tincd.c)
@ -101,7 +101,7 @@ AC_TYPE_SIZE_T
AC_HEADER_TIME AC_HEADER_TIME
AC_STRUCT_TM AC_STRUCT_TM
AC_CHECK_TYPES([socklen_t, struct addrinfo, struct sockaddr_in6], , , AC_CHECK_TYPES([socklen_t, struct addrinfo, struct in6_addr, struct sockaddr_in6], , ,
[#include <sys/types.h> [#include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <netdb.h> #include <netdb.h>

1
lib/utils.h
View file

@ -25,6 +25,7 @@
#include "fake-getaddrinfo.h" #include "fake-getaddrinfo.h"
#include "fake-getnameinfo.h" #include "fake-getnameinfo.h"
#include "ipv6.h"
#define min(a,b) (((a)<(b))?(a):(b)) #define min(a,b) (((a)<(b))?(a):(b))

14
src/net.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.h,v 1.9.4.60 2003/07/06 23:16:28 guus Exp $ $Id: net.h,v 1.9.4.61 2003/07/07 11:11:33 guus Exp $
*/ */
#ifndef __TINC_NET_H__ #ifndef __TINC_NET_H__
@ -56,11 +56,6 @@ typedef struct ipv4_t {
uint8_t x[4]; uint8_t x[4];
} ipv4_t; } ipv4_t;
typedef struct ip_mask_t {
ipv4_t address;
ipv4_t mask;
} ip_mask_t;
typedef struct ipv6_t { typedef struct ipv6_t {
uint16_t x[8]; uint16_t x[8];
} ipv6_t; } ipv6_t;
@ -70,19 +65,16 @@ typedef short length_t;
typedef union { typedef union {
struct sockaddr sa; struct sockaddr sa;
struct sockaddr_in in; struct sockaddr_in in;
#ifdef HAVE_STRUCT_SOCKADDR_IN6
struct sockaddr_in6 in6; struct sockaddr_in6 in6;
#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
struct sockaddr_storage storage;
#endif #endif
} sockaddr_t; } sockaddr_t;
#ifdef SA_LEN #ifdef SA_LEN
#define SALEN(s) SA_LEN(&s) #define SALEN(s) SA_LEN(&s)
#else #else
#ifdef HAVE_STRUCT_SOCKADDR_IN6
#define SALEN(s) (s.sa_family==AF_INET?sizeof(struct sockaddr_in):sizeof(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 #endif
typedef struct vpn_packet_t { typedef struct vpn_packet_t {

16
src/route.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: route.c,v 1.1.2.55 2003/07/06 23:16:29 guus Exp $ $Id: route.c,v 1.1.2.56 2003/07/07 11:11:33 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -286,8 +286,6 @@ static node_t *route_ipv4(vpn_packet_t *packet)
return subnet->owner; return subnet->owner;
} }
#ifdef HAVE_NETINET_IP6_H
/* RFC 2463 */ /* RFC 2463 */
static void route_ipv6_unreachable(vpn_packet_t *packet, uint8_t code) static void route_ipv6_unreachable(vpn_packet_t *packet, uint8_t code)
@ -356,8 +354,6 @@ static void route_ipv6_unreachable(vpn_packet_t *packet, uint8_t code)
write_packet(packet); write_packet(packet);
} }
#endif
static node_t *route_ipv6(vpn_packet_t *packet) static node_t *route_ipv6(vpn_packet_t *packet)
{ {
subnet_t *subnet; subnet_t *subnet;
@ -376,23 +372,17 @@ static node_t *route_ipv6(vpn_packet_t *packet)
ntohs(*(uint16_t *) & packet->data[48]), ntohs(*(uint16_t *) & packet->data[48]),
ntohs(*(uint16_t *) & packet->data[50]), ntohs(*(uint16_t *) & packet->data[50]),
ntohs(*(uint16_t *) & packet->data[52])); ntohs(*(uint16_t *) & packet->data[52]));
#ifdef HAVE_NETINET_IP6_H
route_ipv6_unreachable(packet, ICMP6_DST_UNREACH_ADDR); route_ipv6_unreachable(packet, ICMP6_DST_UNREACH_ADDR);
#endif
return NULL; return NULL;
} }
#ifdef HAVE_NETINET_IP6_H
if(!subnet->owner->status.reachable) if(!subnet->owner->status.reachable)
route_ipv6_unreachable(packet, ICMP6_DST_UNREACH_NOROUTE); route_ipv6_unreachable(packet, ICMP6_DST_UNREACH_NOROUTE);
#endif
return subnet->owner; return subnet->owner;
} }
#ifdef HAVE_NETINET_IP6_H
/* RFC 2461 */ /* RFC 2461 */
static void route_neighborsol(vpn_packet_t *packet) static void route_neighborsol(vpn_packet_t *packet)
@ -504,8 +494,6 @@ static void route_neighborsol(vpn_packet_t *packet)
write_packet(packet); write_packet(packet);
} }
#endif
/* RFC 826 */ /* RFC 826 */
static void route_arp(vpn_packet_t *packet) static void route_arp(vpn_packet_t *packet)
@ -584,12 +572,10 @@ void route_outgoing(vpn_packet_t *packet)
break; break;
case 0x86DD: case 0x86DD:
#ifdef HAVE_NETINET_IP6_H
if(packet->data[20] == IPPROTO_ICMPV6 && packet->data[54] == ND_NEIGHBOR_SOLICIT) { if(packet->data[20] == IPPROTO_ICMPV6 && packet->data[54] == ND_NEIGHBOR_SOLICIT) {
route_neighborsol(packet); route_neighborsol(packet);
return; return;
} }
#endif
n = route_ipv6(packet); n = route_ipv6(packet);
break; break;