aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichux <michux@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2009-03-31 06:46:57 +0000
committermichux <michux@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2009-03-31 06:46:57 +0000
commit3428f32c33f0823cc3f2f0d4ca8a3e21dbda8a55 (patch)
tree4f81916bf92680924a8053d295344aa09446aa63
parent27bba2d8c0a77657c10428a83f46a2d8303487ff (diff)
downloadlcd4linux-3428f32c33f0823cc3f2f0d4ca8a3e21dbda8a55.tar.gz
drv_vnc: http port as option
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1020 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
-rw-r--r--drv_vnc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drv_vnc.c b/drv_vnc.c
index f86af0f..443cab3 100644
--- 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);
/td> 2008-11-22update button_exec plugin - fix segfaultmichux1-3/+2 2008-11-22update fifo plugin - untestedmichux1-1/+1 2008-10-07Replace write to external variable usb_debug by calling usb_set_debug().bwalle7-16/+7 2008-10-06adding GPI to picoLCD for reading button events by Igor Mammedov <niallain@g...michael1-1/+22 2008-10-06properties fixedmichael11-3290/+2675 2008-10-05Rebuild auto-generated autoconf stuff due to last change in drivers.m4.bwalle3-2657/+3297 2008-10-05Add 'ULA200' driver when --with-drivers=all is specifiedbwalle1-0/+1 2008-09-14strftime_tz patch from Bernhard Wallemichael1-0/+11 2008-09-08strftime_tz() plugin by Bernhard Wallemichael1-0/+25 2008-09-03ULA200 driver by Bernhard Wallemichael7-2/+825 2008-09-03indentmichael1-4/+4 2008-08-31Increased the maximum bps to 230400, if defined in <termios.h>.sonic741-2/+7 2008-08-27git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@889 3ae390bd-cb1e-0410-...sonic741-18/+11 2008-08-27D4D updates by Svenmichael1-38/+60 2008-08-03driver for 4D Systems serial displays by Sven Killigmichael9-45/+846 2008-08-03signed/unsigned mismatchmichael1-3/+3 2008-07-26added command functionsmichux1-2/+130 2008-07-15added IRLCD driver by Jean-Philippe Civademichael10-5/+467 2008-07-15'autoreconf -f -i' run & config.rpath addedmichael8-370/+1617