From 8873e85bf5ae9a06aded7e9dd28bade5662b9541 Mon Sep 17 00:00:00 2001
From: Hajime Tazaki <tazaki@sfc.wide.ad.jp>
Date: Fri, 4 Jun 2010 10:17:51 +0900
Subject: [PATCH] update Bug 932 (Support IP_HDRINCL option for Ipv4RawSocket)
 again: regarding w/ Tom's comments.

---
 src/internet-stack/ipv4-l3-protocol.cc     | 4 +---
 src/internet-stack/ipv4-l3-protocol.h      | 2 +-
 src/internet-stack/ipv4-raw-socket-impl.cc | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/internet-stack/ipv4-l3-protocol.cc b/src/internet-stack/ipv4-l3-protocol.cc
index 6891bd1fb..9141432eb 100644
--- a/src/internet-stack/ipv4-l3-protocol.cc
+++ b/src/internet-stack/ipv4-l3-protocol.cc
@@ -524,9 +524,7 @@ Ipv4L3Protocol::Send (Ptr<Packet> packet,
                       Ptr<Ipv4Route> route)
 {
   NS_LOG_FUNCTION (this << packet << ipHeader << route);
-  Ipv4Header hdr;
-  packet->RemoveHeader (hdr);
-  SendRealOut (route, packet, hdr);
+  SendRealOut (route, packet, ipHeader);
 }
 
 void 
diff --git a/src/internet-stack/ipv4-l3-protocol.h b/src/internet-stack/ipv4-l3-protocol.h
index e6650543e..f4b44758c 100644
--- a/src/internet-stack/ipv4-l3-protocol.h
+++ b/src/internet-stack/ipv4-l3-protocol.h
@@ -164,7 +164,7 @@ public:
 	     Ipv4Address destination, uint8_t protocol, Ptr<Ipv4Route> route);
   /**
    * \param packet packet to send
-   * \param ipHeader IP Heeader
+   * \param ipHeader IP Header
    * \param route route entry
    *
    * Higher-level layers call this method to send a packet with IPv4 Header
diff --git a/src/internet-stack/ipv4-raw-socket-impl.cc b/src/internet-stack/ipv4-raw-socket-impl.cc
index d70520b89..946e05653 100644
--- a/src/internet-stack/ipv4-raw-socket-impl.cc
+++ b/src/internet-stack/ipv4-raw-socket-impl.cc
@@ -195,7 +195,7 @@ Ipv4RawSocketImpl::SendTo (Ptr<Packet> p, uint32_t flags,
         }
       else
         {
-          p->PeekHeader (header);
+          p->RemoveHeader (header);
           dst = header.GetDestination ();
         }
       SocketErrno errno_ = ERROR_NOTERROR;//do not use errno as it is the standard C last error number