diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 12:27:06 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-25 12:27:06 +0200 |
commit | 27a0078958d808a323c945b58b77ee96ee690444 (patch) | |
tree | 2bcd479d0e5b42dd92c715e917722d6519c922b0 /plugins/imudp/imudp.c | |
parent | 1eac94e11dab1e7caead5e31a57d2cae31b5ad62 (diff) | |
parent | de71589ca3145dfbe8e34790bb49e3d86d3d3bce (diff) | |
download | rsyslog-27a0078958d808a323c945b58b77ee96ee690444.tar.gz rsyslog-27a0078958d808a323c945b58b77ee96ee690444.tar.xz rsyslog-27a0078958d808a323c945b58b77ee96ee690444.zip |
Merge branch 'master' into master-newtemplate
Diffstat (limited to 'plugins/imudp/imudp.c')
-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) { |