tinc/src net.c,1.35.4.186,1.35.4.187 net.h,1.9.4.58,1.9.4.59 protocol_auth.c,1.1.4.19,1.1.4.20 route.c,1.1.2.51,1.1.2.52 tincd.c,1.10.4.68,1.10.4.69

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

Update of /home/CVS/tinc/src
In directory humbolt:/tmp/cvs-serv31346/src

Modified Files:
      Tag: CABAL
	net.c net.h protocol_auth.c route.c tincd.c 
Log Message:
- simplify configure.in
- drop support for OpenSSL < 0.9.7
- add some missing definitions/includes


Index: net.c
===================================================================
RCS file: /home/CVS/tinc/src/net.c,v
retrieving revision 1.35.4.186
retrieving revision 1.35.4.187
diff -u -r1.35.4.186 -r1.35.4.187
--- net.c	2003/05/06 21:13:14	1.35.4.186
+++ net.c	2003/07/06 17:15:25	1.35.4.187
@@ -31,6 +31,7 @@
 #include <signal.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <syslog.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
@@ -72,10 +73,6 @@
 #include "event.h"
 
 #include "system.h"
-
-#ifndef HAVE_RAND_PSEUDO_BYTES
-#define RAND_pseudo_bytes RAND_bytes
-#endif
 
 int do_purge = 0;
 int sighup = 0;

Index: net.h
===================================================================
RCS file: /home/CVS/tinc/src/Attic/net.h,v
retrieving revision 1.9.4.58
retrieving revision 1.9.4.59
diff -u -r1.9.4.58 -r1.9.4.59
--- net.h	2003/05/07 11:21:58	1.9.4.58
+++ net.h	2003/07/06 17:15:25	1.9.4.59
@@ -70,13 +70,19 @@
 typedef union {
 	struct sockaddr sa;
 	struct sockaddr_in in;
+#ifdef HAVE_STRUCT_SOCKADDR_IN6
 	struct sockaddr_in6 in6;
+#endif
 } sockaddr_t;
 
 #ifdef SA_LEN
 #define SALEN(s) SA_LEN(&s)
 #else
+#ifdef HAVE_STRUCT_SOCKADDR_IN6
 #define SALEN(s) (s.sa_family==AF_INET?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6))
+#else
+#define SALEN(s) (sizeof sockaddr_in)
+#endif
 #endif
 
 typedef struct vpn_packet_t {

Index: protocol_auth.c
===================================================================
RCS file: /home/CVS/tinc/src/protocol_auth.c,v
retrieving revision 1.1.4.19
retrieving revision 1.1.4.20
diff -u -r1.1.4.19 -r1.1.4.20
--- protocol_auth.c	2003/01/17 00:37:20	1.1.4.19
+++ protocol_auth.c	2003/07/06 17:15:25	1.1.4.20
@@ -37,10 +37,6 @@
 #include <openssl/rand.h>
 #include <openssl/evp.h>
 
-#ifndef HAVE_RAND_PSEUDO_BYTES
-#define RAND_pseudo_bytes RAND_bytes
-#endif
-
 #include "conf.h"
 #include "net.h"
 #include "netutl.h"

Index: route.c
===================================================================
RCS file: /home/CVS/tinc/src/route.c,v
retrieving revision 1.1.2.51
retrieving revision 1.1.2.52
diff -u -r1.1.2.51 -r1.1.2.52
--- route.c	2003/06/11 19:40:43	1.1.2.51
+++ route.c	2003/07/06 17:15:25	1.1.2.52
@@ -60,10 +60,24 @@
 
 #include "system.h"
 
+/* Missing definitions */
+
 #ifndef ETHER_ADDR_LEN
 #define ETHER_ADDR_LEN 6
 #endif
 
+#ifndef ICMP_DEST_UNREACH
+#define ICMP_DEST_UNREACH 3
+#endif
+
+#ifndef ICMP_NET_UNKNOWN
+#define ICMP_NET_UNKNOWN 6
+#endif
+
+#ifndef ICMP_NET_UNREACH
+#define ICMP_NET_UNREACH 0
+#endif
+
 int routing_mode = RMODE_ROUTER;
 int priorityinheritance = 0;
 int macexpire = 600;
@@ -210,8 +224,8 @@
 	memcpy(&ip_dst, &hdr->ip_dst, 4);
 	oldlen = packet->len - 14;
 	
-	if(oldlen >= IP_MSS - sizeof(*hdr) - sizeof(struct icmphdr))
-		oldlen = IP_MSS - sizeof(*hdr) - sizeof(struct icmphdr);
+	if(oldlen >= IP_MSS - sizeof(*hdr) - sizeof(*icmp))
+		oldlen = IP_MSS - sizeof(*hdr) - sizeof(*icmp);
 	
 	/* Copy first part of original contents to ICMP message */
 	

Index: tincd.c
===================================================================
RCS file: /home/CVS/tinc/src/tincd.c,v
retrieving revision 1.10.4.68
retrieving revision 1.10.4.69
diff -u -r1.10.4.68 -r1.10.4.69
--- tincd.c	2003/06/11 19:07:56	1.10.4.68
+++ tincd.c	2003/07/06 17:15:25	1.10.4.69
@@ -395,19 +395,7 @@
 
 	RAND_load_file("/dev/urandom", 1024);
 
-#ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS_NOCONF
-	OPENSSL_add_all_algorithms_noconf();
-#else
-#ifdef HAVE_OPENSSL_ADD_ALL_ALGORITHMS
 	OpenSSL_add_all_algorithms();
-#else
-#ifdef HAVE_SSLEAY_ADD_ALL_ALGORITHMS
-	SSLeay_add_all_algorithms();
-#else
-#error No add_all_algorithms function available!
-#endif
-#endif
-#endif
 
 	if(generate_keys) {
 		read_server_config();

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