Attachment #1428 for bug #1477

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




  return;
}

void 
Ipv4L3ClickProtocol::SendWithHeader (Ptr<Packet> packet, 
                                Ipv4Header ipHeader,
                                Ptr<Ipv4Route> route)
{
  NS_LOG_FUNCTION (this << packet << ipHeader << route);

  Ptr<Ipv4ClickRouting> click = DynamicCast<Ipv4ClickRouting> (m_routingProtocol);
  if (Node::ChecksumEnabled ())
    {
      ipHeader.EnableChecksum ();
    }
  packet->AddHeader (ipHeader);
  click->Send (packet->Copy (), ipHeader.GetSource (), ipHeader.GetDestination ());
}

void
Ipv4L3ClickProtocol::SendDown (Ptr<Packet> p, int ifid)
{

                               const Address &to, NetDevice::PacketType packetType)
{
  NS_LOG_FUNCTION (this << device << p << from << to);
  Ptr<Packet> packetForRawSocket = p->Copy ();

  if (protocol == Ipv4L3ClickProtocol::PROT_NUMBER)
    {
      uint32_t interface = 0;
      Ptr<Ipv4Interface> ipv4Interface;
      for (Ipv4InterfaceList::const_iterator i = m_interfaces.begin (); 
           i != m_interfaces.end (); 
           i++, interface++)
        {
          ipv4Interface = *i;
          if (ipv4Interface->GetDevice () == device)
            {
              if (ipv4Interface->IsUp ())
                {
                  break;
                }
              else
                {
                  NS_LOG_LOGIC ("Dropping received packet -- interface is down");
                  return;
                }
            }
        }

      Ipv4Header ipHeader;
      if (Node::ChecksumEnabled ())
        {
          ipHeader.EnableChecksum ();
        }
      packetForRawSocket->RemoveHeader (ipHeader);

      
      for (SocketList::iterator i = m_sockets.begin (); i != m_sockets.end (); ++i)
        {
          NS_LOG_LOGIC ("Forwarding to raw socket"); 
          Ptr<Ipv4RawSocketImpl> socket = *i;
          socket->ForwardUp (packetForRawSocket, ipHeader, ipv4Interface);
        }
    }

  Ptr<Packet> packet = p->Copy ();

  // Add an ethernet frame. This allows

(-)a/src/click/model/ipv4-l3-click-protocol.h (+3 lines)

Lines 116-121	Link Here

116

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

116

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

117

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

117

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

118

119

120

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

121

119

/**

122

/**

120

   * \param packet packet to send down the stack

123

   * \param packet packet to send down the stack

121

   * \param ifid interface to be used for sending down packet

124

   * \param ifid interface to be used for sending down packet




      Ptr<Node> node = this->GetObject<Node> ();
      if (node != 0)
        {
          Ptr<Ipv4> ipv4 = this->GetObject<Ipv4> ();
          if (ipv4 != 0 && m_downTarget.IsNull ())
            {
              this->SetNode (node);
              ipv4->Insert (this);
              Ptr<Ipv4RawSocketFactoryImpl> rawFactory = CreateObject<Ipv4RawSocketFactoryImpl> ();
              ipv4->AggregateObject (rawFactory);
              this->SetDownTarget (MakeCallback (&Ipv4::Send, ipv4));
            }
        }
    }

void
Icmpv4L4Protocol::SendMessage (Ptr<Packet> packet, Ipv4Address dest, uint8_t type, uint8_t code)
{
  Ptr<Ipv4> ipv4 = m_node->GetObject<Ipv4> ();
  NS_ASSERT (ipv4 != 0 && ipv4->GetRoutingProtocol () != 0);
  Ipv4Header header;
  header.SetDestination (dest);

                           uint32_t info, Ipv4Header ipHeader,
                           const uint8_t payload[8])
{
  Ptr<Ipv4> ipv4 = m_node->GetObject<Ipv4> ();
  Ptr<IpL4Protocol> l4 = ipv4->GetProtocol (ipHeader.GetProtocol ());
  if (l4 != 0)
    {

(-)a/src/internet/model/ipv4-raw-socket-factory-impl.cc (-1 / +1 lines)

Lines 28-34	Link Here

Ptr<Socket>

Ptr<Socket>

Ipv4RawSocketFactoryImpl::CreateSocket (void)

Ipv4RawSocketFactoryImpl::CreateSocket (void)

  Ptr<Ipv4L3Protocol> ipv4 = GetObject<Ipv4L3Protocol> ();

  Ptr<Ipv4> ipv4 = GetObject<Ipv4> ();

  Ptr<Socket> socket = ipv4->CreateRawSocket ();

  Ptr<Socket> socket = ipv4->CreateRawSocket ();

  return socket;

  return socket;

(-)a/src/internet/model/ipv4-raw-socket-impl.cc (-2 / +2 lines)

Lines 130-136	Link Here

130

Ipv4RawSocketImpl::Close (void)

130

Ipv4RawSocketImpl::Close (void)

131

132

  NS_LOG_FUNCTION (this);

132

  NS_LOG_FUNCTION (this);

133

  Ptr<Ipv4L3Protocol> ipv4 = m_node->GetObject<Ipv4L3Protocol> ();

133

  Ptr<Ipv4> ipv4 = m_node->GetObject<Ipv4> ();

134

  if (ipv4 != 0)

134

  if (ipv4 != 0)

135

136

      ipv4->DeleteRawSocket (this);

136

      ipv4->DeleteRawSocket (this);

Lines 199-205	Link Here

199

      return 0;

199

      return 0;

200

201

  InetSocketAddress ad = InetSocketAddress::ConvertFrom (toAddress);

201

  InetSocketAddress ad = InetSocketAddress::ConvertFrom (toAddress);

202

  Ptr<Ipv4L3Protocol> ipv4 = m_node->GetObject<Ipv4L3Protocol> ();

202

  Ptr<Ipv4> ipv4 = m_node->GetObject<Ipv4> ();

203

  Ipv4Address dst = ad.GetIpv4 ();

203

  Ipv4Address dst = ad.GetIpv4 ();

204

  Ipv4Address src = m_src;

204

  Ipv4Address src = m_src;

205

  if (ipv4->GetRoutingProtocol ())

205

  if (ipv4->GetRoutingProtocol ())

(-)a/src/internet/model/ipv4.h (+17 lines)

Lines 143-148	Link Here

143

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

143

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

144

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

144

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

145

146

  virtual void SendWithHeader (Ptr<Packet> packet, Ipv4Header ipHeader, Ptr<Ipv4Route> route) = 0;

147

146

/**

148

/**

147

   * \param protocol a pointer to the protocol to add to this L4 Demux.

149

   * \param protocol a pointer to the protocol to add to this L4 Demux.

148

150

Lines 333-338	Link Here

333

   * If set to true, IP forwarding is enabled for input datagrams on this device

335

   * If set to true, IP forwarding is enabled for input datagrams on this device

334

*/

336

*/

335

  virtual void SetForwarding (uint32_t interface, bool val) = 0;

337

  virtual void SetForwarding (uint32_t interface, bool val) = 0;

338

339

/**

340

   * \param protocolNumber number of protocol to lookup

341

   *        in this L4 Demux

342

   * \returns a matching L4 Protocol

343

344

   * This method is typically called by lower layers

345

   * to forward packets up the stack to the right protocol.

346

   * It is also called from NodeImpl::GetUdp for example.

347

*/

348

  virtual Ptr<IpL4Protocol> GetProtocol (int protocolNumber) const = 0;

349

350

  virtual Ptr<Socket> CreateRawSocket (void) = 0;

351

  virtual void DeleteRawSocket (Ptr<Socket> socket) = 0;

352

336

353

337

  static const uint32_t IF_ANY = 0xffffffff;

354

  static const uint32_t IF_ANY = 0xffffffff;

338

355

Return to bug 1477