From 9faf2240c4a8f09f3f6c2c9bbd47e48520524e03 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Wed, 22 Aug 2012 15:29:02 +0200
Subject: changed TRUE/FALSE to RSTRUE/RSFALSE

This is done to prevent name claches with libraries.
---
 plugins/imsolaris/imsolaris.c   | 4 ++--
 plugins/imudp/imudp.c           | 4 ++--
 plugins/omudpspoof/omudpspoof.c | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/imsolaris/imsolaris.c b/plugins/imsolaris/imsolaris.c
index ee9ec5c6..029de722 100644
--- a/plugins/imsolaris/imsolaris.c
+++ b/plugins/imsolaris/imsolaris.c
@@ -247,12 +247,12 @@ getMsgs(thrdInfo_t *pThrd, int timeout)
 		CHKmalloc(pRcv = (uchar*) malloc(sizeof(uchar) * (iMaxLine + 1)));
 	}
 
-	 while(pThrd->bShallStop != TRUE) {
+	 while(pThrd->bShallStop != RSTRUE) {
 		DBGPRINTF("imsolaris: waiting for next message (timeout %d)...\n", timeout);
 		if(timeout == 0) {
 			nfds = poll(&sun_Pfd, 1, timeout); /* wait without timeout */
 
-			if(pThrd->bShallStop == TRUE) {
+			if(pThrd->bShallStop == RSTRUE) {
 				break;
 			}
 
diff --git a/plugins/imudp/imudp.c b/plugins/imudp/imudp.c
index 46631e97..70c21bb9 100644
--- a/plugins/imudp/imudp.c
+++ b/plugins/imudp/imudp.c
@@ -314,7 +314,7 @@ processSocket(thrdInfo_t *pThrd, struct lstn_s *lstn, struct sockaddr_storage *f
 	assert(pThrd != NULL);
 	iNbrTimeUsed = 0;
 	while(1) { /* loop is terminated if we have a bad receive, done below in the body */
-		if(pThrd->bShallStop == TRUE)
+		if(pThrd->bShallStop == RSTRUE)
 			ABORT_FINALIZE(RS_RET_FORCE_TERM);
 		socklen = sizeof(struct sockaddr_storage);
 		lenRcvBuf = recvfrom(lstn->sock, (char*) pRcvBuf, iMaxLine, 0, (struct sockaddr *)&frominet, &socklen);
@@ -499,7 +499,7 @@ rsRetVal rcvMainLoop(thrdInfo_t *pThrd)
 		nfds = epoll_wait(efd, currEvt, NUM_EPOLL_EVENTS, -1);
 		DBGPRINTF("imudp: epoll_wait() returned with %d fds\n", nfds);
 
-		if(pThrd->bShallStop == TRUE)
+		if(pThrd->bShallStop == RSTRUE)
 			break; /* terminate input! */
 
 		for(i = 0 ; i < nfds ; ++i) {
diff --git a/plugins/omudpspoof/omudpspoof.c b/plugins/omudpspoof/omudpspoof.c
index 30792531..c83cc540 100644
--- a/plugins/omudpspoof/omudpspoof.c
+++ b/plugins/omudpspoof/omudpspoof.c
@@ -208,7 +208,7 @@ UDPSend(instanceData *pData, uchar *pszSourcename, char *msg, size_t len)
 
 	inet_pton(AF_INET, (char*)pszSourcename, &(source_ip.sin_addr));
 
-	bSendSuccess = FALSE;
+	bSendSuccess = RSFALSE;
 	d_pthread_mutex_lock(&mutLibnet);
 	bNeedUnlock = 1;
 	for (r = pData->f_addr; r; r = r->ai_next) {
@@ -251,12 +251,12 @@ UDPSend(instanceData *pData, uchar *pszSourcename, char *msg, size_t len)
 		if (lsent == -1) {
 			DBGPRINTF("Write error: %s\n", libnet_geterror(libnet_handle));
 		} else {
-			bSendSuccess = TRUE;
+			bSendSuccess = RSTRUE;
 			break;
 		}
 	}
 	/* finished looping */
-	if (bSendSuccess == FALSE) {
+	if (bSendSuccess == RSFALSE) {
 		DBGPRINTF("error forwarding via udp, suspending\n");
 		iRet = RS_RET_SUSPENDED;
 	}
-- 
cgit