From 8404701a09fc66b9580f0aaa4dc6473917e80701 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Tue, 15 Jan 2008 11:54:15 +0000 Subject: [PATCH] fixup test for BSD. git-svn-id: file:///svn/unbound/trunk@851 be551aaa-1e26-0410-a405-d3ace91eadb9 --- services/listen_dnsport.c | 10 ++++++++++ testdata/fwd_ancil.tpkg | Bin 1764 -> 1896 bytes 2 files changed, 10 insertions(+) diff --git a/services/listen_dnsport.c b/services/listen_dnsport.c index 5d514c898..2ecc4833e 100644 --- a/services/listen_dnsport.c +++ b/services/listen_dnsport.c @@ -246,6 +246,16 @@ set_ip6_recvpktinfo(int s) strerror(errno)); return 0; } +#ifdef IPV6_V6ONLY + on = 0; + if(setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, + &on, (socklen_t)sizeof(on)) < 0) { + log_err("disable sockopt(..., IPV6_V6ONLY, ...) failed: %s" + " (on BSD may be due to net.inet6.ip6.v6only sysctl)", + strerror(errno)); + return 0; + } +#endif /* defined IPV6_V6ONLY */ return 1; } #endif /* defined IPV6_RECVPKTINFO */ diff --git a/testdata/fwd_ancil.tpkg b/testdata/fwd_ancil.tpkg index e8eaac0ed9954e723d6b5a1e67356e87efa0c60e..42d229bc22572a708a775667ce31f97f2f56a8b7 100644 GIT binary patch literal 1896 zcmV-u2bcICiwFQ0n~X;Q1MOLRbK5o&&%eT_*vOhV8J85P=Zz9;tXN9pHj!LezFg

%bns*u0m{+02aHzE`Ix9CJSe5G28WY#|@r*nPwP9 zvt9>$n$4z}e`XC#qgkt(X1!K1!7yvJO63XEztDcxS|ma%z^yEJ6w(JYux&m$NA~+QO76RzgcNEo`A8d4LsET;`SFbxS>Id6!7mA z7jC$0L5&m+fJJjHoCVZ!L<>w(@Ocon;N*NT9G#E?Dr3rBHr0~h!R08Ki3HWeQh0pY z0>()JuNAdJ9w6Uh5!txT#Puk4B6h_i=IA(rlMQPfkVyrGO$Kf3`_KtKElxN7y@)u?_#V zMl;1f`huFoKPq;Q|Ho*rEkXP0erL8Pf2Vr8nLQarVWHMEbgq-rZkJw~ki=57#F7;6=x+$`HdrLjP zMb3l#!E`^M00fT$n?g9FFt-FA9&W4vWb}r`j52V; zLm_7oRR08R0=iz-L;rfJBblD8_!*u(OBvlUzb-|hZkvpZfg)aGzcxkW2^~@+U?E##cNjL(zm;43FckuyxJ!yiz}Cv zvCOhV@1?W?!&+zp@c=Ly>X=A{4IT3|{iea0w}d}n8c-k1l)Mnjetpq}nI#~hLgm}k z0nWaG38rr7n!v?W3zaXe5OTExSqK%BKf=0j;u8Fk7Y1>ptS1X3G%lW{H$3(nCN#N- ziR=JRr4ft2EM~4fQx3H^{H2)gD_&Nf@i{HWm@CV(=J}w!cok?qWIEeO-dQ)RusVg`QKx-&HOL+d;donU_KgdNueNVpO;C&M*E-gs$0zB zEGzA1$re_&X~mpG={5$4DV(%gCM*^Uoqn?BzDF_C&yj65B@?E6rgDoGPZv^*VNs|u zos_pdqxLmeOe|G!#{S@ z@DTTM?mJ!8$G9gsrCBE`A(&^IT-QMMP5wSTtO))B+K@&+y0IU+6LR`b*TjEk;RjB( zPV}{$Z~Z!~-G@zRev9AH$`Oe#Z#WzbNvHeW<;4iIdw)509dgk-9i0vO@WW;ALcS2hW#Oz}=wvgU{>6vh iFdHxApqK2T*YECg`hDBCecQLsZT|*hDRgH5C;$M{9hPNOWi~dSdv4){CUi~LLQ2TGzHN^> zwg4~2axFWQef;k`$rx-BlKqfoON-iobSK?O_n|u-qnR_beB1Rj#|=w6U!>{S8jV`= zU9aZ87j4JT8`X-T8M^*^1Gh=Z?!_D(6E^_XpW6UL*2xa*@% zMwU%gD~{OIid@@-Ipw5a**4`|MKg{<=9!?&3sf)ZV0j*!U7cW>Dg69ZCpq(mg9s7T3*Zt2ZNpzfI=SDEp}7>@AJFiahw06->3esR~v@#|EgZ!`u}~j zXCSOQxdoDpTL$rBuYdf*aTl^_1t|^&Z=h1wbwWDbLI1<>MF;1Qx9!2%zOU&Z+1S%w-D4 z-9mebX?IWGclt|sA(O5wcG2k`Jus*HAGJ;X?{NFhc--dy)p}#;|Fts0jat1{+4}!| zv=VbLyDnrR91t()@a^n@#?YqPjC4xA=brv#7QBU#r(^ zTmQe0wqE~3y?;&Bzy6{|(kwoC0>ys2d(?Xi`%tUYs_^tF$(B)?#dI=x`F^!(3B_dw zF2R@15|_@~7l@?nk*Am)DbQ-I?=M-iVwd)=n=5pJrYZ#_-XJJHoZjg-J;lCO)Z zj+DtGAt&YIY~tDzD9U*sm9(mpEGtdel$H{+E}gr6DNASMl4O;vHl^Ew_4fg^(vnWO z_1J*NiR6xtn#D)ivkAbWv*Bb@>wC(zF!U+jPu#OJcN6!hYSDyFCvEm1tXD#4lMCccyA@(jid;@~^!JMer_i4%!=3!d{RM0XOC zW>#cRT4WUawusb{&M=`djDsgn;ZIU{+x~fYb~40dyJ?hlQh47!9t;Ps`km8eMVF6a zK=+Emc~ggH;v1efp}1O=0QdLN<*@7E!@ZCiDw=805Dq*_s*%OAA^@$DLoZ8y?0Kot z78b=v2jf2AJ_VN|ekcNUj(Nt#Gwh+=u4oH1n!%^+R@TX#CelI`BUi_Dz-Lh+xJQz* z5O&d!^JTGf1Cud@;z}wjCfuWVDr2!o?4A6b)7H|Ng)Z=wMUk^KK&hX-H!fb3zUbnS zMXhB|Y!!8>k-VaowN>TH5+%nlwbX0bol3iBBWXmgO*eAO8n(jMRz0*D$hX`!=6~$o ze*e|$L?sZ#Vh1caBITj8`n1`5*});sRf; z;?TGQ*-f*PG!x