diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 12:19:56 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 12:19:56 +0200 |
| commit | de71589ca3145dfbe8e34790bb49e3d86d3d3bce (patch) | |
| tree | 43a91ec3d4c7306c9ddda820b916e8da71b3d065 /plugins | |
| parent | 2f4292a81c2bf89b349f0e276c69616ac6e51164 (diff) | |
| parent | 8939ccfffd3a0580ead376234ad64a9602d4e4e6 (diff) | |
| download | rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.tar.gz rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.tar.xz rsyslog-de71589ca3145dfbe8e34790bb49e3d86d3d3bce.zip | |
Merge branch 'v6-stable'
Conflicts:
ChangeLog
configure.ac
runtime/ruleset.c
tools/syslogd.c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/imsolaris/imsolaris.c | 4 | ||||
| -rw-r--r-- | plugins/imudp/imudp.c | 4 | ||||
| -rw-r--r-- | plugins/omudpspoof/omudpspoof.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/plugins/imsolaris/imsolaris.c b/plugins/imsolaris/imsolaris.c index 8b607a84..a220e72a 100644 --- a/plugins/imsolaris/imsolaris.c +++ b/plugins/imsolaris/imsolaris.c @@ -252,12 +252,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 d570e3e5..9c92ddde 100644 --- a/plugins/imudp/imudp.c +++ b/plugins/imudp/imudp.c @@ -290,7 +290,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); @@ -560,7 +560,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 4ada8eb0..531a0dcf 100644 --- a/plugins/omudpspoof/omudpspoof.c +++ b/plugins/omudpspoof/omudpspoof.c @@ -344,7 +344,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) { @@ -387,12 +387,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; } |