From 9f962b7e1bbbd9f9df472e56aa5864cb10c60600 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 17 Apr 2014 23:28:56 +0200 Subject: [PATCH] upnp: use data.ptr instead data.u64 for poll events --- src/upnp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/upnp.c b/src/upnp.c index d2ef9c35..849abbe0 100644 --- a/src/upnp.c +++ b/src/upnp.c @@ -126,10 +126,10 @@ upnp_thread( void *aux ) memset(&ev, 0, sizeof(ev)); ev[0].fd = multicast->fd; ev[0].events = TVHPOLL_IN; - ev[0].data.u64 = (uint64_t)multicast; + ev[0].data.ptr = multicast; ev[1].fd = unicast->fd; ev[1].events = TVHPOLL_IN; - ev[1].data.u64 = (uint64_t)unicast; + ev[1].data.ptr = unicast; tvhpoll_add(poll, ev, 2); while (upnp_running && multicast->fd >= 0) { @@ -137,7 +137,7 @@ upnp_thread( void *aux ) while (r-- > 0) { if ((ev[r].events & TVHPOLL_IN) != 0) { - conn = (udp_connection_t *)ev[r].data.u64; + conn = ev[r].data.ptr; iplen = sizeof(ip); size = recvfrom(conn->fd, buf, sizeof(buf), 0, (struct sockaddr *)&ip, &iplen); @@ -145,7 +145,7 @@ upnp_thread( void *aux ) if (size > 0) { char tbuf[256]; inet_ntop(ip.ss_family, IP_IN_ADDR(ip), tbuf, sizeof(tbuf)); - tvhtrace("upnp", "%s - received data from %s:%hu [size=%li]", + tvhtrace("upnp", "%s - received data from %s:%hu [size=%zi]", conn == multicast ? "multicast" : "unicast", tbuf, IP_PORT(ip), size); tvhlog_hexdump("upnp", buf, size);