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/imudp | |
| 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/imudp')
| -rw-r--r-- | plugins/imudp/imudp.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |