Attachment #237 for bug #283

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




      fromAddress = tag.GetAddress ();
    }
  return packet;
}

int
TcpSocketImpl::GetSockName (Address &address) const
{
  NS_LOG_FUNCTION_NOARGS ();

  if (m_endPoint != 0)
    {
      address = InetSocketAddress(m_localAddress, m_localPort);
    }
  return 0;
}

void

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

Lines 93-98	Link Here

  virtual Ptr<Packet> Recv (uint32_t maxSize, uint32_t flags);

  virtual Ptr<Packet> Recv (uint32_t maxSize, uint32_t flags);

  virtual Ptr<Packet> RecvFrom (uint32_t maxSize, uint32_t flags,

  virtual Ptr<Packet> RecvFrom (uint32_t maxSize, uint32_t flags,

    Address &fromAddress);

    Address &fromAddress);

  virtual int GetSockName (Address &address) const;

private:

private:

  friend class Tcp;

  friend class Tcp;




  return packet;
}

int
UdpSocketImpl::GetSockName (Address &address) const
{
  NS_LOG_FUNCTION_NOARGS ();
  if (m_endPoint != 0)
    {
      address = InetSocketAddress (m_endPoint->GetLocalAddress (), m_endPoint->GetLocalPort());
    }
  return 0;
}

void 
UdpSocketImpl::ForwardUp (Ptr<Packet> packet, Ipv4Address ipv4, uint16_t port)
{

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

Lines 72-77	Link Here

  virtual Ptr<Packet> Recv (uint32_t maxSize, uint32_t flags);

  virtual Ptr<Packet> Recv (uint32_t maxSize, uint32_t flags);

  virtual Ptr<Packet> RecvFrom (uint32_t maxSize, uint32_t flags,

  virtual Ptr<Packet> RecvFrom (uint32_t maxSize, uint32_t flags,

    Address &fromAddress);

    Address &fromAddress);

  virtual int GetSockName (Address &address) const;

private:

private:

  // Attributes set through UdpSocket base class

  // Attributes set through UdpSocket base class




  return packet;
}

int
PacketSocket::GetSockName (Address &address) const
{
  NS_LOG_FUNCTION_NOARGS ();
  PacketSocketAddress ad = PacketSocketAddress::ConvertFrom(address);
  
  ad.SetProtocol (m_protocol);
  if (m_isSingleDevice)
    {
      Ptr<NetDevice> device = m_node->GetDevice (ad.GetSingleDevice ());
      ad.SetPhysicalAddress(device->GetAddress());      
      ad.SetSingleDevice (m_device);      
    }
  else
    {
      ad.SetAllDevices ();
    }
  
  address = ad;  
  return 0;
}

}//namespace ns3

(-)a/src/node/packet-socket.h (+1 lines)

Lines 101-106	Link Here

101

  virtual Ptr<Packet> Recv (uint32_t maxSize, uint32_t flags);

101

  virtual Ptr<Packet> Recv (uint32_t maxSize, uint32_t flags);

102

  virtual Ptr<Packet> RecvFrom (uint32_t maxSize, uint32_t flags,

102

  virtual Ptr<Packet> RecvFrom (uint32_t maxSize, uint32_t flags,

103

    Address &fromAddress);

103

    Address &fromAddress);

104

  virtual int GetSockName (Address &address) const;

104

105

private:

106

private:

106

  void ForwardUp (Ptr<NetDevice> device, Ptr<const Packet> packet,

107

  void ForwardUp (Ptr<NetDevice> device, Ptr<const Packet> packet,

(-)a/src/node/socket.h (+5 lines)

Lines 493-498	Link Here

493

  int RecvFrom (uint8_t* buf, uint32_t size, uint32_t flags,

493

  int RecvFrom (uint8_t* buf, uint32_t size, uint32_t flags,

494

                Address &fromAddress);

494

                Address &fromAddress);

495

496

/**

497

   * \returns the address name this socket is associated with.

498

*/

499

  virtual int GetSockName (Address &address) const = 0;

500

496

protected:

501

protected:

497

  void NotifyConnectionSucceeded (void);

502

  void NotifyConnectionSucceeded (void);

498

  void NotifyConnectionFailed (void);

503

  void NotifyConnectionFailed (void);

Return to bug 283