update Bug 932 (Support IP_HDRINCL option for Ipv4RawSocket) again: regarding w/ Tom's comments.
--- a/src/internet-stack/ipv4-l3-protocol.cc Fri Jun 04 07:12:20 2010 +0900
+++ b/src/internet-stack/ipv4-l3-protocol.cc Fri Jun 04 10:17:51 2010 +0900
@@ -524,9 +524,7 @@
Ptr<Ipv4Route> route)
{
NS_LOG_FUNCTION (this << packet << ipHeader << route);
- Ipv4Header hdr;
- packet->RemoveHeader (hdr);
- SendRealOut (route, packet, hdr);
+ SendRealOut (route, packet, ipHeader);
}
void
--- a/src/internet-stack/ipv4-l3-protocol.h Fri Jun 04 07:12:20 2010 +0900
+++ b/src/internet-stack/ipv4-l3-protocol.h Fri Jun 04 10:17:51 2010 +0900
@@ -164,7 +164,7 @@
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
--- a/src/internet-stack/ipv4-raw-socket-impl.cc Fri Jun 04 07:12:20 2010 +0900
+++ b/src/internet-stack/ipv4-raw-socket-impl.cc Fri Jun 04 10:17:51 2010 +0900
@@ -195,7 +195,7 @@
}
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