Mercurial Mercurial > ns-3.24 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bug 984: change EmuNetDevice encapsulation default to DIX
authorTom Henderson <tomh@tomh.org>
Fri, 12 Nov 2010 11:54:45 -0800
changeset 6662 04fb02cefe2a
parent 6661 567a2a9fb792
child 6663 44dd167118c4
bug 984: change EmuNetDevice encapsulation default to DIX
CHANGES.html file | annotate | diff | comparison | revisions
RELEASE_NOTES file | annotate | diff | comparison | revisions
src/devices/emu/emu-net-device.cc file | annotate | diff | comparison | revisions 
--- a/CHANGES.html	Fri Nov 12 13:28:26 2010 +0900
+++ b/CHANGES.html	Fri Nov 12 11:54:45 2010 -0800
@@ -62,6 +62,12 @@
 <h2>Changes to existing API:</h2>
 
 <h2>Changed behavior:</h2>
+<ul>
+<li><b>EmuNetDevice uses DIX instead of LLC encapsulation by default</b>
+<p>bug 984 in ns-3 tracker:  real devices don't usually understand LLC/SNAP
+so the default of DIX makes more sense.
+</p>
+</ul>
 
 <hr>
 <h1>Changes from ns-3.8 to ns-3.9</h1>
--- a/RELEASE_NOTES	Fri Nov 12 13:28:26 2010 +0900
+++ b/RELEASE_NOTES	Fri Nov 12 11:54:45 2010 -0800
@@ -56,6 +56,7 @@
    - bug 892 - WaypointMobilityModel incompatible with MobilityHelper::Install
    - bug 893 - Lazy CourseChange notification for WaypointMobilityModel
    - bug 979 - Multi-octet fields in Wi-Fi headers have wrong endianness
+   - bug 984 - EmuNetDevice should use DIX encapsulation by default
    - bug 988 - MacRxMiddle::SequenceControlSmaller method
    - bug 993 - MinstrelWifiManager::UpdateStats useless if clause
    - bug 1015 - GetChannelFrequencyMhz() does not match with standard
--- a/src/devices/emu/emu-net-device.cc	Fri Nov 12 13:28:26 2010 +0900
+++ b/src/devices/emu/emu-net-device.cc	Fri Nov 12 11:54:45 2010 -0800
@@ -90,7 +90,7 @@
                    MakeTimeChecker ())
     .AddAttribute ("EncapsulationMode", 
                    "The link-layer encapsulation type to use.",
-                   EnumValue (LLC),
+                   EnumValue (DIX),
                    MakeEnumAccessor (&EmuNetDevice::SetEncapsulationMode),
                    MakeEnumChecker (DIX, "Dix",
                                     LLC, "Llc"))
ns-3.24