diff options
Diffstat (limited to 'x11vnc/misc/enhanced_tightvnc_viewer/bin')
| -rwxr-xr-x | x11vnc/misc/enhanced_tightvnc_viewer/bin/util/ss_vncviewer | 18 | ||||
| -rwxr-xr-x | x11vnc/misc/enhanced_tightvnc_viewer/bin/util/ssvnc.tcl | 22 |
2 files changed, 28 insertions, 12 deletions
diff --git a/x11vnc/misc/enhanced_tightvnc_viewer/bin/util/ss_vncviewer b/x11vnc/misc/enhanced_tightvnc_viewer/bin/util/ss_vncviewer index 63ddac5..791c887 100755 --- a/x11vnc/misc/enhanced_tightvnc_viewer/bin/util/ss_vncviewer +++ b/x11vnc/misc/enhanced_tightvnc_viewer/bin/util/ss_vncviewer @@ -586,9 +586,12 @@ elif echo "$host" | grep '^[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$' : else # regular hostname, can't be sure... - host "$host" >/dev/null 2>&1 - host "$host" >/dev/null 2>&1 - hout=`host "$host" 2>/dev/null` + hout="" + if type host > /dev/null 2>/dev/null; then + host "$host" >/dev/null 2>&1 + host "$host" >/dev/null 2>&1 + hout=`host "$host" 2>/dev/null` + fi if echo "$hout" | grep -i 'has ipv6 address' > /dev/null; then if echo "$hout" | grep -i 'has address' > /dev/null; then : @@ -598,7 +601,10 @@ else fi fi if [ "X$ipv6" = "X0" ]; then + dout="" + if type dig > /dev/null 2>/dev/null; then dout=`dig -t any "$host" 2>/dev/null` + fi if echo "$dout" | grep -i "^$host" | grep '[ ]AAAA[ ]' > /dev/null; then if echo "$dout" | grep -i "^$host" | grep '[ ]A[ ]' > /dev/null; then : @@ -3024,8 +3030,10 @@ if [ "X$showcert" = "X1" ]; then fi #echo "openssl s_client $cipher_args -connect $host:$port" if [ "X$reverse" = "X" ]; then - host $host >/dev/null 2>&1 - host $host >/dev/null 2>&1 + if type host > /dev/null 2>/dev/null; then + host $host >/dev/null 2>&1 + host $host >/dev/null 2>&1 + fi timeout=15 if [ "X$SSVNC_FETCH_TIMEOUT" != "X" ]; then timeout=$SSVNC_FETCH_TIMEOUT diff --git a/x11vnc/misc/enhanced_tightvnc_viewer/bin/util/ssvnc.tcl b/x11vnc/misc/enhanced_tightvnc_viewer/bin/util/ssvnc.tcl index 21f3d9f..dc9e2b4 100755 --- a/x11vnc/misc/enhanced_tightvnc_viewer/bin/util/ssvnc.tcl +++ b/x11vnc/misc/enhanced_tightvnc_viewer/bin/util/ssvnc.tcl @@ -439,8 +439,9 @@ proc help {} { Options -> Help), the port mapping is similar, except "listening display :0" corresponds to port 5500, :1 to 5501, etc. Specify a specific interface, e.g. 192.168.1.1:0 to have stunnel - only listen on that interface. IPv6 also works, e.g. :::0 or ::1:0 - This also works for UN-encrypted reverse connections as well ('None'). + listen on that interface only. Listening on IPv6 can also be done, use + e.g. :::0 or ::1:0 This listening on IPv6 (:::0) works for UN-encrypted + reverse connections as well (mode 'None'). Zeroconf/Bonjour: @@ -3455,6 +3456,9 @@ proc do_viewer_windows {n} { set nn [expr "$nn + 5500"] } global direct_connect_reverse_host_orig is_win9x + if {![info exists direct_connect_reverse_host_orig]} { + set direct_connect_reverse_host_orig "" + } if {$direct_connect_reverse_host_orig != "" && !$is_win9x} { set nn2 [expr $nn + 15] set h0 $direct_connect_reverse_host_orig @@ -8627,11 +8631,15 @@ proc launch {{hp ""}} { set ipv6_pid "" global have_ipv6 if {$have_ipv6} { - set res [ipv6_proxy $proxy $host $port] - set proxy [lindex $res 0] - set host [lindex $res 1] - set port [lindex $res 2] - set ipv6_pid [lindex $res 3] + if {$proxy == "" && $use_ssl} { + # stunnel can handle ipv6 + } else { + set res [ipv6_proxy $proxy $host $port] + set proxy [lindex $res 0] + set host [lindex $res 1] + set port [lindex $res 2] + set ipv6_pid [lindex $res 3] + } } if {$proxy != ""} { |