drv_vnc: http port as option

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1020 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/drv_vnc.c b/drv_vnc.c
index f86af0f8ee100d8b16f5d80c5a322e9500fec61b..443cab377f5b04829535240ae1218c0bf26518f0 100644 (file)
--- a/drv_vnc.c
+++ b/drv_vnc.c
@@ -80,6 +80,7 @@ static int keypadxofs = 0;
 static int keypadyofs = 0;
 static int keypadgap = 0;
 static int port = 5900;
+static int httpPort = 5800;
 static unsigned char framer = 0;
 static unsigned char frameg = 0;
 static unsigned char frameb = 0;
@@ -286,6 +287,9 @@ static int drv_vnc_open(const char *Section)
     if (cfg_number(Section, "Port", 5900, 1, 65535, &port) < 1) {
        info("[DRV_VNC] no '%s.Port' entry from %s using default %d", Section, cfg_source(), port);
     }
+    if (cfg_number(Section, "HttpPort", 5800, 1, 65535, &httpPort) < 1) {
+       info("[DRV_VNC] no '%s.HttpPort' entry from %s using default %d", Section, cfg_source(), httpPort);
+    }
     if (cfg_number(Section, "Maxfps", -1, -1, 512, &maxfps) < 1) {
        info("[DRV_VNC] no '%s.Maxfps' entry from %s using default %d", Section, cfg_source(), maxfps);
     }
@@ -423,6 +427,7 @@ static int drv_vnc_start(const char *section)
     if (javaClassFiles != NULL) {
        server->httpDir = javaClassFiles;
        server->httpEnableProxyConnect = TRUE;
+       server->httpPort = httpPort;
     }
     /* Initialize the server */
     rfbInitServer(server);