[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
tinc/lib dropin.h,1.1.2.12,1.1.2.13 ethernet.h,1.1.2.2,1.1.2.3 ipv4.h,1.1.2.1,1.1.2.2 ipv6.h,1.1.2.4,1.1.2.5
Update of /home/CVS/tinc/lib
In directory humbolt:/tmp/cvs-serv19925/lib
Modified Files:
Tag: CABAL
dropin.h ethernet.h ipv4.h ipv6.h
Log Message:
Check for ethernet/ipv4/ipv6 related structures.
Index: dropin.h
===================================================================
RCS file: /home/CVS/tinc/lib/dropin.h,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- dropin.h 2003/07/17 15:06:25 1.1.2.12
+++ dropin.h 2003/07/18 13:42:35 1.1.2.13
@@ -23,6 +23,9 @@
#ifndef __DROPIN_H__
#define __DROPIN_H__
+#include "fake-getaddrinfo.h"
+#include "fake-getnameinfo.h"
+
#ifndef HAVE_DAEMON
extern int daemon(int, int);
#endif
Index: ethernet.h
===================================================================
RCS file: /home/CVS/tinc/lib/Attic/ethernet.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ethernet.h 2003/07/18 12:21:02 1.1.2.2
+++ ethernet.h 2003/07/18 13:42:35 1.1.2.3
@@ -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 @@
#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 @@
#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__ */
Index: ipv4.h
===================================================================
RCS file: /home/CVS/tinc/lib/Attic/ipv4.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ipv4.h 2003/07/18 12:16:23 1.1.2.1
+++ ipv4.h 2003/07/18 13:42:35 1.1.2.2
@@ -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 @@
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 @@
#define icmp_mask icmp_dun.id_mask
#define icmp_data icmp_dun.id_data
};
-
#endif
#endif /* __TINC_IPV4_H__ */
Index: ipv6.h
===================================================================
RCS file: /home/CVS/tinc/lib/Attic/ipv6.h,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ipv6.h 2003/07/17 15:06:25 1.1.2.4
+++ ipv6.h 2003/07/18 13:42:35 1.1.2.5
@@ -60,7 +60,7 @@
&& (((__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 @@
#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 @@
#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;
--
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/