From baaca8a6c4ea7258d1a12fd75c2f8a85d6c66386 Mon Sep 17 00:00:00 2001
From: Dag Wieers <dag@wieers.com>
Date: Sun, 20 Jan 2008 11:15:47 +0000
Subject: [PATCH] More output updates

git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@179 bc163920-b10d-0410-b2c5-a5491ca2ceef
---
 http.c | 25 +++++++++++++------------
 io.c   |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/http.c b/http.c
index 1cb8e57..19d4162 100644
--- a/http.c
+++ b/http.c
@@ -110,19 +110,18 @@ void print_line_prefix(char *buf, char *prefix)
 /*
  * Append an undefined number of strings together
  */
-int strzcat(char *strz, ...)
+void strzcat(char *strz, ...)
 {
     va_list ap;
     va_start(ap, strz);
     char *z;
     int i;
-    for(i=0; i<=sizeof(*ap)-1; i++) {
+    for(i=0; i<sizeof(*ap); i++) {
         z = va_arg(ap, char *);
         strlcat(strz, z, SIZE);
-//	fprintf ( stderr, "strzcat: len-strz(%d)(%s), len-z(%d)(%s), size(%d)\n", strlen(strz), strz, strlen(z), z, SIZE );
+//      fprintf ( stderr, "strzcat: len-strz(%d)(%s), len-z(%d)(%s), size(%d)\n", strlen(strz), strz, strlen(z), z, SIZE );
     }
     va_end(ap);
-    return 0;
 }
 
 /*
@@ -192,8 +191,9 @@ void proxy_protocol(PTSTREAM *pts)
 	 * Print the CONNECT instruction before sending to proxy
 	 */
 	if( args_info.verbose_flag ) {
-		message( "Connect string sent to local proxy:\n");
-		print_line_prefix(buf, " đ»  ");
+//		message( "Connect string sent to local proxy:\n");
+		message( "Communication with local proxy:\n");
+		print_line_prefix(buf, "đ-> ");
 	}
 	
 	/*
@@ -207,8 +207,8 @@ void proxy_protocol(PTSTREAM *pts)
 	/*
 	 * Read the first line of the response and analyze it
 	 */
-	if( args_info.verbose_flag )
-		message( "Data received from local proxy:\n");
+//	if( args_info.verbose_flag )
+//		message( "Data received from local proxy:\n");
 
 	analyze_HTTP(pts);
 
@@ -246,8 +246,9 @@ void proxy_protocol(PTSTREAM *pts)
 		 * Print the CONNECT instruction before sending to proxy
 		 */
 		if( args_info.verbose_flag ) {
-			message( "Connect string sent to remote proxy:\n");
-			print_line_prefix(buf, "  »  ");
+//			message( "Connect string sent to remote proxy:\n");
+			message( "Communication with remote proxy:\n");
+			print_line_prefix(buf, " -> ");
 		}
 	
 		/*
@@ -262,8 +263,8 @@ void proxy_protocol(PTSTREAM *pts)
 		/*
 		 * Read the first line of the response and analyze it
 		 */
-		if( args_info.verbose_flag )
-			message( "Received from remote proxy:\n");
+//		if( args_info.verbose_flag )
+//			message( "Received from remote proxy:\n");
 
 		analyze_HTTP(pts);
 	}
diff --git a/io.c b/io.c
index b68334c..471a99e 100644
--- a/io.c
+++ b/io.c
@@ -65,7 +65,7 @@ int readline(PTSTREAM *pts)
 		char * dstr = malloc(sizeof(buf) + 1);
 		strlcpy( dstr, buf, strlen(buf) - 1);
 		if (strcmp(dstr, ""))
-			message( "  «  %s\n", dstr );
+			message( " <- %s\n", dstr );
 	}
 	return strlen( buf );
 }