Attachment #927 for bug #948

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




/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2010 INRIA
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation;
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#include <iostream>
#include "ns3/abort.h"
#include "ns3/assert.h"
#include "ns3/log.h"
#include "ns3/header.h"
#include "etherip-header.h"

NS_LOG_COMPONENT_DEFINE ("EtheripHeader");

namespace ns3 {

NS_OBJECT_ENSURE_REGISTERED (EtheripHeader);

EtheripHeader::EtheripHeader ()
{
}

EtheripHeader::~EtheripHeader ()
{
}

  TypeId 
EtheripHeader::GetTypeId (void)
{
  static TypeId tid = TypeId ("ns3::EtheripHeader")
    .SetParent<Header> ()
    .AddConstructor<EtheripHeader> ()
    ;
  return tid;
}

  TypeId 
EtheripHeader::GetInstanceTypeId (void) const
{
  return GetTypeId ();
}

void 
EtheripHeader::Print (std::ostream &os) const
{}

uint32_t
EtheripHeader::GetSerializedSize (void) const
{
  return 2;
}

void
EtheripHeader::Serialize (Buffer::Iterator start) const
{
  uint16_t header = 0x3;
  start.WriteHtonU16 (header);
}

uint32_t
EtheripHeader::Deserialize (Buffer::Iterator start)
{
  uint16_t header;
  header = start.ReadNtohU16 ();
  return GetSerializedSize();
}


} // namespace ns3




/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2010 INRIA
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation;
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#ifndef ETHERIP_HEADER_H
#define ETHERIP_HEADER_H

#include "ns3/header.h"

namespace ns3 {

/**
 * \brief Packet header for ETHERIP
 *
 * See rfc 3378
 */
class EtheripHeader : public Header 
{
public:

  /**
   * \brief Construct a ETHERIP header.
   */
  EtheripHeader ();

  /**
   * \brief Destroy a ETHERIP header.
   */
  virtual ~EtheripHeader ();

  static TypeId GetTypeId (void);
  virtual TypeId GetInstanceTypeId (void) const;
  virtual void Print (std::ostream &os) const;
  virtual void Serialize (Buffer::Iterator start) const;
  virtual uint32_t Deserialize (Buffer::Iterator start);
  virtual uint32_t GetSerializedSize (void) const;

};

}; // namespace ns3


#endif /* ETHERIP_HEADER_H */




#include "ns3/trace-source-accessor.h"
#include "ns3/uinteger.h"
#include "ns3/pointer.h"
#include "ns3/ipv4-header.h"
#include "point-to-point-net-device.h"
#include "point-to-point-channel.h"
#include "ppp-header.h"
#include "etherip-header.h"

NS_LOG_COMPONENT_DEFINE ("PointToPointNetDevice");


  NS_LOG_FUNCTION_NOARGS ();
}

void 
PointToPointNetDevice::AddHeader(Ptr<Packet> p, uint16_t protocolNumber, Mac48Address dest)
{
  NS_LOG_FUNCTION_NOARGS ();
  EthernetHeader eth;
  eth.SetSource (m_address);
  eth.SetDestination (dest);
  eth.SetLengthType (protocolNumber);
  p->AddHeader (eth);
  EtheripHeader ethIp;
  p->AddHeader (ethIp);
  Ipv4Header ipv4;
  ipv4.SetSource (Ipv4Address::GetZero ());
  ipv4.SetDestination (Ipv4Address::GetZero ());
  ipv4.SetPayloadSize (p->GetSize ());
  ipv4.SetProtocol (0x61); // ETHERip over IPV4
  p->AddHeader (ipv4);
  PppHeader ppp;
  ppp.SetProtocol(0x0021); // ipv4
  p->AddHeader (ppp);
}

EthernetHeader
PointToPointNetDevice::ProcessHeader(Ptr<Packet> p)
{
  NS_LOG_FUNCTION_NOARGS ();
  PppHeader ppp;
  p->RemoveHeader (ppp);
  Ipv4Header ipv4;
  p->RemoveHeader (ipv4);
  EtheripHeader ethIp;
  p->RemoveHeader (ethIp);
  EthernetHeader eth;
  p->RemoveHeader (eth);
  return eth;
}

  void 

PointToPointNetDevice::Receive (Ptr<Packet> packet)
{
  NS_LOG_FUNCTION (this << packet);
  uint16_t protocol = 0;

  if (m_receiveErrorModel && m_receiveErrorModel->IsCorrupt (packet) ) 
    {
      // 

      // there is no difference in what the promisc callback sees and what the
      // normal receive callback sees.
      //
      EthernetHeader eth = ProcessHeader(packet);

      if (!m_promiscCallback.IsNull ())
        {
          m_macPromiscRxTrace (packet);
          m_promiscCallback (this, packet, eth.GetLengthType (), 
                             eth.GetSource (), eth.GetDestination (), 
                             NetDevice::PACKET_HOST);
        }

      m_macRxTrace (packet);
      m_rxCallback (this, packet, eth.GetLengthType (), eth.GetSource ());
    }
}


  NS_LOG_FUNCTION_NOARGS ();
  NS_LOG_LOGIC ("p=" << packet << ", dest=" << &dest);
  NS_LOG_LOGIC ("UID is " << packet->GetUid ());
  Mac48Address realDest = Mac48Address::ConvertFrom (dest);

  //
  // If IsLinkUp() is false it means there is no channel to send any packet 

  // Stick a point to point protocol header on the packet in preparation for
  // shoving it out the door.
  //
  AddHeader(packet, protocolNumber, realDest);

  m_macTxTrace (packet);





#include "ns3/data-rate.h"
#include "ns3/ptr.h"
#include "ns3/mac48-address.h"
#include "ns3/ethernet-header.h"

namespace ns3 {


   * \param p packet
   * \param protocolNumber protocol number
   */
  void AddHeader(Ptr<Packet> p, uint16_t protocolNumber, Mac48Address dest);

  /**
   * Removes, from a packet of data, all headers and trailers that
   * relate to the protocol implemented by the agent
   * \param p Packet whose headers need to be processed
   * \param param An integer parameter that can be set by the function
   * \return Returns true if the packet should be forwarded up the
   * protocol stack.
   */
  EthernetHeader ProcessHeader(Ptr<Packet> p);

  /**
   * Start Sending a Packet Down the Wire.

(-)a/src/devices/point-to-point/wscript (+1 lines)

Lines 9-14	Link Here

        'point-to-point-remote-channel.cc',

        'point-to-point-remote-channel.cc',

        'point-to-point-test.cc',

        'point-to-point-test.cc',

        'ppp-header.cc',

        'ppp-header.cc',

        'etherip-header.cc',

    headers = bld.new_task_gen('ns3header')

    headers = bld.new_task_gen('ns3header')

    headers.module = 'point-to-point'

    headers.module = 'point-to-point'

Return to bug 948