summaryrefslogtreecommitdiffstats
path: root/syslogd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2007-12-26 17:09:46 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2007-12-26 17:09:46 +0000
commit3eff8e5404a3792acbd4ad00f5c4675a940a0eeb (patch)
treebec7e1a8437857d323c95d0484bf8f50ff076318 /syslogd.c
parent94a4673a148b3ef678849f240a16ee3b006d4ae9 (diff)
downloadrsyslog-3eff8e5404a3792acbd4ad00f5c4675a940a0eeb.tar.gz
rsyslog-3eff8e5404a3792acbd4ad00f5c4675a940a0eeb.tar.xz
rsyslog-3eff8e5404a3792acbd4ad00f5c4675a940a0eeb.zip
removed imudp code dependency on "finet"
Diffstat (limited to 'syslogd.c')
-rw-r--r--syslogd.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/syslogd.c b/syslogd.c
index e51841ae..e1179720 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -422,9 +422,7 @@ static int logEveryMsg = 0;/* no repeat message processing - read-only after st
static unsigned int Forwarding = 0;
char LocalHostName[MAXHOSTNAMELEN+1];/* our hostname - read-only after startup */
char *LocalDomain; /* our local domain name - read-only after startup */
-int *finet = NULL; /* Internet datagram sockets, first element is nbr of elements
- * read-only after init(), but beware of restart! */
-static char *LogPort = "514"; /* port number for INET connections */
+char *LogPort = "514"; /* port number for INET connections */
static int MarkInterval = 20 * 60; /* interval between marks in seconds - read-only after startup */
int family = PF_UNSPEC; /* protocol family (IPv4, IPv6 or both), set via cmdline */
int send_to_all = 0; /* send message to all IPv4/IPv6 addresses */
@@ -2772,12 +2770,6 @@ die(int sig)
queueDelete(pMsgQueue); /* delete fifo here! */
pMsgQueue = NULL;
- /* now clean up the listener part */
-#ifdef SYSLOG_INET
- /* Close the UDP inet socket. */
- closeUDPListenSockets(finet);
-#endif
-
/* rger 2005-02-22
* now clean up the in-memory structures. OK, the OS
* would also take care of that, but if we do it
@@ -3571,24 +3563,6 @@ init(void)
pDfltProgNameCmp = NULL;
}
-#ifdef SYSLOG_INET
- /* I have moved initializing UDP sockets before the TCP sockets. This ensures
- * they are as soon ready for reception as possible. Of course, it is only a
- * very small window of exposure, but it doesn't hurt to limit the message
- * loss risk to as low as possible - especially if it costs nothing...
- * rgerhards, 2007-06-28
- */
- if(Forwarding || AcceptRemote) {
- if (finet == NULL) {
- if((finet = create_udp_socket(NULL, (uchar*)LogPort, 1)) != NULL)
- dbgprintf("Opened %d syslog UDP port(s).\n", *finet);
- }
- } else {
- /* this case can happen during HUP processing. */
- closeUDPListenSockets(finet);
- }
-#endif
-
/* create message queue */
pMsgQueue = queueInit();
if(pMsgQueue == NULL) {