Detach as default, options for foreground and debug level

git-svn-id: https://svn.testnett.uninett.no/radsecproxy/trunk@75 e88ac4ed-0b26-0410-9574-a7f39faa03bf

4 files changed, 71 insertions, 21 deletions

diff --git a/README b/README
index ee65233..f541519 100644
--- a/README
+++ b/README
@@ -1,16 +1,22 @@
-This is the very first experimental version of a generic RADIUS proxy
-that can support various RADIUS clients over UDP or TLS (RadSec).
+This is a beta version of a generic RADIUS proxy that can support
+various RADIUS clients over UDP or TLS (RadSec).
 
-It should build on most Linux platforms by simply typing "make".
-To use it you need to create three config files. These are the
-main config file "radsecproxy.conf" and server and client files
-"servers.conf" and "clients.conf". See the enclosed example files
-for further instructions.
+It should build on most Linux and BSD platforms by simply typing
+"make". To use it you need to create three config files. These
+are the main config file "radsecproxy.conf" and server and client
+files "servers.conf" and "clients.conf". See the enclosed example
+files for further instructions.
 
 The config files must be in either "/etc/radsecproxy" or the
 proxy's current work directory. You may alter the path near
 the top of radsecproxy.h if necessary.
 
+There are two options that may be specified on the command line.
+They are "-d loglevel" to set a loglevel of 1, 2 or 3 where 3
+is the most detailed logging. Also "-f" to run the proxy in
+the foreground with logging to stderr. Without "-f" the default
+is to detach as a daemon and log to syslog.
+
 For more information, feedback etc. contact <venaas@uninett.no>.
 
-Stig Venaas, 2007.01.08
+Stig Venaas, 2007.05.07
diff --git a/debug.c b/debug.c
index d7d333b..d852a8d 100644
--- a/debug.c
+++ b/debug.c
@@ -30,7 +30,17 @@ void debug_init(char *ident) {
 }
 
 void debug_set_level(uint8_t level) {
-    debug_level = level;
+    switch (level) {
+    case 1:
+	debug_level = DBG_ERR;
+	return;
+    case 2:
+	debug_level = DBG_WARN;
+	return;
+    case 3:
+	debug_level = DBG_INFO;
+	return;
+    }
 }
 
 uint8_t debug_get_level() {
diff --git a/radsecproxy.c b/radsecproxy.c
index 95033de..cad2555 100644
--- a/radsecproxy.c
+++ b/radsecproxy.c
@@ -1919,14 +1919,9 @@ void getmainconfig(const char *configfile) {
 	    continue;
 	}
 	if (!strcasecmp(opt, "LogLevel")) {
-	    if (!strcasecmp(val, "1"))
-		options.loglevel = DBG_ERR;
-	    else if (!strcasecmp(val, "2"))
-		options.loglevel = DBG_WARN;
-	    else if (!strcasecmp(val, "3"))
-		options.loglevel = DBG_INFO;
-	    else
+	    if (strlen(val) != 1 || *val < '1' || *val > '3')
 		debugx(1, DBG_ERR, "error in %s, value of option %s is %s, must be 1, 2 or 3", configfile, opt, val);
+	    options.loglevel = *val - '0';
 	    continue;
 	}
 	if (!strcasecmp(opt, "LogDestination")) {
@@ -1938,20 +1933,59 @@ void getmainconfig(const char *configfile) {
     fclose(f);
 }
 
+void getargs(int argc, char **argv, uint8_t *foreground, uint8_t *loglevel) {
+    int c;
+
+    while ((c = getopt(argc, argv, "d:f")) != -1) {
+	switch (c) {
+	case 'd':
+	    if (strlen(optarg) != 1 || *optarg < '1' || *optarg > '3')
+		debugx(1, DBG_ERR, "Debug level must be 1, 2 or 3, not %s", optarg);
+	    *loglevel = *optarg - '0';
+	    break;
+	case 'f':
+	    *foreground = 1;
+	    break;
+	default:
+	    goto usage;
+	}
+    }
+    if (!(argc - optind))
+	return;
+
+ usage:
+    debug(DBG_ERR, "Usage:\n%s [ -f ] [ -d debuglevel ]", argv[0]);
+    exit(1);
+}
+
 int main(int argc, char **argv) {
     pthread_t udpserverth;
     int i;
-
+    uint8_t foreground = 0, loglevel = 0;
+    
+    debug_init("radsecproxy");
     debug_set_level(DEBUG_LEVEL);
+    getargs(argc, argv, &foreground, &loglevel);
+    if (loglevel)
+	debug_set_level(loglevel);
     getmainconfig(CONFIG_MAIN);
-    debug_init("radsecproxy");
-    if (options.loglevel)
+    if (loglevel)
+	options.loglevel = loglevel;
+    else if (options.loglevel)
 	debug_set_level(options.loglevel);
-    if (options.logdestination)
+    if (foreground)
+	options.logdestination = NULL;
+    else {
+	if (!options.logdestination)
+	    options.logdestination = "x-syslog://";
 	debug_set_destination(options.logdestination);
+    }
     getconfig(CONFIG_SERVERS, NULL);
     getconfig(NULL, CONFIG_CLIENTS);
 
+    if (!foreground && (daemon(0, 0) < 0))
+	debugx(1, DBG_ERR, "daemon() failed: %s", strerror(errno));
+	
     if (client_udp_count) {
 	udp_server_listen = server_create('U');
 	if (pthread_create(&udpserverth, NULL, udpserverrd, NULL))
diff --git a/radsecproxy.h b/radsecproxy.h
index 6d47014..fd36b03 100644
--- a/radsecproxy.h
+++ b/radsecproxy.h
@@ -12,7 +12,7 @@
                             sizeof(struct sockaddr_in) : \
                             sizeof(struct sockaddr_in6))
 
-#define DEBUG_LEVEL DBG_WARN
+#define DEBUG_LEVEL 2
 
 #define CONFIG_MAIN "/etc/radsecproxy/radsecproxy.conf"
 #define CONFIG_SERVERS "/etc/radsecproxy/servers.conf"