tinc/lib ipv4.h,1.1.2.3,1.1.2.4 ipv6.h,1.1.2.6,1.1.2.7 ethernet.h,1.1.2.4,1.1.2.5

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

Update of /home/CVS/tinc/lib
In directory humbolt:/tmp/cvs-serv9752/lib

Modified Files:
      Tag: CABAL
	ipv4.h ipv6.h ethernet.h 
Log Message:
Update missing definitions, structs describing headers get __packed__ attribute.


Index: ipv4.h
===================================================================
RCS file: /home/CVS/tinc/lib/ipv4.h,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ipv4.h	2003/07/21 13:14:02	1.1.2.3
+++ ipv4.h	2003/10/08 11:34:55	1.1.2.4
@@ -68,7 +68,7 @@
 	uint8_t ip_p;
 	uint16_t ip_sum;
 	struct in_addr ip_src, ip_dst;
-};
+} __attribute__ ((__packed__));
 #endif
 
 #ifndef HAVE_STRUCT_ICMP
@@ -126,7 +126,7 @@
 #define icmp_radv icmp_dun.id_radv
 #define icmp_mask icmp_dun.id_mask
 #define icmp_data icmp_dun.id_data
-};
+} __attribute__ ((__packed__));
 #endif
 
 #endif /* __TINC_IPV4_H__ */

Index: ipv6.h
===================================================================
RCS file: /home/CVS/tinc/lib/ipv6.h,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- ipv6.h	2003/07/21 13:14:02	1.1.2.6
+++ ipv6.h	2003/10/08 11:34:55	1.1.2.7
@@ -38,7 +38,7 @@
 		uint16_t u6_addr16[8];
 		uint32_t u6_addr32[4];
 	} in6_u;
-};
+} __attribute__ ((__packed__));
 #define s6_addr in6_u.u6_addr8
 #define s6_addr16 in6_u.u6_addr16
 #define s6_addr32 in6_u.u6_addr32
@@ -51,7 +51,7 @@
 	uint32_t sin6_flowinfo;
 	struct in6_addr sin6_addr;
 	uint32_t sin6_scope_id;
-};
+} __attribute__ ((__packed__));
 #endif
 
 #ifndef IN6_IS_ADDR_V4MAPPED
@@ -74,7 +74,7 @@
 	} ip6_ctlun;
 	struct in6_addr ip6_src;
 	struct in6_addr ip6_dst;
-};
+} __attribute__ ((__packed__));
 #define ip6_vfc ip6_ctlun.ip6_un2_vfc
 #define ip6_flow ip6_ctlun.ip6_un1.ip6_un1_flow
 #define ip6_plen ip6_ctlun.ip6_un1.ip6_un1_plen
@@ -93,7 +93,7 @@
 		uint16_t icmp6_un_data16[2];
 		uint8_t icmp6_un_data8[4];
 	} icmp6_dataun;
-};
+} __attribute__ ((__packed__));
 #define ICMP6_DST_UNREACH_NOROUTE 0
 #define ICMP6_DST_UNREACH 1
 #define ICMP6_DST_UNREACH_ADDR 3
@@ -105,7 +105,7 @@
 struct nd_neighbor_solicit {
 	struct icmp6_hdr nd_ns_hdr;
 	struct in6_addr nd_ns_target;
-};
+} __attribute__ ((__packed__));
 #define ND_OPT_SOURCE_LINKADDR 1
 #define ND_OPT_TARGET_LINKADDR 2
 #endif
@@ -114,7 +114,7 @@
 struct nd_opt_hdr {
 	uint8_t nd_opt_type;
 	uint8_t nd_opt_len;
-};
+} __attribute__ ((__packed__));
 #endif
 
 #endif /* __TINC_IPV6_H__ */

Index: ethernet.h
===================================================================
RCS file: /home/CVS/tinc/lib/ethernet.h,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ethernet.h	2003/10/06 14:16:51	1.1.2.4
+++ ethernet.h	2003/10/08 11:34:55	1.1.2.5
@@ -43,14 +43,22 @@
 #define ETH_P_IPV6 0x86DD
 #endif
 
+#ifndef HAVE_STRUCT_ETHER_HEADER
+struct ether_header {
+	uint8_t ether_dhost[ETH_ALEN];
+	uint8_t ether_shost[ETH_ALEN];
+	uint16_t ether_type;
+} __attribute__ ((__packed__));
+#endif
+
 #ifndef HAVE_STRUCT_ARPHDR
 struct arphdr {
-	unsigned short int ar_hrd;
-	unsigned short int ar_pro;
-	unsigned char ar_hln;
-	unsigned char ar_pln; 
-	unsigned short int ar_op; 
-};
+	uint16_t ar_hrd;
+	uint16_t ar_pro;
+	uint8_t ar_hln;
+	uint8_t ar_pln; 
+	uint16_t ar_op; 
+} __attribute__ ((__packed__));
 
 #define ARPOP_REQUEST 1 
 #define ARPOP_REPLY 2 
@@ -68,7 +76,7 @@
 	uint8_t arp_spa[4];
 	uint8_t arp_tha[ETH_ALEN];
 	uint8_t arp_tpa[4];
-};
+} __attribute__ ((__packed__));
 #define arp_hrd ea_hdr.ar_hrd
 #define arp_pro ea_hdr.ar_pro
 #define arp_hln ea_hdr.ar_hln

--
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/