X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Fipv4.h;h=7f1e15929a7efb5155eff85fea4b75cb236f9f5f;hp=ec3c511561431fbb9e11b2d76d20b86aab9892bb;hb=5bba3124c8c23568def7a4804651a53f3a6b4fd2;hpb=b0a4f7b5551cae6fb5af2eb4bcb0dfb3443f7d89

diff --git a/lib/ipv4.h b/lib/ipv4.h
index ec3c5115..7f1e1592 100644
--- a/lib/ipv4.h
+++ b/lib/ipv4.h
@@ -1,7 +1,7 @@
 /*
     ipv4.h -- missing IPv4 related definitions
-    Copyright (C) 2003 Ivo Timmermans <ivo@o2w.nl>
-                  2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 2004 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2004 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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$
 */
 
 #ifndef __TINC_IPV4_H__
@@ -35,6 +35,10 @@
 #define ICMP_DEST_UNREACH 3
 #endif
 
+#ifndef ICMP_FRAG_NEEDED
+#define ICMP_FRAG_NEEDED 4
+#endif
+
 #ifndef ICMP_NET_UNKNOWN
 #define ICMP_NET_UNKNOWN 6
 #endif
@@ -47,8 +51,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;
@@ -58,29 +61,30 @@ struct ip {
 	unsigned int ip_hl:4;
 #endif
 	uint8_t ip_tos;
-	u_short ip_len;
-	u_short ip_id; 
-	u_short ip_off;
+	uint16_t ip_len;
+	uint16_t ip_id; 
+	uint16_t ip_off;
 #define IP_RF 0x8000
 #define IP_DF 0x4000
 #define IP_MF 0x2000
-#define IP_OFFMASK 0x1fff
 	uint8_t ip_ttl;
 	uint8_t ip_p;
-	u_short ip_sum;
+	uint16_t ip_sum;
 	struct in_addr ip_src, ip_dst;
-};
-
+} __attribute__ ((__packed__));
 #endif
 
-#ifndef HAVE_NETINET_IP_ICMP_H
+#ifndef IP_OFFMASK
+#define IP_OFFMASK 0x1fff
+#endif
 
+#ifndef HAVE_STRUCT_ICMP
 struct icmp {
 	uint8_t icmp_type;
 	uint8_t icmp_code;
 	uint16_t icmp_cksum;
 	union {
-		u_char ih_pptr;
+		uint8_t ih_pptr;
 		struct in_addr ih_gwaddr;
 		struct ih_idseq {
 			uint16_t icd_id;
@@ -129,8 +133,7 @@ struct icmp {
 #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__ */