From 4edf2a71fc0c4cac626ad7e0850af0bed6a08755 Mon Sep 17 00:00:00 2001
From: Natale Patriciello <natale.patriciello@gmail.com>
Date: Fri, 10 Jun 2016 14:54:03 +0200
Subject: [PATCH 2/3] tcp: (fixes #2263) GetOption returns const Options

---
 src/internet/model/tcp-header.cc      | 6 +++---
 src/internet/model/tcp-header.h       | 6 +++---
 src/internet/model/tcp-socket-base.cc | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/internet/model/tcp-header.cc b/src/internet/model/tcp-header.cc
index 8348cf3..13fc1c7 100644
--- a/src/internet/model/tcp-header.cc
+++ b/src/internet/model/tcp-header.cc
@@ -460,7 +460,7 @@ TcpHeader::CalculateHeaderLength () const
 }
 
 bool
-TcpHeader::AppendOption (Ptr<TcpOption> option)
+TcpHeader::AppendOption (Ptr<const TcpOption> option)
 {
   if (m_optionsLen + option->GetSerializedSize () <= m_maxOptionsLen)
     {
@@ -491,8 +491,8 @@ TcpHeader::GetOptionList () const
   return m_options;
 }
 
-Ptr<TcpOption>
-TcpHeader::GetOption (uint8_t kind) const
+Ptr<const TcpOption>
+TcpHeader::GetOption(uint8_t kind) const
 {
   TcpOptionList::const_iterator i;
 
diff --git a/src/internet/model/tcp-header.h b/src/internet/model/tcp-header.h
index 4463ad6..99d4db4 100644
--- a/src/internet/model/tcp-header.h
+++ b/src/internet/model/tcp-header.h
@@ -47,7 +47,7 @@ public:
   TcpHeader ();
   virtual ~TcpHeader ();
 
-  typedef std::list< Ptr<TcpOption> > TcpOptionList; //!< List of TcpOption
+  typedef std::list< Ptr<const TcpOption> > TcpOptionList; //!< List of TcpOption
 
   /**
    * \brief Print a TCP header into an output stream
@@ -185,7 +185,7 @@ public:
    * \param kind the option to retrieve
    * \return Whether the header contains a specific kind of option, or 0
    */
-  Ptr<TcpOption> GetOption (uint8_t kind) const;
+  Ptr<const TcpOption> GetOption (uint8_t kind) const;
 
   /**
    * \brief Get the list of option in this header
@@ -217,7 +217,7 @@ public:
    * \param option The option to append
    * \return true if option has been appended, false otherwise
    */
-  bool AppendOption (Ptr<TcpOption> option);
+  bool AppendOption (Ptr<const TcpOption> option);
 
   /**
    * \brief Initialize the TCP checksum.
diff --git a/src/internet/model/tcp-socket-base.cc b/src/internet/model/tcp-socket-base.cc
index 021be65..98d0ad2 100644
--- a/src/internet/model/tcp-socket-base.cc
+++ b/src/internet/model/tcp-socket-base.cc
@@ -1448,7 +1448,7 @@ TcpSocketBase::ReadOptions (const TcpHeader &tcpHeader)
 
   for (it = options.begin (); it != options.end (); ++it)
     {
-      const Ptr<TcpOption> option = (*it);
+      const Ptr<const TcpOption> option = (*it);
       // Placeholder for a switch statement
     }
 }
@@ -2858,8 +2858,8 @@ TcpSocketBase::EstimateRtt (const TcpHeader& tcpHeader)
         { // Ok to use this sample
           if (m_timestampEnabled && tcpHeader.HasOption (TcpOption::TS))
             {
-              Ptr<TcpOptionTS> ts;
-              ts = DynamicCast<TcpOptionTS> (tcpHeader.GetOption (TcpOption::TS));
+              Ptr<const TcpOptionTS> ts;
+              ts = DynamicCast<const TcpOptionTS> (tcpHeader.GetOption (TcpOption::TS));
               m = TcpOptionTS::ElapsedTimeFromTsValue (ts->GetEcho ());
             }
           else
-- 
2.10.1