From c7d137102c1417d930eed49106e45ad5b9d110af Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Tue, 6 Jul 2010 17:15:00 +0200
Subject: [PATCH] Backed out changeset e27b81575ebe

---
 .../hwmp-reactive-regression-test-1-1.pcap    | Bin 20603 -> 20603 bytes
 .../hwmp-reactive-regression-test-3-1.pcap    | Bin 22322 -> 22322 bytes
 .../hwmp-reactive-regression-test-5-1.pcap    | Bin 14761 -> 14761 bytes
 ...hwmp-target-flags-regression-test-0-1.pcap | Bin 10436 -> 10436 bytes
 .../flame/test/flame-regression-test-0-1.pcap | Bin 4996 -> 4996 bytes
 .../flame/test/flame-regression-test-2-1.pcap | Bin 5274 -> 5274 bytes
 .../test/aodv-chain-regression-test-0-0.pcap  | Bin 6938 -> 6938 bytes
 .../test/aodv-chain-regression-test-1-0.pcap  | Bin 9076 -> 9076 bytes
 .../test/aodv-chain-regression-test-2-0.pcap  | Bin 7450 -> 7450 bytes
 .../test/aodv-chain-regression-test-3-0.pcap  | Bin 7292 -> 7292 bytes
 .../test/aodv-chain-regression-test-4-0.pcap  | Bin 5050 -> 5050 bytes
 src/routing/aodv/test/bug-606-test-0-0.pcap   | Bin 5456 -> 5456 bytes
 src/routing/aodv/test/bug-606-test-1-0.pcap   | Bin 6368 -> 6368 bytes
 src/routing/aodv/test/bug-606-test-2-0.pcap   | Bin 4790 -> 4790 bytes
 src/routing/aodv/test/tcp-chain-test-0-0.pcap | Bin 2142 -> 2142 bytes
 src/routing/aodv/test/tcp-chain-test-9-0.pcap | Bin 1972 -> 1972 bytes
 src/routing/aodv/test/udp-chain-test-0-0.pcap | Bin 35532 -> 35532 bytes
 src/routing/aodv/test/udp-chain-test-9-0.pcap | Bin 19114 -> 19114 bytes
 src/routing/olsr/test/bug780-0-0.pcap         | Bin 93516 -> 93516 bytes
 src/routing/olsr/test/bug780-1-0.pcap         | Bin 91884 -> 91884 bytes
 src/simulator/time.cc                         |  16 ++++++----------
 21 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-1-1.pcap
index 1fd80de31e87358de22ac1b852abb9efa9ab30dc..fbdd90d961bf9b52d4d02f7a1a79dded84962f0c 100644
GIT binary patch
delta 1227
zcmZuwZD?C%6u$5KCb@}ALm^vkZf<VxO+Pc)N@8McqidFSvI%<EVT+R@ThU+Qysa>p
z8*^wUI9m7hfc>GPiLPd~GOC&Ehac@k6r4ym{UI_~3yLr+Y$_s*RnNVdwS)b5x#v9Z
zIq!MSInTXWVmC`{=KMN7!Z93Cad};lpRJkgks|vMLy-Y?3JE2Kjm<KCi)7dmd42pv
zFD`5|F|K6AM?ML&sVHoN0+bAU3yG-C?nNPL@%$Qm&=N(x=3%eleFD-!0>Zey#*2jp
z54!?Y9pFnfa5fPL^wdexqY@olN~k!e=D8HQBV!tMu>szvxL|M4i}|=mC{YQ+IRj^6
z7H^CGS5mx0@IM6SG>bp3u6~9utJJTFFSI;gA9Gu8kH|3NdET$N?%sHjziq6p5_rs9
z;by4#E1qXhA+77|9JcENd^oYXfXFsFl%hD6k#SA8_?AZZntBv+lZ1;21N#~*ex>P-
ztchj`Pc|Cx8K=dc@5q?<D{h15Ps?tD*9=R1MfPG&afT`yCS|w7eWoS;Ap3@@Rev(C
z3Ng$7U&_zT84(hWZy?{2VIe%<Qe+L7Y0=qp_?GMqsBi6MTQS%=$e-}Jj1F}K*jX&L
z7Wr0rh2l`g!(KqKZ5PX++@|w>KX$ASW3ya`g|^KshD1_lb0{Qtv3auBf?lb9lAM<L
z>?`;zrMen9l5!|~n(7NI91cnaT6W>YB^8<UMs^*8X`OZ9P}&l|yh^HQ*VtYxk@xUu
z@Z<)K`^PYpGqL|Zi$}+>kc)GB49kT0GnUx$x|_k}qZFjl<oktkG>CFi6K~Sj8F_Qo
z3f(vsly*~9=lDnQ@;zZRWw(b;oxCgj%^P=vMR~l&PGIqVn>~#kIh}RD&e?1mu97{0
zTV!9xo(F7EnW*u4wsf19jChA7_Lp34^g|u#u*HRP?ZLxPI&J<vcW3VCyVU6s<Fq|T
z-(PlGydvl-Dtn0iGQp0%`|=k1j@G#rySoC_xxC6(#6#I^1b;td3%u*f#!dWz?76Uk
z%BHM1P^n4i)+S5zo^d3kxG~`=M{+d*k9Jw2iTrX>LFqvcADP0}2@`6;5<A~>Q+y5|
zZ5lfp&1$9aJL7vMaiYh>$3;^dBw><ZeO?N=IEggDTDK{lArek82R?Y4(1GqO`w%nT
kgW_|dMM+-gwjQaTqL`|YbCFIQC*%>LL^0K0dyWVH1^H=#h5!Hn

delta 1226
zcmZuwU2GIp6rOwU?oJnWkyzN-+1X)cwtq{MW|v);cC{?qHNXRzg06q52~?kq%C?Cn
z6*0uBF{G8BehDN>a5vH){*sa<`k=NYF+4z`6d#P?p>3i*P>qO*F(DPt%wjDG4>xnp
zch9-!JLi0Jr_An@*~AxX`2a^>NX7NFd49fTwubWTNA!le*$G%m1REM<{1!^F1@el#
z--}DzO&nL!;-XK&R3eO$K><pNeF7`2v-QY@ZQi~T7n;IYt$EmoI7dJtKtMfit@L7U
zorm3ks&?~*8aQS7{hdKc+9A=wjHTkDn&o$c_hp<xFw)JRR$Oprz>8~9j|hb&^koc;
zM{M34{;#BXhv2&eXEd8Xr7nMlFRIk9iEp$lk4N0rTSGF;XqFc>*L^dZ=M`gl75@%%
ziJPI~uV|LNh@`HwD!TM;-fJx{AW|`hQW%F*GH&WNFT~vIDQg99kZ{#9(7(>+HyZ9s
zI@u`Ug_r@KaZ3F8nT%_7ire4kr)0Okn}#helRckNoS6!JM0OkOH*Im7>_1ek`ja^;
z#3cWJCqFl)L{K=sfoxNX1+lj&&vZ;Q>FiZ}OZFpJ-Mo`+MNe}Nf7a(RI?(24=P}=$
z=Ue3^ioGch>qEX}H`|Cxi_VL6*tNbMTjU_-TDCA1R$OOO$i;WF@5o*QdZqeR{H)9;
z2QZmXU5Ok_I26846#cXB2c#VBI(KwNMJl<0{f?fb&N^@)X^USzAW^hx><#=%-jjoY
z;YT$t51}_>V&6uaD?^yeMETw!{6k1x$`*x>+zjqJL_sPI{uvQE6hI}eiI3^)jJz>z
zuex<OAnl>5&Z!&3yDRF^knUP_V)%jZ)ngBWMfrG*9mo7*CH4|_WpuU)rA&!!!z|e+
zu}Jm|Uf)y_qo3Azy;8o%OGdQK7H^eZZuCDLY%7WBO6|e-ptP6x_uQSiBkyv%M;xQ=
zIr6^TZu3z=S7F&h>=y}k<Xz0#>^iM;4fbsISEsWoUlI>xvjP15L`e*fy0UQ-e;|9h
z-oRK#TI?IENocXd7G2|xgcLXC;nR-fYWf}AY>OEAmAHcP;~qY68doe6YR(qVopDoq
z4xh+bJRdWwW4YUmzczxS1ruN9O|hSZNrLrxDdfrsk_2m=rg)i1IK>=z|2;x)cc$3|
mOmy~$OGJy3yw2@INEGs7yhhGN+Hi!B?L>)Ustbi9fqwyqv4RZ%

diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-3-1.pcap
index 84ece725f4bf48d5763bb925bd427e9e8469da63..28c26096e8623a185df380d3851a1df16f947a03 100644
GIT binary patch
delta 1102
zcmYk4U1(cn7{|~1ygA8EO}fs>dX7zUPSbp}w&}+TGp1S6tWDQ$%}EL!69e9OA&y}-
zP!tt6SGx+*YW;Uq=9o6!V66Kn3!B1VZ5fC+GPLT=M1>&=yV!+#;f?b>Z`*Yjhx5G8
z$Nzbr_x)YF!meFmi#e0p7>-6Qylf`vpko?nk9u%h9LGo=bt_BP-B`2?JV<%)w$;sC
zxN413YKwFR8<XVGFc;d6-=Z2jg*O^)I=|*v3~Sn7nxbSB@!`9o0W}n-Gc{O=`PnlV
z3E8C7ic&vYz^zb;Zq|bB(p3`aPa@G&qB~oiRPC)gMHv>(VNB-?tTrX-#<oWtb+m=c
z)VxDFL`QyXhXONW;%?Zc(RxRK*Xs%{3)d?Vn+`O{y}plR>G+!29?h~#I1(+<OkhKn
z-VI_YWFXk;!4t70O$9gfwcmpq)7<GbFdj>?3YKF5md7u#68+pH68-%1u!8Bdj$nry
zZ#Ea`YS>xL?X2dGpg3s3(_+)zh%+9Yjlv$Xs;63tjQ*L!bep_O`l^CPVdi^%h_u@D
zO+`k;ie%2q$g%xCR7K?Pc^O%bYwXLa)waqh!Q|uAb|z`UF)bYG?4~7p^o~oN-CC_n
zQFe-fcH&#rz*Aio?e&P^b#(4=;a*Fq`dZhG8kWHE)YEt|sKHKku?cY+rKJ;iFXaG{
zq(8<{?Dw<RF}U02<0rkCd#*uSJ?UM4bdwwSX?L8zGvP(oP`!_fel;I#M3*}Z^rho$
z07ugSrs1P>nHhK}>>~(d$~^a>tWuq-Em#nqx=Amldm3nU5+A26ywGdYy~$59eo9Uu
zn6dC@ug!Y!Y_?1UB(ks4+^jPn=cm1B59=uGIl#9ITTDq)r=1M`(r24ZW--!NW{0uT
z7hooS74`}W{Q-KvBH9TW#A{CW7x+v?D)9T_KQd^-pR@V$yp-`cvyPqfqA+CQV$P-?
zm35|6kGOB;Q|5qSA~9go1-1^AiZ2FS{GkXr;C?MaKae0pmld;I!do5Pdx&r1p}HNl
z#}N5%-(!eK!A(p`n~12YQ#Xcx_m}DUi-H?n3N<W9q7FCvaADY{)&)saM~{lSyo*k(
WMT>DCcI9n4cxjzCwR$!`qx}!Ty-scb

delta 1102
zcmYk4T}%{L6vyYD%j`OK*RL9wk=@y0*$)wx4@m?U++~GDs4%;vXcIT_!IwtcbZcVL
zHm0@GN}HHf@$W~X(FmAmKq+xsoAd!NP1>j02*!t+w2c~Ld@-rM_@cdY0r6on=bn%M
zIp^NrjR|&Rf=#9aRL!tIV&TI;oOU{<f!c^0zl!4k$)j$i=tmbOEd$S5-8g79GL9dt
zerj1Jon}RxTpEUh@8aKx#!lh03Y#v^J0?S#_MfIGNkx3PlQp0QV|0EwZbf~p3VlJF
zUVBBUkBwm}n4@1-fNj!M66veaT$!WWE1gvBi&cu!Bb+@LN*kD~jMGo6-*hZPO(;*%
zQt1#K`B$Y10?7dGhirPk%n{(Fx`OM%wKr^2f4SUiHk_hE^JZ-%#m4bzBuDTs%F>r6
zrh^8|YB%1A#;IT~>T8e8#cBR*GjJptXTz9@`dJVDj^^lorAYMgiy;L=2_0sg3!ksg
z&_u{t&E>47hLP>E;I6Xiudp*7U5LQ$wu+~#vW#8~W2i>nCH*{t3SsuPc@eI*>Gu&C
z5i628DkF!sdr=gT=c6(*6VuquqE$1;sfo$QSy3OSLC3VPufCC{=*>G$*Eee35=Gf4
z2HJ=}R0C@pEb4TN;dRt+Ey2U8VDUi1&E>2KU$?HqZc~HZ+Q0_Ish_3>aJbb0B2JHw
zAlu<%2hg>}=HCu_Fub{3n;rBlJbHi|xVI(74}RxCLwA{%i+<Yoi_w`n1MP_zOJje+
z&z9kMBF}WZ7Iq%~WS(~%l~t-!<;J-1tSopi)KX5f1)NA&*wtp!gTl$Ak2W8JnY8ev
z&1P{lrSimp=F}&2>8vv!r*j_EhIC}M?%->LEvBTxIVXefIlt884Eoyh>?7Q2_cIg!
z2zv&Z4nKV}BH9TW#A_BhG8`jPfj<@hzODd#X`4@vN*T8^>%e6XGTi};rER*aEHI_I
z#eFMhnFB@u&7C$~VGB^HxYSv~Ux|<d?r$PAM}iDpR-EAy-eUi@eS8TI)#a$Yg~+S-
z-a<qQE@6^eLPS-ax&gf0o~IAS1UI@AS~o6<`gpw;S9@&QFfNIzYf-VPw}cMQN3$_6
SHuc)H^V$M$YVl(4DeZruKu-q%

diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap b/src/devices/mesh/dot11s/test/hwmp-reactive-regression-test-5-1.pcap
index 332e8c5b593bd63374c2ac841b91a8f6c44ec8bc..b644bf71a3dd9cf226151d99cb0b04a736e737e0 100644
GIT binary patch
delta 694
zcmYL_O-K}B7{}*%XKfr2cee3kXV-ORR(8c*SChol1e2&k$<#pzT4<B#q&SG3L^Lr-
zf)4Vpte~QgL!xcMKuCwuQ<t@E`=BB^bm-K<f{N(WJ2RSx_x=BPzMp4td~tlGG00j7
z<*I>0!5-?x`QV^@s$3BI1pem7H2e-`m?UFOt(ULLTXvKxG@MZ~RK&azqX|4#vf?F0
zfYMMWF`oH_^N^wANXTMOLT<A7b+>>Yx{ePaORTEq?zGS0+W$<;kkqXFzFrUpc##3L
zhcsMJd*}+Dt1+6wXEjS1bXRA^PYD4<({FY=Dd0w2$J=U4%yZ^LIK4GdqF*SbG;f~O
zdy?DSS*RUl)P?m<6HVGj>T)PD9pHwUhCw!Y5iiYpxni!;UmjIq4K;d3jLcQ?no%0V
zkZ#jql=K+M*yMZ*Im4#?DDq!HpBZCsF5|myV9K;;1RG|IbbK>yvF(mmg00<md(bQv
z;<ktfuCWeA<2m+Dz={-h@{J?gV+Z&Jw#LTEge9I>mfVfYTzdpB61JFnBze0YPey60
zfK<l4*U7*1aPu)H`o~>rvc%cI4*!kpaJ<E1XSn&S-#bRD*i6}U6S=g_CLiK-dX(+U
zd$Lh*g|0!*^ivK)nSOS#h~?G;tm%~}$&x3D*RD|1S!%sY{>7cqJt-F{VmeRTJ)CJU
kon3ni#Qr?PbcY5*lboL&1s>(BcOKmiZtdC*#zc49KYG&6SO5S3

delta 694
zcmYL_O-K}B7{}*%-(ANEYj<09oz>l$(N@uQw<OWr0yFSZGIWp*EoEDDGIk2Pl$0q!
zcIaULViAJq<B+VHFoe({_0(n4RwOD2I&|w`ffSwUomn>z@B9Dpd_T|3$jrz>laIv-
zl|dc-z7!qCE#IJWrc#o6CGn=NsQBeeunGms!3O1lvTa9kmx>Gi1g&DqAE9e_=}+^!
zehL0)NM<7QtKf{T;dsDguL4do|F&1cPff$efXR1P3wON4q1yjUdC0-E@}WVJ21Jno
zbOcn~4yFiL3P$J#z68_Mj-Ki?{~VLBW`yv!*2|hDOgC!Ss5beWU@?Pzq^6!|3&l3o
z9cS^W?DV#CwOK~pSm`p*qJE-oo5EurVHl4Nve7$OH5wFUvZ}N@_SC7U(GpyptP(Zr
z=`u2!Mg1sh5vs(d;71tJElOcc{66#=5w?C0KQtXT4U>lP&WKPH-wlf=AG;;k(le(A
zO(553@%zsmV+eZFRkk5vL9Vmsn=X~d_J{*)kB!qYlb@QEorS%QUB%m&#ariOch{56
z^|W0;_6l!~N{7z3nEX619oOLr&kp|y@37JCvOU~-vD7?5i`Z<lXc|Lti;cd(xp<a!
z&AU=4I6@DhCHm+rGKoHRYz?!?qpbP8E3u+0`_>(yu$@mnq0-6i?1451DQwuUJ6s%(
l8g|9O0<qt3FxII;S7m#vvmm1Em97)z;N+olFs}FP{|ES@&$s{p

diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression-test-0-1.pcap
index 6e034bf14097c2ff78ce67c8f3f52c299791a0d4..35ac17957bac2aa65425059325cb5e7644234248 100644
GIT binary patch
delta 43
qcmX>ScqDLxj385k)MS4#h0S(?+&mz5y|BXOY*`r&7<;9vG&2Ax8w`~I

delta 43
qcmX>ScqDLxj386J)MS4#h0S(?+&mz5y|BXOY*`r&7<;9vG&2Aw)(nyW

diff --git a/src/devices/mesh/flame/test/flame-regression-test-0-1.pcap b/src/devices/mesh/flame/test/flame-regression-test-0-1.pcap
index 20872c09524a8555cddb4c5dbd27cd4481dbcc3d..cf37592f3178d50590ef7c358c44e850b063e8cf 100644
GIT binary patch
delta 659
zcmYk3PiPZC6vp?>oBfylm&8IE+I5?QwA4gUsMb>yY6!R@f`|-4y+}L+LVM|9PeO{-
zgBV_`JqT&Af`=mb2lOT$j2^ux6!BJ%qJn}ab!JM%(>}hL@AtlMwmaFKygd$SFK)q7
zZ@GnY%%JbZk_Cogd}O`-W%|TyszL*wbA!G{B~zU^)PoF1ErZTkC0i*SIiCy@O4&3H
zY&DNkJ+f(?O|$p*F6Rt$tUY3i4R&7Y6Z8xlm^!;`CP}kY<}GN_H6BBs`aHv~r!(2=
z^s+D6g@lADaQQl@M1j&Tu7J^&-!@fvnSPi8uF_d6#+NHV1D?<=OW@`WP~9}=_f628
zDO=!y5Op(@{$Dh(Gjt-<&6F}PXGOT=2%O8KBG5aB<Lgzfw{v-CeU1OOeZ&>;kUDOR
zf7ZD6K5_-_+~NPcJ9oL>-pmQSGG^)RrsT}ht6YZ7aZ7DCmC~2W2z9&`c4JHXzj++)
z(N8afH?-hqxOLy&({X##*4%0!@WGU;xU>;)^bWcd<P#bO0>-Ek#;{2B@H8H&x;o!h
zD6mv>HD@B?>}icogk|{y55o*CL>Zi-FHsCb^70vec$`!5Xd}<D_9UkP!@PhZRSGe*
tsb0wN^Ng=cxw66w+Lp@OqrQGpr6k9E?OH7gkdIi5F+J|<;D`2I_zSYouEqcW

delta 659
zcmYk3PiPZC6vp?>o88I&-^5~!cAEx-mYNC$HF%0rNrhBI1cgELBIIDP<l<#d(umcA
z7+z}yp{BIpK@lvXH$l*N^`M}Fr+O6?DxMT)rc^xb<D2<@@B3yuBb|}kgV5}zEx6LX
z*1}0<(T_sW0n4&JvF=cbJ~Kg8Xy7w$(YLs0>k~m;$gt>Gbjm3Ttz1^~(Wp$*Yz%us
z&%3A|3%bk3*gLVsIl+XpO`OICJFWC#dWsEf=C;^Ok!n=pEtsOKJcVVt&oi9!O(vmF
zF9eF6FO#$-cCLd?6l(qKJXka8J3|#-qD@;ui%vQzzL*DE;bpqzNL;-Ex|`wrz6pji
zDkScW&@@Bk|3xbzLlL8Crj_$*)`W98iIWLx0=>;~e6_&McCPL$E%N`i54aK@(5#!{
zpG9uGk6noyclbZ=#u7K%k9!g??s3d^TXAai(#vpa(9zp%tt=~LfM)#`&ZUm=fA=}u
zqn~~TeQF08K3o;sI(}FahFc9Ku8q2yOTCbzx6h?8DN{d`u$wAT3T>)KO`NE@Cf}n-
z;?8l`aE4>f*2n2cR8l{10uE3+&fpk*jZ=6{ev;w)C!UT+y@X?R-7|oGA|X$ed<vJS
sp3m^h!N8PqRfXsDQ7LZ@1?EY$GE@tUYoQ=PJ$)g?=Hb8u-@oI`Ut&V8h5!Hn

diff --git a/src/devices/mesh/flame/test/flame-regression-test-2-1.pcap b/src/devices/mesh/flame/test/flame-regression-test-2-1.pcap
index 5b5d9079f809505f4d9ac2a02bb9865342992c81..cc554953f6f41d7b09b95a53865502e97955adcb 100644
GIT binary patch
delta 600
zcmXAlKWI}?6vpp)=e~RM{xo@sfh5*v98{VvAwwZLs6(5@r$ulG7Y92?2OSgyg;#8f
zaj;!lkN;kAQEOcU3lRl32f;xQ#X%jM>fqw!;H2Jnx?B$5`F`K|xa+O;*6PqnfR5q5
zwap$*JAyh<%>^OEc?w`2Qxx<u+)+N!8l=uENs+AU+)_}2PN^m(j=_go&}`JCcg`ff
z=ebT}*n!h@6z5@)p4vB|l8l`z1$(Yxmzqw>p4at-=-aS9y$KrhQuc5d?6h#KdX~oB
z6fcI{g0|cN+@Ow%p-;0a#f_Vg_tm-c?=n#AHp$lpiz|?~rfYft2k4)U@lO%C>XCxM
z=?IxZOI<1>Q(vsUWapepyaB$wEvYPPT3XNjJCfPZH@JOQ<}3|-iQD%ivzxww-vmL1
z=f)LNuBEzr6jR><gTq+y#avJKDyA-n23F`pm^lv~(XX&U*T?4Y*<;N{WsP4qG#mF9
z4g93VVunv9JdW3Pd$r|pe7|HMpiwD>8nvSsMsy-N4&Uv&o4@#VG>KDfkCRl{zzofm
zGn{$ub5g-3)wg_3I$SYW8Toua*Dt*AnfhEYut4oy8UC0GneyybcEj9xt12-$6teMP
L)xa5Asy6-u9Bhz+

delta 600
zcmXAlF=!M)6o&Who1M9x-Mib3hnF+1XA#6pa~vp93l$Qsxo8jzkFk(|5YR#kQOH7E
zxirSc_|&km5ffrzVK9=yPOuOxBw!H)t5{gsSXhafeQAcr|NifPKeN(WX+2(WdqC&$
z=+b%@CtQa*QQZT_ac)omvp9ziZHN2HHZ4KwZV8ISuqrG{I&?`kY05SDQaLmoHR-cE
zhF^FdrZRTmGM&R&n5WnF?NL=E?%k3-*RV@P7e&_}*N)S-VSV}-G-yk7aS-gcaIJcc
zM!Xbnh1`NRybKnoBNMnn(=x@?hfwrYh4bGcP~tU7D}&`nP_(9bmBA?eR|)>DAXhzG
zGB^<-Q)sE%F*3Dd^~}x%HRWgc>8YSt)RnNF<!6G~P#fHRE((@1EpT^PFuSe|{2>T(
zygnkC@+>ueSTglJFgQpgUo7;wBa*2*p@BvE8s_ecSM)n<(4ahnZ&no>r8VxXDK?H)
z4E&<|l^oZO`y8+A_Fl{9_<q%Zrp;;!2dNz;@QyA-J@{eYL;S@bqA@(t_Blz$1}14H
z&T;as=A@EMs&8mcIx}Q2-qd`*&~LuiOnn<NkW%|Vjz3R^O!;<;r^3Sdq$aR;I%MOq
Lnt`kIpw`#}*fNkv

diff --git a/src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-0-0.pcap
index b3a6798e3b7a71a237737ec184ba1ce324a6b3ec..e879d113f9b7affc1ff65f14fc524d2abd152b83 100644
GIT binary patch
delta 41
scmbPbHp^^7F%$Oz1}Jdjoh-mDv3VMk7b9cO<cG|%j3Jx<GfRsD0NB9_od5s;

delta 41
scmbPbHp^^7F%$QG1}Jdjoh-mDv3VMk7b9c$<cG|%jKQ1#GfRsD0N9QSng9R*

diff --git a/src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-1-0.pcap
index 28c4e5fc5a076e8d06eb15128e2cb1492845d854..7ab3781a7055904f2235fb312c53346092a47bc3 100644
GIT binary patch
delta 66
zcmez3_Qh?(Z6?M8lkYH<G3rbXX7*>Y;hDULOM;aF2-ZzL$Q;FZV6zO19W&D-k;x9C
U5^NxGE3wIb0t%aFvEPyg0OnH@s{jB1

delta 66
zcmez3_Qh?(Z6?P3lkYH<F=|f^X7*>Y=9#>QOM;aF2-Z$M$Q;GEf3pmW9W&EIk;x9C
U5^NxGOR>p*0t%aFvEPyg0OeK_qyPW_

diff --git a/src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-2-0.pcap
index 27198c7ba77b2cc2c79b8a61f3a035cd306a510c..a0ea904ec8afc28fab3cdb0f9f0fbf9de8a94f7e 100644
GIT binary patch
delta 132
zcmbPbHOp#45))H7`(!;18ODUkjZ9Ho2N<BBU~(Xz$mH4VoJ_|#Ci`$mPMps^S%vvK
z<AKRCEboCN4{HQdkHF*tK?ydHju1hRqRDevO*zX185kUZLJpI8xg<A#VfA5VjGOGp
bDa$x%ay(}{(<14~9qclUA2zdci3$S%@46xV

delta 132
zcmbPbHOp#45))Gy`(!;18OHd@jZ9Ho`x&4he{vw7$mH4VoJ_|!Ci`$mPMps^S%vvK
z<NnDqEboCN4{HQdx4`5AK?ydHj$lEMqRDevO*u;i85kUZLJpI8xg<A#VfA5VjGgSr
bDa$x<ay(}{(?aRV9qclU?>Dn@i3$S%>>eTS

diff --git a/src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-3-0.pcap
index 1565f4808f59920b155a1de4bbc6d2b5dd8e046d..4232ccc17e2611a0fe83bd0759f8ca88475aa216 100644
GIT binary patch
delta 175
zcmexk@yBAq8^&7`-}*CJPqt+|!F7NE3eHWwC?L66gGrW=@xWv^=J$*THk+}CF)}?8
znH<0@!(=5k`2n}&<h5MvlY3axn7qU$e-M^n1?io!S&&VVi^+los7_+?1VI)iAy%MT
zg~?e0X^cuhQ)L;~Z+<VZlo_gojTxv3s^p3YM2RFTNO11t_X3KWt3*?n8Lc+omzc{8
E06)(%m;e9(

delta 175
zcmexk@yBAq8^)Ux-}*CJO}1q`!L^?O3eHWwC?L66gGrW=asOmD=J$;IH=D7DF)}?A
znH<0@!(=Ho`2n}&<h5MvlY3axm^{TMe-M^n1?io>S&&VVi^-e?s7_+?1VI)iK~|tz
zg~?e0X^e_MQ)L;~ZGJDXlo_gojTxv3s^p3YM2RFTNN~>N_X3KWt3*?n87(*8mzc{8
E06C2^h5!Hn

diff --git a/src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap b/src/routing/aodv/test/aodv-chain-regression-test-4-0.pcap
index 798c83e35a7e331f56a5fd3e39fb595cd600b6e8..6fd2c4cdbc2f4ae16d7d3654ab58e00a3bd264f7 100644
GIT binary patch
delta 61
zcmdm`zDs?>Tt>zNljkv(F_p7VPGFOm#LU8(z`?)}!T`jRFS1Kc4q>unJg~WsDT#?O
RZt_PKS;k45`B_)<0RTSY5#j&<

delta 61
zcmdm`zDs?>Tt>$Iljkv(F_p1TPGFOm#LU7O&%wYD!T`jRFS1Kc4q>un+`qYxDT#?O
RcJfCSS;mQ*`B_)<0RTQU5!?U(

diff --git a/src/routing/aodv/test/bug-606-test-0-0.pcap b/src/routing/aodv/test/bug-606-test-0-0.pcap
index b5ba6ac1fb0fdfd33d336cc36774367da4df33c7..d0665813408601abe706dae035e122514315f52f 100644
GIT binary patch
delta 67
zcmV-J0KEUuD$pvha{>XtlXL=h0l$;$0#5?Z2$OyS90DB)lQ0e-vw8z+2m-7Klkf^0
Z0#FH(1R#?n3@!q436rb=AhUD~+z0`|6#)PM

delta 67
zcmV-J0KEUuD$pvha{>XslXL=h0lt&#0#5?Y2$OyS90D8(lQ0e-vw8z+2m-4Jlkf^0
Z0#6B&1R#?n3@!q336rb=AhUD~+z0@^6#4)F

diff --git a/src/routing/aodv/test/bug-606-test-1-0.pcap b/src/routing/aodv/test/bug-606-test-1-0.pcap
index efb54fee7d6126f3e62530eac9c1411bd832a5d1..9554a19d82d0fea979b4e2e55d1fa18206d2e625 100644
GIT binary patch
delta 138
zcmaE0_`q;O4<n=R<VG%$$?rK?CmXP_Fn*uBnlXy&00R`TPv&QmWt_5Emq~(=@xW#`
z<_k<rCwL|YFv~D4;+<^3D>>PpEthE%?_>cc8KywK$qTp?HveJMU}t*9Jh_fZa<V<2
mDdRVw1(Iw`KofVeOrF51uz3sLCpM-A7N98-n-7R8FarRM8zyZ4

delta 138
zcmaE0_`q;O4<n<`<VG%$$?rK?CmXP_Fn*i7nlXxNKLZr7P3C8kWt_ZOmq~(=asOsF
z<_k<r$9X0PFv~D4<ehB5D>>PpEthE{?_>cc8KwZf$qTp?HveJMU}t*DJh_fZa<V<2
mDdSh51(Iw`KofVcOrF51uz3sLCpM;f7N98-n-7R8FarRI8YW)=

diff --git a/src/routing/aodv/test/bug-606-test-2-0.pcap b/src/routing/aodv/test/bug-606-test-2-0.pcap
index 72f7eedb3c9bb06c36d631ad2a913ad814fdd635..25aded0ecac416d7344defa4e0da893d83bd0e20 100644
GIT binary patch
delta 54
zcmdm{x=nS%Tt>zNljkwM7dpTI1^YP|7#x6XhshV&B{%P2s^DZ?Gue<wmN8(nKTkRv
E0J*RZ*Z=?k

delta 54
zcmdm{x=nS%Tt>$IljkwM7uwGN1^YM{7#x6XhshV&B{%P2s^DZ?J=u^)meGH+KTkRv
E0J$j+(*OVf

diff --git a/src/routing/aodv/test/tcp-chain-test-0-0.pcap b/src/routing/aodv/test/tcp-chain-test-0-0.pcap
index d700a47ce2bbc6f89f22478145ed8af86eccc1f8..4c732ee2e66cfcffe8cd3891b0a5da90ba1672db 100644
GIT binary patch
delta 42
zcmV+_0M-BA5Z(~5!U6(R9+Q3q907%s;R0g<l^>Jf1snq7ACsH}8Ik`7vxEcM1WvvW
Ao&W#<

delta 42
zcmV+_0M-BA5Z(~5!U6(Q9+Q3q907!r;R0g<lpmAe1snq6ACsH}8Ik`7vxEcM1WsNL
Ang9R*

diff --git a/src/routing/aodv/test/tcp-chain-test-9-0.pcap b/src/routing/aodv/test/tcp-chain-test-9-0.pcap
index 37cf7be33ab4fd274f2f1fa12ad6a0f454bcde87..731d9874c79d6a61de958fe5f80203024381cba4 100644
GIT binary patch
delta 55
zcmdnOzlDE82@~Vp$)!wD+zAXozzD=|xh6kgmf8G`DU6YE(PUp1f2K{QAQ2`8v(0;0
HelP(5&L$At

delta 55
zcmdnOzlDE82@~U;$)!wD-0=)RzzD=|xF$bfmf8G`DU6YE;bdPHf2NJ5AQ7hjrknS$
H{9pnA)PE7x

diff --git a/src/routing/aodv/test/udp-chain-test-0-0.pcap b/src/routing/aodv/test/udp-chain-test-0-0.pcap
index 3173db198d074c65f79d040851aa463b1a5c65b2..1cbecd3c78507240ac8a13744dd1897ac88db485 100644
GIT binary patch
delta 162
zcmX>zmFdh>rVVQt89!`Z%V^EP{Hl;?@<k(Q=9(g=$>)RQH*0YDurfcG%rg0+uKea{
z{C_x^FWhAVbGAtS;bc6pd84u{7vqM_=XGVdm>2Bk1xxW+JQ87a*!<DQlbhKfoE0n<
r69Lq#u#g?hsY(KJ1YUE3IWuyA90pS!FlSpCkn^FA56rpJ@PiWo67xU#

delta 162
zcmX>zmFdh>rVVQt8Q*VS%V^EP{IZZ~@<k(Q=ISD*$>)RQH*0YDurlAD%rg0+uKea{
z{C_x^&);PObGAtS;bh#ud84u{7vuWP=XGVdnCI{21xxW+JQ88F-~7?XlbcyToE0n<
r69LpKzmOfwsY(KJ_+N8^IWuyAoc|^~V9vHOAm@D@ADDBc;Rh!GCn!Mb

diff --git a/src/routing/aodv/test/udp-chain-test-9-0.pcap b/src/routing/aodv/test/udp-chain-test-9-0.pcap
index 901d3a4e901a4a23cd867a32b4d50203f929c946..3afa2b87f270991edc963e6f8dde37292bd1c5cd 100644
GIT binary patch
delta 64
zcmZ2Am2uTn#tk;ij0+~)GDmSGFaQA~5O3JLkomb9^TQzK$p=lPnU4fBPhQU`Kly}~
R9`iFGJC{j*vxN2}c>sDY6Vm_y

delta 64
zcmZ2Am2uTn#tk;ijPobkGDmU6GXMc25U=07komb9^MfGf$p=lPnGXjuPhQU`Kly}~
R9`jQmJC{j*vxN2}c>sA`6U_hs

diff --git a/src/routing/olsr/test/bug780-0-0.pcap b/src/routing/olsr/test/bug780-0-0.pcap
index ee570e8311c0acec3259955da2969fee2308b966..920b2ff823eefda0282d265a9ee8b2ac3ca48c9e 100644
GIT binary patch
delta 32
qcmV+*0N?-2+6Bzo1+d7AlVp+_0dA9jk|mP}jAoN!kQ%dyjKtsu#1G5>

delta 36
ucmV+<0Nek}+6Bzo1+d7Ale8Zi0dA8q%NUby91W8QjAoM}iypI#jKJVFzz}f&

diff --git a/src/routing/olsr/test/bug780-1-0.pcap b/src/routing/olsr/test/bug780-1-0.pcap
index 4b98541515df4904111480f2345db3e2efc6deb1..eee30b7828ded55fd396ae2cf25def0785e70811 100644
GIT binary patch
delta 40
ycmV+@0N4NQ%?0eu1+c7}lT@A}lg^uFlf<SP0dAAurX`bfoMw}PpBl6DocPJUmKGZT

delta 40
ycmV+@0N4NQ%?0eu1+c7}le9)7lh2!Flk_ec0dA8&hbEJCoMn^JCmOT#ocPJDyA<{S

diff --git a/src/simulator/time.cc b/src/simulator/time.cc
index 437811cfe..a0af0c42d 100644
--- a/src/simulator/time.cc
+++ b/src/simulator/time.cc
@@ -120,17 +120,14 @@ TimeUnit<1>::TimeUnit (const std::string& s)
   iss.str (s);
   double v;
   iss >> v;
-  m_data = HighPrecision (v);
-  m_data.Mul (HighPrecision (TimeStepPrecision::g_tsPrecFactor, false));
+  m_data = HighPrecision (v * TimeStepPrecision::g_tsPrecFactor);
 }
 
 double
 TimeUnit<1>::GetSeconds (void) const
 {
-  HighPrecision tmp = GetHighPrecision ();
-  HighPrecision factor = HighPrecision (TimeStepPrecision::g_tsPrecFactor, false);
-  tmp.Div (factor);
-  return tmp.GetDouble ();
+  double timeValue = GetHighPrecision ().GetDouble ();
+  return timeValue / TimeStepPrecision::g_tsPrecFactor;
 }
 
 int64_t
@@ -288,10 +285,9 @@ std::istream& operator>> (std::istream& is, Time & time)
 
 Time Seconds (double seconds)
 {
-  HighPrecision tmp = HighPrecision (seconds);
-  HighPrecision factor = HighPrecision (TimeStepPrecision::g_tsPrecFactor, false);
-  tmp.Mul (factor);
-  return Time (tmp);
+  double d_sec = seconds * TimeStepPrecision::g_tsPrecFactor;
+  return Time (HighPrecision (d_sec));
+  //  return Time (HighPrecision ((int64_t)d_sec, false));
 }
 
 uint64_t