From a48f260a7ac2d329a0f627742a28c47536c4c009 Mon Sep 17 00:00:00 2001
From: Brian Somers <brian@FreeBSD.org>
Date: Thu, 31 Aug 2000 21:28:28 +0000
Subject: Fix some more diagnostics

---
 www/httptunnel/files/patch-ab | 32 ++++++++++++++++++++++++++++++++
 www/httptunnel/files/patch-ac | 17 +++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 www/httptunnel/files/patch-ab
 create mode 100644 www/httptunnel/files/patch-ac

(limited to 'www/httptunnel/files')

diff --git a/www/httptunnel/files/patch-ab b/www/httptunnel/files/patch-ab
new file mode 100644
index 000000000000..4951e768a37c
--- /dev/null
+++ b/www/httptunnel/files/patch-ab
@@ -0,0 +1,32 @@
+--- tunnel.c.orig	Thu Aug 31 22:22:58 2000
++++ tunnel.c	Thu Aug 31 22:24:27 2000
+@@ -358,10 +358,10 @@
+   if (tunnel->out_fd == -1)
+     {
+       log_error ("tunnel_out_connect: do_connect (%d.%d.%d.%d:%u) error: %s",
+-		  tunnel->address.sin_addr.s_addr >> 24,
+-		 (tunnel->address.sin_addr.s_addr >> 16) & 0xff,
+-		 (tunnel->address.sin_addr.s_addr >>  8) & 0xff,
+-		  tunnel->address.sin_addr.s_addr        & 0xff,
++		  ntohl(tunnel->address.sin_addr.s_addr) >> 24,
++		 (ntohl(tunnel->address.sin_addr.s_addr) >> 16) & 0xff,
++		 (ntohl(tunnel->address.sin_addr.s_addr) >>  8) & 0xff,
++		  ntohl(tunnel->address.sin_addr.s_addr)        & 0xff,
+ 		 ntohs (tunnel->address.sin_port),
+ 		 strerror (errno));
+       return -1;
+@@ -1120,10 +1120,10 @@
+ 	}
+ 
+       log_notice ("connection from %d.%d.%d.%d:%u",
+-		  addr.sin_addr.s_addr >> 24,
+-		 (addr.sin_addr.s_addr >> 16) & 0xff,
+-		 (addr.sin_addr.s_addr >>  8) & 0xff,
+-		  addr.sin_addr.s_addr        & 0xff,
++		  ntohl(addr.sin_addr.s_addr) >> 24,
++		 (ntohl(addr.sin_addr.s_addr) >> 16) & 0xff,
++		 (ntohl(addr.sin_addr.s_addr) >>  8) & 0xff,
++		  ntohl(addr.sin_addr.s_addr)        & 0xff,
+                   ntohs (addr.sin_port));
+ 
+       m = http_parse_request (s, &request);
diff --git a/www/httptunnel/files/patch-ac b/www/httptunnel/files/patch-ac
new file mode 100644
index 000000000000..fdcde075a537
--- /dev/null
+++ b/www/httptunnel/files/patch-ac
@@ -0,0 +1,17 @@
+--- common.c.orig	Thu Aug 31 22:24:49 2000
++++ common.c	Thu Aug 31 22:26:01 2000
+@@ -179,10 +179,10 @@
+       memcpy(&address->sin_addr.s_addr, ent->h_addr, (unsigned)ent->h_length);
+       ip = ntohl (address->sin_addr.s_addr);
+       log_annoying ("set_address: host = %d.%d.%d.%d",
+-		     ip >> 24,
+-		    (ip >> 16) & 0xff,
+-		    (ip >>  8) & 0xff,
+-		     ip        & 0xff);
++		     ntohl(ip) >> 24,
++		    (ntohl(ip) >> 16) & 0xff,
++		    (ntohl(ip) >>  8) & 0xff,
++		     ntohl(ip)        & 0xff);
+     }
+ 
+   return 0;
-- 
cgit v1.2.3