a2bb33d3ff
Modified Files: import.log F-7/.cvsignore F-7/sources Added Files:
F-7/corkscrew-2.0-from-debian.patch F-7/corkscrew-2.0-typo.patch
F-7/corkscrew.spec
145 lines
4.7 KiB
Diff
145 lines
4.7 KiB
Diff
diff -urNp corkscrew-2.0.orig/corkscrew.1 corkscrew-2.0/corkscrew.1
|
|
--- corkscrew-2.0.orig/corkscrew.1 1970-01-01 05:30:00.000000000 +0530
|
|
+++ corkscrew-2.0/corkscrew.1 2007-05-19 09:56:33.000000000 +0530
|
|
@@ -0,0 +1,97 @@
|
|
+.\" Hey, EMACS: -*- nroff -*-
|
|
+.\" First parameter, NAME, should be all caps
|
|
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
|
|
+.\" other parameters are allowed: see man(7), man(1)
|
|
+.TH CORKSCREW 1 "November 22, 2003"
|
|
+.\" Please adjust this date whenever revising the manpage.
|
|
+.\"
|
|
+.\" Some roff macros, for reference:
|
|
+.\" .nh disable hyphenation
|
|
+.\" .hy enable hyphenation
|
|
+.\" .ad l left justify
|
|
+.\" .ad b justify to both left and right margins
|
|
+.\" .nf disable filling
|
|
+.\" .fi enable filling
|
|
+.\" .br insert line break
|
|
+.\" .sp <n> insert n+1 empty lines
|
|
+.\" for manpage-specific macros, see man(7)
|
|
+.SH NAME
|
|
+corkscrew \- Tunnel TCP connections through HTTP proxies
|
|
+.SH SYNOPSIS
|
|
+.B corkscrew
|
|
+.BR
|
|
+proxy
|
|
+.BR
|
|
+proxyport
|
|
+.BR
|
|
+targethost
|
|
+.BR
|
|
+targetport
|
|
+.BR
|
|
+[ authfile ]
|
|
+.br
|
|
+.SH DESCRIPTION
|
|
+This manual page documents briefly the
|
|
+.BR corkscrew
|
|
+command.
|
|
+This manual page was written for the Debian distribution
|
|
+because the original program does not have a manual page.
|
|
+
|
|
+corkscrew is a simple tool to tunnel TCP connections through an HTTP
|
|
+proxy supporting the CONNECT method. It reads stdin and writes to
|
|
+stdout during the connection, just like netcat.
|
|
+It can be used for instance to connect to an SSH server running on
|
|
+a remote 443 port through a strict HTTPS proxy.
|
|
+
|
|
+
|
|
+.SH PARAMETERS
|
|
+
|
|
+.TP
|
|
+.B proxy
|
|
+This is the name of the host running the HTTP proxy.
|
|
+.TP
|
|
+.B proxyport
|
|
+This is the port on which to connect on the proxy.
|
|
+.TP
|
|
+.B target
|
|
+This is the host to reach through the proxy.
|
|
+.TP
|
|
+.B targetport
|
|
+This is the port to connect to on the target host.
|
|
+
|
|
+.SH COMMON USAGE
|
|
+
|
|
+The common usage of corkscrew is to put the following line in your
|
|
+ssh_config:
|
|
+
|
|
+ProxyCommand corkscrew proxy proxyport %h %p
|
|
+
|
|
+This will let your ssh connection go through the proxy with the help
|
|
+of corkscrew.
|
|
+
|
|
+.SH AUTH FILE
|
|
+
|
|
+The auth file is made of one single line containing your username and
|
|
+password in the form:
|
|
+
|
|
+username:password
|
|
+
|
|
+You should add the path to your auth file in the proxy command
|
|
+described above:
|
|
+
|
|
+ProxyCommand corkscrew proxy proxyport %h %p auth-file
|
|
+
|
|
+.SH "SEE ALSO"
|
|
+.IX Header "SEE ALSO"
|
|
+\&\fIssh_config\fR\|(5)
|
|
+
|
|
+.PP
|
|
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
|
|
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
|
|
+.\" respectively.
|
|
+.SH AUTHOR
|
|
+corkscrew was written by Pat Padgett <agroman@agroman.net>.
|
|
+Thomas Seyrat <tomasera@debian.org> is the debian maintainer for this
|
|
+package. This manual page was written by Laurent Fousse
|
|
+<laurent@komite.net>, for the Debian GNU/Linux system (but may be used
|
|
+by others).
|
|
diff -urNp corkscrew-2.0.orig/corkscrew.c corkscrew-2.0/corkscrew.c
|
|
--- corkscrew-2.0.orig/corkscrew.c 2007-05-19 09:56:05.000000000 +0530
|
|
+++ corkscrew-2.0/corkscrew.c 2007-05-19 10:07:00.000000000 +0530
|
|
@@ -176,6 +176,7 @@ char *argv[];
|
|
#endif
|
|
char *host = NULL, *desthost = NULL, *destport = NULL;
|
|
char *up = NULL;
|
|
+ char *tmp = NULL;
|
|
int port, sent, setup, code, csock;
|
|
fd_set rfd, sfd;
|
|
struct timeval tv;
|
|
@@ -262,6 +263,11 @@ char *argv[];
|
|
fprintf(stderr, "Proxy could not open connnection to %s: %s\n", desthost, descr);
|
|
exit(-1);
|
|
}
|
|
+ if (tmp = strstr(buffer,"\r\n\r\n"))
|
|
+ {
|
|
+ tmp += 4;
|
|
+ write(1, tmp, strlen(tmp));
|
|
+ }
|
|
}
|
|
}
|
|
if (FD_ISSET(csock, &sfd) && (sent == 0)) {
|
|
diff -urNp corkscrew-2.0.orig/README corkscrew-2.0/README
|
|
--- corkscrew-2.0.orig/README 2007-05-19 09:56:05.000000000 +0530
|
|
+++ corkscrew-2.0/README 2007-05-19 09:56:48.000000000 +0530
|
|
@@ -47,7 +47,7 @@ Setting up Corkscrew with SSH/OpenSSH is
|
|
the following line to your ~/.ssh/config file will usually do
|
|
the trick (replace proxy.example.com and 8080 with correct values):
|
|
|
|
-ProxyCommand /usr/local/bin/corkscrew proxy.example.com 8080 %h %p
|
|
+ProxyCommand /usr/bin/corkscrew proxy.example.com 8080 %h %p
|
|
|
|
NOTE: Command line syntax has changed since version 1.5. Please
|
|
notice that the proxy port is NOT optional anymore and is required
|
|
@@ -70,7 +70,7 @@ chmod 600 myauth
|
|
Now you will have to change the ProxyCommand line in your ~/.ssh/config
|
|
file. Here's an example :
|
|
|
|
-ProxyCommand /usr/local/bin/corkscrew proxy.work.com 80 %h %p ~/.ssh/myauth
|
|
+ProxyCommand /usr/bin/corkscrew proxy.work.com 80 %h %p ~/.ssh/myauth
|
|
|
|
The proxy authentication feature is very new and has not been tested
|
|
extensively so your mileage may vary. If you encounter any problems
|