From 9bb252107e44fe91f8b6f5bee1f70fc08fdbfa65 Mon Sep 17 00:00:00 2001 From: Mike Moreton Date: Sat, 26 May 2012 06:47:56 -0700 Subject: [PATCH 1/2] bug 1396: ARP with hardware addresses longer than 6 bytes --- src/internet/model/arp-header.cc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/internet/model/arp-header.cc b/src/internet/model/arp-header.cc index 5dcec772c..3d08c0698 100644 --- a/src/internet/model/arp-header.cc +++ b/src/internet/model/arp-header.cc @@ -121,8 +121,13 @@ ArpHeader::Print (std::ostream &os) const uint32_t ArpHeader::GetSerializedSize (void) const { - /* this is the size of an ARP payload. */ - return 28; + NS_ASSERT((m_macSource.GetLength () == 6) || (m_macSource.GetLength () == 8)); + NS_ASSERT (m_macSource.GetLength () == m_macDest.GetLength ()); + + uint32_t length = 16; // Length minus two hardware addresses + length += m_macSource.GetLength () * 2; + + return length; } void From fc20a3f81c728a5e747f21235e8204bcf4235918 Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Sat, 26 May 2012 07:00:04 -0700 Subject: [PATCH 2/2] remove missing figure references from makefile --- doc/models/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/models/Makefile b/doc/models/Makefile index d2d0aef18..26deee39d 100644 --- a/doc/models/Makefile +++ b/doc/models/Makefile @@ -101,7 +101,6 @@ SOURCEFIGS = \ $(SRC)/lte/doc/source/figures/lte-epc-e2e-data-protocol-stack.dia \ $(SRC)/lte/doc/source/figures/MCS_2_test.eps \ $(SRC)/lte/doc/source/figures/MCS_12_test.eps \ - $(SRC)/lte/doc/source/figures/MCS_14_test.eps \ $(SRC)/lte/doc/source/figures/lena-dual-stripe.eps \ $(SRC)/lte/doc/source/figures/lte-mcs-index.eps \ $(SRC)/lte/doc/source/figures/lenaThrTestCase1.eps \ @@ -136,8 +135,6 @@ SOURCEFIGS = \ $(SRC)/lte/doc/source/figures/MCS_17_20.png \ $(SRC)/lte/doc/source/figures/MCS_21_24.pdf \ $(SRC)/lte/doc/source/figures/MCS_21_24.png \ - $(SRC)/lte/doc/source/figures/MCS_25_27.pdf \ - $(SRC)/lte/doc/source/figures/MCS_25_27.png \ $(SRC)/lte/doc/source/figures/lte-phy-interference.png \ $(SRC)/lte/doc/source/figures/lte-phy-interference.pdf \ $(SRC)/lte/doc/source/figures/helpers.png \ @@ -201,7 +198,6 @@ IMAGES_EPS = \ $(FIGURES)/lte-epc-e2e-data-protocol-stack.eps \ $(FIGURES)/MCS_2_test.eps \ $(FIGURES)/MCS_12_test.eps \ - $(FIGURES)/MCS_14_test.eps \ $(FIGURES)/lena-dual-stripe.eps \ $(FIGURES)/lte-mcs-index.eps \ $(FIGURES)/lenaThrTestCase1.eps \