projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert sizeof foo to sizeof(foo).
[tinc]
/
src
/
multicast_device.c
diff --git
a/src/multicast_device.c
b/src/multicast_device.c
index
ceaa3ef
..
5053036
100644
(file)
--- a/
src/multicast_device.c
+++ b/
src/multicast_device.c
@@
-87,7
+87,7
@@
static bool setup_device(void) {
#endif
static const int one = 1;
#endif
static const int one = 1;
- setsockopt(device_fd, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof
one
);
+ setsockopt(device_fd, SOL_SOCKET, SO_REUSEADDR, (void *)&one, sizeof
(one)
);
if(bind(device_fd, ai->ai_addr, ai->ai_addrlen)) {
closesocket(device_fd);
if(bind(device_fd, ai->ai_addr, ai->ai_addrlen)) {
closesocket(device_fd);
@@
-101,20
+101,20
@@
static bool setup_device(void) {
case AF_INET: {
struct ip_mreq mreq;
struct sockaddr_in in;
case AF_INET: {
struct ip_mreq mreq;
struct sockaddr_in in;
- memcpy(&in, ai->ai_addr, sizeof
in
);
+ memcpy(&in, ai->ai_addr, sizeof
(in)
);
mreq.imr_multiaddr.s_addr = in.sin_addr.s_addr;
mreq.imr_interface.s_addr = htonl(INADDR_ANY);
mreq.imr_multiaddr.s_addr = in.sin_addr.s_addr;
mreq.imr_interface.s_addr = htonl(INADDR_ANY);
- if(setsockopt(device_fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (void *)&mreq, sizeof
mreq
)) {
+ if(setsockopt(device_fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (void *)&mreq, sizeof
(mreq)
)) {
logger(LOG_ERR, "Cannot join multicast group %s %s: %s", host, port, sockstrerror(sockerrno));
closesocket(device_fd);
free(host);
return false;
}
#ifdef IP_MULTICAST_LOOP
logger(LOG_ERR, "Cannot join multicast group %s %s: %s", host, port, sockstrerror(sockerrno));
closesocket(device_fd);
free(host);
return false;
}
#ifdef IP_MULTICAST_LOOP
- setsockopt(device_fd, IPPROTO_IP, IP_MULTICAST_LOOP, (const void *)&one, sizeof
one
);
+ setsockopt(device_fd, IPPROTO_IP, IP_MULTICAST_LOOP, (const void *)&one, sizeof
(one)
);
#endif
#ifdef IP_MULTICAST_TTL
#endif
#ifdef IP_MULTICAST_TTL
- setsockopt(device_fd, IPPROTO_IP, IP_MULTICAST_TTL, (void *)&ttl, sizeof
ttl
);
+ setsockopt(device_fd, IPPROTO_IP, IP_MULTICAST_TTL, (void *)&ttl, sizeof
(ttl)
);
#endif
} break;
#endif
#endif
} break;
#endif
@@
-123,20
+123,20
@@
static bool setup_device(void) {
case AF_INET6: {
struct ipv6_mreq mreq;
struct sockaddr_in6 in6;
case AF_INET6: {
struct ipv6_mreq mreq;
struct sockaddr_in6 in6;
- memcpy(&in6, ai->ai_addr, sizeof
in6
);
- memcpy(&mreq.ipv6mr_multiaddr, &in6.sin6_addr, sizeof
mreq.ipv6mr_multiaddr
);
+ memcpy(&in6, ai->ai_addr, sizeof
(in6)
);
+ memcpy(&mreq.ipv6mr_multiaddr, &in6.sin6_addr, sizeof
(mreq.ipv6mr_multiaddr)
);
mreq.ipv6mr_interface = in6.sin6_scope_id;
mreq.ipv6mr_interface = in6.sin6_scope_id;
- if(setsockopt(device_fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, (void *)&mreq, sizeof
mreq
)) {
+ if(setsockopt(device_fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, (void *)&mreq, sizeof
(mreq)
)) {
logger(LOG_ERR, "Cannot join multicast group %s %s: %s", host, port, sockstrerror(sockerrno));
closesocket(device_fd);
free(host);
return false;
}
#ifdef IPV6_MULTICAST_LOOP
logger(LOG_ERR, "Cannot join multicast group %s %s: %s", host, port, sockstrerror(sockerrno));
closesocket(device_fd);
free(host);
return false;
}
#ifdef IPV6_MULTICAST_LOOP
- setsockopt(device_fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (const void *)&one, sizeof
one
);
+ setsockopt(device_fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (const void *)&one, sizeof
(one)
);
#endif
#ifdef IPV6_MULTICAST_HOPS
#endif
#ifdef IPV6_MULTICAST_HOPS
- setsockopt(device_fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (void *)&ttl, sizeof
ttl
);
+ setsockopt(device_fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (void *)&ttl, sizeof
(ttl)
);
#endif
} break;
#endif
#endif
} break;
#endif
@@
-173,7
+173,7
@@
static bool read_packet(vpn_packet_t *packet) {
return false;
}
return false;
}
- if(!memcmp(&ignore_src, packet->data + 6, sizeof
ignore_src
)) {
+ if(!memcmp(&ignore_src, packet->data + 6, sizeof
(ignore_src)
)) {
ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Ignoring loopback packet of %d bytes from %s", lenin, device_info);
packet->len = 0;
return true;
ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Ignoring loopback packet of %d bytes from %s", lenin, device_info);
packet->len = 0;
return true;
@@
-201,7
+201,7
@@
static bool write_packet(vpn_packet_t *packet) {
device_total_out += packet->len;
device_total_out += packet->len;
- memcpy(&ignore_src, packet->data + 6, sizeof
ignore_src
);
+ memcpy(&ignore_src, packet->data + 6, sizeof
(ignore_src)
);
return true;
}
return true;
}