From 5bdb4b048cc89716804d90c4ddc2dd2cac62e7c1 Mon Sep 17 00:00:00 2001
From: Babak Farrokhi <babak@farrokhi.net>
Date: Sat, 31 Oct 2015 12:53:53 +0330
Subject: [PATCH] -Update TODO - Fix indenting

---
 TODO.md   |  3 ++-
 fsipd.c   | 20 +++++++++-----------
 logfile.c |  4 ++--
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/TODO.md b/TODO.md
index f416ae3..955812a 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,2 +1,3 @@
 * ~~Add support for IPv6 (autodetect)~~
-
+* Add optional syslog support
+* Add command line options for IPv4/IPv6, port number, logging method, etc
diff --git a/fsipd.c b/fsipd.c
index e6e5346..5908955 100644
--- a/fsipd.c
+++ b/fsipd.c
@@ -55,10 +55,9 @@
 #define	PORT 5060
 #define BACKLOG 1024
 
-#ifndef IPV6_BINDV6ONLY /* Linux does not have IPV6_BINDV6ONLY */
+#ifndef IPV6_BINDV6ONLY			/* Linux does not have IPV6_BINDV6ONLY */
 #define IPV6_BINDV6ONLY IPV6_V6ONLY
-#endif /*IPV6_BINDV6ONLY */
-
+#endif					/* IPV6_BINDV6ONLY */
 
 /*
  * Globals
@@ -121,7 +120,7 @@ signal_handler(int sig)
 	switch (sig) {
 
 	case SIGHUP:
-		log_reopen(&lfh);
+		log_reopen(&lfh);	/* necessary for log file rotation */
 		break;
 	case SIGINT:
 	case SIGTERM:
@@ -163,6 +162,7 @@ process_request(int af, struct sockaddr *src, int proto, char *str)
 
 	chomp(str);
 
+/* todo: add optional syslog support */
 #ifdef PF_INET6
 	switch (af) {
 	case AF_INET6:
@@ -177,8 +177,8 @@ process_request(int af, struct sockaddr *src, int proto, char *str)
 		break;
 	}
 #else
-		s_in = (struct sockaddr_in *)src;
-		log_printf(lfh, "%ld,%s4,%s,%d,\"%s\"", time(NULL), pname, inet_ntoa(s_in->sin_addr), ntohs(s_in->sin_port), str);
+	s_in = (struct sockaddr_in *)src;
+	log_printf(lfh, "%ld,%s4,%s,%d,\"%s\"", time(NULL), pname, inet_ntoa(s_in->sin_addr), ntohs(s_in->sin_port), str);
 #endif
 
 }
@@ -201,8 +201,8 @@ init_tcp()
 		perror("tcp6 socket()");
 		return (EXIT_FAILURE);
 	}
-
 	int on = 1;
+
 	setsockopt(t6_sockfd, IPPROTO_IPV6, IPV6_BINDV6ONLY, (char *)&on, sizeof(on));
 
 	if (bind(t6_sockfd, (struct sockaddr *)&t6_sa, sizeof(t6_sa)) < 0) {
@@ -246,8 +246,8 @@ init_udp()
 		perror("udp6 socket()");
 		return (EXIT_FAILURE);
 	}
-
 	int on = 1;
+
 	setsockopt(u6_sockfd, IPPROTO_IPV6, IPV6_BINDV6ONLY, (char *)&on, sizeof(on));
 
 	if (bind(u6_sockfd, (struct sockaddr *)&u6_sa, sizeof(u6_sa)) < 0) {
@@ -269,7 +269,6 @@ init_udp()
 		perror("udp4 bind()");
 		return (EXIT_FAILURE);
 	}
-
 	return (EXIT_SUCCESS);
 }
 
@@ -369,7 +368,7 @@ udp6_handler(void *args)
 	return (args);			/* suppress compiler warning */
 }
 
-#endif /* PF_INET6 */
+#endif					/* PF_INET6 */
 
 /*
  * Daemonize and persist pid
@@ -397,7 +396,6 @@ daemon_start()
 	if ((lfh = log_open("fsipd.log", 0644)) == NULL) {
 		err(EXIT_FAILURE, "Cannot open log file");
 	}
-
 	/* Initialize TCP46 and UDP46 sockets */
 	if (init_tcp() == EXIT_FAILURE)
 		return (EXIT_FAILURE);
diff --git a/logfile.c b/logfile.c
index 44baca3..8645e64 100644
--- a/logfile.c
+++ b/logfile.c
@@ -30,7 +30,7 @@
 #define _PROGNAME program_invocation_short_name
 #else
 #define _PROGNAME getprogname()
-#endif /* __linux__ */
+#endif					/* __linux__ */
 
 log_t  *
 log_open(const char *path, mode_t mode)
@@ -52,7 +52,7 @@ log_open(const char *path, mode_t mode)
 	 */
 	if ((fd = open(filename, O_WRONLY | O_APPEND | O_CREAT | O_SYNC, mode)) == -1)
 		return (NULL);
-	if (flock(fd, LOCK_EX) == -1 ) {
+	if (flock(fd, LOCK_EX) == -1) {
 		close(fd);
 		return (NULL);
 	}