From 1b68464ddfac8abdca203f3918da98e7d6c54ad4 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Thu, 2 Oct 2008 11:21:45 +0200
Subject: some code cleanup

removed code not actually needed in imupd
---
 plugins/imudp/imudp.c | 98 +++++++++++++++++++++++++--------------------------
 1 file changed, 48 insertions(+), 50 deletions(-)

diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c
index 5792a999..d4c9d759 100644
--- a/plugins/imudp/imudp.c
+++ b/plugins/imudp/imudp.c
@@ -127,6 +127,8 @@ finalize_it:
 
 
 /* This function is called to gather input.
+ * Note that udpLstnSocks must be non-NULL because otherwise we would not have
+ * indicated that we want to run (or we have a programming error ;)). -- rgerhards, 2008-10-02
  */
 BEGINrunInput
 	int maxfds;
@@ -154,17 +156,14 @@ CODESTARTrunInput
 	        maxfds = 0;
 	        FD_ZERO (&readfds);
 
-		/* Add the UDP listen sockets to the list of read descriptors.
-		 */
-		if(udpLstnSocks != NULL) {
-                        for (i = 0; i < *udpLstnSocks; i++) {
-                                if (udpLstnSocks[i+1] != -1) {
-					if(Debug)
-						net.debugListenInfo(udpLstnSocks[i+1], "UDP");
-                                        FD_SET(udpLstnSocks[i+1], &readfds);
-					if(udpLstnSocks[i+1]>maxfds) maxfds=udpLstnSocks[i+1];
-				}
-                        }
+		/* Add the UDP listen sockets to the list of read descriptors. */
+		for (i = 0; i < *udpLstnSocks; i++) {
+			if (udpLstnSocks[i+1] != -1) {
+				if(Debug)
+					net.debugListenInfo(udpLstnSocks[i+1], "UDP");
+				FD_SET(udpLstnSocks[i+1], &readfds);
+				if(udpLstnSocks[i+1]>maxfds) maxfds=udpLstnSocks[i+1];
+			}
 		}
 		if(Debug) {
 			dbgprintf("--------imUDP calling select, active file descriptors (max %d): ", maxfds);
@@ -177,46 +176,45 @@ CODESTARTrunInput
 		/* wait for io to become ready */
 		nfds = select(maxfds+1, (fd_set *) &readfds, NULL, NULL, NULL);
 
-		if(udpLstnSocks != NULL) {
-		       for (i = 0; nfds && i < *udpLstnSocks; i++) {
-			       if (FD_ISSET(udpLstnSocks[i+1], &readfds)) {
-				       socklen = sizeof(frominet);
-				       l = recvfrom(udpLstnSocks[i+1], (char*) pRcvBuf, iMaxLine, 0,
-						    (struct sockaddr *)&frominet, &socklen);
-				       if (l > 0) {
-					       if(net.cvthname(&frominet, fromHost, fromHostFQDN, fromHostIP) == RS_RET_OK) {
-						       dbgprintf("Message from inetd socket: #%d, host: %s\n",
-							       udpLstnSocks[i+1], fromHost);
-						       /* Here we check if a host is permitted to send us
-							* syslog messages. If it isn't, we do not further
-							* process the message but log a warning (if we are
-							* configured to do this).
-							* rgerhards, 2005-09-26
-							*/
-						       if(net.isAllowedSender(net.pAllowedSenders_UDP,
-							  (struct sockaddr *)&frominet, (char*)fromHostFQDN)) {
-							       parseAndSubmitMessage(fromHost, fromHostIP, pRcvBuf, l,
-							       MSG_PARSE_HOSTNAME, NOFLAG, eFLOWCTL_NO_DELAY, (uchar*)"imudp");
-						       } else {
-							       dbgprintf("%s is not an allowed sender\n", (char*)fromHostFQDN);
-							       if(glbl.GetOption_DisallowWarning) {
-								       errmsg.LogError(0, NO_ERRCODE, "UDP message from disallowed sender %s discarded",
-										  (char*)fromHost);
-							       }	
-						       }
-					       }
-				       } else if (l < 0 && errno != EINTR && errno != EAGAIN) {
-						char errStr[1024];
-						rs_strerror_r(errno, errStr, sizeof(errStr));
-						dbgprintf("INET socket error: %d = %s.\n", errno, errStr);
-						       errmsg.LogError(errno, NO_ERRCODE, "recvfrom inet");
-						       /* should be harmless */
-						       sleep(1);
+	       for (i = 0; nfds && i < *udpLstnSocks; i++) {
+		       if (FD_ISSET(udpLstnSocks[i+1], &readfds)) {
+			       socklen = sizeof(frominet);
+			       l = recvfrom(udpLstnSocks[i+1], (char*) pRcvBuf, iMaxLine, 0,
+					    (struct sockaddr *)&frominet, &socklen);
+			       if (l > 0) {
+				       if(net.cvthname(&frominet, fromHost, fromHostFQDN, fromHostIP) == RS_RET_OK) {
+					       dbgprintf("Message from inetd socket: #%d, host: %s\n",
+						       udpLstnSocks[i+1], fromHost);
+					       /* Here we check if a host is permitted to send us
+						* syslog messages. If it isn't, we do not further
+						* process the message but log a warning (if we are
+						* configured to do this).
+						* rgerhards, 2005-09-26
+						*/
+					       if(net.isAllowedSender(net.pAllowedSenders_UDP,
+						  (struct sockaddr *)&frominet, (char*)fromHostFQDN)) {
+						       parseAndSubmitMessage(fromHost, fromHostIP, pRcvBuf, l,
+						       MSG_PARSE_HOSTNAME, NOFLAG, eFLOWCTL_NO_DELAY, (uchar*)"imudp");
+					       } else {
+						       dbgprintf("%s is not an allowed sender\n", (char*)fromHostFQDN);
+						       if(glbl.GetOption_DisallowWarning) {
+							       errmsg.LogError(0, NO_ERRCODE, "UDP message from disallowed sender %s discarded",
+									  (char*)fromHost);
+						       }	
 					       }
-					--nfds; /* indicate we have processed one */
-				}
-		       }
-		}
+				       }
+			       } else if (l < 0 && errno != EINTR && errno != EAGAIN) {
+					char errStr[1024];
+					rs_strerror_r(errno, errStr, sizeof(errStr));
+					dbgprintf("INET socket error: %d = %s.\n", errno, errStr);
+					       errmsg.LogError(errno, NO_ERRCODE, "recvfrom inet");
+					       /* should be harmless */
+					       sleep(1);
+				       }
+				--nfds; /* indicate we have processed one */
+			}
+	       }
+	       /* end of a run, back to loop for next recv() */
 	}
 
 	return iRet;
-- 
cgit