From e753b0564a73e43ee6caca9dac7fa9a19b5eac0a Mon Sep 17 00:00:00 2001
From: ddouthitt <ddouthitt@users.sourceforge.net>
Date: Fri, 28 Sep 2001 14:23:41 +0000
Subject: [PATCH] Updated configuration file processing:

* Options override all configuration file settings
* In absence of configuration file settings or option settings,
  defaults are used
* Added new global settings: Port, Bind, Wait, WaitTime, Debug
* Added more documentation to LCDd.conf
---
 LCDd.conf       | 29 ++++++++++++++++++---
 server/main.c   | 68 ++++++++++++++++++++++++++++++++++++++++++++++---
 server/main.h   |  1 +
 server/screen.c |  3 +--
 4 files changed, 92 insertions(+), 9 deletions(-)

diff --git a/LCDd.conf b/LCDd.conf
index ba207c9..6e94370 100644
--- a/LCDd.conf
+++ b/LCDd.conf
@@ -18,19 +18,42 @@
 #
 # Before the driver sections, global settings can be set.
 #
-# Currently there is only one global setting:
+# Global settings are:
 #
 # Driver <str>
 #
 #   Use the specified driver.  Second and further instances
 #   of this command add input drivers to the server;
-#   output is only to the first driver.
+#   output is only to the first driver.  The default driver
+#   to use is curses.
+#
+# Bind <addr>
+#
+#   Bind to this address; defaults to 127.0.0.1
+#
+# Port <port>
+#
+#   Listen on this specified port; defaults to 13666.
+#
+# Debug <level>
+#
+#   Debugging level; defaults to 0 (no debugging output).
+#
+# Wait <time>
+# WaitTime <time>
+#
+#   Set the default amount of time (in 1/8 seconds) to
+#   display a screen on the LCD.
 #
 # Comments are all line-based comments,
 # and are lines that start with one of '#', ';'
 # or '//' in the first columns.
 
 Driver curses
+Bind 172.16.3.69
+Port 3777
+Debug 3
+WaitTime 80
 
 # Joystick driver
 
@@ -76,5 +99,5 @@ Arguments -d /dev/ttyS0 -t lkd202-25
 # Curses driver
 
 [curses]
-Arguments -f blue -b cyan
+Arguments -f blue -b cyan -B red -t 20x2
 
diff --git a/server/main.c b/server/main.c
index fade71a..9fd8e6c 100644
--- a/server/main.c
+++ b/server/main.c
@@ -46,7 +46,7 @@ extern int optind, optopt, opterr;
 #define DEFAULT_CONFIG_FILE "/etc/LCDd.conf"
 #define DEFAULT_DRIVER "curses"
 
-int debug_level = 3;
+int debug_level = 0;
 char *version = VERSION;
 char *protocol_version = PROTOCOL_VERSION;
 char *build_date = __DATE__;
@@ -59,8 +59,8 @@ char *build_date = __DATE__;
    Using variables for these means that (later) we can select which port
    and which address to bind to at run time. */
 
-char bind_addr[64] = "127.0.0.1";
-int lcd_port = LCDPORT;
+char bind_addr[64];
+int lcd_port = 0;
 
 // The parameter structure and args[] should
 // be removed when getopt(3) is implemented,
@@ -120,7 +120,7 @@ int drop_privs(char *user) {
 int
 main (int argc, char **argv)
 {
-	char cfgfile[256] = DEFAULT_CONFIG_FILE;
+	char cfgfile[256];
 	FILE *config;
 
 	int i, err;
@@ -144,6 +144,27 @@ main (int argc, char **argv)
 	//	HelpScreen ();
 
 	memset(driverlist, '\0', sizeof(driverlist));
+	memset(bind_addr, '\0', sizeof(bind_addr));
+
+	/*
+	 * Settings in order of preference:
+	 *
+	 * 1: Settings specified in command line options...
+	 * 2: Settings specified in configuration file...
+	 * 3: Default settings
+	 *
+	 * Because of this, and because one option (-c) specifies where
+	 * the configuration file is, things are done in this order:
+	 *
+	 * 1. Read and set options.
+	 * 2. Read configuration file; if option is read in configuration
+	 *    file and not already set, then set it.
+	 * 3. Having read configuration file, if parameter is not set,
+	 *    set it to the default value.
+	 *
+	 * It is for this reason that the default values are **NOT** set
+	 * in the variable declaration...
+	 */
 
 	i = 0;
 	// analyze options here..
@@ -205,6 +226,9 @@ main (int argc, char **argv)
 	syslog(LOG_NOTICE, "server built on %s",
 		build_date);
 
+	if (!cfgfile)
+		strncpy(cfgfile, DEFAULT_CONFIG_FILE, sizeof(cfgfile));
+
 	if ((config = fopen(cfgfile, "r")) == NULL) {
 		syslog(LOG_WARNING, "no configuration file found... using defaults");
 	} else {
@@ -277,18 +301,54 @@ main (int argc, char **argv)
 						driverlist[list_index] = malloc(MAX_DRIVER_NAME_SIZE);
 						snprintf(driverlist[list_index++], MAX_DRIVER_NAME_SIZE, "%s", linebuf + 7);
 					}
+				} else if (strncasecmp(linebuf, "Bind ", 5) == 0) {
+					if (bind_addr[0] == '\0')
+						strncpy(bind_addr, linebuf + 5, sizeof(bind_addr));
+				} else if (strncasecmp(linebuf, "Port ", 5) == 0) {
+					if (lcd_port == 0)
+						lcd_port = atoi(linebuf + 5);
+				} else if ((strncasecmp(linebuf, "Wait ", 5) == 0) ||
+					   (strncasecmp(linebuf, "WaitTime ", 9) == 0)) {
+					char *p;
+
+					p = linebuf;
+					while (*p != ' ') p++;
+					p++;
+					
+					default_duration = atoi(p);
+					if ( default_duration < 16 || default_duration > 10000 ) {
+						snprintf(buf, sizeof(buf),
+							"wait time should be between 16 and 10000 (in 1/8ths of second), not %s\n", optarg);
+						fprintf(stderr, "%s", buf);
+						HelpScreen ();
+					}
+				} else if (strncasecmp(linebuf, "Debug ", 5) == 0) {
+					debug_level = atoi(linebuf + 5);
 				}
 			}
 		}
 		fclose(config);
 	}
 
+	if (debug_level > 0)
+		syslog(LOG_NOTICE, "debug level set to %d",
+			debug_level);
+
+	// set defaults....
+	if (bind_addr[0] == '\0')
+		strncpy(bind_addr, DEFAULT_ADDR, sizeof(bind_addr));
+	if (lcd_port == 0)
+		lcd_port = LCDPORT;
+	if (default_duration == 0)
+		default_duration = DEFAULT_SCREEN_DURATION;
+
 	// Use default driver
 	if (driverlist[0] == NULL) {
 		driverlist[0] = malloc(MAX_DRIVER_NAME_SIZE);
 		strcpy(driverlist[0], DEFAULT_DRIVER);
 	}
 
+	// Go thru all drivers and initialize all of them
 	for (i = 0; i < MAX_DRIVERS; i++) {
 		if (driverlist[i] == NULL)
 			continue;
diff --git a/server/main.h b/server/main.h
index a0e60e1..978ffa0 100644
--- a/server/main.h
+++ b/server/main.h
@@ -29,5 +29,6 @@ typedef struct screen_size {
 #define DEFAULT_SCREEN_PRIORITY 128
 #define DEFAULT_SCREEN_DURATION 32
 #define DEFAULT_HEARTBEAT 1
+#define DEFAULT_ADDR "127.0.0.1"
 
 #endif
diff --git a/server/screen.c b/server/screen.c
index 8b8e681..b34480d 100644
--- a/server/screen.c
+++ b/server/screen.c
@@ -13,8 +13,7 @@
 #include "screen.h"
 #include "main.h"
 
-int  default_priority = 128 ;
-int  default_duration = DEFAULT_SCREEN_DURATION ;  // About 8 seconds
+int  default_duration = 0;
 
 screen *
 screen_create ()