Mirrors/proxytunnel
1
0
Fork 0
mirror of https://github.com/proxytunnel/proxytunnel.git synced 2026-01-23 02:34:59 +00:00
Code Issues Projects Releases Wiki Activity

Removed some debugging output, moved some to 'verbose' mode

Browse source 
Updated darwin makefile


git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@102 bc163920-b10d-0410-b2c5-a5491ca2ceef
This commit is contained in:
Mark Janssen 2006-02-08 09:18:52 +00:00
parent f38d506949
commit c64ea2d874
4 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile.darwin
View file

@ -4,7 +4,7 @@
CC ?= gcc
CFLAGS ?= -Wall -DDARWIN -DHAVE_GETOPT_LONG
LDFLAGS ?= -lcrypto
LDFLAGS ?= -lcrypto -lssl
INSTALLPATH ?= $(DESTDIR)/usr/local/bin
MANPATH ?= $(DESTDIR)/usr/local/man/man1

5
Makefile.no-gcc
View file

@ -4,13 +4,16 @@
CC ?= cc
CFLAGS ?=
LDFLAGS ?= -lssl
CFLAGS += -DUSE_SSL
CFLAGS += -DPROCTITLE
LDFLAGS += -lssl -lcrypto
INSTALLPATH ?= $(DESTDIR)/usr/bin
PROGNAME = proxytunnel
OBJ = proxytunnel.o \
base64.o \
io.o \
setproctitle.o \
http.o \
ntlm.o \
basicauth.o \

7
cmdline.c
View file

@ -212,7 +212,8 @@ int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *ar
#ifdef USE_SSL
case 'e': /* Turn on SSL encryption */
args_info->encrypt_flag = !(args_info->encrypt_flag);
fprintf (stderr, "SSL enabled\n");
if( args_info.verbose_flag )
message("SSL enabled\n");
break;
#endif
@ -405,7 +406,7 @@ if (args_info->proxy_given )
phost = malloc( 51 );
fprintf( stderr, "%s: proxyhost (pre parse) given, it is: '%s'\n", PACKAGE, args_info->proxy_arg );
/* fprintf( stderr, "%s: proxyhost (pre parse) given, it is: '%s'\n", PACKAGE, args_info->proxy_arg ); */
r = sscanf( args_info->proxy_arg, "%50[^:]:%d", phost, &pport );
if ( r == 2 )
{
@ -414,7 +415,7 @@ if (args_info->proxy_given )
args_info->proxyhost_given = 1;
args_info->proxyport_given = 1;
}
fprintf( stderr, "%s: proxyhost (post parse) is '%s':'%d'\n", PACKAGE, args_info->proxyhost_arg, args_info->proxyport_arg );
/* fprintf( stderr, "%s: proxyhost (post parse) is '%s':'%d'\n", PACKAGE, args_info->proxyhost_arg, args_info->proxyport_arg ); */
}
if ( missing_required_options )

6
http.c
View file

@ -91,12 +91,14 @@ void proxy_protocol()
*/
if (args_info.remproxy_given )
{
message( "Tunneling to %s (remote proxy)\n", args_info.remproxy_arg );
if( args_info.verbose_flag )
message( "Tunneling to %s (remote proxy)\n", args_info.remproxy_arg );
sprintf( buf, "CONNECT %s HTTP/1.0\r\n", args_info.remproxy_arg );
}
else
{
message( "Tunneling to %s (destination)\n", args_info.dest_arg );
if( args_info.verbose_flag )
message( "Tunneling to %s (destination)\n", args_info.dest_arg );
sprintf( buf, "CONNECT %s HTTP/1.0\r\n", args_info.dest_arg );
}