daemon: style adjustment

Fix style inconsistencies and move port settings to settings.c.

Part of Ticket 3.

Signed-off-by: Gediminas Jakutis <gediminas@varciai.lt>

3 files changed, 31 insertions, 18 deletions

diff --git a/src/daemon/main.c b/src/daemon/main.c
index a729f84..302a9ce 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -33,7 +33,9 @@ int main(int argc, char **argv)
 
 	printf("Usurpation daemon version %s starting\n", version);
 
-    net_init(6996); // To do: get port from settings.
+	settings_init();
+	net_init(setting_port()); /* TODO: get port from settings. */
+
 	/* by default and if running by as a system service, the init system
 	 * needs to keep control of the process and thus only detach if
 	 * requested when ran manually by a user.
diff --git a/src/daemon/net.c b/src/daemon/net.c
index 2969d9b..27375e3 100644
--- a/src/daemon/net.c
+++ b/src/daemon/net.c
@@ -185,18 +185,18 @@ static void *dolisten(void * state)
 		} else {
 			st->status = A_OK;
 		}
-            
-        if (oldstatus != st->status)
-        {
-            oldstatus = st->status;
-		if(st->status == DEAD)
-			/* this timestamp is arbitraty */
-                fprintf(stderr, "Connection with the client has been lost. Last reply since: %li \n", st->lastreply.tv_sec);
-            else{
-			ipstring = inet_ntoa(clientaddr.sin_addr);
-			fprintf(stderr, "Successful incoming connection from %s\n", ipstring);
-            }
-        }
+
+		if (oldstatus != st->status)
+		{
+			oldstatus = st->status;
+			if(st->status == DEAD) {
+				/* this timestamp is arbitraty */
+				fprintf(stderr, "Connection with the client has been lost. Last reply since: %li \n", st->lastreply.tv_sec);
+			} else {
+				ipstring = inet_ntoa(clientaddr.sin_addr);
+				fprintf(stderr, "Successful incoming connection from %s\n", ipstring);
+			}
+		}
 		pthread_mutex_unlock(&st->datamutex);
 		pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &cancelstate);
 		pthread_testcancel();
diff --git a/src/daemon/settings.c b/src/daemon/settings.c
index 6796ac1..3777f23 100644
--- a/src/daemon/settings.c
+++ b/src/daemon/settings.c
@@ -22,14 +22,25 @@
 
 static struct settings {
 	int daemonize;
+	unsigned short int port;
 } settings;
 
-int setting_detach(void)
-{
-	/* should be, in this order: looking at options provided via command
+/* TODO: should be, in this order: looking at options provided via command
 	 * line arguments, looking at at /etc/conf.d/usurpation.conf or
-	 * using default.
-	 * Right now just uses default.
+	 * using default. Right now just uses defaults.
 	 */
+void settings_init(void)
+{
+	settings.daemonize =0;
+	settings.port = 6996
+}
+
+int setting_detach(void)
+{
 	return settings.daemonize;
 }
+
+unsigned short int setting_port(void)
+{
+	return settings.port;
+}