Attachment #905 for bug #932

View | Details | Raw Unified | Return to bug 932
Collapse All | Expand All





void 
Ipv4L3Protocol::Send (Ptr<Packet> packet, 
                      Ipv4Header ipHeader,
                      Ptr<Ipv4Route> route)
{
  NS_LOG_FUNCTION (this << packet << ipHeader << route);
  Ipv4Header hdr;
  packet->RemoveHeader (hdr);
  SendRealOut (route, packet, hdr);
}

void 
Ipv4L3Protocol::Send (Ptr<Packet> packet, 
            Ipv4Address source, 
            Ipv4Address destination,
            uint8_t protocol,

(-)a/src/internet-stack/ipv4-l3-protocol.h (+9 lines)

Lines 162-167	Link Here

162

*/

162

*/

163

  void Send (Ptr<Packet> packet, Ipv4Address source,

163

  void Send (Ptr<Packet> packet, Ipv4Address source,

164

	     Ipv4Address destination, uint8_t protocol, Ptr<Ipv4Route> route);

164

	     Ipv4Address destination, uint8_t protocol, Ptr<Ipv4Route> route);

165

/**

166

   * \param packet packet to send

167

   * \param ipHeader IP Heeader

168

   * \param route route entry

169

170

   * Higher-level layers call this method to send a packet with IPv4 Header

171

   * (Intend to be used with IpHeaderInclude attribute.)

172

*/

173

  void Send (Ptr<Packet> packet, Ipv4Header ipHeader, Ptr<Ipv4Route> route);

165

174

166

  uint32_t AddInterface (Ptr<NetDevice> device);

175

  uint32_t AddInterface (Ptr<NetDevice> device);

167

  Ptr<Ipv4Interface> GetInterface (uint32_t i) const;

176

  Ptr<Ipv4Interface> GetInterface (uint32_t i) const;




#include "ns3/node.h"
#include "ns3/packet.h"
#include "ns3/uinteger.h"
#include "ns3/boolean.h"
#include "ns3/log.h"

NS_LOG_COMPONENT_DEFINE ("Ipv4RawSocketImpl");

		   UintegerValue (0),
		   MakeUintegerAccessor (&Ipv4RawSocketImpl::m_icmpFilter),
		   MakeUintegerChecker<uint32_t> ())
    // 
    //  from raw (7), linux, returned length of Send/Recv should be
    // 
    //            | IP_HDRINC on  |      off    |
    //  ----------+---------------+-------------+-
    //  Send(Ipv4)| hdr + payload | payload     |
    //  Recv(Ipv4)| hdr + payload | hdr+payload |
    //  ----------+---------------+-------------+-
    .AddAttribute ("IpHeaderInclude", 
		   "Include IP Header information (a.k.a setsockopt (IP_HDRINCL)).",
		   BooleanValue (false),
		   MakeBooleanAccessor (&Ipv4RawSocketImpl::m_iphdrincl),
		   MakeBooleanChecker ())
    ;
  return tid;
}

  if (ipv4->GetRoutingProtocol ())
    {
      Ipv4Header header;
      if (!m_iphdrincl)
        {
          header.SetDestination (dst);
          header.SetProtocol (m_protocol);
        }
      else
        {
          p->PeekHeader (header);
          dst = header.GetDestination ();
        }
      SocketErrno errno_ = ERROR_NOTERROR;//do not use errno as it is the standard C last error number 
      Ptr<Ipv4Route> route;
      Ptr<NetDevice> oif = m_boundnetdevice; //specify non-zero if bound to a source address

      if (route != 0)
        {
          NS_LOG_LOGIC ("Route exists");
          if (!m_iphdrincl)
            {
              ipv4->Send (p, route->GetSource (), dst, m_protocol, route);
            }
          else
            {
              ipv4->Send (p, header, route);
            }
          NotifyDataSent (p->GetSize ());
          NotifySend (GetTxAvailable ());
          return p->GetSize();

(-)a/src/internet-stack/ipv4-raw-socket-impl.h (+1 lines)

Lines 59-64	Link Here

  bool m_shutdownSend;

  bool m_shutdownSend;

  bool m_shutdownRecv;

  bool m_shutdownRecv;

  uint32_t m_icmpFilter;

  uint32_t m_icmpFilter;

  bool m_iphdrincl;

};

};

} // namespace ns3

} // namespace ns3

(-)a/src/internet-stack/ipv4-raw-test.cc (+40 lines)

Lines 33-38	Link Here

#include "ns3/log.h"

#include "ns3/log.h"

#include "ns3/node.h"

#include "ns3/node.h"

#include "ns3/inet-socket-address.h"

#include "ns3/inet-socket-address.h"

#include "ns3/boolean.h"

#include "arp-l3-protocol.h"

#include "arp-l3-protocol.h"

#include "ipv4-l3-protocol.h"

#include "ipv4-l3-protocol.h"

Lines 74-79	Link Here

  Ptr<Packet> m_receivedPacket2;

  Ptr<Packet> m_receivedPacket2;

  void DoSendData (Ptr<Socket> socket, std::string to);

  void DoSendData (Ptr<Socket> socket, std::string to);

  void SendData (Ptr<Socket> socket, std::string to);

  void SendData (Ptr<Socket> socket, std::string to);

  void DoSendData_IpHdr (Ptr<Socket> socket, std::string to);

  void SendData_IpHdr (Ptr<Socket> socket, std::string to);

public:

public:

  virtual bool DoRun (void);

  virtual bool DoRun (void);

Lines 139-144	Link Here

139

  Simulator::Run ();

142

  Simulator::Run ();

140

143

141

144

145

void

146

Ipv4RawSocketImplTest::DoSendData_IpHdr (Ptr<Socket> socket, std::string to)

147

148

  Address realTo = InetSocketAddress (Ipv4Address(to.c_str()), 0);

149

  socket->SetAttribute ("IpHeaderInclude", BooleanValue (true));

150

  Ptr<Packet> p = Create<Packet> (123);

151

  Ipv4Header ipHeader;

152

  ipHeader.SetSource (Ipv4Address ("10.0.0.2"));

153

  ipHeader.SetDestination (Ipv4Address (to.c_str ()));

154

  ipHeader.SetProtocol (0);

155

  ipHeader.SetPayloadSize (p->GetSize ());

156

  ipHeader.SetTtl (255);

157

  p->AddHeader (ipHeader);

158

159

  NS_TEST_EXPECT_MSG_EQ (socket->SendTo (p, 0, realTo),

160

                         143, to);

161

  socket->SetAttribute ("IpHeaderInclude", BooleanValue (false));

162

163

164

void

165

Ipv4RawSocketImplTest::SendData_IpHdr (Ptr<Socket> socket, std::string to)

166

167

  m_receivedPacket = Create<Packet> ();

168

  m_receivedPacket2 = Create<Packet> ();

169

  Simulator::ScheduleWithContext (socket->GetNode ()->GetId (), Seconds (0),

170

                                  &Ipv4RawSocketImplTest::DoSendData_IpHdr, this, socket, to);

171

  Simulator::Run ();

172

173

142

bool

174

bool

143

Ipv4RawSocketImplTest::DoRun (void)

175

Ipv4RawSocketImplTest::DoRun (void)

144

176

Lines 229-234	Link Here

229

  m_receivedPacket->RemoveAllByteTags ();

261

  m_receivedPacket->RemoveAllByteTags ();

230

  m_receivedPacket2->RemoveAllByteTags ();

262

  m_receivedPacket2->RemoveAllByteTags ();

231

263

264

  // Unicast w/ header test

265

  SendData_IpHdr (txSocket, "10.0.0.1");

266

  NS_TEST_EXPECT_MSG_EQ (m_receivedPacket->GetSize (), 143, "recv(hdrincl): 10.0.0.1");

267

  NS_TEST_EXPECT_MSG_EQ (m_receivedPacket2->GetSize (), 0, "second interface should not receive it");

268

269

  m_receivedPacket->RemoveAllByteTags ();

270

  m_receivedPacket2->RemoveAllByteTags ();

271

232

#if 0

272

#if 0

233

  // Simple broadcast test

273

  // Simple broadcast test

234

274

Return to bug 932