File syslog-ng-additional-log-sockets.dif of Package syslog-ng

Overview Repositories Revisions Requests Users Attributes Meta

File syslog-ng-additional-log-sockets.dif of Package syslog-ng (Revision eceab2caa9d8fe852badf93c6feb3547)

Currently displaying revision eceab2caa9d8fe852badf93c6feb3547 , Show latest

--- src/add_socket.c
+++ src/add_socket.c	2006/09/12 17:25:09
@@ -0,0 +1,232 @@
+#ifndef  _GNU_SOURCE
+#define  _GNU_SOURCE
+#endif
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "format.h"
+#include "werror.h"
+
+#include "add_socket.h"
+#include "add_socket.c.x"
+
+#include "afsocket.h"
+
+#ifndef DEV_LOG_SOCKET
+#define DEV_LOG_SOCKET     "/dev/log"
+#endif
+
+/* CLASS:
+   (class
+     (name additional_socket)
+       (vars
+         (skip simple int)
+         (path string)
+         (next object additional_socket)
+       )
+   )
+*/
+
+static struct additional_socket *
+make_additional_socket(const char *path, int skip)
+{
+	NEW(additional_socket, self);
+	self->skip = skip;
+	self->path = format_cstring(path);
+	return self;
+}
+
+static int
+string_equal(const struct ol_string *s1, const struct ol_string *s2)
+{
+	if( s1 != NULL && s2 != NULL &&
+	    s1->length == s2->length)
+	{
+		return memcmp(s1->data, s2->data, s2->length) == 0;
+	}
+	return 0;
+}
+
+static int
+string_equal_c(const struct ol_string *os, const char *cs)
+{
+	if( os != NULL && cs != NULL &&
+	    os->length == strlen(cs))
+	{
+		return memcmp(os->data, cs, os->length) == 0;
+	}
+	return 0;
+}
+
+int
+add_socket_append_new(struct additional_socket **socket_list,
+                      const char                *socket_path)
+{
+	struct additional_socket *sock;
+
+	if( socket_list == NULL)
+	{
+		werror("Invalid additional log socket list\n");
+		return -1;
+	}
+	if( socket_path == NULL || *socket_path == '\0' ||
+	    strcmp(socket_path, DEV_LOG_SOCKET) == 0)
+	{
+		werror("Invalid additional log socket path\n");
+		return -1;
+	}
+
+        /* check if we already have it... fail in this case? */
+	for( sock = *socket_list; sock != NULL; sock = sock->next)
+	{
+		if( string_equal_c(sock->path, socket_path))
+			return 0;
+	}
+
+	sock = make_additional_socket(socket_path, 0);
+	if( *socket_list == NULL)
+	{
+		*socket_list = sock;
+	}
+	else
+	{
+		struct additional_socket *last;
+		for( last = *socket_list; last->next; last=last->next)
+			;
+		last->next = sock;
+	}
+
+	verbose("Additional log socket '%S' earmarked.\n", sock->path);
+	return 0;
+}
+
+void
+add_socket_skip_reset(struct additional_socket *socket_list)
+{
+	struct additional_socket *sock = socket_list;
+
+	debug("Resetting skip flags for additional log sockets.\n");
+	while( sock != NULL)
+	{
+		sock->skip = 0;
+		sock = sock->next;
+	}
+}
+
+void
+add_socket_skip_check(struct additional_socket *socket_list,
+                      const struct ol_string   *socket_path)
+{
+	struct additional_socket *sock = socket_list;
+
+	while( sock != NULL)
+	{
+		if( string_equal(sock->path, socket_path))
+		{
+			sock->skip = 1;
+			verbose("Additional log socket '%S' "
+			        "already in the config - skip.\n",
+			      sock->path);
+		}
+		sock = sock->next;
+	}
+}
+
+void
+add_socket_to_sources(struct additional_socket *socket_list,
+                      struct log_source_group  *sources)
+{
+	struct log_source_group  *grp;
+	struct log_source_driver *drv;
+	struct log_source_group  *dev_log_grp = NULL;
+	struct log_source_driver *dev_log_drv = NULL;
+	struct ol_string         *dev_log     = NULL;
+	
+	/* just return if we have no additional sockets, ... */
+	if(socket_list == NULL || sources == NULL)
+		return;
+
+	/*
+	** Reset additional log socket skip flags.
+	*/
+	add_socket_skip_reset(socket_list);
+
+	/*
+	** Disable sockets that are in the config file
+	** and remember the group containing /dev/log.
+	*/
+	dev_log = format_cstring(DEV_LOG_SOCKET);
+	for (grp = sources; grp; grp = grp->next_source_group)
+	{
+		for (drv = grp->drivers; drv; drv = drv->next_driver)
+		{
+			struct ol_object *obj = (struct ol_object*)drv;
+			if( strcmp("afunix_source", obj->isa->name) == 0)
+			{
+				CAST_SUBTYPE(afsocket_source, src, drv);
+				if(src->bind_addr->family == AF_UNIX)
+				{
+					CAST_SUBTYPE(unix_address_info, addr,
+					             src->bind_addr);
+
+					add_socket_skip_check(socket_list,
+					                      addr->path);
+
+					if( string_equal(addr->path, dev_log))
+					{
+						debug("Found log source driver "
+						      "for '%S' socket.\n",
+						      dev_log);
+						dev_log_drv = drv;
+						dev_log_grp = grp;
+					}
+				}
+			}
+		}
+	}
+
+	if( dev_log_drv != NULL && dev_log_grp != NULL)
+	{
+		struct additional_socket *sock = socket_list;
+		struct ol_string         *path;
+
+		for( ; sock != NULL ; sock = sock->next)
+		{
+			CAST_SUBTYPE(afsocket_source, src, dev_log_drv);
+
+			if( sock->skip == 1)
+				continue;
+
+			path = ol_string_use(sock->path);
+
+			drv = make_afunix_source(
+				&make_unix_address(path)->super,
+				src->flags
+			);
+			/*
+			** can't copy them, because we have no
+			** access to afunix_source struct ...
+			**
+			afunix_set_owner
+			afunix_set_group
+			afunix_set_perm
+			*/
+
+			if( drv != NULL)
+			{
+				verbose("Additional log socket '%S' added "
+				        "to the source group '%S'.\n",
+				        path, dev_log_grp->name);
+
+				drv->next_driver = dev_log_grp->drivers;
+				dev_log_grp->drivers = drv;
+				append_log_handler(drv, dev_log_grp);
+			}
+		}
+	}
+}
+
+/* vim: set ts=8 sts=8 sw=8 ai noet: */
--- src/add_socket.c.x
+++ src/add_socket.c.x	2006/09/12 17:22:22
@@ -0,0 +1,34 @@
+#ifndef CLASS_DEFINE
+struct additional_socket
+{
+  struct ol_object super;
+  int skip;
+  struct ol_string *path;
+  struct additional_socket *next;
+};
+extern struct ol_class additional_socket_class;
+#endif /* !CLASS_DEFINE */
+
+#ifndef CLASS_DECLARE
+static void do_additional_socket_mark(struct ol_object *o, 
+void (*mark)(struct ol_object *o))
+{
+  struct additional_socket *i = (struct additional_socket *) o;
+  mark((struct ol_object *) i->next);
+}
+
+static void do_additional_socket_free(struct ol_object *o)
+{
+  struct additional_socket *i = (struct additional_socket *) o;
+  debug("Additional log socket '%S' destroyed\n", i->path);
+  ol_string_free(i->path);
+}
+
+struct ol_class additional_socket_class =
+{ STATIC_HEADER,
+  0, "additional_socket", sizeof(struct additional_socket),
+  do_additional_socket_mark,
+  do_additional_socket_free
+};
+#endif /* !CLASS_DECLARE */
+
--- src/add_socket.h
+++ src/add_socket.h	2006/09/12 16:49:18
@@ -0,0 +1,16 @@
+#ifndef   ADD_SOCKET_H
+#define   ADD_SOCKET_H
+
+struct additional_socket;
+struct log_source_group;
+
+int
+add_socket_append_new(struct additional_socket **socket_list,
+                      const char                *socket_path);
+
+void
+add_socket_to_sources(struct additional_socket *socket_list,
+                      struct log_source_group  *sources);
+
+#endif /* ADD_SOCKET_H */
+/* vim: set ts=8 sts=8 sw=8 ai noet: */
--- src/main.c
+++ src/main.c	2006/09/12 16:53:09
@@ -48,6 +48,8 @@
 
 #include <resolv.h>
 
+#include "add_socket.h"
+
 #include "main.c.x"
 
 static char cfgfilename[128] = PATH_SYSLOG_NG_CONF;
@@ -155,7 +157,8 @@ static void do_flush_wakeup(struct callb
        (newconfig object syslog_config)
        (oldconfig object syslog_config)
        (persistent object persistent_config)
-       (configuration object syslog_config)))
+       (configuration object syslog_config)
+       (add_sockets object additional_socket)))
 */
 
 static int sighuprecvd = 0;
@@ -211,6 +214,8 @@ int main_loop(struct syslog_backend *bac
 		        /* reload initiated and callout started by SIGHUP finished, e.g. r.state == 0 */
 			backend->newconfig = make_syslog_config(cfgfilename, &backend->super);
 			if (backend->newconfig) {
+				add_socket_to_sources(backend->add_sockets,
+				                      backend->newconfig->sources);
 				
 				io_callout_flush(&backend->super);
 
@@ -396,6 +401,8 @@ void usage(void)
 #ifdef YYDEBUG
 	       "  -y, --yydebug                    Turn on yacc debug messages\n"
 #endif
+	       "  -a <path>, --add-socket=<path>   Add an additional log socket with same type\n"
+	       "                                   and to the same source group as /dev/log.\n"
 		);
 
 	exit(0);
@@ -431,6 +438,7 @@ int main(int argc, char **argv)
 #ifdef YYDEBUG
 		{ "yydebug", no_argument, NULL, 'y' },
 #endif
+		{ "add-socket", required_argument, NULL, 'a'},
 		{ NULL, 0, NULL, 0 }
 	};
 #ifdef HAVE_MALLOPT
@@ -441,7 +449,7 @@ int main(int argc, char **argv)
 	
 	tzset();
 
-	while ((opt = getopt_long(argc, argv, "sFf:p:dvhyVC:u:g:", syslog_ng_options, NULL)) != -1) {
+	while ((opt = getopt_long(argc, argv, "sFf:p:dvhyVC:u:g:a:", syslog_ng_options, NULL)) != -1) {
 		switch (opt) {
 		case 'f':
 			strncpy(cfgfilename, optarg, sizeof(cfgfilename));
@@ -480,6 +488,11 @@ int main(int argc, char **argv)
 			yydebug = 1;
 			break;
 #endif
+		case 'a':
+			if( add_socket_append_new(&backend->add_sockets, optarg) != 0)
+				return 1;
+			break;
+
 		case 'h':
 		default:
 			usage();
@@ -497,6 +510,8 @@ int main(int argc, char **argv)
 	if (syntax_only) {
 		return 0;
 	}
+	add_socket_to_sources(backend->add_sockets,
+	                      backend->configuration->sources);
 	if (debug_flag) {
 		do_fork = 0;
 	}
--- src/main.c.x
+++ src/main.c.x	2006/09/12 15:32:47
@@ -58,6 +58,7 @@ struct syslog_backend
   struct syslog_config *oldconfig;
   struct persistent_config *persistent;
   struct syslog_config *configuration;
+  struct additional_socket *add_sockets;
 };
 extern struct ol_class syslog_backend_class;
 #endif /* !CLASS_DEFINE */
@@ -71,6 +72,7 @@ void (*mark)(struct ol_object *o))
   mark((struct ol_object *) i->oldconfig);
   mark((struct ol_object *) i->persistent);
   mark((struct ol_object *) i->configuration);
+  mark((struct ol_object *) i->add_sockets);
 }
 
 struct ol_class syslog_backend_class =
--- src/Makefile.am
+++ src/Makefile.am	2006/09/12 16:53:33
@@ -24,7 +24,8 @@ dist_h_files = \
 	utils.h \
 	syslog-names.h \
 	nscache.h \
-	macros.h
+	macros.h \
+	add_socket.h
 
 dist_x_files = \
 	cfgfile.h.x \
@@ -46,7 +47,8 @@ dist_x_files = \
 	afremctrl.c.x \
 	filters.h.x \
 	filters.c.x \
-	main.c.x
+	main.c.x \
+	add_socket.c.x
 
 AUTOMAKE_OPTIONS = foreign
 sbin_PROGRAMS = syslog-ng
@@ -73,7 +75,8 @@ syslog_ng_SOURCES = \
 	nscache.c \
 	utils.c \
 	syslog-names.c \
-	macros.c
+	macros.c \
+	add_socket.c
 
 syslog_ng_LDADD = @LIBOBJS@

Places

File syslog-ng-additional-log-sockets.dif of Package syslog-ng (Revision eceab2caa9d8fe852badf93c6feb3547)

Places