diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-19 09:33:33 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-19 09:33:33 +0200 |
| commit | b151584d0929759284c0fb0399709e5ca0e29d60 (patch) | |
| tree | 43799c6ad77fae0fbe86672601f13cfdd0191a66 /plugins/imudp | |
| parent | 8d80f53c2b03a445d3c05046c45f8d4a4beec358 (diff) | |
| parent | e9cf777ca422a964b4324111f4c93d84652ce2fc (diff) | |
| download | rsyslog-master.tar.gz rsyslog-master.tar.xz rsyslog-master.zip | |
Merge branch 'beta'master
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 0dda30ec..782d7bee 100644 --- a/plugins/imudp/imudp.c +++ b/plugins/imudp/imudp.c @@ -574,7 +574,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", @@ -593,7 +593,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); } } |