Bug#81903: tunnelv 1.00-3 patch [alpha]

[Marcelo Magallon <mmagallo@faure.debian.org>]

diff -ruN tunnelv-1.00-3/ipstreams/wvtcp.cc tunnelv-1.00-3.1/ipstreams/wvtcp.cc
--- tunnelv-1.00-3/ipstreams/wvtcp.cc	Sat Jan 13 15:53:26 2001
+++ tunnelv-1.00-3.1/ipstreams/wvtcp.cc	Sat Jan 13 15:47:59 2001
@@ -107,7 +107,7 @@
 WvIPPortAddr WvTCPConn::localaddr()
 {
     sockaddr_in sin;
-    size_t sl = sizeof(sin);
+    socklen_t sl = sizeof(sin);
     
     if (!isok() || getsockname(getfd(), (sockaddr *)&sin, &sl))
 	return WvIPPortAddr();
@@ -205,7 +205,7 @@
     
     if (listenport.port == 0) // auto-select a port number
     {
-	size_t namelen = listenport.sockaddr_len();
+	socklen_t namelen = listenport.sockaddr_len();
 	
 	if (getsockname(fd, sa, &namelen) != 0)
 	    seterr(errno);
@@ -240,7 +240,7 @@
 WvTCPConn *WvTCPListener::accept()
 {
     struct sockaddr_in sin;
-    size_t len = sizeof(sin);
+    socklen_t len = sizeof(sin);
     int newfd;
     WvTCPConn *ret;
 
diff -ruN tunnelv-1.00-3/ipstreams/wvudp.cc tunnelv-1.00-3.1/ipstreams/wvudp.cc
--- tunnelv-1.00-3/ipstreams/wvudp.cc	Sat Jan 13 15:53:26 2001
+++ tunnelv-1.00-3.1/ipstreams/wvudp.cc	Sat Jan 13 15:49:19 2001
@@ -30,7 +30,7 @@
     delete sa;
     
     struct sockaddr_in nsa;
-    size_t nsalen = sizeof(nsa);
+    socklen_t nsalen = sizeof(nsa);
     if (getsockname(fd, (sockaddr *)&nsa, &nsalen) < 0)
     {
 	seterr(errno);
@@ -74,7 +74,7 @@
     if (!isok() || !buf || !count) return 0;
     
     struct sockaddr_in from;
-    size_t fromlen = sizeof(from);
+    socklen_t fromlen = sizeof(from);
     int in = recvfrom(getfd(), buf, count, 0, (sockaddr *)&from, &fromlen);
     
     if (in >= 0)
diff -ruN tunnelv-1.00-3/tunnelv/wvtunnel.cc tunnelv-1.00-3.1/tunnelv/wvtunnel.cc
--- tunnelv-1.00-3/tunnelv/wvtunnel.cc	Sat Jan 13 15:53:26 2001
+++ tunnelv-1.00-3.1/tunnelv/wvtunnel.cc	Sat Jan 13 15:52:08 2001
@@ -59,7 +59,7 @@
     
     all_tunnels.append(this, false);
     
-    if (!cfg.get("Tunnel Vision", "RSA Private Key", NULL))
+    if (!cfg.get("Tunnel Vision", "RSA Private Key", 0))
     {
 	log("Generating RSA key...");
 	WvRSAKey k(1024);