From baa16a52a6a4596003a7c31f74befbafee3bf62f Mon Sep 17 00:00:00 2001 From: Gerhard Rieger Date: Tue, 22 Nov 2011 13:11:51 +0100 Subject: [PATCH] check for defines IPV6_* --- CHANGES | 6 ++++++ config.h.in | 3 +++ xio-ip6.c | 22 +++++++++++++++++++++- xioopts.c | 20 +++++++++++++++++++- 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index f59b626..677acb4 100644 --- a/CHANGES +++ b/CHANGES @@ -65,6 +65,12 @@ porting: for fipsld too. Thanks to Andreas Gruenbacher for reporting this problem + check for netinet6/in6.h only when IPv6 is available and enabled + + don't fail to compile when the following defines are missing: + IPV6_PKTINFO IPV6_RTHDR IPV6_DSTOPTS IPV6_HOPOPTS IPV6_HOPLIMIT + Thanks to Jerry Jacobs for reporting this problem (Mac OS X Lion 10.7) + ####################### V 1.7.1.3: security: diff --git a/config.h.in b/config.h.in index 3a59824..486b785 100644 --- a/config.h.in +++ b/config.h.in @@ -215,6 +215,9 @@ /* Define if you have the header file. */ #undef HAVE_NETINET_IP6_H +/* Define if you have the header file. */ +#undef HAVE_NETINET6_IN6_H + /* Define if you have the header file. */ #undef HAVE_ARPA_NAMESER_H diff --git a/xio-ip6.c b/xio-ip6.c index 9a729f6..4b86c9e 100644 --- a/xio-ip6.c +++ b/xio-ip6.c @@ -1,5 +1,5 @@ /* source: xio-ip6.c */ -/* Copyright Gerhard Rieger 2001-2008 */ +/* Copyright Gerhard Rieger 2001-2011 */ /* Published under the GNU General Public License V.2, see file COPYING */ /* this file contains the source for IP6 related functions */ @@ -25,29 +25,39 @@ const struct optdesc opt_ipv6_v6only = { "ipv6-v6only", "ipv6only", OPT_IPV6_V6O #ifdef IPV6_JOIN_GROUP const struct optdesc opt_ipv6_join_group = { "ipv6-join-group", "join-group", OPT_IPV6_JOIN_GROUP, GROUP_SOCK_IP6, PH_PASTBIND, TYPE_IP_MREQN, OFUNC_SOCKOPT, SOL_IPV6, IPV6_JOIN_GROUP }; #endif +#ifdef IPV6_PKTINFO const struct optdesc opt_ipv6_pktinfo = { "ipv6-pktinfo", "pktinfo", OPT_IPV6_PKTINFO, GROUP_SOCK_IP6, PH_PASTSOCKET, TYPE_BOOL, OFUNC_SOCKOPT, SOL_IPV6, IPV6_PKTINFO }; +#endif #ifdef IPV6_RECVPKTINFO const struct optdesc opt_ipv6_recvpktinfo = { "ipv6-recvpktinfo", "recvpktinfo", OPT_IPV6_RECVPKTINFO, GROUP_SOCK_IP6, PH_PASTSOCKET, TYPE_BOOL, OFUNC_SOCKOPT, SOL_IPV6, IPV6_RECVPKTINFO }; #endif +#ifdef IPV6_RTHDR const struct optdesc opt_ipv6_rthdr = { "ipv6-rthdr", "rthdr", OPT_IPV6_RTHDR, GROUP_SOCK_IP6, PH_PASTSOCKET, TYPE_BOOL, OFUNC_SOCKOPT, SOL_IPV6, IPV6_RTHDR }; +#endif #ifdef IPV6_RECVRTHDR const struct optdesc opt_ipv6_recvrthdr = { "ipv6-recvrthdr", "recvrthdr", OPT_IPV6_RECVRTHDR, GROUP_SOCK_IP6, PH_PASTSOCKET, TYPE_BOOL, OFUNC_SOCKOPT, SOL_IPV6, IPV6_RECVRTHDR }; #endif #ifdef IPV6_AUTHHDR const struct optdesc opt_ipv6_authhdr = { "ipv6-authhdr", "authhdr", OPT_IPV6_AUTHHDR, GROUP_SOCK_IP6, PH_PASTSOCKET, TYPE_BOOL, OFUNC_SOCKOPT, SOL_IPV6, IPV6_AUTHHDR }; #endif +#ifdef IPV6_DSTOPTS const struct optdesc opt_ipv6_dstopts = { "ipv6-dstopts", "dstopts", OPT_IPV6_DSTOPTS, GROUP_SOCK_IP6, PH_PASTSOCKET, TYPE_BOOL, OFUNC_SOCKOPT, SOL_IPV6, IPV6_DSTOPTS }; +#endif #ifdef IPV6_RECVDSTOPTS const struct optdesc opt_ipv6_recvdstopts = { "ipv6-recvdstopts", "recvdstopts", OPT_IPV6_RECVDSTOPTS, GROUP_SOCK_IP6, PH_PASTSOCKET, TYPE_BOOL, OFUNC_SOCKOPT, SOL_IPV6, IPV6_RECVDSTOPTS }; #endif +#ifdef IPV6_HOPOPTS const struct optdesc opt_ipv6_hopopts = { "ipv6-hopopts", "hopopts", OPT_IPV6_HOPOPTS, GROUP_SOCK_IP6, PH_PASTSOCKET, TYPE_BOOL, OFUNC_SOCKOPT, SOL_IPV6, IPV6_HOPOPTS }; +#endif #ifdef IPV6_RECVHOPOPTS const struct optdesc opt_ipv6_recvhopopts = { "ipv6-recvhopopts", "recvhopopts", OPT_IPV6_RECVHOPOPTS, GROUP_SOCK_IP6, PH_PASTSOCKET, TYPE_BOOL, OFUNC_SOCKOPT, SOL_IPV6, IPV6_RECVHOPOPTS }; #endif #ifdef IPV6_FLOWINFO /* is in linux/in6.h */ const struct optdesc opt_ipv6_flowinfo= { "ipv6-flowinfo","flowinfo",OPT_IPV6_FLOWINFO,GROUP_SOCK_IP6, PH_PASTSOCKET, TYPE_BOOL, OFUNC_SOCKOPT, SOL_IPV6, IPV6_FLOWINFO }; #endif +#ifdef IPV6_HOPLIMIT const struct optdesc opt_ipv6_hoplimit= { "ipv6-hoplimit","hoplimit",OPT_IPV6_HOPLIMIT,GROUP_SOCK_IP6, PH_PASTSOCKET, TYPE_BOOL, OFUNC_SOCKOPT, SOL_IPV6, IPV6_HOPLIMIT }; +#endif const struct optdesc opt_ipv6_unicast_hops= { "ipv6-unicast-hops","unicast-hops",OPT_IPV6_UNICAST_HOPS,GROUP_SOCK_IP6, PH_PASTSOCKET, TYPE_INT, OFUNC_SOCKOPT, SOL_IPV6, IPV6_UNICAST_HOPS }; #ifdef IPV6_RECVHOPLIMIT const struct optdesc opt_ipv6_recvhoplimit= { "ipv6-recvhoplimit","recvhoplimit",OPT_IPV6_RECVHOPLIMIT,GROUP_SOCK_IP6, PH_PASTSOCKET, TYPE_BOOL, OFUNC_SOCKOPT, SOL_IPV6, IPV6_RECVHOPLIMIT }; @@ -203,6 +213,7 @@ int xiolog_ancillary_ip6(struct cmsghdr *cmsg, int *num, msglen = cmsg->cmsg_len-((char *)CMSG_DATA(cmsg)-(char *)cmsg); envbuff[0] = '\0'; switch (cmsg->cmsg_type) { +#ifdef IPV6_PKTINFO case IPV6_PKTINFO: { struct in6_pktinfo *pktinfo = (struct in6_pktinfo *)CMSG_DATA(cmsg); *num = 2; @@ -214,16 +225,21 @@ int xiolog_ancillary_ip6(struct cmsghdr *cmsg, int *num, '\0', xiogetifname(pktinfo->ipi6_ifindex, scratch2, -1)); } return STAT_OK; +#endif /* defined(IPV6_PKTINFO) */ +#ifdef IPV6_HOPLIMIT case IPV6_HOPLIMIT: strncpy(typbuff, "IPV6_HOPLIMIT", typlen); strncpy(nambuff, "hoplimit", namlen); snprintf(valbuff, vallen, "%d", *(int *)CMSG_DATA(cmsg)); return STAT_OK; +#endif /* defined(IPV6_HOPLIMIT) */ +#ifdef IPV6_RTHDR case IPV6_RTHDR: strncpy(typbuff, "IPV6_RTHDR", typlen); strncpy(nambuff, "rthdr", namlen); xiodump(CMSG_DATA(cmsg), msglen, valbuff, vallen, 0); return STAT_OK; +#endif /* defined(IPV6_RTHDR) */ #ifdef IPV6_AUTHHDR case IPV6_AUTHHDR: strncpy(typbuff, "IPV6_AUTHHDR", typlen); @@ -231,16 +247,20 @@ int xiolog_ancillary_ip6(struct cmsghdr *cmsg, int *num, xiodump(CMSG_DATA(cmsg), msglen, valbuff, vallen, 0); return STAT_OK; #endif +#ifdef IPV6_DSTOPTS case IPV6_DSTOPTS: strncpy(typbuff, "IPV6_DSTOPTS", typlen); strncpy(nambuff, "dstopts", namlen); xiodump(CMSG_DATA(cmsg), msglen, valbuff, vallen, 0); return STAT_OK; +#endif /* defined(IPV6_DSTOPTS) */ +#ifdef IPV6_HOPOPTS case IPV6_HOPOPTS: strncpy(typbuff, "IPV6_HOPOPTS", typlen); strncpy(nambuff, "hopopts", namlen); xiodump(CMSG_DATA(cmsg), msglen, valbuff, vallen, 0); return STAT_OK; +#endif /* defined(IPV6_HOPOPTS) */ #ifdef IPV6_FLOWINFO case IPV6_FLOWINFO: strncpy(typbuff, "IPV6_FLOWINFO", typlen); diff --git a/xioopts.c b/xioopts.c index 98a397d..2494117 100644 --- a/xioopts.c +++ b/xioopts.c @@ -1,5 +1,5 @@ /* source: xioopts.c */ -/* Copyright Gerhard Rieger 2001-2010 */ +/* Copyright Gerhard Rieger 2001-2011 */ /* Published under the GNU General Public License V.2, see file COPYING */ /* this file contains the source for address options handling */ @@ -388,7 +388,9 @@ const struct optname optionnames[] = { IF_SOCKET ("dontlinger", &opt_so_dontlinger) #endif IF_SOCKET ("dontroute", &opt_so_dontroute) +#ifdef IPV6_DSTOPTS IF_IP6 ("dstopts", &opt_ipv6_dstopts) +#endif #ifdef VDSUSP /* HP-UX */ IF_TERMIOS("dsusp", &opt_vdsusp) #endif @@ -545,8 +547,12 @@ const struct optname optionnames[] = { #endif IF_READLINE("history", &opt_history_file) IF_READLINE("history-file", &opt_history_file) +#ifdef IPV6_HOPLIMIT IF_IP6 ("hoplimit", &opt_ipv6_hoplimit) +#endif +#ifdef IPV6_HOPOPTS IF_IP6 ("hopopts", &opt_ipv6_hopopts) +#endif #if WITH_LIBWRAP && defined(HAVE_HOSTS_ALLOW_TABLE) IF_IPAPP ("hosts-allow", &opt_tcpwrap_hosts_allow_table) #endif @@ -721,14 +727,22 @@ const struct optname optionnames[] = { #ifdef IPV6_AUTHHDR IF_IP6 ("ipv6-authhdr", &opt_ipv6_authhdr) #endif +#ifdef IPV6_DSTOPTS IF_IP6 ("ipv6-dstopts", &opt_ipv6_dstopts) +#endif #ifdef IPV4_FLOWINFO IF_IP6 ("ipv6-flowinfo", &opt_ipv6_flowinfo) #endif +#ifdef IPV6_HOPLIMIT IF_IP6 ("ipv6-hoplimit", &opt_ipv6_hoplimit) +#endif +#ifdef IPV6_HOPOPTS IF_IP6 ("ipv6-hopopts", &opt_ipv6_hopopts) +#endif IF_IP6 ("ipv6-join-group", &opt_ipv6_join_group) +#ifdef IPV6_PKTINFO IF_IP6 ("ipv6-pktinfo", &opt_ipv6_pktinfo) +#endif #ifdef IPV6_RECVDSTOPTS IF_IP6 ("ipv6-recvdstopts", &opt_ipv6_recvdstopts) #endif @@ -753,7 +767,9 @@ const struct optname optionnames[] = { #ifdef IPV6_RECVTCLASS IF_IP6 ("ipv6-recvtclass", &opt_ipv6_recvtclass) #endif +#ifdef IPV6_RTHDR IF_IP6 ("ipv6-rthdr", &opt_ipv6_rthdr) +#endif #ifdef IPV6_TCLASS IF_IP6 ("ipv6-tclass", &opt_ipv6_tclass) #endif @@ -1250,7 +1266,9 @@ const struct optname optionnames[] = { #ifdef O_RSYNC IF_OPEN ("rsync", &opt_o_rsync) #endif +#ifdef IPV6_RTHDR IF_IP6 ("rthdr", &opt_ipv6_rthdr) +#endif IF_TUN ("running", &opt_iff_running) #ifdef TCP_SACK_DISABLE IF_TCP ("sack-disable", &opt_tcp_sack_disable)