From 8988d5f8bc62549539ffa027f66750e916de13d6 Mon Sep 17 00:00:00 2001
From: Alex 'AdUser' Z <ad_user@runbox.com>
Date: Fri, 15 Jan 2021 00:57:15 +1000
Subject: [PATCH] * move SA_REGISTER() macro to daemon.c, cleanup headers

---
 src/common.h | 20 ++++----------------
 src/daemon.c | 12 ++++++++++++
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/common.h b/src/common.h
index 9537462..fb883c2 100644
--- a/src/common.h
+++ b/src/common.h
@@ -39,17 +39,13 @@
  */
 #define DEFAULT_PIDFILE_PATH "/var/run/f2b.pid"
 /**
- * Default path of unix control socket (server endpoint)
+ * Default path of unix control socket
  */
 #define DEFAULT_CSOCKET_PATH "/var/run/f2b.sock"
 /**
  * Default path of directory to store ip states for jails
  */
 #define DEFAULT_STATEDIR_PATH "/var/db/f2b"
-/**
- * Template for making path for client side of connection to control socket
- */
-#define DEFAULT_CSOCKET_CPATH "/tmp/f2bc-sock-XXXXXX"
 
 /**
  * @def UNUSED
@@ -57,16 +53,8 @@
  */
 #define UNUSED(x)  (void)(x)
 
-/**
- * @def SA_REGISTER
- * Register signal handler
- */
-#define SA_REGISTER(SIGNUM, HANDLER) \
-  memset(&act, 0x0, sizeof(act)); \
-  act.sa_handler = HANDLER; \
-  if (sigaction(SIGNUM, &act, NULL) != 0) { \
-    f2b_log_msg(log_fatal, "can't register handler for " #SIGNUM); \
-    return EXIT_FAILURE; \
-  }
+/* default size of buffers */
+#define RBUF_SIZE   256
+#define WBUF_SIZE 32768 /* 32Kb */
 
 #endif /* F2B_COMMON_H_ */
diff --git a/src/daemon.c b/src/daemon.c
index 6597658..3c7a201 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -17,6 +17,18 @@
 #include <getopt.h>
 #include <signal.h>
 
+/**
+ * @def SA_REGISTER
+ * Register signal handler
+ */
+#define SA_REGISTER(SIGNUM, HANDLER) \
+  memset(&act, 0x0, sizeof(act)); \
+  act.sa_handler = HANDLER; \
+  if (sigaction(SIGNUM, &act, NULL) != 0) { \
+    f2b_log_msg(log_fatal, "can't register handler for " #SIGNUM); \
+    return EXIT_FAILURE; \
+  }
+
 enum { stop = 0, run, reconfig, logrotate, test } state = run;
 
 void signal_handler(int signum) {