From ad7e7136e9b9aa14244cb329e598a0483339e542 Mon Sep 17 00:00:00 2001
From: "frederic." <urbani@inria.fr>
Date: Fri, 9 Mar 2012 13:19:27 +0100
Subject: [PATCH] Replace references to m_recvpktinfo with method call
 IsRecvPktInfo()

---
 src/internet/model/ipv4-l3-protocol.cc     |  2 --
 src/internet/model/ipv4-raw-socket-impl.cc |  2 +-
 src/internet/model/ipv6-raw-socket-impl.cc |  2 +-
 src/internet/model/udp-socket-impl.cc      |  2 +-
 src/network/model/socket.cc                | 10 ++++++++--
 src/network/model/socket.h                 | 12 +++++++++++-
 6 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/internet/model/ipv4-l3-protocol.cc b/src/internet/model/ipv4-l3-protocol.cc
index aedde9014..57b44a53f 100644
--- a/src/internet/model/ipv4-l3-protocol.cc
+++ b/src/internet/model/ipv4-l3-protocol.cc
@@ -504,8 +504,6 @@ Ipv4L3Protocol::Receive ( Ptr<NetDevice> device, Ptr<const Packet> p, uint16_t p
       NS_LOG_WARN ("No route found for forwarding packet.  Drop.");
       m_dropTrace (ipHeader, packet, DROP_NO_ROUTE, m_node->GetObject<Ipv4> (), interface);
     }
-
-
 }
 
 Ptr<Icmpv4L4Protocol> 
diff --git a/src/internet/model/ipv4-raw-socket-impl.cc b/src/internet/model/ipv4-raw-socket-impl.cc
index 4734f2a17..53f4c1f07 100644
--- a/src/internet/model/ipv4-raw-socket-impl.cc
+++ b/src/internet/model/ipv4-raw-socket-impl.cc
@@ -318,7 +318,7 @@ Ipv4RawSocketImpl::ForwardUp (Ptr<const Packet> p, Ipv4Header ipHeader, Ptr<Ipv4
     {
       Ptr<Packet> copy = p->Copy ();
       // Should check via getsockopt ()..
-      if (this->m_recvpktinfo)
+      if (IsRecvPktInfo ())
         {
           Ipv4PacketInfoTag tag;
           copy->RemovePacketTag (tag);
diff --git a/src/internet/model/ipv6-raw-socket-impl.cc b/src/internet/model/ipv6-raw-socket-impl.cc
index 8c8288708..51d556b01 100644
--- a/src/internet/model/ipv6-raw-socket-impl.cc
+++ b/src/internet/model/ipv6-raw-socket-impl.cc
@@ -338,7 +338,7 @@ bool Ipv6RawSocketImpl::ForwardUp (Ptr<const Packet> p, Ipv6Header hdr, Ptr<NetD
         }
 
       // Should check via getsockopt ()..
-      if (this->m_recvpktinfo)
+      if (IsRecvPktInfo ())
         {
           Ipv6PacketInfoTag tag;
           copy->RemovePacketTag (tag);
diff --git a/src/internet/model/udp-socket-impl.cc b/src/internet/model/udp-socket-impl.cc
index 3c11482a4..acd93b6a3 100644
--- a/src/internet/model/udp-socket-impl.cc
+++ b/src/internet/model/udp-socket-impl.cc
@@ -872,7 +872,7 @@ UdpSocketImpl::ForwardUp (Ptr<Packet> packet, Ipv4Header header, uint16_t port,
     }
 
   // Should check via getsockopt ()..
-  if (this->m_recvpktinfo)
+  if (IsRecvPktInfo ())
     {
       Ipv4PacketInfoTag tag;
       packet->RemovePacketTag (tag);
diff --git a/src/network/model/socket.cc b/src/network/model/socket.cc
index 66e4b2b24..58494265f 100644
--- a/src/network/model/socket.cc
+++ b/src/network/model/socket.cc
@@ -34,7 +34,7 @@ namespace ns3 {
 Socket::Socket (void)
 {
   m_boundnetdevice = 0;
-  m_recvpktinfo = false;
+  m_recvPktInfo = false;
   NS_LOG_FUNCTION_NOARGS ();
 }
 
@@ -331,7 +331,13 @@ void
 Socket::SetRecvPktInfo (bool flag)
 {
   NS_LOG_FUNCTION_NOARGS ();
-  m_recvpktinfo = flag;
+  m_recvPktInfo = flag;
+}
+
+bool Socket::IsRecvPktInfo () const
+{
+  NS_LOG_FUNCTION_NOARGS ();
+  return m_recvPktInfo;
 }
 
 /***************************************************************
diff --git a/src/network/model/socket.h b/src/network/model/socket.h
index 7649c4b73..33d300dbc 100644
--- a/src/network/model/socket.h
+++ b/src/network/model/socket.h
@@ -595,10 +595,20 @@ public:
    * For IP_PKTINFO/IP6_PKTINFO. This method is only usable for 
    * Raw socket and Datagram Socket. Not supported for Stream socket.
    *
+   * Method doesn't make distinction between IPv4 and IPv6. If it is enabled,
+   * it is enabled for all types of sockets that supports packet information
+   *
    * \param flag Enable/Disable receive information
    * \returns nothing
    */
   void SetRecvPktInfo (bool flag);
+
+  /**
+   * \brief Get status indicating whether enable/disable packet information to socket
+   *
+   * \returns True if packet information should be sent to socket
+   */
+  bool IsRecvPktInfo () const;
  
 protected:
   void NotifyConnectionSucceeded (void);
@@ -612,7 +622,7 @@ protected:
   void NotifyDataRecv (void);
   virtual void DoDispose (void);
   Ptr<NetDevice> m_boundnetdevice;
-  bool m_recvpktinfo;
+  bool m_recvPktInfo;
 private:
   Callback<void, Ptr<Socket> >                   m_connectionSucceeded;
   Callback<void, Ptr<Socket> >                   m_connectionFailed;