X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fmain.c;h=92f76b37b1f911965eeecb580763430310bd140f;hb=289794ba2dcbe6234e25e5d00531b26baee342b7;hp=aff5b83826f187b158f3b5e02bf12406fb0ff8eb;hpb=f677f4f422f9e4efd4cf83eea8ec271bb38f53d5;p=matches%2FMCTX3420.git

diff --git a/server/main.c b/server/main.c
index aff5b83..92f76b3 100644
--- a/server/main.c
+++ b/server/main.c
@@ -9,12 +9,14 @@
 #include "sensor.h"
 #include "actuator.h"
 #include "control.h"
+#include "pin_test.h"
 #include "bbb_pin_defines.h"
 
 // --- Standard headers --- //
 #include <syslog.h> // for system logging
 #include <signal.h> // for signal handling
 
+
 // --- Variable definitions --- //
 Options g_options; // options passed to program through command line arguments
 
@@ -27,15 +29,18 @@ Options g_options; // options passed to program through command line arguments
  */
 void ParseArguments(int argc, char ** argv)
 {
-	// horrible horrible hacks
-	g_options.argc = argc;
-	g_options.argv = argv;
+
 
 	g_options.program = argv[0]; // program name
 	g_options.verbosity = LOGDEBUG; // default log level
 	gettimeofday(&(g_options.start_time), NULL); // Start time
-	g_options.adc_device_path = ADC_DEVICE_PATH;
-	Log(LOGDEBUG, "Called as %s with %d arguments.", g_options.program, argc);
+
+
+	g_options.auth_method = AUTH_NONE;  // Don't use authentication
+	g_options.auth_uri = ""; // 
+	g_options.ldap_base_dn = "";
+	
+
 
 	for (int i = 1; i < argc; ++i)
 	{
@@ -48,34 +53,48 @@ void ParseArguments(int argc, char ** argv)
 		if (strlen(argv[i]) > 2)
 			Fatal("Human readable switches are not supported.");
 
+		char * end = NULL;
 		switch (argv[i][1])
 		{
-			case 'a':
-				g_options.adc_device_path = argv[i+1];
-				Log(LOGINFO, "ADC Device Path: %s", argv[i+1]);
-				++i;
+			// Set program verbosity
+			case 'v':
+				g_options.verbosity = strtol(argv[++i], &end, 10);
+				break;
+			// Enable/Disable pin test
+			case 'p':
+				g_options.enable_pin = !(strtol(argv[++i], &end, 10));
+				break;
+			// LDAP URI
+			case 'A':
+				g_options.auth_uri = argv[++i];
+				break;
+			// LDAP DN
+			case 'd':
+				g_options.ldap_base_dn = argv[++i];
 				break;
 			default:
 				Fatal("Unrecognised switch %s", argv[i]);
 				break;
 		}
+
+		if (end != NULL && *end != '\0')
+			Fatal("argv[%d] -%c requires an integer (got \"%s\" instead)", i-1, argv[i-1][0], argv[i]);
 	}	
-}
 
-/**
- * Handle a signal
- * @param signal - The signal number
- */
-//TODO: Something that gets massively annoying with threads is that you can't predict which one gets the signal
-// There are ways to deal with this, but I can't remember them
-// Probably sufficient to just call Thread_QuitProgram here
-void SignalHandler(int signal)
-{
-	// At the moment just always exit.
-	// Call `exit` so that Cleanup will be called to... clean up.
-	Log(LOGWARN, "Got signal %d (%s). Exiting.", signal, strsignal(signal));
+	Log(LOGDEBUG, "Verbosity: %d", g_options.verbosity);
+	Log(LOGDEBUG, "Pin Module Enabled: %d", g_options.enable_pin);
+	Log(LOGDEBUG, "Auth URI: %s", g_options.auth_uri);
+	Log(LOGDEBUG, "LDAP Base DN: %s", g_options.ldap_base_dn);
 
-	//exit(signal);
+	if (g_options.auth_uri[0] != '\0')
+	{
+		//HACK...
+		if (PathExists(g_options.auth_uri))
+			g_options.auth_method = AUTH_SHADOW;
+		else
+			g_options.auth_method = AUTH_LDAP;
+	}
+	
 }
 
 /**
@@ -84,8 +103,9 @@ void SignalHandler(int signal)
 void Cleanup()
 {
 	Log(LOGDEBUG, "Begin cleanup.");
+	Sensor_Cleanup();
+	//Actuator_Cleanup();
 	Log(LOGDEBUG, "Finish cleanup.");
-
 }
 
 /**
@@ -101,24 +121,13 @@ int main(int argc, char ** argv)
 	openlog("mctxserv", LOG_PID | LOG_PERROR, LOG_USER);
 	Log(LOGINFO, "Server started");
 
-	ParseArguments(argc, argv);
-
-	//Open the system log
+	ParseArguments(argc, argv); // Setup the g_options structure from program arguments
 
-	// signal handler
-	//TODO: Make this work
-	/*
-	int signals[] = {SIGINT, SIGSEGV, SIGTERM};
-	for (int i = 0; i < sizeof(signals)/sizeof(int); ++i)
-	{
-		signal(signals[i], SignalHandler);
-	}
-	*/
 	Sensor_Init();
 	Actuator_Init();
 	Pin_Init();
-	//Sensor_StartAll("test");
-	//Actuator_StartAll("test");
+	
+	// Try and start things
 	const char *ret;
 	if ((ret = Control_SetMode(CONTROL_START, "test")) != NULL)
 		Fatal("Control_SetMode failed with '%s'", ret);