X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fmain.c;h=ecdf0682ef750ce29911001d281aed61dfeb025f;hb=86e68ea7c2ee5c34a1cb1e1b0b7bbed09da161d3;hp=596fb39afdb05cc6846a1dd79ca699008b2c2e28;hpb=ab0ae45f79caaae86b36f8230f9399138c9e73bc;p=matches%2FMCTX3420.git

diff --git a/server/main.c b/server/main.c
index 596fb39..ecdf068 100644
--- a/server/main.c
+++ b/server/main.c
@@ -1,22 +1,23 @@
 /**
  * @file main.c
- * @purpose main and its helper functions, signal handling and cleanup functions
+ * @brief main and its helper functions, signal handling and cleanup functions
  */
-#include "common.h"
-
-
-// --- Standard headers --- //
-#include <signal.h> // for signal handling
 
 // --- Custom headers --- //
-#include "fastcgi.h"
-#include "log.h"
+#include "common.h"
 #include "options.h"
 #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
-Sensor g_sensors[NUMSENSORS]; // sensors array
 
 // --- Function definitions --- //
 
@@ -27,9 +28,72 @@ Sensor g_sensors[NUMSENSORS]; // sensors array
  */
 void ParseArguments(int argc, char ** argv)
 {
+
+
 	g_options.program = argv[0]; // program name
 	g_options.verbosity = LOGDEBUG; // default log level
-	Log(LOGDEBUG, "Called as %s with %d arguments.", g_options.program, argc);
+	gettimeofday(&(g_options.start_time), NULL); // Start time
+
+
+	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)
+	{
+		if (argv[i][0] != '-')
+			Fatal("Unexpected argv[%d] - %s", i, argv[i]);
+
+		if (i+1 >= argc || argv[i+1][0] == '-')
+			Fatal("No argument following switch %s", argv[i]);
+		
+		if (strlen(argv[i]) > 2)
+			Fatal("Human readable switches are not supported.");
+
+		char * end = NULL;
+		switch (argv[i][1])
+		{
+			// 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]);
+	}	
+
+	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);
+
+	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;
+	}
+	
 }
 
 /**
@@ -38,12 +102,14 @@ void ParseArguments(int argc, char ** argv)
  */
 //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));
-	exit(signal);
+
+	//exit(signal);
 }
 
 /**
@@ -61,20 +127,47 @@ void Cleanup()
  * @param argc - Num args
  * @param argv - Args
  * @returns 0 on success, error code on failure
+ * NOTE: NEVER USE exit(3)! Instead call Thread_QuitProgram
  */
 int main(int argc, char ** argv)
 {
+	// Open log before calling ParseArguments (since ParseArguments may call the Log functions)
+	openlog("mctxserv", LOG_PID | LOG_PERROR, LOG_USER);
+	Log(LOGINFO, "Server started");
+
 	ParseArguments(argc, argv);
 
-	// start sensor threads
-	for (int i = 0; i < NUMSENSORS; ++i)
+	//Open the system log
+
+	// signal handler
+	//TODO: Make this work
+	/*
+	int signals[] = {SIGINT, SIGSEGV, SIGTERM};
+	for (int i = 0; i < sizeof(signals)/sizeof(int); ++i)
 	{
-		Sensor_Init(g_sensors+i, i);
-		pthread_create(&(g_sensors[i].thread), NULL, Sensor_Main, (void*)(g_sensors+i));
+		signal(signals[i], SignalHandler);
 	}
+	*/
+	Sensor_Init();
+	Actuator_Init();
+	Pin_Init();
+	//Sensor_StartAll("test");
+	//Actuator_StartAll("test");
+	const char *ret;
+	if ((ret = Control_SetMode(CONTROL_START, "test")) != NULL)
+		Fatal("Control_SetMode failed with '%s'", ret);
 
 	// run request thread in the main thread
 	FCGI_RequestLoop(NULL);
+
+	if ((ret = Control_SetMode(CONTROL_STOP, "test")) != NULL)
+		Fatal("Control_SetMode failed with '%s'", ret);
+	//Sensor_StopAll();
+	//Actuator_StopAll();
+
+	Pin_Close();
+
+	Cleanup();
 	return 0;
 }