From cba4c88776a4d98d197c14ec9014f7abc973255e Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 25 Jul 2007 11:35:04 +0000
Subject: moved code to output module

---
 omfwd.c   | 14 ++++++++++++++
 syslogd.c | 14 --------------
 syslogd.h |  1 -
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/omfwd.c b/omfwd.c
index 0b1db927..94303288 100644
--- a/omfwd.c
+++ b/omfwd.c
@@ -104,6 +104,20 @@ CODESTARTdbgPrintInstInfo
 	printf("%s", f->f_un.f_forw.f_hname);
 ENDdbgPrintInstInfo
 
+/* get the syslog forward port from selector_t. The passed in
+ * struct must be one that is setup for forwarding.
+ * rgerhards, 2007-06-28
+ * We may change the implementation to try to lookup the port
+ * if it is unspecified. So far, we use the IANA default auf 514.
+ */
+static char *getFwdSyslogPt(selector_t *f)
+{
+	assert(f != NULL);
+	if(f->f_un.f_forw.port == NULL)
+		return("514");
+	else
+		return(f->f_un.f_forw.port);
+}
 
 BEGINdoAction
 	char *psz; /* temporary buffering */
diff --git a/syslogd.c b/syslogd.c
index f99b35f9..5e0772c7 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -1081,20 +1081,6 @@ void freeAllSockets(int **socks)
 }
 
 
-/* get the syslog forward port from selector_t. The passed in
- * struct must be one that is setup for forwarding.
- * rgerhards, 2007-06-28
- * We may change the implementation to try to lookup the port
- * if it is unspecified. So far, we use the IANA default auf 514.
- */
-char *getFwdSyslogPt(selector_t *f)
-{
-	assert(f != NULL);
-	if(f->f_un.f_forw.port == NULL)
-		return("514");
-	else
-		return(f->f_un.f_forw.port);
-}
 
 
 /*******************************************************************
diff --git a/syslogd.h b/syslogd.h
index f2cfd6d2..d4d5eed4 100644
--- a/syslogd.h
+++ b/syslogd.h
@@ -76,7 +76,6 @@ void logerrorInt(char *type, int iErr);
 void printchopped(char *hname, char *msg, int len, int fd, int iSourceType);
 void freeAllSockets(int **socks);
 int isAllowedSender(struct AllowedSenders *pAllowRoot, struct sockaddr *pFrom, const char *pszFromHost);
-char *getFwdSyslogPt(selector_t *f);
 void getCurrTime(struct syslogTime *t);
 int formatTimestampToMySQL(struct syslogTime *ts, char* pDst, size_t iLenDst);
 int formatTimestamp3339(struct syslogTime *ts, char* pBuf, size_t iLenBuf);
-- 
cgit