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);