From 0afae8ef344293c3017509627d92ed51915cd136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Tue, 14 May 2019 19:39:07 +0200 Subject: [PATCH] wifi: Enable preamble detection model by default --- CHANGES.html | 1 + RELEASE_NOTES | 2 +- examples/wireless/examples-to-run.py | 2 +- .../test/aodv-chain-regression-test-0-0.pcap | Bin 6802 -> 1448 bytes .../test/aodv-chain-regression-test-1-0.pcap | Bin 9090 -> 1024 bytes .../test/aodv-chain-regression-test-2-0.pcap | Bin 7944 -> 1024 bytes .../test/aodv-chain-regression-test-3-0.pcap | Bin 7400 -> 1024 bytes .../test/aodv-chain-regression-test-4-0.pcap | Bin 4976 -> 1024 bytes src/aodv/test/bug-606-test-0-0.pcap | Bin 5840 -> 1448 bytes src/aodv/test/bug-606-test-1-0.pcap | Bin 5720 -> 1024 bytes src/aodv/test/bug-606-test-2-0.pcap | Bin 4146 -> 1024 bytes src/aodv/test/bug-772.cc | 1 + .../hwmp-proactive-regression-test-0-1.pcap | Bin 7313 -> 784 bytes .../hwmp-proactive-regression-test-1-1.pcap | Bin 11767 -> 784 bytes .../hwmp-proactive-regression-test-2-1.pcap | Bin 13393 -> 1039 bytes .../hwmp-proactive-regression-test-3-1.pcap | Bin 11841 -> 860 bytes .../hwmp-proactive-regression-test-4-1.pcap | Bin 7387 -> 1142 bytes .../hwmp-reactive-regression-test-0-1.pcap | Bin 7789 -> 1544 bytes .../hwmp-reactive-regression-test-1-1.pcap | Bin 10958 -> 1544 bytes .../hwmp-reactive-regression-test-2-1.pcap | Bin 7329 -> 1544 bytes .../hwmp-reactive-regression-test-3-1.pcap | Bin 7390 -> 1544 bytes .../hwmp-reactive-regression-test-4-1.pcap | Bin 4971 -> 1544 bytes .../hwmp-reactive-regression-test-5-1.pcap | Bin 3955 -> 1920 bytes ...hwmp-target-flags-regression-test-0-1.pcap | Bin 10782 -> 1066 bytes ...hwmp-target-flags-regression-test-1-1.pcap | Bin 15211 -> 1066 bytes ...hwmp-target-flags-regression-test-2-1.pcap | Bin 13320 -> 1066 bytes ...hwmp-target-flags-regression-test-3-1.pcap | Bin 7135 -> 860 bytes .../test/flame/flame-regression-test-1-1.pcap | Bin 448 -> 24 bytes src/wifi/helper/spectrum-wifi-helper.cc | 4 ++-- src/wifi/helper/wifi-helper.cc | 7 +++++++ src/wifi/helper/wifi-helper.h | 5 +++++ src/wifi/helper/yans-wifi-helper.cc | 4 ++-- src/wifi/test/inter-bss-test-suite.cc | 1 + 33 files changed, 21 insertions(+), 6 deletions(-) diff --git a/CHANGES.html b/CHANGES.html index b0674169d..3e56e1b06 100644 --- a/CHANGES.html +++ b/CHANGES.html @@ -64,6 +64,7 @@ us a note on ns-developers mailing list.

  • Added a new trace source EndOfHePreamble in WifiPhy for tracing end of preamble (after training fields) for received 802.11ax packets.
  • Added a new helper method to SpectrumWifiPhyHelper and YansWifiPhyHelper to set the frame capture model.
  • Added a new helper method to SpectrumWifiPhyHelper and YansWifiPhyHelper to set the preamble detection model.
  • +
  • Added a new helper method to WifiPhyHelper to disable the preamble detection model.
  • Added a method to ObjectFactory to check whether a TypeId has been configured on the factory.
  • Added a new helper method to WifiHelper to set the 802.11ax OBSS PD spatial reuse algorithm.
  • diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 2f15e6add..cafbae5b7 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -23,7 +23,7 @@ requirements (Note: not all features available on all platforms): New user-visible features ------------------------- -- (wifi) Preamble detection can now be modelled. +- (wifi) Preamble detection can now be modelled and is enabled by default. - (wifi) 802.11ax spatial reuse is now supported. - (lte) Radio Link Failure (RLF) functionality is now supported. diff --git a/examples/wireless/examples-to-run.py b/examples/wireless/examples-to-run.py index ab124ffc5..0f9252bf8 100755 --- a/examples/wireless/examples-to-run.py +++ b/examples/wireless/examples-to-run.py @@ -49,7 +49,7 @@ cpp_examples = [ ("he-wifi-network --simulationTime=0.25 --frequency=2.4 --useRts=0 --minExpectedThroughput=6 --maxExpectedThroughput=238", "True", "True"), ("he-wifi-network --simulationTime=4 --frequency=2.4 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=224", "True", "True"), ("simple-ht-hidden-stations --simulationTime=1.5 --enableRts=0 --nMpdus=32 --minExpectedThroughput=59 --maxExpectedThroughput=60", "True", "True"), - ("simple-ht-hidden-stations --simulationTime=1 --enableRts=1 --nMpdus=32 --minExpectedThroughput=57 --maxExpectedThroughput=58", "True", "True"), + ("simple-ht-hidden-stations --simulationTime=1 --enableRts=1 --nMpdus=32 --minExpectedThroughput=56 --maxExpectedThroughput=57", "True", "True"), ("mixed-network --simulationTime=1", "True", "True"), ("wifi-aggregation --simulationTime=1 --verifyResults=1", "True", "True"), ("wifi-txop-aggregation --simulationTime=1 --verifyResults=1", "True", "True"), diff --git a/src/aodv/test/aodv-chain-regression-test-0-0.pcap b/src/aodv/test/aodv-chain-regression-test-0-0.pcap index ebab66de7fae4cea7641410c30e483ccb57dcd1d..dd4d381abad4b1cbe7b3620761acd0f96482792d 100644 GIT binary patch literal 1448 zcmb7^txm*16opU!w%sjkScibH31$VNq6rp5f?EUvi6b~Hjwjfx0||;`72yd;z+oy7 zJOXb~?wQ?^nL@eDO>Xb}Wai5`bJO>ir~42wny72wVl}yudb-L?YHh-72F-V|h-8@I z5Gc78jDSH91d??)3uhS1+JrmcTEYSMIp>(Mc?FzEW&Y0DfW;|z@&{)N2<3cp_p+vy zESdOtjT9|on^E$zs9Q_e(n7R}>aDME3YR1HCEc8;#i7~8xZ8=Q=fLI26Q|vrxWzFI z!3R3p9x8f{U5>o)ZZ{`saZEqZywAO%(gSBUr$A5b0kTBGvIl6~e55fhT}JB1plJ^~ zx#HKg%_!OMfB4mF`6a5QUnKXlT=8pea|-lTEo6QBMbI?X7YVU&^1jg8%>k literal 6802 zcmd5=J%|)Z7_IJ^ot@nk-8(N36mC?I6_Z8>JdYC>QScWQTwxP&Q^8=vH8V8Q%`UmX z%R~%3BZWH=6cYtkP?R%K;V?Ww^YOjucy>G^W%417tGnlwWkl=nAp$j*BkiSR)>}9@?P?TQj|x-R!AKEH zaw#x$AKb^azz*H7 zG|z1&tIVor(ZoR-O}q)T+*PN&c!s@1lK&*7c&0UvQse=u$;JTt9PI;I3lAGK!%yd# z&RX^yD;e)O{z~*%5r0uLr|wfzx<5V|KLr>FXS8nK8`aO`n=|nB#$S2nUXxbCK1ZW|lv>TAh1{tZ=Z!CM?EN*s zQWzlo)G=3+kVhB$HIcr)M|02bIvzmFTX&uaXd2|U97vJiv)l~+!*M5lniY^cv7&CVZjmRRbj{5XNSmRNcf zU-7j>r$EJZyw9SDPV9VZBEVAfVC(;r0hWSke0jCRGEniMS@yuAq@`xS&~tw^oEh00 ztAd<(qbK8&tzuQdQH;Lw#AlFecoG-0zK3Cyxalg9@%iY?`jx8+2@+6S8cZI2;|py8 z=h{$UUH@R`xO3V10$c_=_nxc7Je3GIcW9RX;z3aIgmx}N@2+(2YKdjQxkIx&7(zz;e-d{A!fOCgtc_!*yhHn28b(N`j z-+YL5ZXM?mt+tAsl`*5q9KE?n}2=iI*844nebwV}Ye{=v>i-C4CAdWZQo zJoY2^(yXd0N|w7(mXccHG*gj|TakIrSAh{Uv|6X&rksaW>pSrHdweu_Y`~l2DClv2 z<7n`BxOFsmyxK7uJnkGC4IY1-clYK(I}MpTf4KX9dPQ#cPB7H@TaS2LF&oIiiRA_` zN;8%=t&817d#zH%g9sRo5x8qgd%)Fb3;h4I3 zYqKts-X71VXoR@E-I3|}B9|w93@K+EA>FazVwKw@>E>5P_ ZRo2Dq(TTr^vG}M};jgPc1~jYVuTMSd54ZpT diff --git a/src/aodv/test/aodv-chain-regression-test-1-0.pcap b/src/aodv/test/aodv-chain-regression-test-1-0.pcap index e6d4a2f60afa1b7244f92539921388129ca0dca4..a8486eca8073fb94efe58108d6e85358a56f92ad 100644 GIT binary patch literal 1024 zcmca|c+)~A1{MYw`2U}QArs1}c*ejG0%U_Q2N3@U1F$3$j9j&f87%9{z+eCpV-#dy z;9_KC0^=0l;u>+`y6gxnc61GDD)efL0 zQtSYQz>RB!{9%A<2T&6!c7S4N!XrXO=ule7`-!-q%TPcjm^S^=xYmAap543YQ>+2RIvU)76F4OWK&cW$wp0FWuag} zN)}yNg}9S~kP1RJVo_R3QHjz@bsckaD;NhYNkxNqK@nfsmd zo$qJv%)9i(#~pP2)R93u8@h`XtU^!{_PK1-`V@qe^x3p>d@~ zvMj?`%TMGdR2!Gw!83}-2Kj~O`J3OlEzK)6g*`_cXOD|ha%NV?xkafQ^DEo3-?fTE zdYk(tiNR@lvg1q1Lk1&xpjias%E zyBHmcQq;9-!#9ZueRE?XT7YW%n|=XXgQqgjY!;?mPh zaL6l()BdecU0lG?QV-x0o20$LvAPYZtfhtqbUHyii2$$0H(Mz0{a&as9OSr!p*MSW z<(iA;RgOU`t0+}yQVkkS>dZwO{A)e5-G3MA5fI>r`_`?{Sf{s=tE1t7uG5i94xXKc zG+pdDY87etPgWM!Y;1h@6DekGDP5#Tmwmda>fRV;j9c!crK({Hdd^CZ5K|cUvXC#(s|4od4r-*PfT7a!oN? zRb6FIaC(*P<>-H~7ietJW}k>?EN2aSi)J-`_&R8O?8yjAVE~QKKNVr=-E|f!O)SfY zt^><=UyHD`cdM^okFYec(Ro-brdSR#XSX9)Y2!!mNJo5fF2Yin4Ivims87Ybu%PE#_UN&a=7I*|K zH3OPHg!NsZrCPzKS>Oe6KCC=a4~o{tUqn)IXI5J_(7s87(qnE1EbY~ zi!nt%BArHNz}8kaPEL0kp1loR0+ynIAm^SEnq{QZG-f#g3-P?8=|f-?u=G03YM^DL z(==xJ=B@}!&4Z@jM;{7U3Z^JpTurfbJ56JjAI18iWO7Zks0*|%CozoLUQW0jlbx}S zq37T@_R?ucbOj@kcSfrv*N-W7uuFNp>2VzSy_Z>`Ae7J56JjKO{R1O`q)BX+kX{ou)C% z@p8h& z*iffo5wP#r>S%fI5R6u})dD6(I*rs5>}_S^gmn=FPB|NpKc<+dG zn#L?o!9t+c4d5|=Ua}K-JncT?RM~R_^cdZ{GxQkSw=;MgIJh%-WJh)ekBOJv{~}{= zqf5VAqw_dVp!WSbQk$JsXE^ryJv%!d8_V~=h_6C;w)`sD%T1qM_3ueTmI2>T*H?|4 z<2`2+G2h-Sd;A`X`YH#)1QRq}dv42C`m@NPGX%*ok zebUPE!0g>g9OKKR>q|#Luff>Ap>3t@R?({Cto%CM#~*JE+o973(*E!tOV=NUh067CeM_MQ!1?J`mBA3g}L%{LJaznSo;`XW_=83 z=2TNXm-QTAU@sVOT}^-4&yU*L2X~^)_(6=f|4d>SKNfsHdRlF$URWRP&xTTQH}Pn@ z7#)STb?f98*ZOXL>F>mO?58A-@nzA+fnMw6R}=^CtDE6ZBKF3g(#0v&?!Iv`&o2^t TVqCeH#4x@r`54e_Gx_yDuKu{* diff --git a/src/aodv/test/aodv-chain-regression-test-2-0.pcap b/src/aodv/test/aodv-chain-regression-test-2-0.pcap index 047a42c94db91ef31b2c3caba652bad5bcab5804..aa61bb29d714747fac994f38b86ad349121d4e1d 100644 GIT binary patch literal 1024 zcmb8uAr8Vo5Czb`Ezp7jkKhQE2t);FDoC&-7;s1=Cuq0=wvrQ&Z~+7d;ReeepkmZ8 zn@qdi&Ckp3q|f{HlAwcj#0czvAFpM=igT%)6+h#%nYPcSk!g+vP{>*s0fP`yR!r)o z#u!MrE^D&?eP<7u2Ub;D#t_P2$YY3o+*-y&8w`02IoNJy8HF|&@)*(~`>slDFyt}1 zG;V9_9F;a0@)*6p&au%3LmnfeVfXx?4Te01{15hBowUJ_$LQ0T&aHl&wZV|bcmu&$ Bhg|>w literal 7944 zcmcIpO=ule82x7EC3z;X)Tq0nsUj*ad}_fe{)B=MYpWHq=%Qj4ZlnmoQX2&&8^Kk{ zN<v)Ii{d7p^W8gl?tS;(PF^P+n3-hm%y-UrzVDv- zc^AJw_f081sh6!Sk$3BVu8J(+Z?1i;Te|3AS#QsrsdV%ekpYht_lQguMTvE*JYAla zJt91r$2e~G6C3=S%jO$J4ugS3u+3mp2@Jgk$FXlP)=p$GOybyPFnS3Ly#~jzZ!pgO zSjkb)<(k%Nw~w(;3g|Md)hzUTj3Yw*#;~Ve`al2X^2JYC9IIE1V{6jrHLEzRM;7P6 zrAp>-0@tB@tY!{pT#CMo_msB?73-N!sdGRGIsS7cyRheakq5YFhWz8v%azv!FYr)3 zYSCtW_54mF-k8^E%+gcvzUwBK$lhyh84YTTTV-TaM$qqqc$TwaYb)V6*YR`)2pO6) zRI8fbu|Eer~&C<%U-5iigFtA8pvfU~&vB~`6JzXxzy z?PWyiseY4aZw~14>Wu`RtJm*aes+O(TD79=*tPIGR?DenItGXL!fxiU=j!;INama} z(`}sL=8QnCrw}hv%bW*sw0-_j;Q0=enC9jr!EiF>b+UhkCM%v$&?a-J!AnSUPzb{HYJtG2XFuVtEcc^0Q>u;RMUz4zN;d;#j_P2Uu3G zCs;ZyZ(=mkQajX|Sw`qr zMiWz^UR)d7K}0cgp@!5TKuh*Ep$%Du9e#p^Fpb=HnU~?Fu0|pC(O8B8US1%ZS!;7ziM>IP$ zDmNcv6S35)@yidEYQxt_Stk5YZKUy%W4=BQq^itm;g45Lvwlt+WXH|$|w*K2Sbd*g>Bn)gGF zK8SOpIm`iLve*V$E-=f4ADS!lve7rZ_(|}H`cCuVC_cu=ECWB3!uwXOEE9g%ndRq* z5V6##++1n(!&u9NA9iMWFzbg5eKO@V2Gb~tZ`Q+FCj787%TKd@$j~#b&xgAsmbT)) zA9iLrk$pa7=)k z-?A9$1yT;>(O_)L582@Tzp@xMk3pCRo@hqNgAYLMTFr$Rn6aZ^;B@JqFLJ-F**uQ; z82beC&Hnbmud(LdF$-L*Sonod=Rfwmo{#H79Jw&jg0mRnVCIgQ-&j&OtdozUbpCrI$2PceP_W%F@ diff --git a/src/aodv/test/aodv-chain-regression-test-3-0.pcap b/src/aodv/test/aodv-chain-regression-test-3-0.pcap index c7bbf4bd339b6b310bcc1a7d086dad7e328b6b58..30c4ea28a6800f9d6aef6c88f3f44e05d3cffed9 100644 GIT binary patch delta 132 zcmaE1*}ySDX5y2C$x?i3i~^G#`D`b*2&pkDOkOQyJNccM8l%DFjbaj$b;VWLSQr=> zb~H^^;8S39n0!}UVsfN}=HzD*N=yL^ler`vm^`w_wK!!nNB(|Gs*q=&iT&w zlbOlgufP1PYx*WXHaCrV)BQ4hx?|??GtXI^oA$7igZz5!TF=g&G$!L%XP+@UJDmZ} z&F*S<)f_OUi*b%|UhX^A`7@8@aT0@ujlng6(TiZ%Js8Km#CY_45`=Q)Mrd?|2d zOlQ{2^ofLnp7bSxxor+Vx#8P8&LOO|R~O^J9>Zx2BP=VdWjlt;9PI7Eo#)+rP}bqM zPcd6<Xh??Bf2=SIN&Pq71x@qH0zd;j#aZ9PHe85eDKBmfZNo_gCe#(=W>zY^9&X z6!wO{`u3E5F7Aa#xjoU3{AGpGFN3{6zXELovw?ojis(1W*_)HDB70JiMCld!jZ8;$ zvlR&)ckRmc`}nsAgF?TX_kDkre$L;7e%9Y2{|b8xfBN>Ee#)b9?vd87RIOAJE)4$K ziv8}td*(T;;yG(#(Ng*yq$aMT5v6bS+nE;#XAi()I$jGXr4d%~oT^r*R^Xjft5&Ov z?e=&TO(#GrW)F4yVRp!@LtD(XEV833*+IN+ksatasqFauMc*T*pu$+nF?77jDA9Jo z`SsIVd35`wzFCInJmc|N$>`)isdHbrWmrXKjMV^g_ai{iLg}Fb3M>9Qa!C%zHvDDRwMa082dajz6UgUJ0rp6b4d)zp1$(c$6%MA zegm|7Fpj&tIT7Q9fBk1#^>;~P-@B##fY#nK*))dT0}R{+gQ3}vOAt{TGhU8iZBWDF zpJTA@GnnVwSftZfdocGv2RAUv-}=t0ZYq(rvC$@ zgqAKV7XvLLou)O*-N{Zv)00>~lvq10!-z*ZO>36#qvNHu`~-a{&{8mkYwyQE%Sfkb z&2j?)D&IO)g}Rt7`8+b#N0UxNf~Ve2Vz`JXUww>PorW0C+^Om`_q88Txk;yCP|gA< zh$zANAR>&eKhGbmf*#zPNRJFF=}-hVmyYIhD65{je0|0 z&x~JOn{*nc&iF{u510RITB{O+Z*kMlO?D5)ahK;NV%&T$iNR@n2uu1=ODlp-PA4&( zAJ?@X7;O@BYos#fnT|(^QOge$x%uK$l^?gXAK28y4`O6zeT>*Qmy!0PeCDSg#rJb0 zA-}@$@tb$aN&G^Le}ED1x}5#_lFvXr3%HCJYX+s4wUk7gs*&02T1jkbq9ifaFIV}o zsQoB0YWcx0kJbM_n|h|frY3$6WAa*+A4}Sg5~G$Mc-gHH5A{5d8Ek6e2Qk(@sPbb) K`%z-l^5cKxY+V!p diff --git a/src/aodv/test/aodv-chain-regression-test-4-0.pcap b/src/aodv/test/aodv-chain-regression-test-4-0.pcap index d7e988f42c8f98e1dcb456b32c9707facb8b48d6..ab9bb4adf840df72fea9a643102012d03c7797c9 100644 GIT binary patch delta 113 zcmV-%0FM9gCV&W#e3JqQCIJwWjR+W#S0$4m3j~wE3L*g@lj90K0Rxl03MG>W1r3v_ z4Kb5G4knZO1`U&O4l$Dk44<-R%ll2chlNb>u0dSK)5j~UO5hekE TlLrz#lc*9Vlbj6?lid<8a-JdT literal 4976 zcmb_gF=!M)6#aXalPDIq=?>K6F^hFbcRrR^H7K_noq6Ye+gGBqIsLDsbvQk;0BSaPMM<2%J zdAx`3Xx&9Gh9t$G9*o3+A?9#DpEHbepJQq=7LEZODaNG27^A30V+lokDG?A7sao!YLq5L%zgJJoDQAC^j?m*L{?H>-kax|@0 zQ=w_Sv2-2u##(QaBB@ijj&)B=CBcca&-sZ?FQ{-Nf?OIiBCaPwqH!EV-oYwS#qzn=;2hkxKR;$q$wsEF}Yu ze&eo#rRB>jg()Cy-NmrKC|qgR>laKEnFEP0Z{uL!m4hRHXXM~PkDD?!Ii3dJ(O!MBbM3e z1;JZh3|W_C-PGDZMN$l`x`R&>Vh;E7S?=^$9u_!vIZuduV)P|nJKVV&CW96pTpZ4o z>k!A=O~d5Z%p=EA=)vgupmWIMAazS_F)uqE)4qI>s*X}3p)3g$)H6%$>Cgt+I7R^zh38J^jgrl%Q=<~ z=Z?(sqSv_yy%cmVMaCP4$fd)%BeM)Uch$^R12rw%$l$holp=5a4Z zx_5MK9XzRw4q!ANdoeJ~Z)$a0M}|>I2Z+`#c`;HQ>$VQ=Eu#ZL!u4p_Ix>txI@tJB zp9$&MuyydHGCF|qZqCGTJ-s(=9rj+X-$~h{co)Uv0nYlK0>&m|xOYj6b{?7xtp6rb zN6gv`GL?lg$%{k*XZP$(@}x4E1jhA8Asua7M}|>I2i^|D|KkkoUp%Rd4qzN^hjeso h9T`R;9s3H^!`cNK#FNVC0LIkQkd9?rM}|>I$A1qTvQGd2 diff --git a/src/aodv/test/bug-606-test-0-0.pcap b/src/aodv/test/bug-606-test-0-0.pcap index d0b8402392fafd7ce49c0e39727a0e75a7da0b9d..f3b305fbf526b2b16287adf32fe1a509004edb13 100644 GIT binary patch literal 1448 zcmb8vu};E37zglwuarV71a=chSaj>q#FfR}!NJi{H(r3q=!86iPAZe}2~2ze1`}V# zq<;TX$lYoE>?KF9y_R3Te?NG8eZDhjVLPe{xcokuj({^+b9Q7_cG%7K_H(_C?d~y9 z@>(;p!gr!5Csa!fa} zwqx-aE47SWqvV&x^|hFw7SeWHzjqa<@Eu7csdwVQvH7vUi$bes>O1m^(|V^BIJP0^ zJoNfXJtw}C0F!zr2^_im>%HNyuk^sV>lBa;o0fv#E$tzBM(jyjrg>l;}!L*o61@#GtMGlTypS09;@ V)r)WJH8UhyqysIhjc@dt8J}k9xMu(W literal 5840 zcmd5=J!lj`82$G4a(B7t89@ZW=z)cT%@$V*E)h|zQlv;}7wxPxh(ZJr3yGFCLToff z0%9RH;z2C@Cq;^wCU*}dJl`QDp1Z@-z{<;BN$OH?LZ zIvt|3>LT7xG{L`7Yg{{`h{lRO&d-OU^*B)r_kx{7^&kkic1km)8EW#qLuet~!=FVv zuJIdX`Y_QrpHUMyRkRZyEu09q6i&(D>?JDkeZIy?ovTauEz0Fg3^kTv7lYZQ#?r+A zcZ`S6U5x1mVUAu+8>0onVYXfvo2{1^7sk?l6;jM+RKH$kEENiBR4FU1t58SIqU6p2 zxO{fv9g#Ps@=BXX^Vabsmx_rZBFm0MH(!U;;0x4ceN#r_tGPFM?2SqqO*+M8FO)&> z>u*ELJ&L_VQ|>YBiCvm>Pas^1nT?YUt*;_J%5BC-jYvl4*0pz@R!od2FW!6j$yUWL z*6RBBg@&JT94TiEJ=GZTN~Wf21`UR*shC0I2;;CjAMAKOO~*869Z&Y{`k?C#Cb_`z zvh|x>4QZ7Bg<2z@{|p)w+J{kF&t^#|R3|Ho?OOBT83#V()+vsG>c=~+M+ZElC5qXD za68w~Of4FED6=0oV|n9~ho$42G|QuZfo1)t#|sXRb6Tw|FVvu#7V64|XVga0^S?Z! zcAn;Gjb`RXjXE^hNJI5-zQ#QKj+Mzsx+mK~Mia@BJ9!+WLv4vCI)CGuVky)@>jocE zK6hsBma8TI-{T;J+HyhXMV|WV(HBIY!*v<#(QS@gn6V`iVTg=?Ngci z2bIMi*(@WhxJC9Tz^Fa5R|?;L%kh3htgDp=<$en*8OKu30#*tRE%zugMSIkiBaoU` z5}x2r9_Q*%j8wd!bGCEQx|o&^>S{89GFy@>+n9sS+GaO;5F5+Chc%(exIM;as$MJM{oU21I>*58S zvz?39V=PCCrQ_VMw%UTF$GJVT9PxQV@IdI310I%6&ZWS5gc3wb%$$uto$<08)GX%Hpl3CFpKJi(nj&efq*#9}9OuGrqJ`S#iW zhQ}oq-stfkdEDnY=m#E+9sR-M$DaP+v2w6Kcr-`*gGc*iUXDtv;GD^eKIKKfMq{8O_ diff --git a/src/aodv/test/bug-606-test-1-0.pcap b/src/aodv/test/bug-606-test-1-0.pcap index c6d1c770555fa764e46ba9f60b44087a6429318e..60a46e02eed01bc1f412164d7dbdea402170dce1 100644 GIT binary patch delta 98 zcmcbi)4(x7W@1aiWDy><$$5;Dli5X8CztT6F)B=+&2KyTijdl54`%+!Yk9apGLuBq zCR?!ZPv#ZinrtuP%@n{exkn_4DS=_~2Ow3zFgZjtY4QvX-pPkW!qK0Ta_w+v3z;cOPE;y%9fVy=xv{>@|lP%Z``6>ttlErDV4 zz_p8U{!A{0(Q72k0}4cXb@QM;)C|`y#t8IYy(TRmW0a!Q@@qo=XGV1>Gn&(i%UZa_Kj=i80dL3F(oxsYrd%Ixx zgNl!j$H0g(($O(`<%OS7pr7$?R1d9R6B+3|0{w0wUWBG20d4$cB40gf@@?B{rSh%0 ze4T^EIBmmyo3Fe|FmU394n-J2dLI1&{eFK~?EDEZ(~O6%ivm=lA0uYjPSfc&72D zY<9%sLMv@Jp1nnXxWaRw#BmBd@>#x4u?$=lv)uC^ST1}@uynPX{OLO-aGvJcY*{U> zQ}o)QIxTkIE5dELyJ<_@2|5lyHEZdIUTo zCujzEm0ada;} zB9?)_=0Yv;e4?uuYRv~HkHNJOOQ+>Iyn`Z^y6229+Yw8nrC;&VEH8pb#8NR}=x-^O zfiJH{EEB#g&GHL2%l6J393`DUnVv}>-{p9(c&KN=?+Xv^e{uM`QYRQoKZzpmK;3>&QW*h zS{k+IeYGbAlM+2#n&n|ch*&BH41F-w9h#r<-BiRf(Zi)#9?k7xhQ5_z8T9aC#4^#t zrCDCj?O}#4{>{7Ov&>lWL4NZRBf}m)=XbT~ud5*j7!T545W0{43f759_Hd%V7;4Q2 zC+GJUM=uoi*RrpKVwvc#(ky3CmUMqH^k;lTt3c3SGZD)~f0btW9T6gys>2z24lapU z2K^-!?>{NNmj0W(G|RK=5-gQk3|-t`BR)(2-O|_lix}_r7rlprcZ-kF*L#>4%QuU9 zc;5F!CQxON9!4?c#6)f$+I@{ys8x5J=u0b5>H{MSF}iv5g+T)@?Jmlr9b#b8AZsec pDBc%!LJUkA1cPnX$@i71$5e=cNrPal2gZ(VMOsaV7??B&#$Om0+?oIY diff --git a/src/aodv/test/bug-606-test-2-0.pcap b/src/aodv/test/bug-606-test-2-0.pcap index 14f23022c8ae85b1db528a9701394890f040b479..855705acf3b6af0e8c5b4a61a3da5029352d7b8c 100644 GIT binary patch delta 89 zcmV-f0H*)4Ab<#v9Fc%vlL81P0T7do2pE$Y4keSk3MK&{lj90OlX?vzlL!S3lc^0? vllle?lMN16lPCxelXDJL0brBK4r2julPwQplL`zClbsJ&lbj6?lLHVhx?CD^ literal 4146 zcmb_fziSjh6n=XfFXsg$f>?-xAZSnsi-n{RJP<{!0^T2xPV7>N1PsQ|VxwJsiiZl#L*P z5EvcOql=x=1SxHQF=qD9_lBeLG{$UZ4rIN>r^BQmi4JMX+rDw*7^oUN%ve zRp3y2@OK9O%Gs~L>gCwcx3h*+jypQX++~WDUn9M0>f?g|%c6h}{{&b%s_dDZ{Huij z#*(4_Licj1c+h%)il2P$5h z#=kyzEPG-yW+K3&R&Y0!o_~5&ln))C;eEbFbNLIPkLRK>AoFn z#)?$=H^Hr?T)DKK4r#(s?!acyp3P@id`wKw})`OXe=bF#2vBm{bLW z<&S?QIy-kJm{bLW3t?|Q7RQbo2PRd)pvdF(*mE&3sS3t%VDzuW;&Aq(Ofabm#$N#< BRYm{+ diff --git a/src/aodv/test/bug-772.cc b/src/aodv/test/bug-772.cc index ec889377e..6768ce98a 100644 --- a/src/aodv/test/bug-772.cc +++ b/src/aodv/test/bug-772.cc @@ -127,6 +127,7 @@ Bug772ChainTest::CreateDevices () WifiMacHelper wifiMac; wifiMac.SetType ("ns3::AdhocWifiMac"); YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default (); + wifiPhy.DisablePreambleDetectionModel (); // This test suite output was originally based on YansErrorRateModel wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel"); YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default (); diff --git a/src/mesh/test/dot11s/hwmp-proactive-regression-test-0-1.pcap b/src/mesh/test/dot11s/hwmp-proactive-regression-test-0-1.pcap index ef403bf98b90b870e5450adeda195a8e05e3dd71..4177b5e964cbff4ff791bc64a95d6ea783dfc050 100644 GIT binary patch literal 784 zcmca|c+)~A1{MYw`2U}QArs2+@@HhQ0kT230f_&D0g%DKzzrioYCzxxm}2DM5t2|b z@JPt1U?^hAO)bs9zyO4V0a~6P>S>7CKO%`3|=C3M46R!fRMW;Fl3!{C1@4^I1ZJL literal 7313 zcmd5=U1(fI6h5qAtEwy}M%ffYOCW?k8g1*IY+~%d53$yp$ zo!M{BcjkQO%+CD9v!_#3N0n=7iRhsJ^3VyQop|OpOFib>CVgwHd=?au$~NB7c5laH z{fAzyd-?gpFTRpditv5+a2gMl>xmDDZo><=`O23D4R4!IF4y}LdU<|svL($_NHJ(= zi*H4$d)P}U(w#hj($ho_HEdb4NlfePlyEB3#Os{Wzhjs+~A1sRPh!n4jf4vVZXC{M!5l??Fu!_u7 zT8rmL4+1TIuFL3kmN(+Tn_u47e-LIec7xUKy((_;&6s>qk6{-Hi$Cow{(S>k zdIW>HmC@X2>Z5bdWzi!5=BO)sRjIwII-~{{vk7K)5RVa2JsJRN7^A%6`3uIxcr*KH zF4Zgp=IECK%v^L(lf7A@_r_vSJxVuMo0;s*A^Pi+HF0JhSpzf29MoiQ_R++HZ8EAy zp8_@XCdc%bQ$)LP=O(A4GBv4p+KGx7LDa-Q8g0?f=A$v~zi`iy#Kk#AExka)AsXvouGG%-dxS6fjS7fqBzl(Kk$7i$-dt)5F6+5_Xcjlx&f8Z?^cDNT(ENabr`6-`XAOSAPz`BY!$C-_26 zDbI|@6A#nt_d*2SFX{IB6?i1BJaCHqP=#(hldoWso`=VA$34@TWtOvb#%AWvZ7-)i zxAxdd=KeT>9`Re=_~96viBb$^cdyiM-IoPs+IHrBaxOz>apyLg_L-TOvVCjjUW-8$ zud+DH{9d}9h*ymLI;E(A4)M3Q=3)kCz`zlrww-%_{nK7K$+xGBsXA(6eXFA;h)Ius z!srkD9gFTqJf|;QjNZOd^segyvtZ@=|FP$mR?bu}qc%1|jLAR+6exq44FNsgt9$+x zqQ;Jwf%;zaV}8c0=G7(YwXZ*88gAm%JTWplw$+a9Bu% z`I`+W%=1o$Pu`A9((kWrlud{f4MrAbenUKu_8TEWFWV1+(@6c1l$Oz@2 z)-rk=44g32Lg6s`TH+Uxk~Y8La|-$v;#6a z??ioaHCmwE2l$v+K=o(_s9`l?M>o8w+>;hNUo{q0{)-gcr6CiqnCgh=Dz;{C`a*% diff --git a/src/mesh/test/dot11s/hwmp-proactive-regression-test-1-1.pcap b/src/mesh/test/dot11s/hwmp-proactive-regression-test-1-1.pcap index 3fd6ef1334882763ec99d97282df3f8067acc584..9727e56b43dd72408d32746eebbbdb85d14cd693 100644 GIT binary patch literal 784 zcmca|c+)~A1{MYw`2U}QArs1(e1d_&2FM2C1|a?q20#V_0}qS@sR4l(j3APcgGWe0 z#lRyWr-Gq~B{#J=10)Ipn-e(*m?Z#K15%66ERZ#mrx0?N0>kBN{2-$Unnl=M1`MAU zixV`938-T73qtO4U=YrgC(5kNrG&yOfWi2e8bPy|LGJoP$Xy8x!H4yTGHdfjLhdSH jD6TLgXcj2NP5wa0T@4JAf7%jd7UA%kz_7W_m7rMw?8KbY literal 11767 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 EA2Ninp8x;= diff --git a/src/mesh/test/dot11s/hwmp-proactive-regression-test-2-1.pcap b/src/mesh/test/dot11s/hwmp-proactive-regression-test-2-1.pcap index 3943044159380364e997110aad26c67de6b640d9..321308af8dfb724884be0ede4230a41a651dd8ae 100644 GIT binary patch literal 1039 zcmca|c+)~A1{MYw`2U}QArs2c0t&kV*&uuYi2s8DSdte;@-jB5GB7AGg84v#mkCI8 z2t&Ax>_}RmDm11sFxUXuAlv}NNGhO)3NV1wfWQl|v5Xu%LJ}$l9tk-W3`H!tsl^!( zSq27=bPfV$DS*`wG7Dsl#yUdoGGNH~zz?<>pSwV25q6gYL&r*Sf@Xoja@Br9kr2QD zjRcT#FyLhdQn(@kq)Ou*AJagU23FM#i730QIfMvj6}9 literal 13393 zcmd5?TWnNC7@pG$yQST36~je=ZUU47Db^q$2CycrsSvQ@gPK56i6Rn+DBuNe3rZ*v zladAyeL!xZEf5eM)JS3xFx;#~O2QlUg%F8JjSvMR_5Wt(oSm~XvqO1ccapPvc4zwi z|M%bKpVRF=et1V7D`5WU>tpOS`C&YLT}Su0y6EcTgHOi%*O<3<3}Xq8f2NmM9=$XT z5+A*Y@+We|s?m&1r+ZvUx|9{A^pP=ojnNv6s~pygmfSydbaj2>(s$UK1X{++-#vj8g46+0c zEjdWDKC3{M&_qZqC0Q_yA}uASFpmqAqBf5;=pDjJ^h59VN`u~kjUF9m&|9#QdRKG3 zNx#4gs@{1plpM8$g+Ia-ctfDjH^asoScN3jI9YK6a%tlT%`WS0n$^4^G?AVs3!1%= zH*FQXk&-lgfPugQUPrYiL$W#gL?iOsq&+zL#>z_-&bF z{X(-EE1`*ySYk~@&H0y2k^=kXpSC(*N=mSnQ`~DN=Wo%R-$Q_!yNU$>W9!Zsh>2M# z&YG*5yIwqNa7YL%V>YHau5jAY=K5LXOSq% z1`EuJ6Dpunr2?p^D;88~f#q!RB`fM8pf1!W+bC*7{(%4YduZyEWAIA6$*!S4=j3K~;|BlMq|uhgJJK7<+==aRn_> zs4gc7^kdRBK`YWaN&Za3G4Izc9)bb?oo<$MHAK+BQdePh){JE&xE7ob~DSj{3e zJtWNH34;e`1lbrdR;-$3FTrVM2|T;a7Wmiii~vUwHnkL<`fgKW+W znq8&Ylt(3RAx~(a${qog`Xl?>PJ?WY2-!osBJ41|<7&ze*<8pLO{2^JTI9>dQ-dTv z*WAY#;vZJ;@K_OBif`}D0E0?m09A1Xe&xDj_PU9ms9GYjRDP;obB5ovUk&_%*x7c$ z;6Js|SNW;2lQaAtxvoZks0Pc5gJ)ATc-C7h4$u0a1{dNF;QtMFbXhGsuvDPitEC0K z>xNbLQlU!^2j{xmtEB~f%HIah2bsJ1A62#~b43#`_AaPltQtX$WI^48-S!Z=J*!sV zG{_ERl_FcsDu3UE2&yTl8~iRLd+IHN>>%PB|24=CMZ6+gjrco~-SVG7Hb;lbzuh)u zo2Vm#eO$^;-=Wg8&Ew3As9xUVYWXKI(EQ4E2fyY%13z9%WC~FI0yUU?=$Lxs(I^o~P%0n*TTh@M|eD@C()Y1lY;G1UHuW%u1~X zgI&Zxp`0?oVYkh)N(ZF7oDL%8tubF(M@eAU!nC`Uv3)T7rrzd(d+~%79 z+>aD{+0VaMaTbP$T%A=^l~I~g&kx{t_ans~c6I(l8|pQnUeQq9kCl7bbL*|B3nmik zs5g`b|G zIlyo29s|E1L#OXG@C)rA3O{`Z$pL;hTMhhz9b|I5fuD#^;l;S*XFe^Y_+_oa))50O zK7$=()II}0k$Hlp$}dxVW{uzC{RVzPeBL-<;1}9K6#r$4&#dut|67iEe|$RGR_kA% zOjQ}BIlP0o&mg@ldfSS+5vc1mRQDN#c`GWX*mS)O)WHv{x>Ea^;S7RV_Zg&y%d_kt zRHU=HgMfkk41(DWq@mUWg?12ypPr#Pz^{{NXcdTODEN(Won;0>WwEb8Db2H!fY(JI|4OD4@K$Ra$0NMxS zGD-o1f%mxtr&UP~gxR7Gtir@zP~s9+q6!;EaGEdB)RxQlsmFwm*{j33? z4}4?=l??6z^cI0?Jc82uMbc%o8sQ=TM-RS-Qa^f7jn+v~#9t&vvf|mU<9l0~NL<+x5@tHM#?n8BhSJhcdv1)9IzOJP<1HDGLC2}9C i6JC7{8WAIECs5C5sP02`gLhiR#2eDzHL diff --git a/src/mesh/test/dot11s/hwmp-proactive-regression-test-3-1.pcap b/src/mesh/test/dot11s/hwmp-proactive-regression-test-3-1.pcap index dfeeefc3f78dbfdbb6f496c15248b21cc48d298d..dcb7d561b3256b9739e26fa5b9b03cb4cf5f5c35 100644 GIT binary patch literal 860 zcmca|c+)~A1{MYw`2U}QArs2sRbgPT0kT230f_&D0g%DKzy~8iYCzxxBZy?=;1QBg zG4M#psbDB#$xSWJ0EvQt?o@UHW(k1RfYjnM3uFzi4k33bF!<*2gN!0*mhM7A?lNG= zeJnGg&@3jP3f+~2+!esER#%NEvwZCcxhsL;>>*u(W-)`@l}X55 x1q^TXO^Gs#u)7)r2Y{M5Gn+t0=nXZ zO^OM|1RG=cQA`Sm0bV6q`B9`&3lbrbhrVbKB&iSn5DE1=GqZQ+?wsjuU+7LU+q*k+ zzjMBG&YU@OZ!exawy%sTDBp&Lh+Z~dcH`$3TyyV7A5u*XR_8yfgY7ejvVr=JkLogf zbWG4+gQRtfnNdBRXaTOd=g_SgHTX(|PoBf=s)7wtf0!#T*anX-54%g38P73e*@r=$h%!G97=8t_fn) zLeMcF?;^vKZ=)5fJ%DLio`IV4QpKoy5vCqgL%yBXT=t@_X4K~$)OgRgQt!1%vPl!f zs8RCqo^Pl1$;mQcnyycRnwK5ac+cmk<8?1;axzfMYi(V5X~cWJjjngr$+{+pQ48c5 zFy8Yydav69n5G?dQ1cB3HQw_(sr#OKST(G26DKAd_Qo{;xh ze59ar-Dq`w@@&$LnJ_?mdu`cVK%%LLA|0kWa)_#6ca;;1yrCnhD(?gB7Y5;hUx3bF z+{2}#aCvmi4}xqhPitVyo`xHWBVkzCGtLRJ6)xYlwJ%A>@Rxf>d4#u?T7>~_Dhm0+ z@aFSwj=wjLC*l}n<~;#b(mMY2&NODQ0}LG7D&2Xs_D6xAop@}1D)*Eczg7JLztDfT z&I|lhRGYZ9`Pp$>GX6{dWk-J`51Liqqk~DUJnyPkD=*B03BHB>-|9yUBMB zwCFegwsn_QPpw8TUOo97&MKN5uCBuT!2^~52%Zlk`x-`9VitFK|1jB-?RM{InN9rH zMmNkN>&9YcubUAuy8v`&&4w}k-%UYwB&IFdc1({*_Ou~EcDN68QOcJO%|2jc7w-eb z>nY%zNR`NlcQ_w*gMnk)aIZqAvf66J>s(t6caP;R$qc4I2PZ0&-+A-{iC<*3Tm0;TM1U@1Y0!8o^aOesEkDjvs82{z}1M$|O9x z3T1;Q;7uCLViua51`7c{CTUQ)91NU*P`dMIIhZ>9B55$o>`Ym}7m>2C1o$lh7l&UM z@bS-f2I<^2Pq?J1uMuhRxDzw+&vpjr>N9iLT+)Nm>x}xFgWB+kP{JxEICOBUYEpkZ zM-VLhu}-cJgMs6VFu5L=_~})oS=#*ECS7ZqOm&rPl+z%TyU zPCq@qVXlfo;h{Rmbu_tdJSZ3}Os=y(7YwFDL5D@g7)(yC1%r)Qa$NuhPQWYOIUsIG z{36NK;^)?wCBW~&F9d#Jz{kHepx{QQCtT9BVJ_0(vvZ1LCcbhVq||LM>JCPIH-d_y zhf-2yr(?||*Jc&gp5zL5j%9LX2L8&GN8>A3i=UfZOMsuha%Fz+s zUuDYtHpU*sEPigaPy+nok7Bh!=h4L+gYF}S1aYE{RtvWe2nGw6Z2O_OqnI(6TrCs~ zHfGgA4h)`h*h)WW`$WhGV=N`pMfZx=^0zb7~Fu(YtSZmPOx0s{F4VN?>U5tHw Yj}tTTN3m?Mw3&BC5w(v|&qh%H2NHmtO#lD@ diff --git a/src/mesh/test/dot11s/hwmp-proactive-regression-test-4-1.pcap b/src/mesh/test/dot11s/hwmp-proactive-regression-test-4-1.pcap index 347ba681697d48a0fcd44283e3cc6629e715c6f7..6d1badc344e5d47fc5b38efd0d4bcf024ce4e16e 100644 GIT binary patch literal 1142 zcmca|c+)~A1{MYw`2U}QArs2Uwr60l0kT230f_&D0g%DKzz-uqYCzxxBZy?=;1QBg zG4M#psbDB#$xSWJ0EvP?_X>6bW(k1RfYcH)Yqcyt0kaesKxzn?1#)tC2qAYFFr1zy zMwD5r-|`V~mjlCVeK~?=F%jji00!=xszjOPafF@052zA^JD5@95fY~fU~_=6%E+Jq z3YAr>fXWy+*nknrz{Ua;1p$68Mn+bMdLRod268E3Ul%ZF7wLkHz!$S18@pQw#YO{z zx3?)#W+^Nrs|clymT>XHd@THX-Ee4Gi73E<~9{ i*w+WZ=0JQ6@(HoN2DxkQM-e4Q>#WeshsOuyE literal 7387 zcmd5=Pi$0082@J5Ww*QTA2k6CwcSIhe{f9?qQMB%q#CHvRL`39pag9RC^k`Jbj6r7 zDJH$Z#e)Sy(iTwQXH?uQuAHA@hWcJN_Gw+-4 z_nYtc&FovbdgV-tI;m0C*NNT_ZYKJOUP7B|4Ru`#8brm$ZvkVttSbIh*@qt4-ZyYy zbo>+gsPo8s#}D&UE^`>S4_B^rv51DYQbLOeza`j+Ea>+?%qT^8zGtEXjYfHEr+%3Y ztTY~KJGkra_w*JT!+t_<16AmWem6i>rc#PWN4`W}q*LNfVC+}lOxg-YoO;58*_x@c z0nF!MjZIsa!@1H=dQjxW_t=4iMCH($s$TTNzjgs$J(%Gh1-X*vX}wwuXp9-||fZGM9} zTH6XY|Fo=fq$RUCN^4U+eyeH9Y%|?tgUM{x=-b&CgE>0c12;c&taklI#IejZOmdd6 zrm3L5?j@>V1W|!qnS4~*`lr|t+;GnySBYN1m1`ZEq0zNBt6oJlV%fp2;jiF6qe>I6(;sVeh3_lZ{=AB_v2D zHBCsW$0g($sK`f1vIM3nU+oufJW8EIC`1zAX%8%B=nY)CPJ%0A4NAH_gC3L;a&m>W zJwMNsX15@B)0WO4Q-f}$=O=cf;*FoK_#J=}%@ z++O$KGX-ek6Af-QeDynKbXaN%;{B#3TcRU2-X%IhHKq9#X7AH~P3yk(FKg?~>)+5S z8$on%1V}54Lhg9}ZmYHV0KHM%TgZYuaY;-{+;?vj*{OS`^#GZ*@&+<<qQSwF|m>z^bYM0jB}3;a?re3ysaMb=Iipm1~X~jSoxN&aA-* zhTwyPPgaO~zeDgk_^jA5@R_l*Y49Z<7#C>Qa#dEzv#AebAB#41reqq4(jiPJ;odx2 z4q;Zn2ZZ?pJ_?Ao1Uw_y0R#@dFyNDq%eU#qtr$9Uv|Pop;1`F}${Ek*By$Gae|`X- zq4;HlAZ@pd-aQ+a;F;6KA3XRZW`t^lje*aV(I&u`d^WDrYe#p>B6(!AhIO}PbohdY zFrkDAyK~V)m?fitFu#lLcO&ji-i-`=u8cMTzU1BLCXJQ%$|`webQ0?x$%rXA8@n5E@7oYm z>)j|I%rB#eu(rsE5sU)?M=)3W_{F`+yHQycsxfrtsJs_4`p@BX-{;ExFk)uwVntaW zZ#ZMwA8*(>E_{9S3&p1)sdZfSe-AV?D*O(>oP4}tLsAO-V%*0YK@Ow)F@|gSfytD5 z>9+mx#__Ra`dIx^xim|@-!eOz9yeYMg&;Qi3BFvol4_RB#dt^@kCxZ~BdWR_ PLuZaI4xJ%b~=WFj;}qo3UVW4v^2yrN-L8@bS7W zP*!nrIF}mZgvoVWs*?+O)L0iV7*_d$#rFbv8yEt=hk$vUylRXGCL8d2GhJYqT+8dl z`ha2MuI$MTysFHCF&vWxcoioX@OiN^Fn)Yc1=jF@PmNW8QE*-pn5V<9#;U+*$lV3z QDaxs_8ZZXlnF!(m02fd;wEzGB literal 7789 zcmb`MTWm~07{|Xk+soFidr0v@*CjzpweFXadT1gW^=kb-*3K|`Oi1snRec9 zxu8J?Sf#fYU~B9T;~zi?f5sZ(wbv~C0U*=*#5PzyF#Kfx0fUE+Em~N;V?XT4*tvP{ z7W@{A-sxAc0%jX*n~sIusQn5;@qz%Nlq|hfb!(``ELOFPG6zbzs*+b4Q`MwCR!(Wa)J&5A4_>+XNluGaRwXANrH^mu;HH4*!U# zKMavk{h=du5y9BfpA%zD0*%M2lrId%^LeH#>1G63dZTJa+CaZt=7{xVd`>*Iibw|q zESJxNCL}S5^d(dCnW+nyiEiOUAy!!FkZpnjOqCAdL`P|FCJ8jDXKrZ2CR5Vx@sn;4 z_Y-R;I*i2}DXveMEXvvDA;^R%hf_GyB%twH*}ijPjGMtIRPDP66xS{>J4>fBWa-yb zDtiqT-7AzV+*rmGm0w*@(^ln(rB*+%h6$ULESyv0qiRMCNjVm(*zo?uTm{VkaZO7Rl4ctE!2Uih#9YI9kKKyD!)pZe(s=>m4klWQZ2=L--QL5RAFvt-X+QBm+gL&lwj>&=&@~i?3AXcMA^&pS8m~$>?o-_tthS378N25N&S%)s3(*}tda`31VjJ0 z8niiM6QYJD{!{#;H5dH@wM|XiKd{(TDy^817-MSqvuI*4{z`4j`QGmB-JCnOvwQnC z*<+90@8{mkym{}l{CM zXw{t+)sd&8ua2;xqSyL|U&jC9(c2Zu#|jz`1k2dJdqc*hiZubOZSW+X^9B_zOiJ3W zGFA%qWUVo6c|FKEga0?hbhxmNk#2z&!nVRuFfG>`=sN%3WVk7qCw1V62M6xBCD5b}?1k2To09g_ z3MH*0MM-OC;cOW3-ESK?C9OoGq%8w&6F4WH@_^aGN_EpmV?iBbcD3HnISmD}dhgHM)mqxL6GA6@} zV4gK+bISE;4-UNZYk?+pU@x?qiAs)NpLp*fVhj`a_KEw_4KExH@7bwQ@k2qo?9hlHx!YH5zgFXu*FJsoke(E8Rj#`yFV`NwA6w8weN&wq!i_oVd!8cDjT3Sd;L}Ud4wV^&#H+ zm=AGTvk!4_s~_>U0>!v=O~CHIl>p-K-M-Tq;j`@>#?acTbs-5NEBS8TRcm?$+`^ZB zcvi{6hZAR1c6IV_Yqu*_vRP$Ul-FJEQ?f8@Brd7!I>_6O9dO0!eLSySW`qiM^0Otw zu2^Hh%EUQo>WM2;4@Oh-MaW2tK$FfvFSNexl(eBIC}}-AC~2{sl(c9oB`y49$et&S zd5O;U*&azHos)uL#Iqa5I#hh-q6fuafmoh`@$P-_lFvDnjEm?Z*k>|R35tIe#Zpgn z5TAzEhM8aXD&7z8^$Heu!E3yN#clA`u3+)%s1NZqKjJ}np=a}gjDsZ)skVhC`M@)I zf?Yr_9TvBR@XcG|4%PB)iYF>Z;YsJ^8?urgfQ_`-zKuH_hLrFWlmy&j* zi;_0fO-bwjL!e1#N|gtHJMgDKllq$%TE}0MwCTSoX>B(sX@Q%Rv@dT_(*C)v*{kfF zxIHBd@fCx3>>LaX47XM?OimP%XJnXcC+*ED!1&9f39NFx Zv>K}dqtvlZFfUX_jn#nBDtsb{2LMoJL)QQR literal 7329 zcmb`MT}TvB6vyw~)pga_)k>5NqRf;c%knEt%>>O#&C;@@z@Q-MOA{e{+RO@rXzd%R z(1#%3q~44mkOUthi=HNm-m;e{3aTO4&Y9VDNA~XA*`0IY4zoM=|C=*+&YpAb-S^W^ z#~mz*gKeIONw}c?gzaooHO{o zqTdN8*l@<$ZyIQB^fPD))5>m9(pqj)(u(d-(pKE1q`B@<(w5w(q-AbSmH1mv9RBvx zNE7;7JhV?+47S;(%@$MA-jq<%rb{VlAId0cKg%g;pSGs5LI^_G#qrJ0yiPr)^`|&7 zl$Ai&!`YJxgIMSgCgPz=JK}9N#NAbP#ML&$RW&xmIolHyJK=RHmu0y+z($)kYOmI; z9zm9x8#BL#a^e`9`dTVwVHKvFkl8iKl(W^ASose*^T0^#?==M+Qt<@u^tH|riL7B~ z)vhu(j$!T$F3aTj^g2!T$mZZBQ?u)}@n-XhmStXy$qLmg-`T{lHC8dO%Kk=*GAgLXN|*hKj77k{wQM z<)p`>FN?sW;?t9w=Bh7bLkfqkd z%;cfUD1%pCYnQUnX_Z&9%4ikuY&&9!r4GpKD&hm~<5Ctrgz`dWS1ljCe##O{K3}bT z%F}0w^}1e=B^SjRzqG!?pRT^y_Yr8~NQ20RhRA%1S4~}#m=?Ly_MHZn@CR$1wWE=a zbzm1At7A7Et91_@tGtPhRnSbw%5E|EvM~4bNPSsftDv_o-)o==JuDuYua%OPypNKW zzMqm7B&GdpqqOZyJ0)%QfIE^vh5iPyGqMZhgax&}3xw|V;GjV)bT1R}xehzxLpH=m z58Dub194P((2@-v(vAqw+SSlzzbjyz&Lk)u%R#1R9v_IK&{`FXge}KxpzA;^M&k~M zG9gRs0j@kBKs!zUWB%C&%pS=rgmcszdg~FL`Chh}6peFn(@m diff --git a/src/mesh/test/dot11s/hwmp-reactive-regression-test-3-1.pcap b/src/mesh/test/dot11s/hwmp-reactive-regression-test-3-1.pcap index c4a116a8e9e6b33eeeae0fcd30ba2289f66430dd..0b7a9502720d16aabb894945e4b080d338a5c799 100644 GIT binary patch delta 251 zcmca-*}*d*gNaLe@&zdcMuExm*`+4$m*Sp$l3k5aVe$udZ&m{aufO7x1*H@xCvvE< zIxuAIlLztGnHU%txIS}Cz9=Qn7%;hjQ*|;Uml|sV!zvzqkUSeRNM0OhtRf4;sk>%i z6E+E|u{JQgnr8>*F-fYiPGI1YaRc&HnO`kr1ewLOfMGJ9lo#s;2CsFYU}beuYODts zvXo=Nyi-8l1%|F4DU%(gRVPbHD=|G_m~1EQ#rlEaR9^{L$vSB@RtCmb>@{HCFKIQP VzZ7M>f&R&r0s4p0>-!{-3;-yNMxX!y literal 7390 zcmb`MYe*DP6oBuYb=}=bQi`ysNYJvDB7Ux#|DBRLa}T+XJ%*jZZo@gwmBE>?&!?Mnui$9IMH-?W=`l(bX3DQO4lDQT@CN?OAnN?Ki*k{13Y&}{v!AOnA^_$|}d?XrYj$%5DN?14hUMwa>{Wx|dn*$^wA%9pYf)T>mcS2JsTy1)^u z=c-Lm$<{?J%M$h% zrrp8RX#*4zw$8f66G_(eBcsGKO3wiJ5mbcfPE(8|i?m6gS;`ijgLi9gC-jc*Y>ZK2 zMdf#v3ou0(Epck&RXlp}!}Rm2D6lLe=@c9(ct?0EGn6Nd#JKFOaFrQj{pl2Frj7oa z_N9xGHqlK<^Yu{Dev#59?o#SDdXJK(ty2=K$kyNTGVr(j^@=qyB(2Fva$@kX(zvr0 zgRo^`#FtO`NwyvCsqB&)hv~g0}nT?dXm29G<1vU#4Y|ety37!MOsVDd>+@+h~ z!&@k6d$tO%ZM#YexNx$C;eJiruUBppgiV_z1>rQpgCK0NSv*^)GXuIdsekDx;p)6C zx+<2Fn1Ax=aL{Jsu5ZmTFa20592l7vNZPnV227moDX?=jNdi8Sk<2fk{SD`jbk@#0X4>n$M Q#8P`?dPR8o_!TMZFHS;(y#N3J diff --git a/src/mesh/test/dot11s/hwmp-reactive-regression-test-4-1.pcap b/src/mesh/test/dot11s/hwmp-reactive-regression-test-4-1.pcap index b364dfeda480f4307f2635c7c15ac92ac68e4ac6..23258feee39bbf3b74a3b4ebdde37166b4543b64 100644 GIT binary patch delta 180 zcmaE@*1@yk0psM=oNBBI3|4%46Z;h>f9F(VESN0ErOL*_z`#)DJb5Fh0&4?9m5(h@ zmK`KE>ka!vd3nYOll=s|Sr;(un&$)3w_iYwbpyk#^bin-TTqSl0K>00(I8H^pc>N! zhROAUUaSuotc0^cV()x8^n6&QD!cY=iE Ph1FOM7;pWV0OSAwB4s+A literal 4971 zcmb`K!A}!G6vp4Qg|>jS(L(_dYXsCNrUwZDMKI9FfkT6O5DzvQBL+2whW35>DZ(hJ6*ihD~tLje(l%Ix+Y52>3A2;O?xi%N)Ys{96pEtu?Sroo%1hQYVj9 zxmO-*TO#Xcy}Z2A`{c2{HppXr+V6!H?hWkb{^DMCYWwB5+lh8M!9z7e4IMCuO$}us zetED2acffv;&8KxIA{IF{{78uJHPn?7Z+Zx3ufq?!^2`kB8N@#vMWv=DM37Ov`Dd& zkBf4aDluZvQGHyDpj8=#EOnhKG3H?~-fD|g)#%AD3*18L(Vp|)n*1%&{sO-|mWF5ZGVIf7cra3FG z?9wQD*~LeMD7&=r#mwSQ47AMn7EPO)kx83=DwFn5l}VeOl}Vd;CX=@OJnOcd!$tFk z?zT-)yf_LJFHTXmfVc{Na+1eu}6z**PMTNKZ5ap8HVucYgs z{_4fKvAlMd@$Z#$)IPfjiMf7TEVZ7x!UIcPKTopCF|W&1UVgTU7E4{D^6F-T3u7b;7b#tjM3{0>vBgpssl1|0UA}LNm1y!6I(zl= Xa)c$?rbreBtFNfMCRyrtjAZ=*rHr d4Pb1a)dc3<2J#XZm-BaldFuQi*Zc9S0s!=5LVW-L literal 3955 zcmb`K&ubGw6vy8rX?7D!6I->txzkk4V>BZ8E;6X}|$||i=4F&NOMA#|{ z6?zg25ye1HBK|liC=|)XLk{ugA)r#hOa6oS-fT8a%x2%z?7-|ycHaBUcV=FOx0Q|8 z&jJtvr_}2J*BU=eO~5JaQ_W+o%Yq$%sPiNnD!*kT^!~w-vD8#{;Wpd~UB8mMDhKgl zeb*UQT-tCfn#Rm=x(q13jmxRMbP>y{ak^4aIx@nt0%%dz0H(2}x*TlZFMIFOID#b# z0t}jceI3m}4};Jl9KyF$qER8jwmtUbJEEH>xmC}==BK?9;k9aFS)mAX8d=cpCzM$C z!Vx%wmQ>3+#R?WXJ|eOo$wCZQu@xJ3WZcwnZTSAgQqW!`kg`>z4PZ;PBHi&JIW+nQ zN1cc)%bqjpMC2mG$gpL$t$F$aazY#>lY-vDa&+5@8_})K8jbqLD)#%wdN<%7Yc1v< z>rvc4*5#f4vC@MrvFsXO`EA7V#i16OYlLlwc6OJawDfL2X{Y!2Nt+z@llB8?9XE>n zhtn-EVMO3Cwp5!pO55#)XB4z=tR*c-7sydGwXcv#bnZYmFRSNn=(Y=H&P z7F|y4sOtKP&fRroMqSXVx(@B{!FhJ92j|*>9-LPbJvhHO=;Ew;7H`nG`&sN5cR{P3 z#mkBRbf%<(%5}dZOVO%e8k8t`ubNo(HPIP2I(gFQm#KiqD4%TC!1{HLV4l0*CoQ-* zane?74brB%V?;NHxE+g&;_P{;!z-yJmi3cMQn`iQPXH7lrxljuOjS=5*zS_2e$g bqHEOr!0B2M#n=NSmi3U+RS>1>W0v(7?JF~~ diff --git a/src/mesh/test/dot11s/hwmp-target-flags-regression-test-0-1.pcap b/src/mesh/test/dot11s/hwmp-target-flags-regression-test-0-1.pcap index a48ddbcc2aa7358da43ccfca1711629faa804295..a3900b4180260de9219a7d759d97753b82de3ec3 100644 GIT binary patch literal 1066 zcmca|c+)~A1{MYw`2U}QArs2+@@HhQ0kT230f_&D0g%DKAOIslYCzxxm}2DM5t2|b z@JPt1U?^hAO)bs>qjP_yq7W|cR4VeS}sqNS@lwE41PeBAl$)>8upNQ2mqS{j0r{t1&~ixtpX}z z;9z55PhilBHUry$&)1+}^x`HI*9#cDMC^z%i?FXZ cfX#vU8srmVeGPJH)&WAkKERN5(v_e~0SO@3;s5{u literal 10782 zcmdT~TWnNC82-<0x0XfdULqhMEZ3GxV4*@O2wf9v42jSLAMn9gF-EDFQ~@#gK!chR z;{%9Xe9;<-55$KGi6q2m4JL9ip%ETTd?7v%@TrN3_lW=Z&+IvK&dllACZ>y%OwZY! z+3%n4zs*0BUcYeWqZBnzwcWWxv{QdrcYABr6ynK)65r5yYH_b2A_V`Jnsr&)`di6_%#-EnHKi23~9))~#_eyfqoC0XD z7QKp8$KFiJBN@a5N?#&+n4jqV-0w)^7b4B7L`N^mXSyZJ4=`WL&~g4!(Nt52+8NMN zlY+|09R6Fonr<+fr6z^LU~gS^C_;_u#g|19tbgAqrXo_Xi*Cml%aWu}c*c`g9IQf; zDr2!?wWqy6={p%MUe@UR!FzWz3E_2P`L=HyC*IcN^!U$Tt9Y)2D4 z%9GLix!c~a6mfD+cdEQnp>QcR^MF-l}r8#y*fiGL6^xDu7CnwiA(n1_MRSq`Ft zi_s;s9kP`?wE|PNaE&(weuaWc98cohMa!!yEeXxx#CN zn}hkVN0Vq5zMYr`;`^C_d*i|A_L8aFa4>`dS?n4cYGPMEkP+!(*9-Gv(erBd5T>$k zve(3?i5T?1=R27BmbEW+tEzMqosyU^Q@j2^GmcNRLlCKN4Nb~IX| zUgN=YXcGI)1bfX0r$39IEE?=PS{(dD^SXj882rqLyleRV+G;SEti9uZ#UQz$8Kz>F zDBmvRvNUThR|;)2q8od1L35ZcUyDJ_P#2?yD}`I-bV8*tg4n~+gEx-Y1e51LNcjl{ z(xFJY=mFeSV=gWL~o5;>R$H{aKmPDuVGOx0`0i$;&Sd8%H?e}EZS zVJ!LqzsV08+N%b^f2O^QjBd&HQ^@o+hHTz2lx?9y(ly?od=S5g-x^~4;_3Dz^dW^V z2^hMF_=R|wO8LImVVd~GC+kdf*Va;2=;G6Oji3us;A`Qn<#R^2^yb@aeTTy*LpIa0 zYuQ>-_1IbttatG9{o?fvrfx%ip-YAvO1DxnjMs9{&uNUyM%wF!1N0K=n26^)m9EI04=;cAG&v`HAiyZ%jwe zji}=dm3RgNV%gOrntUVYE4%^j-6akNzSnJ7>JVm@1Nj^?2+mTzF#jwS686NhMtkEh z*Iuk(UG}yV-8fMHHE{Kpo#^`Sw(4Q}5y>XR=N$@_T^pAxxQs2RG+sKGG-Vf6_6j736>gwe0qQfK&y z?!JZT;Sp}pv%E4AW7qQ*1`Mt;1B;(H7)DR=AB&&4Ule+H7Pn|Q5xz0C_!U5?dS6hH4>9{iV86QYOFnH^yln$3goWksS$b*(htb}asMjZ-wsT%~ z+DbQSh6Wfl97exSahwi9*{n|~I(jmRI#OLutZ4&(c3@ zI1Nr)8O>VB)kMi#dM*YvL#=B~KpX?(s|k#@BvuoLvHrMff`47lY61+}W2*^_{^{ap zCXs^X=T0I4zq;(UV9?2bEGLvO!svOvEwDBLGl>*>cosMCvy;eOz%RL)=<$wT+9)I( z)x?JzIgHL(UY}e|l)cT{@sB!=;LOlvMh&V7C_1^C7z9?_{db_~x>OTj5MNDT^n=7| zVvuKXt0hn-yqW-mpJJ;Cj3!qTLts}MzX{)M!C+5pHG$Eg#A>1s>}pE{b>Vkxo@2L_ zR0e+MxYn=|out8PHKFb2t|o%`t4lQj2H(1>CE1EFnp{ovd1rfZv+PJ%S*mn#8r;4q WnzfRviHg_zM+|C)US!lD4gL$V_UV)W diff --git a/src/mesh/test/dot11s/hwmp-target-flags-regression-test-1-1.pcap b/src/mesh/test/dot11s/hwmp-target-flags-regression-test-1-1.pcap index fe3ca5a1829dd6f2f5ca7fac26ea017509b6dc3c..105dc09f006ae34784fdc1e53b042f1f2a4804be 100644 GIT binary patch literal 1066 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 ZJ-f1dS$=0;5B6X7pcd7qfEsU({{`TIoHPIc diff --git a/src/mesh/test/dot11s/hwmp-target-flags-regression-test-2-1.pcap b/src/mesh/test/dot11s/hwmp-target-flags-regression-test-2-1.pcap index 4f52374cfe7a0fe1c3beaa70985a0727237f4e7d..62ba0e7d45b78a535dcc614863ff5ef2bb53154c 100644 GIT binary patch literal 1066 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 diff --git a/src/mesh/test/flame/flame-regression-test-1-1.pcap b/src/mesh/test/flame/flame-regression-test-1-1.pcap index 37169e367bbbbbc67df30d28df0837e2fa10a879..4d23035c503ba792074d13b7682ee597bf08142a 100644 GIT binary patch delta 5 McmX@WEHOa>00mJ2ga7~l literal 448 zcmca|c+)~A1{MYw`2U}QArr`90^$ik90kQ4%nS_w!2l@0z`zV)3xGKcK)F?`fCPhs z1CU@sR>#4{z{tVC#=^h|R?5u9$OzR7WP!y%HeCZ^95x}F2DBH+CPq?i0=bZ|pA>+q ffB@MhxPKusg#84vi3jLA{C>g`dW^7;CDtYY(8P4l diff --git a/src/wifi/helper/spectrum-wifi-helper.cc b/src/wifi/helper/spectrum-wifi-helper.cc index 3499b5d86..62d96bcea 100644 --- a/src/wifi/helper/spectrum-wifi-helper.cc +++ b/src/wifi/helper/spectrum-wifi-helper.cc @@ -66,12 +66,12 @@ SpectrumWifiPhyHelper::Create (Ptr node, Ptr device) const phy->CreateWifiSpectrumPhyInterface (device); Ptr error = m_errorRateModel.Create (); phy->SetErrorRateModel (error); - if (m_frameCaptureModel.GetTypeId ().GetUid ()) + if (m_frameCaptureModel.IsTypeIdSet ()) { Ptr capture = m_frameCaptureModel.Create (); phy->SetFrameCaptureModel (capture); } - if (m_preambleDetectionModel.GetTypeId ().GetUid ()) + if (m_preambleDetectionModel.IsTypeIdSet ()) { Ptr capture = m_preambleDetectionModel.Create (); phy->SetPreambleDetectionModel (capture); diff --git a/src/wifi/helper/wifi-helper.cc b/src/wifi/helper/wifi-helper.cc index 95478fb9c..9127e88b8 100644 --- a/src/wifi/helper/wifi-helper.cc +++ b/src/wifi/helper/wifi-helper.cc @@ -131,6 +131,7 @@ AsciiPhyReceiveSinkWithoutContext ( WifiPhyHelper::WifiPhyHelper () : m_pcapDlt (PcapHelper::DLT_IEEE802_11) { + SetPreambleDetectionModel ("ns3::ThresholdPreambleDetectionModel"); } WifiPhyHelper::~WifiPhyHelper () @@ -212,6 +213,12 @@ WifiPhyHelper::SetPreambleDetectionModel (std::string name, m_preambleDetectionModel.Set (n7, v7); } +void +WifiPhyHelper::DisablePreambleDetectionModel () +{ + m_preambleDetectionModel.SetTypeId (TypeId ()); +} + void WifiPhyHelper::PcapSniffTxEvent ( Ptr file, diff --git a/src/wifi/helper/wifi-helper.h b/src/wifi/helper/wifi-helper.h index b849565e3..0342a8d8f 100644 --- a/src/wifi/helper/wifi-helper.h +++ b/src/wifi/helper/wifi-helper.h @@ -161,6 +161,11 @@ public: std::string n6 = "", const AttributeValue &v6 = EmptyAttributeValue (), std::string n7 = "", const AttributeValue &v7 = EmptyAttributeValue ()); + /** + * Disable the preamble detection model. + */ + void DisablePreambleDetectionModel (); + /** * An enumeration of the pcap data link types (DLTs) which this helper * supports. See http://wiki.wireshark.org/Development/LibpcapFileFormat diff --git a/src/wifi/helper/yans-wifi-helper.cc b/src/wifi/helper/yans-wifi-helper.cc index bb4ae1767..afe3ee6e6 100644 --- a/src/wifi/helper/yans-wifi-helper.cc +++ b/src/wifi/helper/yans-wifi-helper.cc @@ -156,12 +156,12 @@ YansWifiPhyHelper::Create (Ptr node, Ptr device) const Ptr phy = m_phy.Create (); Ptr error = m_errorRateModel.Create (); phy->SetErrorRateModel (error); - if (m_frameCaptureModel.GetTypeId ().GetUid ()) + if (m_frameCaptureModel.IsTypeIdSet ()) { Ptr capture = m_frameCaptureModel.Create (); phy->SetFrameCaptureModel (capture); } - if (m_preambleDetectionModel.GetTypeId ().GetUid ()) + if (m_preambleDetectionModel.IsTypeIdSet ()) { Ptr capture = m_preambleDetectionModel.Create (); phy->SetPreambleDetectionModel (capture); diff --git a/src/wifi/test/inter-bss-test-suite.cc b/src/wifi/test/inter-bss-test-suite.cc index d9a3bb5f7..658135bce 100644 --- a/src/wifi/test/inter-bss-test-suite.cc +++ b/src/wifi/test/inter-bss-test-suite.cc @@ -416,6 +416,7 @@ TestInterBssConstantObssPdAlgo::RunOne (void) lossModel->SetDefaultLoss (m_txPowerDbm - m_obssRxPowerDbm); //Force received RSSI to be equal to m_obssRxPowerDbm SpectrumWifiPhyHelper phy = SpectrumWifiPhyHelper::Default (); + phy.DisablePreambleDetectionModel (); Ptr channel = CreateObject (); channel->SetPropagationDelayModel (CreateObject ()); channel->AddPropagationLossModel (lossModel);