Attachment #636 for bug #729

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




PointToPointNetDevice::AddHeader(Ptr<Packet> p, uint16_t protocolNumber)
{
  NS_LOG_FUNCTION_NOARGS ();
  NS_ASSERT_MSG (protocolNumber == 0x800, "PointToPointNetDevice::AddHeader(): protocolNumber must be 0x800");
  PppHeader ppp;
  ppp.SetProtocol(ETHERtoPPP(protocolNumber));
  p->AddHeader (ppp);
}


  NS_LOG_FUNCTION_NOARGS ();
  PppHeader ppp;
  p->RemoveHeader (ppp);
  param = PPPtoETHER(ppp.GetProtocol());
  return true;
}


  return m_mtu;
}

  uint16_t
PointToPointNetDevice::PPPtoETHER(uint16_t proto)
{
  switch(proto)
    {
      case 0x0021: return 0x0800; //IPv4
      case 0x0057: return 0x86DD; //IPv6
      default: NS_ASSERT_MSG(false, "PPP Protocol number not defined!");
    }
  return 0;
}

  uint16_t
PointToPointNetDevice::ETHERtoPPP(uint16_t proto)
{
  switch(proto)
    {
      case 0x0800: return 0x0021; //IPv4
      case 0x86DD: return 0x0057; //IPv6
      default: NS_ASSERT_MSG(false, "PPP Protocol number not defined!");
    }
  return 0;
}


} // namespace ns3

(-)a/src/devices/point-to-point/point-to-point-net-device.h (+9 lines)

Lines 548-553	Link Here

548

  uint32_t m_mtu;

548

  uint32_t m_mtu;

549

550

  Ptr<Packet> m_currentPkt;

550

  Ptr<Packet> m_currentPkt;

551

552

/**

553

   * PPP to Ethernet protocol number mapping

554

*/

555

  static uint16_t PPPtoETHER(uint16_t);

556

/**

557

   * Ethernet to PPP protocol number mapping

558

*/

559

  static uint16_t ETHERtoPPP(uint16_t);

551

};

560

};

552

561

553

} // namespace ns3

562

} // namespace ns3




void 
PppHeader::Print (std::ostream &os) const
{
  os << "Point-to-Point Protocol: " << m_protocol;
}

  uint32_t

  void
PppHeader::Serialize (Buffer::Iterator start) const
{
  start.WriteHtonU16 (m_protocol);
}

  uint32_t
PppHeader::Deserialize (Buffer::Iterator start)
{
  m_protocol = start.ReadNtohU16 ();
  return GetSerializedSize();
  return 2;
}

  void
PppHeader::SetProtocol (uint16_t protocol)
{
  m_protocol=protocol;
}

  uint16_t
PppHeader::GetProtocol (void)
{
  return m_protocol;
}


} // namespace ns3




 *
 * This class can be used to add a header to PPP packet.  Currently we do not
 * implement any of the state machine in RFC 1661, we just encapsulate the
 * inbound packet send it on.  The goal here is not really to implement the
 * point-to-point protocol, but to encapsulate our packets in a known protocol
 * so packet sniffers can parse them.
 *
 * if PPP is transmitted over a serial link, it will typically be framed in
 * some way derivative of IBM SDLC (HDLC) with all that that entails.

 * teach the PcapWriter about the appropriate data link type (DLT_PPP = 9),
 * and we need to add a PPP header to each packet.  Since we are not using
 * framed PPP, this just means prepending the sixteen bit PPP protocol number
 * to the packet.  The ns-3 way to do this is via a class that inherits from
 * class Header.
 */
class PppHeader : public Header 
{
public:

  /**
   * \brief Construct a PPP header.
   */
  PppHeader ();

  /**
   * \brief Destroy a PPP header.
   */
  virtual ~PppHeader ();


  virtual void Serialize (Buffer::Iterator start) const;
  virtual uint32_t Deserialize (Buffer::Iterator start);
  virtual uint32_t GetSerializedSize (void) const;

  /**
   * \brief Set the protocol type carried by this PPP packet
   *
   * The type numbers to be used are defined in RFC3818
   *
   * \param protocol the protocol type being carried
   */
  void SetProtocol(uint16_t protocol);

  /**
   * \brief Get the protocol type carried by this PPP packet
   *
   * The type numbers to be used are defined in RFC3818
   *
   * \return the protocol type being carried
   */
  uint16_t GetProtocol(void);

private:
  uint16_t m_protocol;
};

}; // namespace ns3

Return to bug 729