diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-19 09:39:29 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-19 09:39:29 +0200 |
| commit | e65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124 (patch) | |
| tree | 2783ebe1f2983311c0b85d738e093da9a2d02aff /plugins/imudp/imudp.c | |
| parent | de2fd07836accab563ecbf0405749b6bef9e76b4 (diff) | |
| parent | b151584d0929759284c0fb0399709e5ca0e29d60 (diff) | |
| download | rsyslog-e65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124.tar.gz rsyslog-e65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124.tar.bz2 rsyslog-e65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124.zip | |
Merge branch 'master' into master-ratelimit
Conflicts:
ChangeLog
configure.ac
doc/manual.html
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 3b140847..9b6409c1 100644 --- a/plugins/imudp/imudp.c +++ b/plugins/imudp/imudp.c @@ -591,7 +591,7 @@ rsRetVal rcvMainLoop(thrdInfo_t *pThrd) for(lstn = lcnfRoot ; lstn != NULL ; lstn = lstn->next) { if(lstn->sock != -1) { udpEPollEvt[i].events = EPOLLIN | EPOLLET; - udpEPollEvt[i].data.u64 = (long long unsigned) lstn; + udpEPollEvt[i].data.ptr = lstn; if(epoll_ctl(efd, EPOLL_CTL_ADD, lstn->sock, &(udpEPollEvt[i])) < 0) { rs_strerror_r(errno, errStr, sizeof(errStr)); errmsg.LogError(errno, NO_ERRCODE, "epoll_ctrl failed on fd %d with %s\n", @@ -610,7 +610,7 @@ rsRetVal rcvMainLoop(thrdInfo_t *pThrd) break; /* terminate input! */ for(i = 0 ; i < nfds ; ++i) { - processSocket(pThrd, (struct lstn_s*)currEvt[i].data.u64, &frominetPrev, &bIsPermitted); + processSocket(pThrd, currEvt[i].data.ptr, &frominetPrev, &bIsPermitted); } } |