Skip to content

D
Dnsmasq
Commit 0e88d53f authored by Simon Kelley's avatar Simon Kelley
Browse files
Options

Fix preprocessor checks, IP_TOS -> IPV6_TCLASS

parent 01d1b8dd
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/dhcp6.c
View file @ 0e88d53f
...@@ -33,12 +33,12 @@ void dhcp6_init(void) ...@@ -33,12 +33,12 @@ void dhcp6_init(void)
{ {
int fd; int fd;
struct sockaddr_in6 saddr; struct sockaddr_in6 saddr;
#if defined(IP_TOS) && defined(IPTOS_CLASS_CS6) #if defined(IPV6_TCLASS) && defined(IPTOS_CLASS_CS6)
int class = IPTOS_CLASS_CS6; int class = IPTOS_CLASS_CS6;
#endif #endif
if ((fd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP)) == -1 || if ((fd = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP)) == -1 ||
#if defined(IP_TOS) && defined(IPTOS_CLASS_CS6) #if defined(IPV6_TCLASS) && defined(IPTOS_CLASS_CS6)
setsockopt(fd, IPPROTO_IPV6, IPV6_TCLASS, &class, sizeof(class)) == -1 || setsockopt(fd, IPPROTO_IPV6, IPV6_TCLASS, &class, sizeof(class)) == -1 ||
#endif #endif
!fix_fd(fd) || !fix_fd(fd) ||
......
src/radv.c
View file @ 0e88d53f
...@@ -50,7 +50,7 @@ void ra_init(time_t now) ...@@ -50,7 +50,7 @@ void ra_init(time_t now)
{ {
struct icmp6_filter filter; struct icmp6_filter filter;
int fd; int fd;
#if defined(IP_TOS) && defined(IPTOS_CLASS_CS6) #if defined(IPV6_TCLASS) && defined(IPTOS_CLASS_CS6)
int class = IPTOS_CLASS_CS6; int class = IPTOS_CLASS_CS6;
#endif #endif
int val = 255; /* radvd uses this value */ int val = 255; /* radvd uses this value */
...@@ -72,7 +72,7 @@ void ra_init(time_t now) ...@@ -72,7 +72,7 @@ void ra_init(time_t now)
if ((fd = socket(PF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) == -1 || if ((fd = socket(PF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) == -1 ||
getsockopt(fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &hop_limit, &len) || getsockopt(fd, IPPROTO_IPV6, IPV6_UNICAST_HOPS, &hop_limit, &len) ||
#if defined(IP_TOS) && defined(IPTOS_CLASS_CS6) #if defined(IPV6_TCLASS) && defined(IPTOS_CLASS_CS6)
setsockopt(fd, IPPROTO_IPV6, IPV6_TCLASS, &class, sizeof(class)) == -1 || setsockopt(fd, IPPROTO_IPV6, IPV6_TCLASS, &class, sizeof(class)) == -1 ||
#endif #endif
!fix_fd(fd) || !fix_fd(fd) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment