summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2007-07-16 07:24:23 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2007-07-16 07:24:23 +0000
commita8c6819d7e1cc570a0c2c633d6b6bfa635685d23 (patch)
tree9b517cb70e8c8637be0e74332311dec5241938ae
parent63e43e656a9f900cbc58494b2c935b677ef76b94 (diff)
downloadrsyslog-a8c6819d7e1cc570a0c2c633d6b6bfa635685d23.tar.gz
rsyslog-a8c6819d7e1cc570a0c2c633d6b6bfa635685d23.tar.xz
rsyslog-a8c6819d7e1cc570a0c2c633d6b6bfa635685d23.zip
added patch by mildew@gmail.com to support IPv6 in $AllowedSender
-rw-r--r--Makefile.am2
-rw-r--r--net.h28
2 files changed, 29 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 27e91540..f5c4c6ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ rfc3195d_SOURCES=rfc3195d.c rsyslog.h
man_MANS = rfc3195d.8 rklogd.8 rsyslogd.8 rsyslog.conf.5
-syslogd_SOURCES=syslogd.c pidfile.c template.c outchannel.c stringbuf.c srUtils.c parse.c syslogd-types.h template.h outchannel.h syslogd.h stringbuf.h parse.h srUtils.h liblogging-stub.h
+syslogd_SOURCES=syslogd.c pidfile.c template.c outchannel.c stringbuf.c srUtils.c parse.c syslogd-types.h template.h outchannel.h syslogd.h stringbuf.h parse.h srUtils.h liblogging-stub.h net.h
syslogd_CPPFLAGS=$(mysql_includes)
syslogd_LDADD=$(mysql_libs) $(zlib_libs) $(pthreads_libs)
diff --git a/net.h b/net.h
new file mode 100644
index 00000000..f985940b
--- /dev/null
+++ b/net.h
@@ -0,0 +1,28 @@
+/*
+ * FIXME: All network stuff should go here (and to net.c)
+ */
+
+//#ifdef SYSLOG_INET
+
+#define F_SET(where, flag) (where)|=(flag)
+#define F_ISSET(where, flag) ((where)&(flag))==(flag)
+#define F_UNSET(where, flag) (where)&=~(flag)
+
+#define ADDR_NAME 0x01 /* address is hostname wildcard) */
+#define ADDR_PRI6 0x02 /* use IPv6 address prior to IPv4 when resolving */
+
+#ifdef BSD
+#ifndef _KERNEL
+#define s6_addr32 __u6_addr.__u6_addr32
+#endif
+#endif
+
+struct NetAddr {
+ uint8_t flags;
+ union {
+ struct sockaddr *NetAddr;
+ char *HostWildcard;
+ } addr;
+};
+
+//#endif