tinc/lib dropin.c,1.1.2.15,1.1.2.16 fake-getaddrinfo.c,1.1.2.4,1.1.2.5 ipv4.h,1.1.2.2,1.1.2.3 ipv6.h,1.1.2.5,1.1.2.6

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

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

Modified Files:
      Tag: CABAL
	dropin.c fake-getaddrinfo.c ipv4.h ipv6.h 
Log Message:
Be consistent.


Index: dropin.c
===================================================================
RCS file: /home/CVS/tinc/lib/dropin.c,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- dropin.c	2003/07/17 15:06:25	1.1.2.15
+++ dropin.c	2003/07/21 13:14:02	1.1.2.16
@@ -22,6 +22,8 @@
 
 #include "system.h"
 
+#include "xalloc.h"
+
 #ifndef HAVE_DAEMON
 /*
   Replacement for the daemon() function.

Index: fake-getaddrinfo.c
===================================================================
RCS file: /home/CVS/tinc/lib/Attic/fake-getaddrinfo.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- fake-getaddrinfo.c	2003/07/17 15:06:25	1.1.2.4
+++ fake-getaddrinfo.c	2003/07/21 13:14:02	1.1.2.5
@@ -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 @@
 #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;
 

Index: ipv4.h
===================================================================
RCS file: /home/CVS/tinc/lib/Attic/ipv4.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ipv4.h	2003/07/18 13:42:35	1.1.2.2
+++ ipv4.h	2003/07/21 13:14:02	1.1.2.3
@@ -57,16 +57,16 @@
 	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 @@
 	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;

Index: ipv6.h
===================================================================
RCS file: /home/CVS/tinc/lib/Attic/ipv6.h,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- ipv6.h	2003/07/18 13:42:35	1.1.2.5
+++ ipv6.h	2003/07/21 13:14:02	1.1.2.6
@@ -46,7 +46,8 @@
 
 #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;

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