From ad628903c040a1e02019db08f4e45608ca36078f Mon Sep 17 00:00:00 2001 From: Peter Haag Date: Sat, 18 Mar 2017 15:16:18 +0100 Subject: [PATCH] Fix memory leak, if nfcapd can not write into directory --- bin/flowtree.c | 1 - bin/ipv6.pcap | Bin 324402 -> 0 bytes bin/nffile.c | 52 +++++++++++++++++++++++-------------------------- 3 files changed, 24 insertions(+), 29 deletions(-) delete mode 100644 bin/ipv6.pcap diff --git a/bin/flowtree.c b/bin/flowtree.c index 46e8952..f44363c 100644 --- a/bin/flowtree.c +++ b/bin/flowtree.c @@ -411,7 +411,6 @@ void DisposeNodeList(NodeList_t *NodeList) { LogError("Try to free non empty NodeList"); return; } -printf("FREE - waitrs: %u\n", NodeList->waits); free(NodeList); } // End of DisposeNodeList diff --git a/bin/ipv6.pcap b/bin/ipv6.pcap deleted file mode 100644 index 60da18f9f14af02510eac5e4ac3f9318861272a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324402 zcmdVD3Aj(?`v1T7HfG%BA@iJ>ZO%N8p`=hU51BHgQbb}UArvK1lBAL*6&etQLMTIK znMKA7wbuWBFYR;Ioqam3?{B~FbNyYHb2-oFxjwI6Ykk&pzn^DK+g88-YOIsoN%-UY zjuRvQ=j$hO-0@BESf{=G8-L^D{cQ11I{RCV9ln43o-Wej6sX~Qqwx>NiQV7I_v8~l z_WJ*q|BXR^*XeQsEeZV&UT)%h(jF6Y{hL7f&V(}kP37`q>hqCYq`&K==n;0gns1-) zNqg93rU~W54&~zep14deRr){d7x_f(7wPXhZr8Aj0{hb{W!sjPFUixCGw>m#rq0k?WKT_DlY?W9r2v z;*x)@@5v|1CD}%!IPLaH_D&q!&^+<$IStb1o5=^1XdeK2a{x-*tLa3A^l? z*V*@^U0i~1g3EprO5w}O#c|@CoWlwqbH?u(i2uOwn4EK%@5v|1Mf$r=-!$l2GA3ne z-!Cx)|CT>-;u3rlT#B1e(ho@!-Y;EdzUt&1IdxvQDPI$xH@e|$oH znRaBE?@7D31m6UgEGCozyOqoKTW`m&d`{a$T=L_1nbTIeNPpKUcq;5ta?>u~llJS! z%bd1w8LTNa+dLYHBK=)w&EPO)a+yWGC+%U%gPKBe8LlZLm*+gSUoa*|`Hcl*@~!#8 zTP!pt|LZsQBAxP$?EP}(Roy4#F;FU*P~N2{CAfTGLRs;%+AsKxC2<~u%Ssc<@H=W*j4+{e-l|-%Uy?YF!KIrCWzQ^j9)rsv6H1r;%B6LV+L7{@^mmW934~mT=i^La8uL)&1C3Qz9iL>F+xJ&Eelz zkjJDwAt}M7iV3B|CgnoN$#A*Xgi?2_aw+x1iAZ@&`nyiL-@^MPSW}XA*)KsJgG)mb zO4gs03n3@NC8wqkaxy4+G==1nS5rtX6;0B3RTIirYtx43$SF+uNvWAbBZpl*np0vyH5_}W({yI8kolsiRXBMEeHKE*1Pvda8*M#!NXDTNX zGCy2mKewQCIHf3r%nz5&CX^IEsGLk#gM~{P6UyV7Ldg7Z8EZnR6t8kJA@jqfnhE8* zCsl?apFv&WQ(eF={qzJ2$^#~p zcExVUV@bR=4wnullwtIo43|euD8H>z`(hSS$^M*5$$JTZlk;wWOt|5_6)cTn8cb#FchsUwlV#|F`+Jp6E=?|COCX~nN zvn04oFrlpY;D($W<$4$y!(Hd)OyT_!y6z(QCb+CLp}a_+@xf(|3FT4xj1MlOOek|N zs^1u4UI~}iOem{!s<~K(&8s5KE2Y0&(~AqW|8*@~Y~jqlC+)#FCfClvWt|Bn>tf~d zLArjC&RIx**I9fv>{4i*Tr(%_;u4&*fJ-hD%H1C;7s4DFF87#F9x<7{jx?b>uv_hy zbo<|r^c$1@u5(NJ@NcYs|0%vF?cv|pa5`m!?EO@QZw+*Ib;pY`RzOfd=ffcCxC z=#}-qWUe2oFLQL~fxRc*WHDpl#{(Xj5Oxb79&|y7$+=TzzcVO?HLy~nLGys#24D$U|oz$)FXxy$q z<+A0Sl=AgCog7Xkr#LoHmjD0$r^o-OW{rdyFg8$C6UyOp>{%mRj+;;>T~KFM2{SFY zOf{i=o02`#g3I?Nl-JUz6x{HZ#*tPfrN8UUdKn{6!f3WIZPV&|q&;C(5-x9>P`;th z=isv0gyO%a_6uRw2$$saStBTSTv0BBnHDI$Oeiz6s6-4{eNWnDOb+fghD%u!N-_Ez2reZ} zDCg3tnHJ&9DqJp^P{x?d=f=}1-^mv1d6b>`LFsEkd6S-C;j-9-QtOkO!YdPmE8XBy z&xEojwaPGroD7!@CX^{pD;L7q6}U_{p`8C%xe#(PTrQhXdh7dv2ss%p{Y)qo=?NAt zl}#u&J*V;*At%En&V;f+udfrbC0rJnP+mEp_6y4Zp8DXD%Y?Epm#US7YzdclO(?y)C>Lb@C{GxY z{;u=s)$p+&x>G0kCb;x7p}am_xe&4?To##78qrf9T$-6s>d^BTTpDN!A&-I5R8t7q zGT1MgLUOr}p8DX@jZWDll(|>gc?^{KCX}HMsXX@S*C`|2)hhj6$EzP6lVkJC+d8CO z@>p8TGc4NWNh)~WqMShs}BAQQ^nIw=wI7+mhr z6ha;YrK_fpT)Jrr!DX|!WTB@EP;#13?xU|nIg>1skr z-$#uwgq#eQOeU0aCP!r@I%SJ&v7rsrn$n^L56Ig1KY!Dv^mm=_i-y->f~W6GdvHC! zd=n@SnNSvf!XC%q^0o%G~>K3v|UQ??3a4*i!5%9kdTT+7w5AFL@Q z?b}@8lFx*)?REB3Md7m3gwm8g!oa1K2_>bk#$-YsgG(9{O64!q+IZWax5$}>=OrC0x$ZDL)9M2L1iFpwu>@+)f`Y z;nLoOGV7Rn-o^M=AB%JiiS&1!hH1jTu~FZz_C0A2@|Zjs9WHZBDBG{9`jU0|ghjZ7BzRFYU5lf?5femrN)b-cc@ux(}BuCX}@^ z*>xW-8%!u4Z&xn0&wUx`*q8pUbMw&fZ*18ldCI%AhmZZwOek;eVP_cZm&J6-k3xAq zx0;I)*7`ts$%ImcUXkHa!-VpZzO$ZC_u=x2rVuJJDDyRigLdHZUS z-X13XUFTZ4@HiHmZ#tz^&l;d0r8QgeW+`-BVwm-;4@ci&Pj zgbV|h4@@X~>FEM4hfF9{eqv`BxYRJA?Ayf7FmO3Vr)(F>>W^Z=Yf4LRJ}hfWV~6ig z%Y;OBReq;INjZN~2`i)6{*J-TQE((+``{P^Ej=GO;g3DPGN>!bd z2zd-Hw`vL@kAYH0Q%Ej#HHGBTEJo!qLbk*fyUm0$iJto4GS!6AslUo&glq|yE+&*) z)+m>T%}PXC>y!Sjv!-siRxUf%-uI+k#<5_n4=!a)C_n1=tr6Cg;PR6R<>BKhTN2Lk z!DXZgW!qkMwuH+LI%Nm;K0Wn;vd@IlH@&)sgz)w-xIAD&X;X%sli||NgwleZ`ry*q zgwi;>%E^RtuW)H@LaCNc-M>#reQ>F1Litcr2ss%ppO{eIPQ%X0aCy&!Qj(rv;ZoLw z(shu^mV}%Pm!2k+dc%~<%Pr^0O3=)yKP58X$C{FSqUQV3-*xh+oE*2Z&qEWXJy=tc z{%~nzLMbp$xezixT#A@bN*rP5WVnV52U7NDe~Q+5euV7l0Fwj^8+1IiE+%J<3H^B1`MU_z-{ls$ie%dIAqZK+k} zC(K{qvde@rnm)6D%abOQ!pYh57r2zr6hh_)rL?9H<}aX>(G-%)f-LHs1!4XIm$ytP z<;$r&Mwq|ArLqYnAAM#4mqI3#%R|+EA)K>-%kL(XdQ+84%?Xzy&5@+D?@&iqF< zPVqfyPnaXarLhTRioRQraQ+1@&zVs6>{a`PFc*W%0TW6d`pg0@1?iNZgmN@9JM)9` ziwWhGvh17;mjx!2Q}hH2m$N36v3c1U1}?4%<&hK01^2y1d1jaNcb#tP`7oh(KLy_e zmr*8^R%O+gOvqz!x!r^^`z7Tmww^_A@jqf6P>bKDD&wnilDq{ zLiuzQJHx=`a}!EjD)w3*T(X)_8n#n)pRf)Cmu4oE%=B~tm+U5#Gb2@fA!Hc1oHwC7 zF-5r$G7MbCnNXglpW%heR1?aDPt|@YyQ*NMH6`iqI?s0s*ZuiZ;vX6=?Fnm2aJg(k z8MaKh94mDp(m8SI?>a{x3At+*MWD!^cY<6Uso71UrOI*&};D|997~ z8~yXzQNn$EpcFBotdCdgmX%x2kM!&g>F+uxc7=aqu}}5%J!zNUSn%u)xNI_^%y^2O z`Qb9lgfjnLc20)NLKDi8g&sJc(c$#B_fLK!qexe#(PT!xxZa?w*C zTnd^{GSX8YT(X)_-qdgVC1gvuykkOnke)5!GQx!NBR%!OjZ+n;`A7#e(x<*e}O4CBEUEktovNbqeeWQ(`j}@;zw}Q%-3L z$>kSKA-N3br{*t&a~9YyLrf@dpH?n}xfopDGodWhS3-{4P(RZ8nDlp@Z!3g<$(ie( z_dRKsUvls)HMqQ^DXGVojYN_Da<+PQm~!xP6W^2eFy(zsA-Q~@DI}M>hO2ocVUCRb za*qk6z;xw8m?OibhzX_gC(4Cz{sk`8O(=`?Oq_831uh?$P#V)`uW)H@LK(S^ea-?d zV@xPT^^A{jmIp2+>6Cp!$wHs;fs)gN@>ON_ISaU~Goh5yGYi7}1ukVZg)n~sC0y5=g&@KJI$YkH{%6PY99`D5~lnj=ep*V&|=X&<~VN!lg#1>b}%cGiUQ z&@|=p)4X|gyN)m2I?IhN^}CMuJ^4hrNPpK!@oYH32Jd~7_L!LK-vpOOO(>HqvggQf znWia(c_k<>Y6@YF49YA`A-Vi;iaoD{%TFehX@gZxCd|d)GE-9sb1_g}(iD=*Y)v7# z)SIUE3t=vXE!NnCviYKNAmj-moexckt zgPoH>sb@m@u8(>SiFdSkkfKW8m|5?2@{XpETrQntXMSw4YbKPNyQn-y$jNXipecl$3`!AAA-NRQ6p~BI zvueK(ax%79S`$hydV+<^024}clLXtAPB|c3tQkGQf^wS)<+Ecd^Ec>TJ5o-T{;u;v zw{T7l&Q?o%LQaOuN)yUEJ=vKbF7KOA7SLCE;j+ktGDSb_gpm2+GF?*$nIDvynnH4U zK~qRBA3V#>{Mce2n^5ZPS1$8@Eg9)5HR&(+R~8PBW5KmO(k|mza4j5M8ktZI)McNu zfXfk0A!L3~PHGBa{sPJ=O(D6|q+bmMmwK8)NaLV1(iB1(2c@y5kX#m?VP}50ylq06 z-jcnZ43`;n%0Z!Yp(j{SdYDkYI?2w-aQViB@>wr-PKL`$6Uz6os_ql=7+ikT6ha;Y zWw)k~T=r-R$>o{KYQGTH#<9hwno#bTuUrUg<8Zm#gfefNav|hoxGXTCY}KpQglq|y z?V3W!mZ1EkDI}NOnnH5fye@V4eHMi0U0{p-U_v=azfuJ*M>K_ylR-JDDTK@q$|+4D zx!m%udjHGnugA(=HidSKPvrc5QMubpK2hiQrN7)|Gegby_q^wO(k}D;;G5u5j!row zlskW6XG>5znou4b&d!!_dBlYB-6iF6Ngh#Ov{0p)8~(#@Og>S+G3oC*TgQceW5NBE z(jNTAq(5A?m{9ub)JMpcaCtye2-y;pVVXj6c~DbGE+y#+7F(>W3FXo}l`RQ587|jM zD9h;y7A{|yP-f`WQ9`za%PdVHWJ^%yXbQ=GCB$s+73APcP^0Vxh*hf?zBV5x9N-7h|0~eJGAzQ*_m+B2zmnTgqeU2y>!df3(2AEJP(5o0+s+dsRUsSDpdfF3_o&_!aU8m-+;dy0j zrX9W~?J}3tXNvp%gi- z?tgja(65o63?}{M2~_I2)}sb=^F3(~ju(0U7+h{Kp*;IDdrXGQ^CpzM zx^PIO^Oe%ybvCG+JZkl;z9;Qc#e(ydaQW7R(#T}AY(b}-kS%s_pgPBQ=b%cFu1}W! zuG1oWI9;qSnbr5CUG__Gr86i;O(^v|c20&%V-w0?os$tUVulJs|-hu;q$FO?=2 z`F)YJ2X$Zi!{vDs%1&L8@f!=0$A55{Ixn+wk^Zi8Yre2c=)73)O>o&ur<@c@EWILw zlG23IojzK^rLPHP7JW>H%Ul!6`nS}WOsM;C*{CUmx(~`$O(D5#(-e|RS9%r07VB+7 ziKSODxTG?nyiKoSaCy&!@|W{sgjxxg=jgTalu!x}V9$|3DQ-gfeUuuL3G)}Y#L#Oc zCgiAvcN@kNPmYq)dMYdSlwd`66N=6gPn~$kl`9{JDT_WRHV(;UV{;o5s zWq5>%EuX^oq&?xA;Ii0+GDeU5g!%%PahgJ?FQ7cFDI}MPnnH5gf* zg^!oe%p&+ExO6w6G^VEuxU@2%l)c2BSHh*DrV#22C{;9tP%A;HrYR(sVe~2nmxoO# z@6)RoT$Y+px|vk5-gL?t*lFdC|5M4{h}?ADAM0`K5rPNoUT0H_oO{c`9o7kE}o{4T%Mti{Mav3 zO(@GZsNWdj{61X1G@)$Es>WnOeSym^6Us%C5#|b=a$dIB6n#_@j(t#`(-gw756TOg zLUMUgQ%EkQ=pziaSOpVGi`?vEA1ae#-u$V^O%950_acl;xMz zbKx@Wts|q)KYzEN^mm<@`0#IRZRupbC+)#FCf@{?FX@zvLb?BKb?%k$E>2Jenov4r zjR{|KmEXbBb!SffDUteuYkK7qRbQmP>%945c)!Hvi}O8c4~~8550@?`6u*v|zYxYT zxTK(uW1#eWQ@IdEeo*e$6hajPWuT^zTn1?h$>o=hYD^~77i_V!CX}TUl?$Q1z-5^U z;IF^62tVqpitHv?u?>dKShR3nYv-bF&w97aad=p%rG@;yW zQpN72Q!dFCt2UoqD?zDcLUA*(Yb9JJnouefQP1ec3Vf93kVt=d{+PN3K6FiQ@J(>3 zYC?H|UiabhvI*t#7*+RUTTO{H7nA<3b8KgL94onLm+wh?!dwh4e`rdD&%cdCk^Zie zQ?A``9B(xK*KrE1lTlUL!<3jOEL>tWh2)Z4rwc-c!G5_(QwSLblnk0ea*5Lvl1s}T zs_ql=7`9kj6Uu^V%7u`};Ihbs(s;dcA>=W*G&7+LGf7I1(kZ{;mrPGepxkLfDMC+5 za4BIzd3b}m2L7jK|9o0#BJ&rl^H-X=LCs&Jzw2Bbib|YNk=qxW;d|096*+kBC|pLG zP`)d~&X#cb-h`5>lgcoJH6^&D)fB>+cTh5F3dto-Q%Ek)=>$v2$=G7EO(^N<2^KDy zOenc^>LX-Jxa89mLbe2@kfxAa3Tq0Xf=sKVuQ6H52u>K&$Cfsrn8q)3ryBA<4TAd7!J~ zq;q26SK@z0E=f;R@GEOViAkpF5FzWpC8eeivJNO|G==1nR#QkW&+9iF6H*Aa*o!8V zjVsk}jF1oDvPDw}`2dt3HHGA|T~kOdlXIzja52sHNcS&Ef7gk>6$5s{7~ibz_${wU zdvGPI+`oh^Hr<4>>L=wwSVx1)S~}&LP_ArXuh)R$nNU_%|6k+-_^th)k!KEx4c`|? zxW^HGb4(}==qUs)O-v}i#H%_)sN8V5U_$Ap?`|h#9k}!|q3o@!_DizNry`xpmHw`C z;!3y<#THxcd(xh8E*CC`H05lIXcX!1I-QDyDOdCD^F3(~Q;us2$>pS`kX#ni(;@cD z2PTvgI#CgF8(hw43L&?Fa$ZwNE*CU~B4za~5&?&zQC2s+Bzh=8!`+_^eO5b>% zE%y35zDkGILSlUB?>hBLgh!Z?n~wXQv5da2T&6f&W_n@eRF!Z|~@d~8Bl(pR|< z@)%q`GNGLQMY*J(*Dca-O!~Xd#&^TNvEZ3T(jNYeoj0LmtElQeA&+6d^tgU*F zT(%>vB0Ud4`n%3A_lC#hpzce%jLE_C0I*-$&?$ciWmR5wh5==*38fJ|UBIQ838iL( z|HV2Q{ObJA$m{5d3Vz?2P~N-7&TVk{$b{0wQP-{A++fJ{yJQoY=OlK&t@L-DZ7IUz zUAOoaz9;Q6-UavD!li`?Wl05g28GLqnnK7rpnR+;gscO~GEE_59ZN& z_RA_wA?=sdnnKzyF+J6JHo`eW?3a`#l)Wa2>W~SgqJ9DfuJwxYj8N(CI^&Xu$K-!s z<9+>`uwSatDV|X7&CkxDpma5%bfc$3xb!xmRG^=6giBQu$~&jnc?>S^n^5}t>YfNf z9)rsu6UvHM^$yTOy<10mw~_RBooP$L<5+C5)V?R}k}dPE9aAq3E~`u^g<7g?NvOzh zDW)lebOA~!O(D6I))bPRspBOyuMEBkF5^rndD5}7C0q)cP$tEw41@g=oOlm!tFqi!FB2gtEJ{%9ez6OStSep)`G3 zxqLWvd8C{y{axqTyTix+i1pQdPudf5GF)1kQ2ghW3nBBvB^f>QgYxP#?CStPdEJC^ z_&4>=Db$xFUQdS02@^_Oef4a;GzB_KhWY2u36%b>v!!kLcsY2viSJ3f952B)!6hr5 z;*6EE)z#Va7f`-8q0FMsEZ{Q7gi;}|%KU`+3tXz0P|9agnV&F!flFl*N%)@6stT zLg`6QmrqS7`3|Z5Lb%@#E`?1fFV<2y znQ%P}T;`fk^3u~dTnd^{?)gxivmjhU0++5PlxLn&Yp{fD374rRlzp!$7s7fnTz)p8 z{6J5AaM@`>`KVI*@H26~I(szI8m#npoj&T`_~0GW(w?ve3zuakl;5hWY)Qz;aQWSY z(##~mwxUyFWs8k?h`lxr%Ht-K3mH^~A*{i|<%$U<*Ffch<0Xl&A%RO?6Uw1cDZ=9z zAzQ-bxCy0DU3RvFOED8l3%#O9SWkvaYZJ&c+>H=!KZrd%d}J}T04f2F_c{Q61wc!@14_wP%)9Q*rQ$#Z|KQeEN&jq}XwUX~wvOw}RM+*@??1)&hsBF~S5%K{Th*)%HiPda^)Sp(k?E+H^C*|g!1tKe{U3)h!W<`1svg-aI`NKe)%=BUZ#5{ZOejlED;L6C3@)FTP}Ef zl%=O}xKuQuG{~7cyq>(bc`d0gYdeidWWFD~2e8u!wFWEwU8m#3aD55ht|9F~eUWd1 zOA`~yEmKuaCS-oNlr^E;Hdnc9%+Wd0y`s|JbzVOe-Y@G{eB*o49<0O2GgaVnhY98J zOzg}LmnTgq-Lokd!uc1t^f944*_WO9;WEL5a_cnqbxLrlYeFexlE#bCDJf)&y(;G# z+siP7zwz-t;rt6IubWV2(lb9?UNWI{`^%d`lKz|pTzZ*M?oX|6xz1SHBE-89jP?`=>l}taV$8;*H1kUHgt|J_$Ig{ zKWjl5N>55~dB}v4hn~maQqY7_y0xnN*VmJi^gJ?LDwt4Spyx5T%r>EPr6(o0^fIA* zNl!{}`O1Xy_)vBpgUdJ*$`E=|g3E9d$_KZw&+o(K6FMc8P>$1+5-9vU21=(k>^ufa z7Zb`4zq6APTz)d4{FqT))j4|6`bg(1rN6vKc}#e|pM1%v+y$jQ;e2J_VnX?}k-A^3 zX3pV}o&_!aUFVrc!Y+#n^zuDv7nk5!&~W*}gfgQxd)*Q)FPTu{^!;LlbFXm8W^Gq-9jJ10j_t)Gt-(rv*ZE*ncuZb) z={?_*_JlQ9xGXcFyfj3)5Y}Mf@`?$iwMl|)N2jEgE%x9o`dMm8zitW22ouVv*6f@N zm$4?4TFF(mB&=J)rM?Me7(KzlOLlrK)O(^{;u(Ksx z2ANP&>pO-BsShscOemXbvDcH~veksL`eAj2>WAm_JR-nVo2 z$e0|wX&EkGn^2Ctt6T_c<8V1)La9kleQ>F3LV25>`rz`O3FQbq^}*#NosvcVwPUCX~j-RknO1m_bc1_29pc{e*Wo z$L??Cd-91o_NBk;jB1Hv|6l#er|>;#PxvOdG&iA)qbFFnJZ(a8pHTaSkdxsu(S|Zu z= z)qO&Sfy)pR%9(-6g^*$3a?XU3lb$Z%lE;K{u$ZcqgbV|hBPNt@>L?e&xmUPsFrmEv zxN;$67`S|FLiv0EJHxz6mZn zOejT8DVLT%kBf9JN&36avZ7&^$z>M#p0o$^7kS<|TuPcyGOuB07`Wu1Q_=~gP8oI0 z72zBoC=E?0PgGQOpO9hTGTwyp)&>`gRS3nyzj{; zY7JKU%RN?S!x`qn6LFvZChajX*S`t-Wj39XUMP3dD>5keno#1lt6Dj~_TotUMf$tW zu{`1ZQu=tBCGSgn!hV5EHWNxydPRmyD-+6n^eP6I9wwAZPpLUFVeJAg)lDdI^eP6I ztR|FM2UM*rT;PsK^GfOOI&aPiAN#@klB7LhUI~}ECX`+DiVT;1CX_eItMe}t#vF^Z zb|L*;r=nWB$Xxfl?@4>Y+67$RGNEi7q~`l6zfBYAK0fL1I(-|4e`CRW6Qn(Gk*Bi3 zWvdD0Lz8sz37wKbw%Ene?6nI}u9#4g?`3BgxTH0q^rWW?xb!ojbfQ;exO6q4)S*`~ zxHK}MF8NI;)o)U@lCaJXms%#22K0&ymnJ5Z!}N*_m*Xasm6h0Q7jRia zr(_h$$2-}z5|rg8l&%xl^Gdk%G@&ecQ;o@cZg-vho7>N6d*k|8Z2rx@C!eVGG3oC* z4JwCoa`w2nz9;RHlY?)9%ZDbE*7Pa{mpe=-+b*d6La3E+*6AF36uZc-m7tU~p|qxt{BUV!LMgIDjmdL= z9UbXDKIt#-8u%hyE4w92?R(NLwKBMm4=%TuP=?V*ez-hhLV1`z^224E38haHRbL2e z<8T>ZLaEzLxe#h4TpF2Bx-MncO1Shgq1@e#T`S>oFP)M}D6f2{?nz8rrlX9cm1b^8 zWd0JoXJqCEHGh%*uG8}N@R(e(YE|Ep_FznwZvy3Y6H5Eys_y@vu7%r_G3=7Okbbr; zTskHJrDKCIrNrrt>Iu4_bWH-ve|PDY1eAZ^az^bJ!nF$6V!cc#l_#(>3|wlMPzEei zE`+rUxC}O-Ty3gqC86%a#W$hs?y6h}bssMKO(>7hD>7V0no#cR$*%iw=|QJt7Rs03 zvg6$C)?>g7qa2j8^@Y0C&(jHu=BzK;{ zC6x)K2z^xnE+tGTBkAb^E@Mn6aUZkSF5r^YgmUek@VhwWcOT>AdhxBo?GonuPRy9r zJ)I9L83tRd zkqIR^Jzc;hwFzZz26l#l%K{V1*W=h@GF&#$DOrWmZVP)%2Bm`uWqoBe7bDD(;j%Fa zD1SeWf%0P#Q2u^Q24#B^Q2x8i;AhmBoafHYkty9Zs4sBoX+pVajdFP-Hf^MPtfar|oEsM2FR}Sn$+HJz)5?Aco&yh;3?`Jq z$CV3Vz7Ln;CX`$0RSYh5OejlDs@O6UO5I!;!_VoxJLf%-)?uW->lAoP9WSYl`<}EX ztixcxG@?_o31#s2?79!igC>-oNl?Z9zE;AeZxT@czE*-VAPFe{-DO}BQ2x8iY<-5e z!M&p*)qUwN?-}_qe7xMhaDeYgdqUmE7JJ2nGG(HwFN6#Om*-37EDQ*y`_>-UqISAINsR-|jK zrN8T}I~5+sMy-~$K4}j!zg%k#%3u>p?o;eB87>7(C_lUE*eA@z;BwrAvQv*Rgt-`8 z_L@+hqmM9fdC7!wdXE~D3H1do=S?Ut)ML+I;4+6!$tjd)cCp7~P@XfPe0iKbCd1_` z6Ux`s)iWYi&D`VUUpuB=T*7rqp=*2cuk}6oL|xk>{axpwJ>gmzoPUvasg=Pu!DWL9 z<;5AQz7WP_xV&saDcVAfW4WhwkF?G&{avSVuke1!Ge1qXMbe(I&JUMcOejy&M@zU& zHlb8B87-^PDY;~emEFl6lR>F$Ldmj6xlD||D^li{{;qSnZ1{Nj{JsmmC+!KDA1*me zC~dQI|Z6UvXDvTG$=elnq~YR;~ea9L|Yd7WOx;PR#kWm8@D`~@ys z>6F|;sl1zAUqGp0LfL#$xe(UJ;IhqxGAN6xFN9hNm!T$<&2^Ovp;iX_#f0LvR4#;C z373f`l=cUe%UA2R%aw)y{Qbz%-*uK22xpifLpS)Iv`dBwz6mZJO(?mCtGbW(R|Z!} zCX&bSu4j4onaX3*-*rB{8g_9UAAh{SMf$@fzX|0?Gj`pF%Sk%rW})1r&n6J&FQD9G zLOFYaU0>jG*@W^?c6IC%>I+;RHK7ckkNj{MY(mL7QSBE(eSu3}6UtEf$Pbr?O(>r} z$gVGN`P_suT95qeJ~$9*4OaTQ&cH?CS{ZwDci)qCsg=PyQsMHX31wRkcCCcV4in1m z+Uof*j*~p%{m98(r%QM2m+SW&U(^K?pHp&Xi`=9S*j;=$@k>Hn~HF}+l2wRR!>U1$4g z6#9gFcw-Ci^F3+*a~-BMC`U~w3$n0lC0yP%q0FPt_~5d@gmT9mcCCcVT_%*-=~9R9 z6(y`&!sQhcN}CaCUYT$7N0IL1lm4!=e0=!WAHJ=!?@7BH`@u8q;nL28vO+)IlrXP^ z%PJE}26`2POJ)sswLmkoKU8$qGCuM>U1y za!gZ5E?3g4^T>qxKDO8&CX{mZmCJ|Ib4R)!M*6$X_?N@uSa5HGw9DQPu7`n3Je`tH zD5>a436yjul&>?h^B7zc(S-8iPCN7JK&~)Y+hK4bYvXxG`ks8E z*2bm3>)aBY6aUxRc;42&C+#w?48932@0w6b7gn`$_19x%g|5(!@rk(LU1{=(a*_V7 zQ*lN(^Jm`kp6^L}u+}I2;Znhbvfrd4|4gS8kS%t2HoNYFa>9gCBu>@+57Q2fwhoha zsOyY;Cj1+VEmFnzF$31!qB%4K@_g^}jS(%*H))(X2U8o$T)q+MKsIWkoS#L((Qjg(n_!NmoYhgc)!%|KgIW?UG__G)izvmn^5A$ zvFkouvYAj8J+E8{^Gdj^FrlobS7f++Z9;h^8@ukq<#jrxpiqk4>4eX{64v=aDP=-A z_zJu3!{w+6Wmb%;FNC@empLYsUH2##LfwbUUK7f(vC4%|_u=x338myD-(SyRft+4tlVwWcKfU8j1v@La6p61jd%+A&AQ zH^Jo@6Us;QbOD!THk4kfRuVD{Ts}9Utbazi5b8c$zBi#X*6D(f$KcY!gtDHVF5t4s zgi^nf$}lgT-49nNafU zr_a^iHb2sNG3oC*-k5NG=~{N#Q#VPw)R*A;B-lFNj0;#+l&FaEKdk)9DD{axp1kMQvlo4=FqNxK{`!80P@a>j)6#~$TE zSnGpJ%w7x1v71yLtF~lgr2ECBzw7Mk5Z*6`3#EFvj7rHD|LO<}L~f%1h3Wl>sHD^F&4BT^od z{;tz-MR*)bnXiZMNqa&bgUezQN*8^{5FsbSrH7^v5-ccvG==2SS5rtXXEvzc7$J{g zi=8*2jH4$dxJ)#m)Yzet(y>w(B4tbIFWK^u@Ufri<#Ww{llFvc376U?l&tjB2bY{C zlyUUb7yQOdD1EB1vn5>mn@}F5r#`qmZbIouPknIdY(n{J?O&cj6c_P%eQ~bSHx0(I z>(A>eF$DjXKXEdS1<&h)%Q_QEnp@a887>*=l%hg;VkbK%gEHQP@}xdnO~}b`nP5Ws zqmIgBglq|y7<#q@C8eg2TvBNYAt%G-wjb1fA>?FGZa1M6q$gOo6g8pj+|JI)aM`OV zPfvRyQW}^3u2b_@l&yc=VV7x#?@4m{8`@Qy*MjGok#huOe7_ z;mJtr$41e4hF7YOmLociSLdg7ZIc7q6 zR9~S=xL*t|qfID7=xH1-51UYy|EzK{A@jrK3lqwgi^_$N`Qft5gi5c?CPLg2=f=X>@}gZ(X%AN`~@y|m{6LwVb5RS(vnUoA(WK#G!9BS z6UwhIvDf+Ga?ym6si4YZgq#eQoF(U*J-~gmU?AOE2|A^uP6G|z1Qi4kb z6Uy1{>iXo5ZeJRyR!V=@IdMeQO1%F?+7oIeT&|i>TI#1a?Ay{H(lx!(-*uk57Is;` z;v3(Sc5w-=>4i%h6G}~b>Vr#N6Utb6Qi6+XLg`IU7jWrsLizD_Rrd)Q1}?iyD8F@8 zE`$sNmun`JCmv&G7`Tk5Q%VVC!YeW1HKnCDAC~9zjvc-~k!uw9xAHytL|vmO{axq9 zo5N#r@Sb;RmoYi`CQv4uP#(y~&SP*HW9LRq_=y*>t)^(K@F^rQrr zNhXxnW7L`wA&C6_JtTLg@KFvNa2A5Y&DAl{Dx<8|7jY#(+OMlm?+b2A)?0lt~ z?@7DND}(!y;Znzh^2P0{z7T39TvpR5WrXr2edGsajR~a;{mcklDwt4~=1}#e+?|7D zo&WjCRT5c;!829l6SWQ_{aq*7JK^JH{r;1_C+)#Hzx0R8G84*U1KH;+;4;R9@=j_s zN1iylb)<6^(%*Hyj1TXZD%s}vp0p>Nvw+KcCX{X2l?!3M50@P#ls-qj)6eGXMCi#qcnWf6b_p>F+xImV}d1Y`#^#C+%U%PE8@X?9vpH%hU99f&DVogfh$|T|8_;@sg=EB|=Wd zeo2;`O(`#w3-qJ}%4HME6ZF*{xQsWUOz6YTV{n;dLdjfKtz8h-Vc?S8gp!tCk>Qfj zgpxIrs{1duoEPbwh4gowJaxkrIc{a2hbBt9ROJ1w+qRx(}C&nnI}i zpj^=ulFL<1A-O!cUhNmcxg>0{r%Wi$2IZ1J(}qar#iYOM%;*?CUP^8{?t9WM$4hV@ zA6$}~Pzum93|xwuP-@jt?|dZOV+EIbbV>!G%%-OcP+l>i6r-mLxRf-ZEP6D#bGID2 z_!}SZ#5l>EVmW($SMks5lnP~vNqB4A)FLx7G&)keLg+dr2mKEW&U(@*RCi{Iwel4) z7zG?Bb<+-Q8r|N$d?mERz-F-#=k^lpOa`0wCX}m{mCF|+21go~rN8U^+!*^KVIK}@ zKgRc@Jz-pii)TVfnffN@e)%uKU-_Lm&NZjtxQ@9e{`otrl*v!{Z;UNC&iCXK^*fXP zS&wHu?o`SUtj8q$&XQHETrsvnm1GsmSBtG)AywajWxDq0F(i4{ArEwQoOIWJdFlUW z1h`(@g|f^Iw2BrC|t5@3L%Grl1o!aF1a;@mN>A-Q;m)P8ArOXEoMY3VQP=r7Bd|F1f_}MSgv&e= zN{#aDJPnuHCX~_X{}*{0eoy_+$g|>9p1!^w^3U(7k^ZjJZ6ij7gt>-#$De!?{N|WY zZaJ-7YG$n(>8!Ezcb(=J!Y*;sZhd~Cv`bA5uCIejSxq5a#Rp17O(D5d(G-%)hB%c% z2YMM~qct&N*>755g%9he!p4ISsc)xT@mfH8EJt14d}&~_ zt0t88gW1^B{gY%lMT=4ksb+piV&ET8ha@mA(C9k?B zCDYzIvi4MH$M{5CiWc%c`9!%$f7gjo&(~X9I+^cDd$9H-{o(Qlol;pS$EvgEIiQ>} zq3n3%`ZeDF_v^eb^}}`Ez1pqIAV0LfT<2XSxXv3kdyP1gvasiEu$gK?8L&aUJD2bt zV7Lr6p*%5=JqLx$coRxz`s@%c-AyRFGpjiaVLk?z{U($N-3aIQT%&-Ja`9%w9A@u@J(>}#Dwy7EW7T*Ws?adJG~;qCASG>!31{Qhsz=p%1!i& z443pKlqMO{hjTKaR>GwPol;FGai!JyB*M8dP_mj(S`1SzSWiykbCz&vZ9@5uKJvq5 ziwUJ0edLErFB8g|r`TgMT-KXVUTCc{fAu<7afeHX!HHxTybn-5Q5i=1yUu7ooMD1z zQA@jInBbe>@`?#%VGj0~43~H4lXtwgz^r3w1mt1 zCX|!~*<&(X(wIB-(%yu!=4Ez$fy+7*$`?J^>tk^F%7pTLFLr%_%a10MZ|EaG zT)s7-%$vm?li{+!gi`XnI%hF$*Pcjg7t-H#_I((xFTr}UwEwxDTpBLrOenjusB;!+ z^0$-O;M94U|HHgeK2h^Z>F+xI?+UxrPSwu$q&=8dN`JWQrBiMdN_YBb2}&OmN+VN$1%8MFrhqnl0A;WWrPW3xXB1Jf=;O^TP(hZI``W6lbupu z#tz?~$e4`tmGX%ilcm4wR90j1&iu{pD=zIpeUbj4R5hVo>A}vHaPdqiFI5bmdzG3O zJYzOn=ozyyvB`6w7VekNo=YxwQ3X$wMN9A}^o-eRqjiCzwo5#G64MLzQoGGeTlG{ zV8mH>P`#tMV44pjjb+l`b?(X=9?MErt?GNyo-mfdW}~KLyZCD)iu8A#Y(2x2;B2C_ zhbdb$h2*kTQ%Ek)o=o}w_&Yn?4ZpK;rLxw$@pmRSEX#Y2uxFk#;-s6Ra@qB@*ngfe zrN7+&o-_OlQ1^_>H^C-OQ!e$a7b(d~f7dy*Ele5p{c7Kn_Jkx0N>)uFxn$E6lFL{0 z#Dp#OjR~dXR(39fOIZ_2w_WU92A7^Dl*>I-E;~PTR-`pQ>F+x4)D9n&d$LzpG*jB; zs0>yQ;qto)iCYF;o`<{HFa7*JZ8 zP;RHE3%J~6Lb-gDy`}`0KTIeO9aAoZbOD!W_~uDz0+@ZZjh!DW`F5b8cC zb2NpJVL+LyDI}Lkr*7CUNxY^6m#HR{i3Qmi1}@KADTMk0 zN@-0Y)JjmwXbQ=tLwfb@E4U&qCY0{=K(v-W4b9VV6HlD6foG`{jDw|L4yhmj13YepA>bbS+%)>|yMe`6iTD`cVm& zR3?Rn?UJmLOJNDW1ldN z!R3gi5JrAbPG}0r<)o&NTxyM0`-LzjV~f=@p|qxtFmSn(PH8NZYn9o@J}5EtV;_{q z^)H!lynyng3FVrm5ROW?I5Fy|BvE!ht|)|KA1?b%D6yN=Gd$oD<=I_9w!Af8IKzap zW$;aKNohhkWHQ1WHK9ycqvn;h%03zC9oEv{b-ukXykBDTck(@HmkblU4IBGq5}ndS zC@;{*WKiaqP|i0{$39_9hRbi7LKw$Dxuz*3m)|vo+AoAL8Cz_o3FXy|>@gWG z3rr|?_EBqnggG)?I+#%EKBru+|HkBL;fc&E@k}-OM9nLMTKVbK@R%H`mHS&sf4DR> zp}b}?@-L)Qn#va2(vY3`LD_CXDOpF2V}vmoE@d@^FeZaiQBz1R@tQ(%DMcUovBk=n zP;RA<{BWsjLOI`Cjmd=i0+-7sl)clH3!%Qi<)8`WGn0{jC7setw%7yoksp*{CX|MH zv?PqlaA~S3gfSVEmYPCxX{9M7m!|ZQA6u-I3B@UM!#I}2Yf5lQVM3WoANk=j(}eOH zedLGBH51D7KeN}z;PN7!(p)I#nzH9FpjFGEZyh4s}P$jM1uU$9?_n@}D)enYJcR)UglO$jcKno!;~87)7cQ(DLt z`=F?L&)D%k@sZxoBmG@xZ;J5oay8#R-;;JZ{}Q~V7?h7qC>y|0iyCD8Oj$QvIxO6t59Bi-F$5QNdB3;)f{axpUD&hUIX!$1JlXlrJ z!8M9-Ich>#HCm0ygjxxguT3b=Kc!scHx{YBNPpM)`&tQ?7d3@Y#Xy;>DI}LyG==0+ zqTCJjC5dY#wpeKsN`@0RxFm6{giB@<$_A4vwwX?8DO+r$T>sHthE)8GkM{|+5|q&< zl(Y0I2A4}Fl#gy>*Gjl7GokFES24I8GNGKC%C42cZ%k7N^#znaG=)$rLGd(& zsxJ+DZjbaVHR&&Jny4AhmYHYm@jYpmY#BUD4KClAP|DJ0d~m5qr?e8v(p>EN0?Kj| z%1bVLE(VvmCX|);sC7%ibK&5!#)NXZuX5S(`n*W@j7WdidF|Wqu^-I$rCpBw;O-N+ zTriK`*g}}LTSB{Jtl*4rwJwB z9cmmSjLC2*ZbEsQK3c+MvI(V~zW;?VCd1`!6H4vA>@gWG^-U-*y`-+SKC&*0tZ3)x zJ@r4Vjmsx$ZCv`h&hb;>aV)mrao>}68OMTeg3DYJN(_Bw0hbgelomE4Kb_KAwpiK= zYW|X6-qRRm-BS9y&YLf)-&npl-;;LvjRoHXN=6gP$uHQo5-z`*P%6@^7+k8DP)gCO z7+fltP#&OHF}Msfp*-7#T`S@8oC&3@r(E_nuN7&IEd5=lTm`tq zn@~QR#jg8sS!qH^ms-um2uguY zOUX^Ud{5ftcnQ{%;WC*{X(N=P^mGBrEhdx<^mGB2EGCrc52*P*VcilgFPKoOO;;|2 zwF|h^GNF_$tZF4;z7Lm*CX^Fpl#86>i?p5`T-)<)Ot|ict{)4oxq{1S6H4{Y%7w6= z442v_lqYUd&x9o8F}RF3q0Ej^d2HN<`jOUQq`y4xqC)sLmbvbE-;?%)br`t3swwy- zM_KI&e#yPnRh^++ zD_d;!dG@*`C|{dUD$o-wTq>JTKKhcKli{+=gwmyw%439_43{37f?65m&O}C-^1bB= z?Pt!Z5hkenf1hAM>7ywmm%f@pa=HHxwO$4INz(%*F!sO!h>UpPSSdB4~( zVQm~PWlSh1<|-FLPKL{A6UtK~R8A&bs{og0Oeif|v$G{!+L%yk-Nw$AaH&tH+#!^X z@+_p#z13qDycB8WO8UFbGuOgvKYe(U-&xBI-6_u0c z*Ipdyc^A^(b&8J(@0ZjY&-8j<+7q6q1eaS)D5c7)oJ>f4a4Ba(xlo#&E#Y#-gt9!Z zs+EL12A7p4lxq2u3nBHvrKYB|@A*`uq$K@aXF{RyQ5jn}v+qfJLQ(>yuBMP&>S+qe z(k;-~Q zzrf|J3B|iv)k;Ewg-dK6MIj_uP*P|LA;E%@MpH;zEUl)Hwpcn%A#JgY?bY6Yr^)(A zXGWyI>-=y!T=!#(I=(0E31>#IU$SUQ#h99rDAM0`e#Pl-#~Y3Rb(|v`r}&<sve1Oml|Hk8OHUKZnPY0d5aus%Id4MgaW{MZ0+&7}l;W4! z^B1_3qEp%nCCd}+a~7cFFroB+R^{Z;i`GYaHk9;to#ww|#7`Lct5x2ZyP&iO^L=?X z6kHxKp~SzaT+Ur?8p%cayUurw!Y;AJQv05?hh3_gP;$SlT>ek{Wx=|zOX)tNZrCsR zOei^%smxEf<_f>DJSLPkvnm(DTnsMnm{6(@Q`f*h@>|A8*TPAE*BSJ9_%{|@qbThO z*TTW2mZseFPM$~<>F+ut?+8Jz^1iA;Q%opsjJmdmu+9&ciFC?cLh1i7 zJ12wkfC=U8FH(fhzYxyx!R37uO0G%&@7eP2Ge2DNnNT*rpj-%fd = fd; + if ( anonymized ) SetFlag(flags, FLAG_ANONYMIZED); nffile->file_header->flags = flags; - if ( strcmp(filename, "-") == 0 ) { // output to stdout - nffile->fd = STDOUT_FILENO; - } else { - nffile->fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH ); - if ( nffile->fd < 0 ) { - LogError("Failed to open file %s: '%s'" , filename, strerror(errno)); - return NULL; - } - } - /* XXX catalogs not yet implemented if ( nffile->catalog && nffile->catalog->NumRecords ) { @@ -511,28 +522,12 @@ int flags; nffile->file_header->ident[IDENTLEN - 1] = 0; } - - if ( TestFlag(flags, FLAG_LZO_COMPRESSED) ) { - if ( !lzo_initialized && !LZO_initialize() ) { - LogError("Failed to initialize LZO compression"); - close(nffile->fd); - return NULL; - } - } - - if ( TestFlag(flags, FLAG_BZ2_COMPRESSED) ) { - if ( !bz2_initialized && !BZ2_initialize() ) { - LogError("Failed to initialize BZ2 compression"); - close(nffile->fd); - return NULL; - } - } - nffile->file_header->NumBlocks = 0; len = sizeof(file_header_t); if ( write(nffile->fd, (void *)nffile->file_header, len) < len ) { LogError("write() error in %s line %d: %s\n", __FILE__, __LINE__, strerror(errno) ); close(nffile->fd); + nffile->fd = 0; return NULL; } @@ -541,6 +536,7 @@ int flags; if ( write(nffile->fd, (void *)nffile->stat_record, len) < len ) { LogError("write() error in %s line %d: %s\n", __FILE__, __LINE__, strerror(errno) ); close(nffile->fd); + nffile->fd = 0; return NULL; }