diff options
| author | runge <runge@karlrunge.com> | 2010-04-25 21:05:49 -0400 |
|---|---|---|
| committer | runge <runge@karlrunge.com> | 2010-04-25 21:05:49 -0400 |
| commit | 8d79a63d3c8caca5d0db4827e072f7c773387afa (patch) | |
| tree | 7e0a75c820cde9bc2d17efa04b47be268a5e400f /x11vnc/sslhelper.c | |
| parent | 6de3f0bed722384fe21567c13a76843d64491bf4 (diff) | |
| download | libtdevnc-8d79a63d3c8caca5d0db4827e072f7c773387afa.tar.gz libtdevnc-8d79a63d3c8caca5d0db4827e072f7c773387afa.zip | |
incorporate new ultravnc_dsm_helper.c.
Diffstat (limited to 'x11vnc/sslhelper.c')
| -rw-r--r-- | x11vnc/sslhelper.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/x11vnc/sslhelper.c b/x11vnc/sslhelper.c index 3fc97b4..0cb120c 100644 --- a/x11vnc/sslhelper.c +++ b/x11vnc/sslhelper.c @@ -2717,6 +2717,19 @@ void openssl_port(int restart) { return; } + if (ipv6_listen && screen->port <= 0) { + if (got_rfbport) { + screen->port = got_rfbport_val; + } else { + int ap = 5900; + if (auto_port > 0) { + ap = auto_port; + } + screen->port = find_free_port6(ap, ap+200); + } + rfbLog("openssl_port: reset port from 0 => %d\n", screen->port); + } + if (restart) { port = screen->port; } else if (screen->listenSock > -1 && screen->port > 0) { @@ -4279,6 +4292,8 @@ if (db) rfbLog("raw_xfer bad write: %d -> %d | %d/%d errno=%d\n", csock, s_out #define ENC_HAVE_OPENSSL 0 #endif +#define ENC_DISABLE_SHOW_CERT + #include "enc.h" static void symmetric_encryption_xfer(int csock, int s_in, int s_out) { |