Attachment #2440 for bug #231

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

(-)a/src/internet/model/nsc-tcp-socket-impl.cc (-1 / +1 lines)

Lines 633-639	Link Here

633

  SocketAddressTag tag;

633

  SocketAddressTag tag;

634

635

  tag.SetAddress (m_peerAddress);

635

  tag.SetAddress (m_peerAddress);

636

  p->AddPacketTag (tag);

636

  p->ReplacePacketTag (tag);

637

  m_deliveryQueue.push (p);

637

  m_deliveryQueue.push (p);

638

  m_rxAvailable += p->GetSize ();

638

  m_rxAvailable += p->GetSize ();

639

(-)a/src/internet/model/tcp-socket-base.cc (-1 / +1 lines)

Lines 874-880	Link Here

874

875

          tag.SetAddress (Inet6SocketAddress (m_endPoint6->GetPeerAddress (), m_endPoint6->GetPeerPort ()));

875

          tag.SetAddress (Inet6SocketAddress (m_endPoint6->GetPeerAddress (), m_endPoint6->GetPeerPort ()));

876

877

      outPacket->AddPacketTag (tag);

877

      outPacket->ReplacePacketTag (tag);

878

879

  return outPacket;

879

  return outPacket;

880

(-)a/src/internet/model/tcp-socket.h (+9 lines)

Lines 42-47	Link Here

 * This class exists solely for hosting TcpSocket attributes that can

 * This class exists solely for hosting TcpSocket attributes that can

 * be reused across different implementations.

 * be reused across different implementations.

 * Socket data that is read from this socket using the methods returing

 * an ns3::Packet object (i.e., Recv (), RecvMsg (), RecvFrom ()) will

 * return Packet objects with a SocketAddressTag attached as a packet tag.

 * The address, of underlying type InetSocketAddress, contains the address

 * and port of the sender.  Applications may safely remove this tag from

 * the Packet.

 * \see class SocketAddresssTag

*/

*/

class TcpSocket : public Socket

class TcpSocket : public Socket

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

Lines 1036-1042	Link Here

1036

      Address address = InetSocketAddress (header.GetSource (), port);

1036

      Address address = InetSocketAddress (header.GetSource (), port);

1037

      SocketAddressTag tag;

1037

      SocketAddressTag tag;

1038

      tag.SetAddress (address);

1038

      tag.SetAddress (address);

1039

      packet->AddPacketTag (tag);

1039

      packet->ReplacePacketTag (tag);

1040

      m_deliveryQueue.push (packet);

1040

      m_deliveryQueue.push (packet);

1041

      m_rxAvailable += packet->GetSize ();

1041

      m_rxAvailable += packet->GetSize ();

1042

      NotifyDataRecv ();

1042

      NotifyDataRecv ();

Lines 1092-1098	Link Here

1092

      Address address = Inet6SocketAddress (header.GetSourceAddress (), port);

1092

      Address address = Inet6SocketAddress (header.GetSourceAddress (), port);

1093

      SocketAddressTag tag;

1093

      SocketAddressTag tag;

1094

      tag.SetAddress (address);

1094

      tag.SetAddress (address);

1095

      packet->AddPacketTag (tag);

1095

      packet->ReplacePacketTag (tag);

1096

      m_deliveryQueue.push (packet);

1096

      m_deliveryQueue.push (packet);

1097

      m_rxAvailable += packet->GetSize ();

1097

      m_rxAvailable += packet->GetSize ();

1098

      NotifyDataRecv ();

1098

      NotifyDataRecv ();

(-)a/src/internet/model/udp-socket.h (+9 lines)

Lines 42-47	Link Here

 * This class exists solely for hosting UdpSocket attributes that can

 * This class exists solely for hosting UdpSocket attributes that can

 * be reused across different implementations, and for declaring

 * be reused across different implementations, and for declaring

 * UDP-specific multicast API.

 * UDP-specific multicast API.

 * Socket data that is read from this socket using the methods returing

 * an ns3::Packet object (i.e., Recv (), RecvMsg (), RecvFrom ()) will

 * return Packet objects with a SocketAddressTag attached as a packet tag.

 * The address, of underlying type InetSocketAddress, contains the address

 * and port of the sender.  Applications may safely remove this tag from

 * the Packet.

 * \see class SocketAddresssTag

*/

*/

class UdpSocket : public Socket

class UdpSocket : public Socket




 * - Accept: not allowed
 *
 * - Listen: returns -1 (OPNOTSUPP)
 *
 * Socket data that is read from this socket using the methods returing
 * an ns3::Packet object (i.e., Recv (), RecvMsg (), RecvFrom ()) will
 * return Packet objects with three PacketTag objects attached.
 * Applications may wish to read the extra out-of-band data provided in
 * these tags, and may safely remove the tags from the Packet.
 *
 * - PacketSocketTag: contains destination address (type PacketSocketAddress)
 *   and packet type of the received packet
 *
 * - SocketAddressTag:  contains source address (type PacketSocketAddress)
 *   of the received packet
 *   
 * - DeviceNameTag:  contains the TypeId string of the relevant NetDevice
 *
 * \see class PacketSocketTag
 * \see class SocketAddresssTag
 * \see class DeviceNameTag
 */
class PacketSocket : public Socket
{

Return to bug 231