From: Guus Sliepen <guus@tinc-vpn.org>
Date: Mon, 21 Jul 2003 13:14:02 +0000 (+0000)
Subject: Be consistent.
X-Git-Tag: release-1.0~52
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=c1e8152f4fe5e4557784d8411e50006d461b8786;p=tinc

Be consistent.
---

diff --git a/lib/dropin.c b/lib/dropin.c
index 0efa5f2b..0a8ae6ef 100644
--- a/lib/dropin.c
+++ b/lib/dropin.c
@@ -17,11 +17,13 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: dropin.c,v 1.1.2.15 2003/07/17 15:06:25 guus Exp $
+    $Id: dropin.c,v 1.1.2.16 2003/07/21 13:14:02 guus Exp $
 */
 
 #include "system.h"
 
+#include "xalloc.h"
+
 #ifndef HAVE_DAEMON
 /*
   Replacement for the daemon() function.
diff --git a/lib/fake-getaddrinfo.c b/lib/fake-getaddrinfo.c
index e1706802..29b3f9b0 100644
--- a/lib/fake-getaddrinfo.c
+++ b/lib/fake-getaddrinfo.c
@@ -11,6 +11,8 @@
 
 #include "system.h"
 
+#include "ipv4.h"
+#include "ipv6.h"
 #include "fake-getaddrinfo.h"
 
 #ifndef HAVE_GAI_STRERROR
@@ -40,7 +42,7 @@ void freeaddrinfo(struct addrinfo *ai)
 #endif /* !HAVE_FREEADDRINFO */
 
 #ifndef HAVE_GETADDRINFO
-static struct addrinfo *malloc_ai(int port, u_long addr)
+static struct addrinfo *malloc_ai(int port, uint32_t addr)
 {
 	struct addrinfo *ai;
 
diff --git a/lib/ipv4.h b/lib/ipv4.h
index 39d914ef..4be432f7 100644
--- a/lib/ipv4.h
+++ b/lib/ipv4.h
@@ -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.2 2003/07/18 13:42:35 guus Exp $
+    $Id: ipv4.h,v 1.1.2.3 2003/07/21 13:14:02 guus Exp $
 */
 
 #ifndef __TINC_IPV4_H__
@@ -57,16 +57,16 @@ 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;
 };
 #endif
@@ -77,7 +77,7 @@ struct icmp {
 	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;
diff --git a/lib/ipv6.h b/lib/ipv6.h
index d8cb4cf5..0db5d011 100644
--- a/lib/ipv6.h
+++ b/lib/ipv6.h
@@ -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.5 2003/07/18 13:42:35 guus Exp $
+    $Id: ipv6.h,v 1.1.2.6 2003/07/21 13:14:02 guus Exp $
 */
 
 #ifndef __TINC_IPV6_H__
@@ -46,7 +46,8 @@ struct in6_addr {
 
 #ifndef HAVE_STRUCT_SOCKADDR_IN6
 struct sockaddr_in6 {
-	in_port_t sin6_port;
+	uint16_t sin6_family;
+	uint16_t sin6_port;
 	uint32_t sin6_flowinfo;
 	struct in6_addr sin6_addr;
 	uint32_t sin6_scope_id;