From db3682d99b9d17c745a6286b404abf2f4d1347a2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 13 Nov 2012 13:36:48 -0500 Subject: [PATCH] Add missing INET6 conditional Signed-off-by: Thomas Petazzoni Signed-off-by: Steve Dickson --- src/rpc_generic.c | 2 ++ src/svc_dg.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/rpc_generic.c b/src/rpc_generic.c index 509fb36..2eb91ad 100644 --- a/src/rpc_generic.c +++ b/src/rpc_generic.c @@ -535,7 +535,9 @@ __rpc_nconf2fd_flags(const struct netconfig *nconf, int flags) si.si_af == AF_INET6) { int val = 1; +#ifdef INET6 setsockopt(fd, SOL_IPV6, IPV6_V6ONLY, &val, sizeof(val)); +#endif } return fd; } diff --git a/src/svc_dg.c b/src/svc_dg.c index a79a70d..b1ac462 100644 --- a/src/svc_dg.c +++ b/src/svc_dg.c @@ -653,10 +653,11 @@ svc_dg_enable_pktinfo(int fd, const struct __rpc_sockinfo *si) case AF_INET: (void) setsockopt(fd, SOL_IP, IP_PKTINFO, &val, sizeof(val)); break; - +#ifdef INET6 case AF_INET6: (void) setsockopt(fd, SOL_IPV6, IPV6_RECVPKTINFO, &val, sizeof(val)); break; +#endif } } @@ -694,6 +695,7 @@ svc_dg_valid_pktinfo(struct msghdr *msg) } break; +#ifdef INET6 case AF_INET6: if (cmsg->cmsg_level != SOL_IPV6 || cmsg->cmsg_type != IPV6_PKTINFO @@ -706,6 +708,7 @@ svc_dg_valid_pktinfo(struct msghdr *msg) pkti->ipi6_ifindex = 0; } break; +#endif default: return 0; -- 2.50.1