Skip to content

L
libvncserver
Commit 387e189b authored by runge's avatar runge
Browse files
Options

Synchronize ssvnc source, etc. Nearly the 1.0.24 release...

parent 3129ef66
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1064 additions and 310 deletions
x11vnc/misc/enhanced_tightvnc_viewer/README
View file @ 387e189b
......@@ -244,7 +244,7 @@ Unix and Mac OS X:
Unpack the archive:
% gzip -dc ssvnc-1.0.22.tar.gz | tar xvf -
% gzip -dc ssvnc-1.0.24.tar.gz | tar xvf -
Run the GUI:
......@@ -252,7 +252,7 @@ Unix and Mac OS X:
% ./ssvnc/MacOSX/ssvnc (for Mac OS X)
The smaller file "ssvnc_no_windows-1.0.22.tar.gz"
The smaller file "ssvnc_no_windows-1.0.24.tar.gz"
could have been used as well.
On MacOSX you could also click on the SSVNC app icon in the Finder.
......@@ -298,8 +298,8 @@ Unix/MacOSX Install:
For the conventional source tarball it will compile and install, e.g.:
gzip -dc ssvnc-1.0.22.src.tar.gz | tar xvf -
cd ssvnc-1.0.22
gzip -dc ssvnc-1.0.24.src.tar.gz | tar xvf -
cd ssvnc-1.0.24
make config
make all
make PREFIX=/my/install/dir install
......@@ -311,7 +311,7 @@ Windows:
Unzip, using WinZip or a similar utility, the zip file:
ssvnc-1.0.22.zip
ssvnc-1.0.24.zip
Run the GUI, e.g.:
......@@ -323,7 +323,7 @@ Windows:
select Open, and then OK to launch it.
The smaller file "ssvnc_windows_only-1.0.22.zip"
The smaller file "ssvnc_windows_only-1.0.24.zip"
could have been used as well.
You can make a Windows shortcut to this program if you want to.
......
x11vnc/misc/enhanced_tightvnc_viewer/bin/ssvnc
View file @ 387e189b
#!/bin/sh
#
# Copyright (c) 2006 by Karl J. Runge <runge@karlrunge.com>
# Copyright (c) 2006-2009 by Karl J. Runge <runge@karlrunge.com>
#
# sslvnc:
# ssvnc:
#
# A wrapper for ssvnc_cmd using a tcl/tk gui.
#
# See ssvnc_cmd for details.
#
if [ "X$1" = "X-help" -o "X$1" = "X-h" ]; then
cat << END
ssvnc - a GUI wrapper for SSL and SSH VNC connections.
SYNOPSIS
ssvnc
ssvnc [host][:display]
ssvnc [saved-profile-name]
ssvnc [options] [host-or-profile]
ssvnc --help
DESCRIPTION
ssvnc is a tcl/tk gui wrapper that runs on Unix, MacOSX, and Windows.
It sets up an SSL or SSH tunnel to the remote VNC Server and then
launches the VNC viewer (either the one provided or another one that
you have specified) to use that encrypted tunnel to connect to the VNC
Server. The use of Proxies and Gateways to make the connections is
implemented.
OPTIONS
-help, -h Print this help.
--help Starts up the GUI as though the 'Help' button was pressed to
show the main Help panel.
-profiles
List the saved SSVNC profiles you have created. A profile is a
destination host with specific parameter settings.
-list Same as -profiles
-ssh Start in "SSH Only Mode". No SSL aspects are shown. Same as
running the command sshvnc
-ts Start in "Terminal Services Mode". This is like "SSH Only
Mode", but simpler and assumes x11vnc is available on the remote
side to start and manage X and VNC sessions. Same as running
the command tsvnc
-tso Same as -ts "Terminal Services Mode", however never let the user
leave this mode (no button to switch modes is provided.) Same
as SSVNC_TS_ALWAYS=1.
-ssl Force the full GUI Mode: both SSL and SSH. This is the default.
Same as -ss.
-nv Toggle the "Verify All Certs" button to be off at startup.
-nvb Never show the "Verify All Certs" button. Same as SSVNC_NO_VER-
IFY_ALL_BUTTON=1.
-bigger
Make the Profile Selection Dialog window bigger. Same as
SSVNC_BIGGER_DIALOG=1.
-noenc Start off in a mode where a 'No Encryption' check button is
present. You can toggle the mode with Ctrl-E. Same as
SSVNC_DISABLE_ENCRYPTION_BUTTON=1. Or noenc=1 in ~/.ssvncrc.
Selecting no encryption is the same as the vnc:// and Vnc://
prefixes described below. -enc implies the opposite.
-killstunnel
On Windows, automatically terminate the STUNNEL process when the
viewer exits instead of prompting you (same as killstunnel=1 in
ssvnc_rc or toggle in Options menu)
-nokillstunnel
On Windows, disable -killstunnel mode. Same as killstunnel=0 in
ssvnc_rc or toggle in Options menu. Note that -killstunnel mode
is now the default.
-mycert /path/to/mycert.pem
Set the default "MyCert" to be /path/to/mycert.pem. Same as
-cert. If the file does not exist, ~/.vnc/certs is prefixed and
tried. You can also set mycert=/path/to/mycert.pem in ~/.ssvncrc
-cacert /path/to/cacert.crt
Set the default "ServerCert" to be /path/to/cacert.crt. Same as
-ca. If the file does not exist, ~/.vnc/certs is prefixed and
tried. You can also set cacert=/path/to/cacert.crt in ~/.ssvncrc
-crl /path/to/mycrl.pem
Set the default Certificate Revocation List to be
/path/to/mycrl.pem. If the file does not exist, ~/.vnc/certs is
prefixed and tried. You can also set crl=/path/to/mycrl.pem in
~/.ssvncrc.
END
exit 0
fi
if [ "X$XTERM_PRINT" != "X" ]; then
XTERM_PRINT=""
cat > /dev/null
......@@ -18,6 +108,7 @@ if [ "X$1" = "X-bg" ]; then
exit 0
fi
PATH=$PATH:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/openwin/bin:/usr/sfw/bin:/usr/local/bin
export PATH
......
x11vnc/misc/enhanced_tightvnc_viewer/bin/util/ss_vncviewer
View file @ 387e189b
......@@ -141,6 +141,7 @@ if uname | grep Darwin >/dev/null; then
fi
# work out which stunnel to use (debian installs as stunnel4)
stunnel_set_here=""
if [ "X$STUNNEL" = "X" ]; then
check_stunnel=1
if [ "X$SSVNC_BASEDIRNAME" != "X" ]; then
......@@ -161,6 +162,7 @@ if [ "X$STUNNEL" = "X" ]; then
STUNNEL=stunnel
fi
fi
stunnel_set_here=1
fi
help() {
......@@ -287,6 +289,8 @@ do
;;
"-ssvnc_encodings") shift; VNCVIEWER_ENCODINGS="$1"; export VNCVIEWER_ENCODINGS
;;
"-ssvnc_extra_opts") shift; VNCVIEWERCMD_EXTRA_OPTS="$1"; export VNCVIEWERCMD_EXTRA_OPTS
;;
"-rfbversion") shift; VNCVIEWER_RFBVERSION="$1"; export VNCVIEWER_RFBVERSION
;;
"-nobell") VNCVIEWER_NOBELL=1; export VNCVIEWER_NOBELL
......@@ -687,6 +691,12 @@ if echo "$0" | grep vncip > /dev/null; then
VNCVIEWERCMD="$VNCIPCMD"
fi
if echo "$VNCVIEWERCMD" | egrep -i '^(xmessage|sleep )' > /dev/null; then
:
elif [ "X$VNCVIEWERCMD_EXTRA_OPTS" != "X" ]; then
VNCVIEWERCMD="$VNCVIEWERCMD $VNCVIEWERCMD_EXTRA_OPTS"
fi
# trick for the undocumented rsh://host:port method.
rsh_setup() {
if echo "$ssh_host" | grep '@' > /dev/null; then
......@@ -719,11 +729,30 @@ rsh_viewer() {
fi
}
check_perl() {
if type "$1" > /dev/null 2>&1; then
:
elif [ ! -x "$1" ]; then
echo ""
echo "*******************************************************"
echo "** Problem finding the Perl command '$1': **"
echo ""
type "perl"
echo ""
echo "** Perhaps you need to install the Perl package. **"
echo "*******************************************************"
echo ""
sleep 5
fi
}
# this is the PPROXY tool. used only here for now...
pcode() {
tf=$1
PPROXY_PROXY=$proxy; export PPROXY_PROXY
PPROXY_DEST="$host:$port"; export PPROXY_DEST
check_perl /usr/bin/perl
cod='#!/usr/bin/perl
# A hack to glue stunnel to a Web proxy or SOCKS for client connections.
......@@ -1535,6 +1564,26 @@ if [ "X$use_ssh" = "X1" ]; then
# let user override ssh via $SSH
ssh=${SSH:-"ssh -x"}
sshword=`echo "$ssh" | awk '{print $1}'`
if [ "X$sshword" != "X" ]; then
if [ -x "$sshword" ]; then
:
elif type "$sshword" > /dev/null 2>&1; then
:
else
echo ""
echo "*********************************************************"
echo "** Problem finding the SSH command '$sshword': **"
echo ""
type "$sshword"
echo ""
echo "** Perhaps you need to install the SSH client package. **"
echo "*********************************************************"
echo ""
sleep 5
fi
fi
if [ "X$SSVNC_LIM_ACCEPT_PRELOAD" != "X" ]; then
SSVNC_LIM_ACCEPT_PRELOAD="$SSVNC_BASEDIR/$SSVNC_UNAME/$SSVNC_LIM_ACCEPT_PRELOAD"
fi
......@@ -1958,6 +2007,23 @@ if [ "X$use_ssh" = "X1" ]; then
fi
fi
if [ "X$stunnel_set_here" = "X1" -a "X$showcert" = "X" ]; then
if type $STUNNEL > /dev/null 2>&1; then
:
else
echo ""
echo "***************************************************************"
echo "** Problem finding the Stunnel command '$STUNNEL': **"
echo ""
type $STUNNEL
echo ""
echo "** Perhaps you need to install the stunnel/stunnel4 package. **"
echo "***************************************************************"
echo ""
sleep 5
fi
fi
# create the stunnel config file:
if [ "X$verify" != "X" ]; then
if [ -d $verify ]; then
......@@ -2033,6 +2099,19 @@ if [ "X$showcert" = "X1" ]; then
if [ "X$ciphers" != "X" ]; then
cipher_args=`echo "$ciphers" | sed -e 's/ciphers=/-cipher /'`
fi
if type openssl > /dev/null 2>&1; then
:
else
echo ""
echo "********************************************************"
echo "** Problem finding the OpenSSL command 'openssl': **"
echo ""
type openssl 2>&1
echo ""
echo "** Perhaps you need to install the 'openssl' package. **"
echo "********************************************************"
echo ""
fi
#echo "openssl s_client $cipher_args -connect $host:$port"
if [ "X$reverse" = "X" ]; then
openssl s_client $cipher_args -prexit -connect $host:$port 2>&1 < /dev/null
......@@ -2052,6 +2131,9 @@ if [ "X$showcert" = "X1" ]; then
#echo "openssl s_server $cipher_args $cert_args -accept $port -verify 2 > $tmp_out 2> $tmp_err" 1>&2
# assume we have perl:
check_perl perl
perl -e "
\$p = open(O, \"|openssl s_server $cipher_args $cert_args -accept $port -verify 2 1>$tmp_out 2> $tmp_err\");
exit 1 unless \$p;
......@@ -2094,7 +2176,11 @@ if [ "X$showcert" = "X1" ]; then
if [ "X$SSVNC_PREDIGESTED_HANDSHAKE" != "X" ]; then
rm -f $SSVNC_PREDIGESTED_HANDSHAKE
fi
exit $rc
if [ "X$SSVNC_SHOWCERT_EXIT_0" = "X1" ]; then
exit 0
else
exit $rc
fi
fi
if [ "X$direct_connect" != "X" ]; then
......
x11vnc/misc/enhanced_tightvnc_viewer/man/man1/ssvnc.1
View file @ 387e189b
......@@ -8,7 +8,7 @@
.\" License as specified in the file LICENCE.TXT that comes with the
.\" TightVNC distribution.
.\"
.TH ssvnc 1 "December 2008" "" "SSVNC"
.TH ssvnc 1 "September 2009" "" "SSVNC"
.SH NAME
ssvnc \- a GUI wrapper for SSL and SSH VNC connections.
.SH SYNOPSIS
......@@ -67,9 +67,15 @@ The related commands \fBsshvnc\fR and \fBtsvnc\fR start up the GUI in
simplified modes: SSH Only Mode, and Terminal Services Mode, respectively.
See below and the application Help for more information on the modes.
You can also place certain settings in your ~/.ssvncrc, see the
SSVNC Help panel ('Tips') for more info.
There are also some command line options described as follows.
.SH OPTIONS
.TP
\fB\-help\fR, \fB\-h\fR
Prints out to the terminal a brief description and the options.
.TP
\fB\--help\fR
Starts up the GUI as though the 'Help' button was pressed to show the
main Help panel.
......@@ -180,9 +186,31 @@ You can put a few global parameters (e.g. mode=sshvnc) in your
\fB$HOME/.ssvncrc\fR file (\fBssvnc_rc\fR on Windows); see the
application Help for more information.
.SH FONTS
The following is from Tip 18 in the Help panel.
Fonts: To change the tk fonts, set these environment variables
before starting up ssvnc: SSVNC_FONT_DEFAULT and SSVNC_FONT_FIXED.
For example:
% env SSVNC_FONT_DEFAULT='helvetica -20 bold' ssvnc
% env SSVNC_FONT_FIXED='courier -14' ssvnc
or set both of them at once.
To acheive the same effect, you can also
set parameters in your ~/.ssvncrc file, for example:
font_default=helvetica -20 bold
font_fixed=courier -14
.SH SEE ALSO
\fBssvncviewer\fB(1), \fBvncviewer\fR(1), \fBstunnel\fR(8), \fBssh\fR(1), \fBx11vnc\fR(1), \fBvncserver\fR(1)
http://www.karlrunge.com/x11vnc http://www.karlrunge.com/x11vnc/ssvnc.html
.SH AUTHORS
Karl J. Runge <runge@karlrunge.com> wrote the SSVNC gui (tcl/tk) and
associated wrapper scripts.
associated wrapper scripts, and added features to the unix vncviewer
source code.
x11vnc/misc/enhanced_tightvnc_viewer/man/man1/ssvncviewer.1
View file @ 387e189b
......@@ -11,7 +11,7 @@
.\" License as specified in the file LICENCE.TXT that comes with the
.\" TightVNC distribution.
.\"
.TH ssvncviewer 1 "June 2009" "" "SSVNC"
.TH ssvncviewer 1 "September 2009" "" "SSVNC"
.SH NAME
ssvncviewer \- an X viewer client for VNC
.SH SYNOPSIS
......@@ -225,6 +225,18 @@ time tries to play it safe by not allowing anyone on
the network to put (many) desktops on your screen over
a long window of time. Use -multilisten for no limit.
.TP
\fB\-acceptpopup\fR
In \fB\-listen\fR (reverse connection listening) mode when
a reverse VNC connection comes in show a popup asking
whether to Accept or Reject the connection. The IP
address of the connecting host is shown. Same as
setting the env. var. SSVNC_ACCEPT_POPUP=1.
.TP
\fB\-acceptpopupsc\fR
As in \fB\-acceptpopup\fR except assume UltraVNC Single
Click (SC) server. Retrieve User and ComputerName
info from UltraVNC Server and display in the Popup.
.TP
\fB\-use64\fR
In \fB\-bgr233\fR mode, use 64 colors instead of 256.
.TP
......@@ -422,7 +434,7 @@ the username and password.
IMPORTANT NOTE: The UltraVNC MS-Logon Diffie-Hellman
exchange is very weak and can be brute forced to recover
your username and password in a few hours or seconds of CPU
your username and password in a few seconds of CPU
time. To be safe, be sure to use an additional encrypted
tunnel (e.g. SSL or SSH) for the entire VNC session.
.TP
......@@ -765,7 +777,8 @@ remote TCP port number.
.SH AUTHORS
Original VNC was developed in AT&T Laboratories Cambridge. TightVNC
additions was implemented by Constantin Kaplinsky. Many other people
participated in development, testing and support.
participated in development, testing and support. Karl J. Runge
added all of the SSVNC related features and improvements.
\fBMan page authors:\fR
.br
......@@ -777,4 +790,4 @@ Tim Waugh <twaugh@redhat.com>,
.br
Constantin Kaplinsky <const@ce.cctpu.edu.ru>
.br
Karl Runge <runge@karlrunge.com>
Karl J. Runge <runge@karlrunge.com>
x11vnc/misc/enhanced_tightvnc_viewer/src/patches/_bundle
View file @ 387e189b
#!/bin/sh
rm -rf ./src/tmp/* || exit 1
vers=1.0.23
vers=1.0.24
cd .. || exit 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment