From ab88e121ca4f2e4afcf522039726c66eac6d4bf7 Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Mon, 8 Jun 2015 13:46:18 -0700
Subject: [PATCH] fix attribute accessor for DropTailQueue Mode attribute
 (reported by Chip Webb)

---
 src/core/test/attribute-test-suite.cc | 27 +++++++++++++++++++++++++++
 src/network/utils/drop-tail-queue.cc  |  5 +++--
 src/network/utils/drop-tail-queue.h   |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/core/test/attribute-test-suite.cc b/src/core/test/attribute-test-suite.cc
index b8f8279f4..76fe17e38 100644
--- a/src/core/test/attribute-test-suite.cc
+++ b/src/core/test/attribute-test-suite.cc
@@ -136,6 +136,13 @@ public:
                      MakeEnumChecker (TEST_A, "TestA",
                                       TEST_B, "TestB",
                                       TEST_C, "TestC"))
+      .AddAttribute ("TestEnumSetGet", "help text",
+                     EnumValue (TEST_B),
+                     MakeEnumAccessor (&AttributeObjectTest::DoSetEnum,
+                                       &AttributeObjectTest::DoGetEnum),
+                     MakeEnumChecker (TEST_A, "TestA",
+                                      TEST_B, "TestB",
+                                      TEST_C, "TestC"))
       .AddAttribute ("TestRandom", "help text",
                      StringValue ("ns3::ConstantRandomVariable[Constant=1.0]"),
                      MakePointerAccessor (&AttributeObjectTest::m_random),
@@ -228,6 +235,7 @@ public:
     NS_UNUSED (m_uint8);
     NS_UNUSED (m_float);
     NS_UNUSED (m_enum);
+    NS_UNUSED (m_enumSetGet);
   }
 
   virtual ~AttributeObjectTest (void) {};
@@ -255,6 +263,8 @@ private:
   Ptr<Derived> DoGetVector (uint32_t i) const { return m_vector2[i]; }
   bool DoSetIntSrc (int8_t v) { m_intSrc2 = v; return true; }
   int8_t DoGetIntSrc (void) const { return m_intSrc2; }
+  bool DoSetEnum (Test_e v) { m_enumSetGet = v; return true; }
+  Test_e DoGetEnum (void) const { return m_enumSetGet; }
 
   bool m_boolTestA;
   bool m_boolTest;
@@ -264,6 +274,7 @@ private:
   uint8_t m_uint8;
   float m_float;
   enum Test_e m_enum;
+  enum Test_e m_enumSetGet;
   Ptr<RandomVariableStream> m_random;
   std::vector<Ptr<Derived> > m_vector1;
   std::vector<Ptr<Derived> > m_vector2;
@@ -653,6 +664,22 @@ AttributeTestCase<EnumValue>::DoRun (void)
   ok = CheckGetCodePaths (p, "TestEnum", "TestC", EnumValue (AttributeObjectTest::TEST_C));
   NS_TEST_ASSERT_MSG_EQ (ok, true, "Attribute not set properly by SetAttributeFailSafe() via EnumValue");
 
+  //
+  // When the object is first created, the Attribute should have the default 
+  // value.
+  //
+  ok = CheckGetCodePaths (p, "TestEnumSetGet", "TestB", EnumValue (AttributeObjectTest::TEST_B));
+  NS_TEST_ASSERT_MSG_EQ (ok, true, "Attribute not set properly by default value");
+
+  //
+  // Set the Attribute using the EnumValue type.
+  //
+  ok = p->SetAttributeFailSafe ("TestEnumSetGet", EnumValue (AttributeObjectTest::TEST_C));
+  NS_TEST_ASSERT_MSG_EQ (ok, true, "Could not SetAttributeFailSafe() to TEST_C");
+
+  ok = CheckGetCodePaths (p, "TestEnumSetGet", "TestC", EnumValue (AttributeObjectTest::TEST_C));
+  NS_TEST_ASSERT_MSG_EQ (ok, true, "Attribute not set properly by SetAttributeFailSafe() via EnumValue");
+
   //
   // Set the Attribute using the StringValue type.
   //
diff --git a/src/network/utils/drop-tail-queue.cc b/src/network/utils/drop-tail-queue.cc
index 5833be6a2..9e68e7358 100644
--- a/src/network/utils/drop-tail-queue.cc
+++ b/src/network/utils/drop-tail-queue.cc
@@ -36,7 +36,8 @@ TypeId DropTailQueue::GetTypeId (void)
     .AddAttribute ("Mode", 
                    "Whether to use bytes (see MaxBytes) or packets (see MaxPackets) as the maximum queue size metric.",
                    EnumValue (QUEUE_MODE_PACKETS),
-                   MakeEnumAccessor (&DropTailQueue::SetMode),
+                   MakeEnumAccessor (&DropTailQueue::SetMode,
+                                     &DropTailQueue::GetMode),
                    MakeEnumChecker (QUEUE_MODE_BYTES, "QUEUE_MODE_BYTES",
                                     QUEUE_MODE_PACKETS, "QUEUE_MODE_PACKETS"))
     .AddAttribute ("MaxPackets", 
@@ -75,7 +76,7 @@ DropTailQueue::SetMode (DropTailQueue::QueueMode mode)
 }
 
 DropTailQueue::QueueMode
-DropTailQueue::GetMode (void)
+DropTailQueue::GetMode (void) const
 {
   NS_LOG_FUNCTION (this);
   return m_mode;
diff --git a/src/network/utils/drop-tail-queue.h b/src/network/utils/drop-tail-queue.h
index 546e16c01..d5de0cefe 100644
--- a/src/network/utils/drop-tail-queue.h
+++ b/src/network/utils/drop-tail-queue.h
@@ -61,7 +61,7 @@ public:
    *
    * \returns The encapsulation mode of this device.
    */
-  DropTailQueue::QueueMode GetMode (void);
+  DropTailQueue::QueueMode GetMode (void) const;
 
 private:
   virtual bool DoEnqueue (Ptr<Packet> p);