summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--gss-misc.c1
-rw-r--r--omfwd.c1
-rw-r--r--plugins/omgssapi/omgssapi.c1
-rw-r--r--runtime/net.h5
-rw-r--r--syslogd.c3
-rw-r--r--tcpclt.c1
-rw-r--r--tcpclt.h2
-rw-r--r--tcps_sess.h6
-rw-r--r--tcpsyslog.c55
-rw-r--r--tcpsyslog.h38
11 files changed, 8 insertions, 107 deletions
diff --git a/Makefile.am b/Makefile.am
index cc3b41b..123030c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,8 +35,6 @@ rsyslogd_SOURCES = \
template.h \
conf.c \
conf.h \
- tcpsyslog.c \
- tcpsyslog.h \
cfsysline.c \
cfsysline.h
diff --git a/gss-misc.c b/gss-misc.c
index a80f2e6..d24dcf8 100644
--- a/gss-misc.c
+++ b/gss-misc.c
@@ -48,7 +48,6 @@
#include "omfwd.h"
#include "template.h"
#include "msg.h"
-#include "tcpsyslog.h"
#include "module-template.h"
#include "obj.h"
#include "errmsg.h"
diff --git a/omfwd.c b/omfwd.c
index 67ef4b6..ddaf496 100644
--- a/omfwd.c
+++ b/omfwd.c
@@ -55,7 +55,6 @@
#include "omfwd.h"
#include "template.h"
#include "msg.h"
-#include "tcpsyslog.h"
#include "tcpclt.h"
#include "cfsysline.h"
#include "module-template.h"
diff --git a/plugins/omgssapi/omgssapi.c b/plugins/omgssapi/omgssapi.c
index 8c6a200..078343d 100644
--- a/plugins/omgssapi/omgssapi.c
+++ b/plugins/omgssapi/omgssapi.c
@@ -50,7 +50,6 @@
#include "omfwd.h"
#include "template.h"
#include "msg.h"
-#include "tcpsyslog.h"
#include "cfsysline.h"
#include "module-template.h"
#include "gss-misc.h"
diff --git a/runtime/net.h b/runtime/net.h
index a0791a9..5919945 100644
--- a/runtime/net.h
+++ b/runtime/net.h
@@ -27,6 +27,11 @@
#include <netinet/in.h>
#include <sys/socket.h> /* this is needed on HP UX -- rgerhards, 2008-03-04 */
+typedef enum _TCPFRAMINGMODE {
+ TCP_FRAMING_OCTET_STUFFING = 0, /* traditional LF-delimited */
+ TCP_FRAMING_OCTET_COUNTING = 1 /* -transport-tls like octet count */
+ } TCPFRAMINGMODE;
+
#define F_SET(where, flag) (where)|=(flag)
#define F_ISSET(where, flag) ((where)&(flag))==(flag)
#define F_UNSET(where, flag) (where)&=~(flag)
diff --git a/syslogd.c b/syslogd.c
index bf4f5e6..ef12424 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -129,6 +129,8 @@
#include <zlib.h>
#endif
+#include <netdb.h>
+
#include "pidfile.h"
#include "srUtils.h"
#include "stringbuf.h"
@@ -140,7 +142,6 @@
#include "msg.h"
#include "modules.h"
#include "action.h"
-#include "tcpsyslog.h"
#include "iminternal.h"
#include "cfsysline.h"
#include "omshell.h"
diff --git a/tcpclt.c b/tcpclt.c
index 3a76e47..824e829 100644
--- a/tcpclt.c
+++ b/tcpclt.c
@@ -41,7 +41,6 @@
#include "syslogd.h"
#include "syslogd-types.h"
#include "net.h"
-#include "tcpsyslog.h"
#include "tcpclt.h"
#include "module-template.h"
#include "srUtils.h"
diff --git a/tcpclt.h b/tcpclt.h
index d2f1fe0..1534426 100644
--- a/tcpclt.h
+++ b/tcpclt.h
@@ -26,7 +26,7 @@
#ifndef TCPCLT_H_INCLUDED
#define TCPCLT_H_INCLUDED 1
-#include "tcpsyslog.h"
+//#include "tcpsyslog.h"
#include "obj.h"
/* the tcpclt object */
diff --git a/tcps_sess.h b/tcps_sess.h
index 0433fdf..1d45c48 100644
--- a/tcps_sess.h
+++ b/tcps_sess.h
@@ -28,12 +28,6 @@
/* a forward-definition, we are somewhat cyclic */
struct tcpsrv_s;
-/* framing modes for TCP */
-typedef enum _TCPFRAMINGMODE {
- TCP_FRAMING_OCTET_STUFFING = 0, /* traditional LF-delimited */
- TCP_FRAMING_OCTET_COUNTING = 1 /* -transport-tls like octet count */
- } TCPFRAMINGMODE;
-
/* the tcps_sess object */
typedef struct tcps_sess_s {
BEGINobjInstance; /* Data to implement generic object - MUST be the first data element! */
diff --git a/tcpsyslog.c b/tcpsyslog.c
deleted file mode 100644
index d00731d..0000000
--- a/tcpsyslog.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* tcpsyslog.c
- * This is the implementation of TCP-based syslog. It includes those
- * (few) things that both clients and servers need.
- *
- * File begun on 2007-07-20 by RGerhards (extracted from syslogd.c)
- * This file is under development and has not yet arrived at being fully
- * self-contained and a real object. So far, it is mostly an excerpt
- * of the "old" message code without any modifications. However, it
- * helps to have things at the right place one we go to the meat of it.
- *
- * Copyright 2007 Rainer Gerhards and Adiscon GmbH.
- *
- * This file is part of rsyslog.
- *
- * Rsyslog is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Rsyslog is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Rsyslog. If not, see <http://www.gnu.org/licenses/>.
- *
- * A copy of the GPL can be found in the file "COPYING" in this distribution.
- */
-#include "config.h"
-#include "rsyslog.h"
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include <errno.h>
-#include <assert.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#if HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#include "syslogd.h"
-#include "syslogd-types.h"
-#include "net.h"
-#include "tcpsyslog.h"
-#include "srUtils.h"
-
-
-/* vi:set ai:
- */
diff --git a/tcpsyslog.h b/tcpsyslog.h
deleted file mode 100644
index 13c40a9..0000000
--- a/tcpsyslog.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* tcpsyslog.h
- * These are the definitions for TCP-based syslog.
- *
- * File begun on 2007-07-21 by RGerhards (extracted from syslogd.c)
- *
- * Copyright 2007 Rainer Gerhards and Adiscon GmbH.
- *
- * This file is part of rsyslog.
- *
- * Rsyslog is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Rsyslog is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Rsyslog. If not, see <http://www.gnu.org/licenses/>.
- *
- * A copy of the GPL can be found in the file "COPYING" in this distribution.
- */
-#ifndef TCPSYSLOG_H_INCLUDED
-#define TCPSYSLOG_H_INCLUDED 1
-
-#include <netdb.h>
-
-typedef enum _TCPFRAMINGMODE {
- TCP_FRAMING_OCTET_STUFFING = 0, /* traditional LF-delimited */
- TCP_FRAMING_OCTET_COUNTING = 1 /* -transport-tls like octet count */
- } TCPFRAMINGMODE;
-
-#endif /* #ifndef TCPSYSLOG_H_INCLUDED */
-/*
- * vi:set ai:
- */