don't log to syslog when testing

common.h

@@ -35,6 +35,30 @@
 
 #include "version.h"
 
+#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
+
+
+#define CHECK_RES_DIE(res, str) \
+    if (res == -1) {    \
+       print_message(msg_system_error, "%s:%d:", __FILE__, __LINE__); \
+       perror(str);     \
+       exit(1);         \
+    }
+
+#define CHECK_RES_RETURN(res, str, ret) \
+    if (res == -1) {                                    \
+        print_message(msg_system_error, "%s:%d:%s:%d:%s\n", __FILE__, __LINE__, str, errno, strerror(errno));  \
+        return ret;                                     \
+    } 
+
+#define CHECK_ALLOC(a, str) \
+    if (!a) { \
+        print_message(msg_system_error, "%s:%d:", __FILE__, __LINE__); \
+        perror(str); \
+        exit(1); \
+    }
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
 
 #if 1
 #define TRACE fprintf(stderr, "%s:%d\n", __FILE__, __LINE__);
@@ -59,6 +83,9 @@ enum connection_state {
     ST_SHOVELING   /* Connexion is established */
 };
 
+/* this is used to pass protocols through the command-line parameter parsing */
+#define PROT_SHIFT 1000  /* protocol options will be 1000, 1001, etc */
+
 /* A 'queue' is composed of a file descriptor (which can be read from or
  * written to), and a queue for deferred write data */
 struct queue {
@@ -116,7 +143,6 @@ typedef enum {
     BLOCKING = 1
 } connect_blocking;
 
-#include "log.h"
 
 /* common.c */
 void init_cnx(struct connection *cnx);
@@ -126,9 +152,11 @@ int fd2fd(struct queue *target, struct queue *from);
 char* sprintaddr(char* buf, size_t size, struct addrinfo *a);
 void resolve_name(struct addrinfo **out, char* fullname);
 int get_connection_desc(struct connection_desc* desc, const struct connection *cnx);
+void log_connection(struct connection_desc* desc, const struct connection *cnx);
 void set_proctitle_shovel(struct connection_desc* desc, const struct connection *cnx);
 int check_access_rights(int in_socket, const char* service);
 void setup_signals(void);
+void setup_syslog(const char* bin_name);
 void drop_privileges(const char* user_name, const char* chroot_path);
 void set_capabilities(int cap_net_admin);
 void write_pid_file(const char* pidfile);
@@ -149,29 +177,4 @@ void start_shoveler(int);
 
 void main_loop(struct listen_endpoint *listen_sockets, int num_addr_listen);
 
-#define MAX(a, b)  (((a) > (b)) ? (a) : (b))
-
-
-#define CHECK_RES_DIE(res, str) \
-    if (res == -1) {    \
-       print_message(msg_system_error, "%s:%d:", __FILE__, __LINE__); \
-       perror(str);     \
-       exit(1);         \
-    }
-
-#define CHECK_RES_RETURN(res, str, ret) \
-    if (res == -1) {                                    \
-        print_message(msg_system_error, "%s:%d:%s:%d:%s\n", __FILE__, __LINE__, str, errno, strerror(errno));  \
-        return ret;                                     \
-    } 
-
-#define CHECK_ALLOC(a, str) \
-    if (!a) { \
-        print_message(msg_system_error, "%s:%d:", __FILE__, __LINE__); \
-        perror(str); \
-        exit(1); \
-    }
-
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
-
 #endif