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

Check for ethernet/ipv4/ipv6 related structures.

Browse source
This commit is contained in:
Guus Sliepen 2003-07-18 13:42:35 +00:00
parent 00ddbf5723
commit 96ee04b678
6 changed files with 341 additions and 306 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/dropin.h
View file

@ -17,12 +17,15 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: dropin.h,v 1.1.2.12 2003/07/17 15:06:25 guus Exp $
$Id: dropin.h,v 1.1.2.13 2003/07/18 13:42:35 guus Exp $
*/
#ifndef __DROPIN_H__
#define __DROPIN_H__
#include "fake-getaddrinfo.h"
#include "fake-getnameinfo.h"
#ifndef HAVE_DAEMON
extern int daemon(int, int);
#endif

10
lib/ethernet.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: ethernet.h,v 1.1.2.2 2003/07/18 12:21:02 guus Exp $
$Id: ethernet.h,v 1.1.2.3 2003/07/18 13:42:35 guus Exp $
*/
#ifndef __TINC_ETHERNET_H__
@ -39,8 +39,7 @@
#define ETHERTYPE_IP 0x0800
#endif
#ifndef HAVE_NET_IF_ARP_H
#ifndef HAVE_STRUCT_ARPHDR
struct arphdr {
unsigned short int ar_hrd;
unsigned short int ar_pro;
@ -56,11 +55,9 @@ struct arphdr {
#define ARPOP_InREQUEST 8
#define ARPOP_InREPLY 9
#define ARPOP_NAK 10
#endif
#ifndef HAVE_NETINET_IF_ETHER_H
#ifndef HAVE_STRUCT_ETHER_ARP
struct ether_arp {
struct arphdr ea_hdr;
uint8_t arp_sha[ETH_ALEN];
@ -73,7 +70,6 @@ struct ether_arp {
#define arp_hln ea_hdr.ar_hln
#define arp_pln ea_hdr.ar_pln
#define arp_op ea_hdr.ar_op
#endif
#endif /* __TINC_ETHERNET_H__ */

10
lib/ipv4.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: ipv4.h,v 1.1.2.1 2003/07/18 12:16:23 guus Exp $
$Id: ipv4.h,v 1.1.2.2 2003/07/18 13:42:35 guus Exp $
*/
#ifndef __TINC_IPV4_H__
@ -47,8 +47,7 @@
#define IP_MSS 576
#endif
#ifndef HAVE_NETINET_IP_H
#ifndef HAVE_STRUCT_IP
struct ip {
#if __BYTE_ORDER == __LITTLE_ENDIAN
unsigned int ip_hl:4;
@ -70,11 +69,9 @@ struct ip {
u_short ip_sum;
struct in_addr ip_src, ip_dst;
};
#endif
#ifndef HAVE_NETINET_IP_ICMP_H
#ifndef HAVE_STRUCT_ICMP
struct icmp {
uint8_t icmp_type;
uint8_t icmp_code;
@ -130,7 +127,6 @@ struct icmp {
#define icmp_mask icmp_dun.id_mask
#define icmp_data icmp_dun.id_data
};
#endif
#endif /* __TINC_IPV4_H__ */

10
lib/ipv6.h
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: ipv6.h,v 1.1.2.4 2003/07/17 15:06:25 guus Exp $
$Id: ipv6.h,v 1.1.2.5 2003/07/18 13:42:35 guus Exp $
*/
#ifndef __TINC_IPV6_H__
@ -60,7 +60,7 @@ struct sockaddr_in6 {
&& (((__const uint32_t *) (a))[2] == htonl (0xffff)))
#endif
#ifndef HAVE_NETINET_IP6_H
#ifndef HAVE_STRUCT_IP6_HDR
struct ip6_hdr {
union {
struct ip6_hdrctl {
@ -80,7 +80,9 @@ struct ip6_hdr {
#define ip6_nxt ip6_ctlun.ip6_un1.ip6_un1_nxt
#define ip6_hlim ip6_ctlun.ip6_un1.ip6_un1_hlim
#define ip6_hops ip6_ctlun.ip6_un1.ip6_un1_hlim
#endif
#ifndef HAVE_STRUCT_ICMP6_HDR
struct icmp6_hdr {
uint8_t icmp6_type;
uint8_t icmp6_code;
@ -96,14 +98,18 @@ struct icmp6_hdr {
#define ICMP6_DST_UNREACH_ADDR 3
#define ND_NEIGHBOR_SOLICIT 135
#define ND_NEIGHBOR_ADVERT 136
#endif
#ifndef HAVE_STRUCT_ND_NEIGHBOR_SOLICIT
struct nd_neighbor_solicit {
struct icmp6_hdr nd_ns_hdr;
struct in6_addr nd_ns_target;
};
#define ND_OPT_SOURCE_LINKADDR 1
#define ND_OPT_TARGET_LINKADDR 2
#endif
#ifndef HAVE_STRUCT_ND_OPT_HDR
struct nd_opt_hdr {
uint8_t nd_opt_type;
uint8_t nd_opt_len;