From 8fb41f5c00207f1df0b47fd5cbbb8caca88d251d Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Tue, 21 Oct 2008 13:00:07 +0000 Subject: [PATCH] ported 1.1 to windows. git-svn-id: file:///svn/unbound/trunk@1316 be551aaa-1e26-0410-a405-d3ace91eadb9 --- daemon/remote.c | 11 +++++++++++ doc/Changelog | 3 +++ testdata/08-host-lib.tpkg | Bin 2103 -> 2202 bytes testdata/09-unbound-control.tpkg | Bin 7087 -> 7072 bytes util/tube.c | 2 ++ 5 files changed, 16 insertions(+) diff --git a/daemon/remote.c b/daemon/remote.c index 74c5d4262..94613c5b0 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -233,6 +233,12 @@ add_open(char* ip, int nr, struct listen_port** list, int noproto_is_err) hints.ai_socktype = SOCK_STREAM; hints.ai_flags = AI_PASSIVE | AI_NUMERICHOST; if((r = getaddrinfo(ip, port, &hints, &res)) != 0 || !res) { +#ifdef USE_WINSOCK + if(!noproto_is_err && r == EAI_NONAME) { + /* tried to lookup the address as name */ + return 1; /* return success, but do nothing */ + } +#endif /* USE_WINSOCK */ log_err("control interface %s:%s getaddrinfo: %s %s", ip?ip:"default", port, gai_strerror(r), #ifdef EAI_SYSTEM @@ -1207,6 +1213,11 @@ handle_req(struct daemon_remote* rc, struct rc_state* s, SSL* ssl) int r; char magic[5]; char buf[1024]; +#ifdef USE_WINSOCK + /* makes it possible to set the socket blocking again. */ + /* basically removes it from winsock_event ... */ + WSAEventSelect(s->c->fd, NULL, 0); +#endif fd_set_block(s->c->fd); /* try to read magic UBCT string */ diff --git a/doc/Changelog b/doc/Changelog index 5fed53902..c32a9c387 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,6 +1,9 @@ 21 October 2008: Wouter - fix update-anchors.sh, so it does not report different RR order as an update. Sorts the keys in the file. Updated copyright. + - fixup testbound on windows, the command control pipe doesn't exist. + - skip 08hostlib test on windows, no fork() available. + - made unbound-remote work on windows. 20 October 2008: Wouter - quench a log message that is debug only. diff --git a/testdata/08-host-lib.tpkg b/testdata/08-host-lib.tpkg index b41384315cb10a7f10cfa2f2d7090b8c6a885a95..b5a6628cf6aa57e978e82ee066d50856e009398f 100644 GIT binary patch literal 2202 zcmV;L2xa#liwFR+%KbkxgH+6rj-hXrS>nB^1}Xl-YAuIL)gEZ*Yi7|t%dtD z@WSo?3k_JE_E`m{EKmNO1$0#-XDl$e?T50X$$}7QFmz3DJg*n|5Cyi|0h|@N zEiZB{a>^MM$Y(S}vgh1}D>?+d1bV(==#}DIIIZ0_!O*m~IjYYYxxt6I zUThGtp4sjYdq_2UJhvStXx`8uU{-~kQ`?D7)>L8BojO3_T(M>RLb@n~HYZ z;}{Q2>VVudh)F}F6m%(P_>j<30UFGAsL5cjKU6KRk5u=d#T;({13TRyF)LKX>)4UAXMij_p!D1eb*akM~rf zYm$;NN2xy)GEXKa9V7Jo0(zU<7`J97#9d;FfipCEX@Kg12h^2}41+Fn!4CI? zt20cm|Abr{RP|5|{a!~!G&Py=FL?cWMCgg}SuP^?KF4EBKqAkOpBa*&%<^OaLBd!} zcmo$CAsp!0jsxw1g%ZeS_WbVb{^s%wP7W>haOg(ZXPms&W$5W)B*fJJ3?^ZZb_m+f zRUfSMf6ms!W3~SqdR|+o{|!C$|82k%{?FMqy*~=(9ak0;qS{D;flXV;(#J9!4;tSZ z1W2Qf-g@0=9%uLWA={|d&#tfF4HWam0vsF=>CDM+c7%)LI*u{3>wz-C7_}5QIa%O? z`ofJQg&$z7!L=cJt#RyFZjciwZb0mIyr@@V4a#qWu5ET@JgGH)Q;vi#U6P5X9d^Aw zI~>SOdDybu!)ZEgo5Zsq=fha6g;R_hzzK#pEEGC2Lcwd2#IED)tLfE=j->JA+DsZg zvEBi-V_OA`KcKBc4>}%1{-33-;2p9Rn?=+>C-4qEN1PK8X+T4>dqUcgYl>r{q;ntB zxR3n(1NaZgTvh*Z|LNww+4y{{8yd;nRWFIp#JBI9J zR^0jK4VoC6mPay~k@8XXSzT%CzFKiQwa{6DGyZW^^?MX**eE@2Rr zVgLNP@d2_pbZB~R+wQ1c_-{O-SgdWkOqs9mMG2^dKNI||(sLC_9l zNT(0fc7)(Z@j8N@?fc9^Au`E90RuEHUk;*J@-QMMV>pfpo?v?D!28L~#Z0yz3Tc9tRiLV7D5?~j$ivu^mH~+_5sq+=j&-~pWfX@6$f3rro)?By`4+U?BE@Ay&>?Q01K*~dh~%#fk7l3O>RQP@R~Z+l7Ay>~LFamZc3 z!re5iyc&yZ-kH6auq;xQ{{R^WMuy8fWd#FRSjE73Q#dq!Je&U?c77c;@Ep5p_- za`obYWE?HtE6ZcW*C_S-X-!l)hx={Hdm;#ZttS7de(>4Yn8Ln-_*OMI&C6KE%=i)J z3O8)A_0oS~MoXd<=1r41j(l0X)R5+e4Y^+WD-4;emRXxOvizhthjgGAI>VBMj zo1iS%Vrq~~o!gElr?#&?TI|a6B_szs%VY6PhWP3semy(z#DUg~zyI(MZ@}#^z90(3 z_ZspekAzHo`Lb+D;WMiW*SfGpc}#iqlrJa(g-n?ee#+Ol-wn^*|GI0q>U{S5uX17b z{jY)e<@Ek{8*l{T{oLpcp1gY%5h{D#xcuv79j1b#O0v!7N642njgTXGMeB3BFKUP{ z5#vKrt2Y~;?|-S`JaScSo?d|Gn^;}ImvHFgU->aqqjvN0GyK|sY8C3&wMOH*L8@ne z`*hm`)ANV-wnc7hr_IajI{f;nb}Jg>ede;Bso#zVs`cBuT4U6m8Rwuxf?EBIY)%-= z8G>(hUYb#VW-4E8OCV#JM8>>G#LJBFQkU|P6q>w@iDWs4>3Mr(JLJBFQ ckU|P6q>w@iDWs4>3hROY0l9ixNB~d(0NcGz(EtDd literal 2103 zcmV-72*~#ziwFQ#ZY@Xv1MM1rbK1($|8k#VgPGWFiY#FpXK--Cvq|l~82e$;G}Gz$ z3F!dULZ_T0W2WtQ@7_rQA#8|Wz;E(=n~4#3d%JtPw?A%?{0^3_~~eD%C@yQr!?w`_&CNScfoqh=S1M02?C~g_J*zw`~3g1wCi~ z?Dvocp%<)x2SPPx_pJR75BGESukKgT{`&W`UJftZ{zu@MLmE(iM>z&k)YW+CF>JrG#UxMjl4AJc)`%MimvVH z+P?l=0#zQ9sFD|{k`+nVf06(D_^^sIw#@$zDtmeVH*iS#|1-cQY?jNAw>p%|n`9FL z7IBM0IG`{z1Kd8`p{_)LfYE?@;DlR&nB|oG6Usf%v|TOqZ~GdeX~~Lz!Ryy4p$Fz? zxyS&tgvW${M4ll(GeyJ>YzAYTM8YPw*~kM)2q$hG*M;85MhWC&>BHyKo2&CvINr7C z-L4nmSmpS&fv7|CmO>EWy2Y4;-a8@aC}{~Yj> z8PFD{o?12rkiSzNILxboq3Pt51{QbxP!4p2)0x58v%qESHu50~Ly?!bjP2BQkbUaex(4&K5ErY@-H`de~gI$ntXDX)ReHTbNZXbt>u{_XWm zblHHMAeBDj;~J0?HuRZCy|6}3hW07-sb>c`K7Bf)u3sZpe0DpUkG^|_UutuKj)?ut z4$Iili0(gN2of}}%pjn4jeIa27lT0U$MWxGu*m<#!wSm(<@LXAscu1+x@-g^Cmcu)@vx|ef%RnimPyzeV3^QQ zz*^0Khd}Zd?59uKgbSJ65}veb6V8Wb-|893DodtK~nXyx$v*mfinXamE(=zhP7`+2`wjmH(dy=Iei1 zRzGL`9|if+U4|18Z<6bPV|J0HkBJydji+7%$W^;pFACOLQB?jC-|5B0KVW2vd_t`O zgW@sRP9NS+BSqOys{PA$2k<(rW!fR|U!;T)Dhh=@isUyhB`8auQy+>MuP>&vM?$|I zDZ~~q%V=5S`)b4)RE-j?qucY5O;sfhu#Zsjo-Gl52Wk!Oh# zR(=xIO%9o)7Wm6o>s4G`+OmUi?N?n*k&Z7MZ5mLgXzd+feFkPAKIJ=f| z&UjJI#XBq%aF62u|0c&fPQqwkTh!*;7}%*5QdCxw<-m+E**ad2?ZkH5I?ibv%4aZF z3&O%wB+tg|+1?`SpgQ%Kg)8y)vecn2e@^`<{@%iKCB`zRCp`i=?+No4prB~Lxy6>mG zz~Y=OGLs~8Z>vvlZQp#g*p&B6NG^6Zqk+7&i!NjQbLfbP3#}FRTN&bwxD&<=nLzYM zWm7dF6E`~^+fuk>SK&%GHZPAQubzD&a8M)}Q^F7Vv*{lO7QX+%>1uc^{{5$7?B(D8 zJ2CF`Z_Z78)Ht<%d3cmoG}2m7$IL((KFrb{U<&Ko;P z>!vuxNS}&ud_2bo^@RsX3O_Qrc&`M}o9()5dqFvF24y>(n9F~STdXCC_iHf?vhlLr z0UOfY_|WZk9d9>F2P15}YPQWh|L!Inr%_gx0Ix~%?n=G%D!V%|kUTuNHxaJq_d7D3 z*jDM=gADo%BLC0QR`4zf_u@COV|W*YT$I0vG%`bLa6Ij?3OYA2jho1iJFORuf82b! zy6LpP)QyTx3ZEP2otw^CyLnyT!>@uXnlt3%x(-L;6W-NDb2nWT559SWCdNmbWqPcr z`jR0IOfN1 hP@q780tE^bC{Un4fdT~z6exHm_&k{Wty;8k*m9=4AjM93eC9)?n@%OgLuWH?Oe; zHu%B^26p$muVgMmpdoE0-QR50Hel&Fr0168luSolePp=06cG*Gu?#gTDOT*=Yc`UM zlc_`keUfA<8ONU#>hhnr?HxstsT31W(Mi-#CFvCX4kTW678japJAwtkyPn}X(7FuA zN}8f8wqps7VcBmnvo~qvdHtX1MxW!a4$Bon8Z6vMnDX*!-tz60dz zF7bq{Fb<~`6|E#k-)6eRl|P{fUCSk688+-$V@&%}*u z!-&1IRbz4wbc47-HUmW@7=#@PAz(!sD=I_}TPup99@H<&mSH#>7(~L-1r2VVBqO35 zPGs&vYZXxqQBY;Wc6{O%)C>pi><~?L`z-=>VT75ipp9p|>sEB6$gv=z5sFSlN%V)h zFn)he9ms80m~GVgcBA^ZUFk+Zkr`Y?j+gYf8Hu8i&>l>LmU98lgj(pp>WOM8esMG>S;D~68zC`u9>v_(rX9lwK20|(j;IKcoL zU){MHa12Bxi-HKo;sgh=sTn%xKod|2KvDNp{GPl6*<6PQG)dkOH34}i`iDXikgO=^ zMYB;BeJE3XA|P9~i7cWr@dFK!H8c|$z3$u-Sxw@g33VK-h{LxcRLy&$X`NkO)U+Vc z^rOtVK{P<{@WLowJi)rlJaSCTs43VslU6#)DQoEi}oJ8k3=rnKZr!$6Yqg-xRwZkBSWAGHj)xpAd%sm1Uwn)Kyg0U zcoezQpCB>@(P%8{n6pU~fkn3%{{%n(yd!jG{FsX$TAtytC*T7gkv|$D@CqaYtk57L zjADr4>A)w124;$?g0Ux|8Tems^F8jdS>n);Cd?qPkux8UfKM?AE@HZi`shzTQ+p~~ z0iwsbt3XFx{RV7BNApn};0ZRc9m6!C1U$u&pTx~yl<{HZwkwJdN>KWB%eq_7G`jWk z?4M5bOVDtMW2mGJh)c?#6|9_iy+5av0mfnwc1E)TX%2%N1 z`(U8pVjq|&(JK1nr9psbV~0RB@5kF;egU^_w$3$bAPf>rA`X82mDu}?53&O$e4pQ9 z?Rya#g;0X~gwt^vjYCm3KFP2f<3#rYE!ap>QktcbE7{&MYqhknPZ)`^=9T1+-H81sDBiH#IJ z7Nj#)hz%Bqm|(w@OVyNagHI?BN70tj4^`l2VjFQk-u@I64DQ%|xv)e(AmZZ+W#Zc@ zfl4zFf#8E3^Y^d+`8oFCNEIJqA9mxLoskc*n{i+?C|@5Y*n#2xIJZ1J74QkTBmdi8 z2U{@T#*uT41aUU8{1nn`=RSt8pP*gbEqaLUKqKg{xFZBU?Kal|nFWIXL2gH#frqp5 z69wmtOg%x_c;sd`iz<6CF@S6S=6fXg15E*o8t*}~L{5r_ z>1=nzkFNR4ui(Fkn;P4H>^2|y_TVE$lf+GrE%A?hv7PIDWJrG-3y{+~*6Je(e#f8S zkB{K?fVJrihmj+ruaZIB-0W-^S@11|!@_uCp-o5VmJZ>LLt5O~^UcjhR1(@y05ng` z=3_U>!9WmTl>REOj-|mgEZ$yd+FLDbScE~=#LJYrm*8Kal>+3&kj$g^+ zi}fFsOfdA}{69f&_J2Rlf8V5Ctp7IQ^KVoE29qjc=f~THpt@*-W&;XGGuIX-@F?N# z_h%7#Ul!f|2Z*2?LG7aOCeVA9fg)Uhs2>b5L3|Rs3GM_`ZMZ`?2YL@0l@P9*w&G9? zaTY-#Q5mlQVvn}uwt_@}hyAH+H;vnrjF#b=(QV5AgtE;9c%B!9OF=VLh)M{O+`aSEugl5j541YB#`V4^Ib zz7x}VWgkkck&0|iuqJZof?b>eeW|4&%Y&9>SiYfrolu^dmuOh{M&=x!orPIYHIQfy z78E^aRifZ$aWGl|({&u2#|5B64-xRMX(E!~2mq>3gSxY;Ww-RULf+mn1>o<&2Vsod zelvwADAfTA647Kd6}|i5SEajR`8qXi=sd5Z4cw`M$Y&JfPjz!DW823@7j(AZik^40 zqxHYY$+mL(4i2WFWC>(p0nrZ$;JZ2n+Nh-Uq5!$u=Co_Oq$?GNlCNVwuQwkIZJ`{^ zjNab9p8obS{g-1nf*RFbExKLS$3Lk^`k#N2=*K^9LtD;Y7Bvnu+XeY@-Olz{hWmTg zDzK}@@k^G1;a?h4H>(+MZez}` z#!m|tlu+1G1l1-)^AO6B0SBVb$py3@pH4uYUK1mL;0^H?Z~`~H0VI64dk*R81u{ko z-W`7l>x5VEBKZv3B^~X+t~1Va(66gce8C7eX=#&W0KN?0$5EdV+CLtKLRT8CkMW2x zz^*9Lq2oKbB0g`!UqpXB2Yty}{A?X8^6-RMK&5Gvrsybj?V_He^B064M@BLAlqG_* z9s6R@i$Gpj^kR$`7QK7fy?sUwNJc}>aU>d9K)HD-8E8O163{8+6%u-a@-h+C`&^^O zmg?U@LO6J%g5}h1BHO7V$O&|w2rgX1ZU9y9(wNN+7EfQRQ(QmmR!yBx1FMZCU>0n{VpFOgdh`rzH3>@8D*zAD7it#}T+5rTm8`SPbPe;SYD)X12 z8paH1<7yZ5p`YmL>+oJrmhZQ|fUi8ZypV7-DBw#HWZO0vK~ccRd8h=%AHv~Q<~Lx- zz=Nt9CH(W0?QzUOZr8^rT+RDve{9uvjbxr6{q?cv?|%$AR$W`hC)C%e&If;a`EVBP z)lasrn#H5DGM`phe4oE^6&LZp({fHXY}YR16z^5{K)T`iuaE`KSFb)}Gt6s_*bMVE zgQAVx_4p(i??=#1T~${;4JbtkzCC!XvHg!UNnE()-$FdS;zzXo*WDuI@f&acdk~vw zah%4si@+D~yI1j6(D}{3x<=lLujBXE>6_57#n?eND!&8&O#lqKdnEwhyB}&@0}De2 zre*jNIX{Ev==s<97nXOd5Zm!zJoMis_?9>pkjZaP4_Sh7@-X)hL4a)wylml)@ST-o z2_lT{tp^LpH^1P0RuJ+Zr>{)}0e#Y*Va*^uR=?Tl<`N{H{uc6N@i$MGzkBUs`vL{} z7d+HI7UdDKQ%XA&Kd+p=WBGr%z3l#9|Ei1cXMg{LWc>F(Q&fVX8T|Vn3`NpE?*HGS z{SNReTf3LKd)@`F*DwOKrXp?ix^HsnkNs=IPbsU&8IRr!0SUy_>hAA2n1am)^ z&oNP=ooiMHpw$K}3+jzryWMCLELZM!cpw_)>QRx1PA<~sNbfvSL;QvHVA zkFfPlFW27p-vnyA?JRP2?kgs=+pk_TqoZx{W_khE-&=*>)Gqk{$(_PC@_6R=KNHE+ z&i`qe!tZ}mH0t`{|8LMDxcP1a+8q`&+ocDV&w)yA;ExcsQYqVKOBt4}WF{@nQ4-WJ zIcGZycG}G6vVEIfk|PHw{Zwnsxc~WR`8UI7VtJj#uKBlPt>-C86li3}o`{ zSuG}eRKdI(IZ1uwqEh2wxilN;{v7~M*b(a*}d6Bs*j}}U7n(U-)PNkQ`oLaOU zWtPhf%f0bTwi|0}?d7=&q(-G!E~lrxGRv+TUYkvq=j~y$o3g7`uViW(KN`#7Dxt%6 zrDGTJMyHh22`QVas#z_*nvRA;b6u#(jMeET`(?+SPnUL&8LuRxkzVTz z;ZCa3VxgDvOBOD>-e}S)XW06xMlnmVF&cNvjcMANs)ejfW;r=V#v66@u2Z}#X7t+K z#AS(gxs>Q67n!05AKHeQ8;W_#ZfQxcHfG>7W*26wRee!jwr7Kngzr8mKb&`~@9p;c zc18R*q4teDo{9fdk_p8BxF7$2{Ql3|v_SmN=GuHIU&c&8=$F7Fo|5sIP?j2Fu!d-{%#kxj`*6D6mvFN3hFU6A@5G%!513QqvKgAVn>0 z*Gh$PjU@}&&b-hmjTo+#!?R%7c%ja6*^JWKWGmvO>FP9F5id8T2P#<&ulbbHmxpm@)nU`Q%#0GkI=|STQVX9X*g`~=ue4$oN_NzH{IWM`fnU(V5VxF`ri{Y}@v@`AbU|J*+ zMXPd`wOV9&u;>>1ikm74Y_?ihRQiKBKNpx{YqiKZ>uRqYFUk$8u)ND3;@=aq`rao0 zqXpU*;{W08rElf&^7@~me*FIrZ_=)*|9jr9{?Ddm*QysYPA1jL=iFwwp=VcWx7W?n zv2KT1q*tw0tFPOR+po3yZDCFkl)F%>nkN)o>mlvvlYSyyEb(@RPsQsk%gI;9Ij;Jk zR4t7bEVhGmC&TPfkBQ$ zZM1Ycvw=ttbG@u5H)m?sYX$0me!3nm>v2oadO}?<3uc+`$Ga>}8Lp%rHx@Q>EeZ zL7XB5;g3#dc59Y zI$R}L=BO}ZYAi>NTD`oXIOdo@MQ<@(jQ10hd?vBT4%6wugE1&l-F~krPEbtsmTPih zlr$%)W-B>d|HlWdILp+?a7DRW5Jfed$XB{my+d}L%*=z?#S9hB)Oy&SP6t*}uIh7D z%FkvKK2zyIDrI*2eNy+@wNaBA4Euxn^vGvpiN$-e7x$j~y(j$c#QYMF1@+=CrGW{`qHQk&JCnPiFl@ru zM>31hu}AO8;37Aq(t^1e4TpiH($gzqd4>Tfs_Mw%kQO#JRgZ_}y>h@~R}B(Dno8nM zj&52*jEh4;N*@r7!noI3r^R`GQLJeJDCeSth$7DH$XPqSv3R+Ugb=L3 z5+tcH2tHY(qTWw&jKReAprZXz5t=g=X$x5J@fy`L*iI-7vzO(TVx1X61c{qH9~XDu zDl%tr62V^_GGW?EhfALnU;vsD8%i#6R>%nglt7|2{H$qkp}rJba@ z<3i5s16TcHf7$y=!ImAHFJ{AU_B5D)vz z*4z;2pkWyqL?lBa!0(q)yZi2BjbzUC2g2O=a?wk4zsfbU3M2|Lj^JX{Blo4omB-ZVV|HI7GVek0@9uzH8o>|hMwc4p`=$XHq(8JCi2)v-zG1+4_G zsALDuaJPI9Z%R~e=2Z$eVeyQ+mqeL9G;vo&K{~|^7BW8KC8z-oc}Bk%4s8 z)N7`;UEL`TBe@=ntuB>7Ck=B@stv+zDOH6uMeGZgitOFEB3pN;jZ>FN4uqROnj9Hp zCeJYXv+lp-{|4?ogzQ$5m^+bbR=-Hzjui-k-ljoy?4%V%aglu~+ZjN(O#WbwTNo_? zloq14rkC`_w?wGZ{6z{A`-R_o{_s-q@9zJ9@TSop*yB&;|6kYt&;5^|!*}HWWDuLA zbovnf1Nr}9xGeGhgpFVGfA6iNzdrj*^M3*O-gfodZUuaAyZUXn0=~Ch{pb8&me`<; zZDo~8c1=m;{s<#2bNfT*9>wwY^#$)Evq}?$&-xRybPP8H?o4iFDMMdO+r$v@m-o-pBTS()@Qxmym z#`yBdxXG>Ro!>H3g8*I=^Tk%PXfHM&->P0V@6X$jj zsp4s$pDPnFljYqyCS+yzK64@mAlK^L0x)uwt}kZlMdATZ*BGw27B8S@<5Tss@)MU1 zt6L~}WY0*%>B+)-Oo%%;n}PX0r!G3ox^ouU+)8Ykw4IzCVI9=yl}99HiAV7`^2ghL zW$%msr{h#It9=QYhy4TsHoi`@^Ypjn)}k?^8b(y#3eS(y=BkWj!TaXw#k>HfZoJ?- zyN-F?u_uPz#eUu~pa|r-uOaA*|08mxD#2u>PBRpDEg{X^;?}adEfEz7E>R{+XE;os zz+<;u?&KWDI>4K)wyy$XV?pf^6#}lx7Rp!DJX0-0`RcK2EPsa|W^*@kW@idzlT2LR zNk1`|`|}FGy+ekR78jxEuEZus!Tr#Cv(xbvGsBpSuU@-GL1pfoUTAbd+><`K7Ub={ zuxe%~(1$FYI8TVB2*L>PvF%TV!Y5oh5OW;~PjOrNwhK7~Yw>o_5>zpUKWHJ-M1m+` z4WM>}l_%F2GGA)vv_AA+Ia;qweCyy&;A$nDo*;;@l=-TSrv`Nj+zKL}bTzmi2kZd) zKC1b`J&uIV-@`?T6X26oC|+R=o966Qf;veg^M3jJ=l{R|?}8uM<4@-QU)O*1Q~!So ze?I>gW>Z7Fc6f-=59I&f^#32u|Cb|wCGXy}n6U%Ap!kSzN|3HExqRGt0|J+o#pK7; zl53d1~yKB`K!t*`ZCpLo6M zkyKO>Mi-quUtAh2s$Fdo;zT#ck=fk)a&THAH{EbJ91?`ia-6D;i9?(?8_(yiQtEHy z|7-*>CfszoXwJB1Y*zx~9@E5$kcalaW`pm|ILynkd7l!1x_!zuy6sc_eWdQ96Nim#+v+PEj@%l)4MFAqp z0qsN&p5TOP>|?n0XT(>W(%c02d7LcLUTjx;Xi@pe|37^A@ZrOU4<9~!`0(L>m45=P KvADMYcmMzjAMNn~ literal 7087 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 diff --git a/util/tube.c b/util/tube.c index 3b430d7b4..74fe936f1 100644 --- a/util/tube.c +++ b/util/tube.c @@ -647,6 +647,8 @@ int tube_setup_bg_listen(struct tube* tube, struct comm_base* base, { tube->listen_cb = cb; tube->listen_arg = arg; + if(!comm_base_internal(base)) + return 1; /* ignore when no comm base - testing */ return winsock_register_wsaevent(comm_base_internal(base), &tube->ev_listen, tube->event, &tube_handle_signal, tube); }