x11vnc: -http_oneport for single port HTTP and VNC. Improve find_display wrt lsof blocking with -b.

1 files changed, 32 insertions, 1 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index 4089448..366ea7d 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -1732,7 +1732,8 @@ void print_help(int mode) {
 "                       Use this option if you do not want to deal with SSL\n"
 "                       certificates for authentication and do not want to\n"
 "                       use SSH but want some encryption for your VNC session.\n"
-"                       Or if you must interface with some symmetric key tunnel.\n"
+"                       Or if you must interface with a symmetric key tunnel\n"
+"                       that you do not have control over.\n"
 "\n"
 "                       Note that this mode will NOT work with the UltraVNC DSM\n"
 "                       plugins because they alter the RFB protocol in addition\n"
@@ -1865,6 +1866,36 @@ void print_help(int mode) {
 "                       to include the PORT= in the browser URL, simply supply\n"
 "                       \"-httpsredir\" to x11vnc.\n"
 "\n"
+"-http_oneport          For un-encrypted connections mode (i.e. no -ssl,\n"
+"                       -stunnel, or -enc options), allow the Java VNC Viewer\n"
+"                       applet to be downloaded thru the VNC port via HTTP.\n"
+"\n"
+"                       That is to say, you can use a single port for Java\n"
+"                       applet viewer connections by using a URL in your web\n"
+"                       browser like this, for example:\n"
+"\n"
+"                       http://hostname:5900\n"
+"\n"
+"                       The regular, two-port mode, URL http://hostname:5800\n"
+"                       will continue to work as well.\n"
+"\n"
+"                       As mentioned above, this mode will NOT work with\n"
+"                       the -ssl, -stunnel, or -enc encryption options.\n"
+"                       Note that is it equivalent to '-enc none' (i.e. it\n"
+"                       uses the same detection mechanism as for HTTPS, but\n"
+"                       with no encryption.)\n"
+"\n"
+"                       HTTPS single-port is on by default in -ssl encrypted\n"
+"                       mode (and -enc too), so you only need -http_oneport\n"
+"                       when doing non-SSL encrypted connections.\n"
+"\n"
+"                       This mode could also be useful for SSH tunnels since\n"
+"                       it means only one port needs to be redirected.\n"
+"\n"
+"                       The -httpsredir option may also be useful for this\n"
+"                       mode when using an SSH tunnel as well as for router\n"
+"                       port redirections.\n"
+"\n"
 #endif
 "-ssh user@host:disp    Create a remote listening port on machine \"host\"\n"
 "                       via a SSH tunnel using the -R rport:localhost:lport\n"