Attachment #1951 for bug #1835

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




  address = InetSocketAddress (m_src, 0);
  return 0;
}
int
Ipv4RawSocketImpl::GetPeerName (Address &address) const
{
  NS_LOG_FUNCTION (this << address);

  if (m_dst == Ipv4Address::GetAny ())
    {
      m_err = ERROR_NOTCONN;
      return -1;
    }

  address = InetSocketAddress (m_dst, 0);

  return 0;
}
int 
Ipv4RawSocketImpl::Close (void)
{

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

Lines 53-58	Link Here

  virtual int Bind ();

  virtual int Bind ();

  virtual int Bind6 ();

  virtual int Bind6 ();

  virtual int GetSockName (Address &address) const;

  virtual int GetSockName (Address &address) const;

  virtual int GetPeerName (Address &address) const;

  virtual int Close (void);

  virtual int Close (void);

  virtual int ShutdownSend (void);

  virtual int ShutdownSend (void);

  virtual int ShutdownRecv (void);

  virtual int ShutdownRecv (void);

Lines 98-104	Link Here

    uint16_t fromProtocol;   /**< Protocol used */

    uint16_t fromProtocol;   /**< Protocol used */

};

100

};

100

101

  enum Socket::SocketErrno m_err;   //!< Last error number.

102

  mutable enum Socket::SocketErrno m_err; //!< Last error number.

102

  Ptr<Node> m_node;                 //!< Node

103

  Ptr<Node> m_node;                 //!< Node

103

  Ipv4Address m_src;                //!< Source address.

104

  Ipv4Address m_src;                //!< Source address.

104

  Ipv4Address m_dst;                //!< Destination address.

105

  Ipv4Address m_dst;                //!< Destination address.




  return 0;
}

int
Ipv6RawSocketImpl::GetPeerName (Address& address) const
{
  NS_LOG_FUNCTION (this << address);

  if (m_dst.IsAny ())
    {
      m_err = ERROR_NOTCONN;
      return -1;
    }

  address = Inet6SocketAddress (m_dst, 0);

  return 0;
}

int Ipv6RawSocketImpl::Close ()
{
  NS_LOG_FUNCTION_NOARGS ();

(-)a/src/internet/model/ipv6-raw-socket-impl.h (-1 / +2 lines)

Lines 95-100	Link Here

  virtual int Bind6 ();

  virtual int Bind6 ();

  virtual int GetSockName (Address& address) const;

  virtual int GetSockName (Address& address) const;

  virtual int GetPeerName (Address& address) const;

  virtual int Close ();

100

  virtual int Close ();

100

  virtual int ShutdownSend ();

101

  virtual int ShutdownSend ();

Lines 183-189	Link Here

183

/**

184

/**

184

   * \brief Last error number.

185

   * \brief Last error number.

185

*/

186

*/

186

  enum Socket::SocketErrno m_err;

187

  mutable enum Socket::SocketErrno m_err;

187

188

/**

189

/**

189

   * \brief Node.

190

   * \brief Node.




  return 0;
}

int
TcpSocketBase::GetPeerName (Address &address) const
{
  NS_LOG_FUNCTION (this << address);

  if (!m_endPoint && !m_endPoint6)
    {
      m_errno = ERROR_NOTCONN;
      return -1;
    }

  if (m_endPoint)
    {
      address = InetSocketAddress (m_endPoint->GetPeerAddress (),
                                   m_endPoint->GetPeerPort ());
    }
  else if (m_endPoint6)
    {
      address = Inet6SocketAddress (m_endPoint6->GetPeerAddress (),
                                    m_endPoint6->GetPeerPort ());
    }
  else
    {
      NS_ASSERT (false);
    }

  return 0;
}

/* Inherit from Socket class: Bind this socket to the specified NetDevice */
void
TcpSocketBase::BindToNetDevice (Ptr<NetDevice> netdevice)

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

Lines 120-125	Link Here

120

  virtual uint32_t GetTxAvailable (void) const; // Available Tx buffer size

120

  virtual uint32_t GetTxAvailable (void) const; // Available Tx buffer size

121

  virtual uint32_t GetRxAvailable (void) const; // Available-to-read data size, i.e. value of m_rxAvailable

121

  virtual uint32_t GetRxAvailable (void) const; // Available-to-read data size, i.e. value of m_rxAvailable

122

  virtual int GetSockName (Address &address) const; // Return local addr:port in address

122

  virtual int GetSockName (Address &address) const; // Return local addr:port in address

123

  virtual int GetPeerName (Address &address) const;

123

  virtual void BindToNetDevice (Ptr<NetDevice> netdevice); // NetDevice with my m_endPoint

124

  virtual void BindToNetDevice (Ptr<NetDevice> netdevice); // NetDevice with my m_endPoint

124

125

protected:

126

protected:

Lines 647-653	Link Here

647

648

  // State-related attributes

649

  // State-related attributes

649

  TracedValue<TcpStates_t> m_state;         //!< TCP state

650

  TracedValue<TcpStates_t> m_state;         //!< TCP state

650

  enum SocketErrno         m_errno;         //!< Socket error code

651

  mutable enum SocketErrno m_errno;         //!< Socket error code

651

  bool                     m_closeNotified; //!< Told app to close socket

652

  bool                     m_closeNotified; //!< Told app to close socket

652

  bool                     m_closeOnEmpty;  //!< Close socket upon tx buffer emptied

653

  bool                     m_closeOnEmpty;  //!< Close socket upon tx buffer emptied

653

  bool                     m_shutdownSend;  //!< Send no longer allowed

654

  bool                     m_shutdownSend;  //!< Send no longer allowed




  return 0;
}

int
UdpSocketImpl::GetPeerName (Address &address) const
{
  NS_LOG_FUNCTION (this << address);

  if (!m_connected)
    {
      m_errno = ERROR_NOTCONN;
      return -1;
    }

  if (Ipv4Address::IsMatchingType (m_defaultAddress))
    {
      Ipv4Address addr = Ipv4Address::ConvertFrom (m_defaultAddress);
      address = InetSocketAddress (addr, m_defaultPort);
    }
  else if (Ipv6Address::IsMatchingType (m_defaultAddress))
    {
      Ipv6Address addr = Ipv6Address::ConvertFrom (m_defaultAddress);
      address = Inet6SocketAddress (addr, m_defaultPort);
    }
  else
    {
      NS_ASSERT_MSG (false, "unexpected address type");
    }

  return 0;
}

int 
UdpSocketImpl::MulticastJoinGroup (uint32_t interface, const Address &groupAddress)
{

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

Lines 93-98	Link Here

  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;

  virtual int GetSockName (Address &address) const;

  virtual int GetPeerName (Address &address) const;

  virtual int MulticastJoinGroup (uint32_t interfaceIndex, const Address &groupAddress);

  virtual int MulticastJoinGroup (uint32_t interfaceIndex, const Address &groupAddress);

  virtual int MulticastLeaveGroup (uint32_t interfaceIndex, const Address &groupAddress);

  virtual int MulticastLeaveGroup (uint32_t interfaceIndex, const Address &groupAddress);

  virtual void BindToNetDevice (Ptr<NetDevice> netdevice);

  virtual void BindToNetDevice (Ptr<NetDevice> netdevice);

Lines 227-233	Link Here

227

  uint16_t m_defaultPort;   //!< Default port

228

  uint16_t m_defaultPort;   //!< Default port

228

  TracedCallback<Ptr<const Packet> > m_dropTrace; //!< Trace for dropped packets

229

  TracedCallback<Ptr<const Packet> > m_dropTrace; //!< Trace for dropped packets

229

230

  enum SocketErrno         m_errno;           //!< Socket error code

231

  mutable enum SocketErrno m_errno;           //!< Socket error code

231

  bool                     m_shutdownSend;    //!< Send no longer allowed

232

  bool                     m_shutdownSend;    //!< Send no longer allowed

232

  bool                     m_shutdownRecv;    //!< Receive no longer allowed

233

  bool                     m_shutdownRecv;    //!< Receive no longer allowed

233

  bool                     m_connected;       //!< Connection established

234

  bool                     m_connected;       //!< Connection established




  m_receivedPacket = 0;
  m_receivedPacket2 = 0;

  // Simple getpeername tests

  Address peerAddress;
  int err = txSocket->GetPeerName (peerAddress);
  NS_TEST_EXPECT_MSG_EQ (err, -1, "socket GetPeerName() should fail when socket is not connected");
  NS_TEST_EXPECT_MSG_EQ (txSocket->GetErrno (), Socket::ERROR_NOTCONN, "socket error code should be ERROR_NOTCONN");

  InetSocketAddress peer ("10.0.0.1", 1234);
  err = txSocket->Connect (peer);
  NS_TEST_EXPECT_MSG_EQ (err, 0, "socket Connect() should succeed");

  err = txSocket->GetPeerName (peerAddress);
  NS_TEST_EXPECT_MSG_EQ (err, 0, "socket GetPeerName() should succeed when socket is connected");
  peer.SetPort (0);
  NS_TEST_EXPECT_MSG_EQ (peerAddress, peer, "address from socket GetPeerName() should equal the connected address");

  Simulator::Destroy ();
}
//-----------------------------------------------------------------------------




  m_receivedPacket = 0;
  m_receivedPacket2 = 0;

  // Simple getpeername tests

  Address peerAddress;
  int err = txSocket->GetPeerName (peerAddress);
  NS_TEST_EXPECT_MSG_EQ (err, -1, "socket GetPeerName() should fail when socket is not connected");
  NS_TEST_EXPECT_MSG_EQ (txSocket->GetErrno (), Socket::ERROR_NOTCONN, "socket error code should be ERROR_NOTCONN");

  Inet6SocketAddress peer ("2001:db8::1", 1234);
  err = txSocket->Connect (peer);
  NS_TEST_EXPECT_MSG_EQ (err, 0, "socket Connect() should succeed");

  err = txSocket->GetPeerName (peerAddress);
  NS_TEST_EXPECT_MSG_EQ (err, 0, "socket GetPeerName() should succeed when socket is connected");
  peer.SetPort (0);
  NS_TEST_EXPECT_MSG_EQ (peerAddress, peer, "address from socket GetPeerName() should equal the connected address");

  Simulator::Destroy ();
}
//-----------------------------------------------------------------------------

(-)a/src/internet/test/tcp-test.cc (-2 / +22 lines)

Lines 343-349	Link Here

343

  source->SetRecvCallback (MakeCallback (&TcpTestCase::SourceHandleRecv, this));

343

  source->SetRecvCallback (MakeCallback (&TcpTestCase::SourceHandleRecv, this));

344

  source->SetSendCallback (MakeCallback (&TcpTestCase::SourceHandleSend, this));

344

  source->SetSendCallback (MakeCallback (&TcpTestCase::SourceHandleSend, this));

345

346

  source->Connect (serverremoteaddr);

346

  Address peerAddress;

347

  int err = source->GetPeerName (peerAddress);

348

  NS_TEST_EXPECT_MSG_EQ (err, -1, "socket GetPeerName() should fail when socket is not connected");

349

  NS_TEST_EXPECT_MSG_EQ (source->GetErrno (), Socket::ERROR_NOTCONN, "socket error code should be ERROR_NOTCONN");

350

351

  err = source->Connect (serverremoteaddr);

352

  NS_TEST_EXPECT_MSG_EQ (err, 0, "socket Connect() should succeed");

353

354

  err = source->GetPeerName (peerAddress);

355

  NS_TEST_EXPECT_MSG_EQ (err, 0, "socket GetPeerName() should succeed when socket is connected");

356

  NS_TEST_EXPECT_MSG_EQ (peerAddress, serverremoteaddr, "address from socket GetPeerName() should equal the connected address");

347

357

348

358

349

void

359

void

Lines 379-385	Link Here

379

  source->SetRecvCallback (MakeCallback (&TcpTestCase::SourceHandleRecv, this));

389

  source->SetRecvCallback (MakeCallback (&TcpTestCase::SourceHandleRecv, this));

380

  source->SetSendCallback (MakeCallback (&TcpTestCase::SourceHandleSend, this));

390

  source->SetSendCallback (MakeCallback (&TcpTestCase::SourceHandleSend, this));

381

391

382

  source->Connect (serverremoteaddr);

392

  Address peerAddress;

393

  int err = source->GetPeerName (peerAddress);

394

  NS_TEST_EXPECT_MSG_EQ (err, -1, "socket GetPeerName() should fail when socket is not connected");

395

  NS_TEST_EXPECT_MSG_EQ (source->GetErrno (), Socket::ERROR_NOTCONN, "socket error code should be ERROR_NOTCONN");

396

397

  err = source->Connect (serverremoteaddr);

398

  NS_TEST_EXPECT_MSG_EQ (err, 0, "socket Connect() should succeed");

399

400

  err = source->GetPeerName (peerAddress);

401

  NS_TEST_EXPECT_MSG_EQ (err, 0, "socket GetPeerName() should succeed when socket is connected");

402

  NS_TEST_EXPECT_MSG_EQ (peerAddress, serverremoteaddr, "address from socket GetPeerName() should equal the connected address");

383

403

384

404

385

Ptr<Node>

405

Ptr<Node>

(-)a/src/internet/test/udp-test.cc (+29 lines)

Lines 322-327	Link Here

322

  m_receivedPacket->RemoveAllByteTags ();

322

  m_receivedPacket->RemoveAllByteTags ();

323

  m_receivedPacket2->RemoveAllByteTags ();

323

  m_receivedPacket2->RemoveAllByteTags ();

324

325

  // Simple getpeername tests

326

327

  Address peerAddress;

328

  int err = txSocket->GetPeerName (peerAddress);

329

  NS_TEST_EXPECT_MSG_EQ (err, -1, "socket GetPeerName() should fail when socket is not connected");

330

  NS_TEST_EXPECT_MSG_EQ (txSocket->GetErrno (), Socket::ERROR_NOTCONN, "socket error code should be ERROR_NOTCONN");

331

332

  InetSocketAddress peer ("10.0.0.1", 1234);

333

  err = txSocket->Connect (peer);

334

  NS_TEST_EXPECT_MSG_EQ (err, 0, "socket Connect() should succeed");

335

336

  err = txSocket->GetPeerName (peerAddress);

337

  NS_TEST_EXPECT_MSG_EQ (err, 0, "socket GetPeerName() should succeed when socket is connected");

338

  NS_TEST_EXPECT_MSG_EQ (peerAddress, peer, "address from socket GetPeerName() should equal the connected address");

339

325

  Simulator::Destroy ();

340

  Simulator::Destroy ();

326

341

327

342

Lines 500-505	Link Here

500

  m_receivedPacket->RemoveAllByteTags ();

515

  m_receivedPacket->RemoveAllByteTags ();

501

  m_receivedPacket2->RemoveAllByteTags ();

516

  m_receivedPacket2->RemoveAllByteTags ();

502

517

518

  // Simple getpeername tests

519

  Address peerAddress;

520

  int err = txSocket->GetPeerName (peerAddress);

521

  NS_TEST_EXPECT_MSG_EQ (err, -1, "socket GetPeerName() should fail when socket is not connected");

522

  NS_TEST_EXPECT_MSG_EQ (txSocket->GetErrno (), Socket::ERROR_NOTCONN, "socket error code should be ERROR_NOTCONN");

523

524

  Inet6SocketAddress peer ("2001:0100::1", 1234);

525

  err = txSocket->Connect (peer);

526

  NS_TEST_EXPECT_MSG_EQ (err, 0, "socket Connect() should succeed");

527

528

  err = txSocket->GetPeerName (peerAddress);

529

  NS_TEST_EXPECT_MSG_EQ (err, 0, "socket GetPeerName() should succeed when socket is connected");

530

  NS_TEST_EXPECT_MSG_EQ (peerAddress, peer, "address from socket GetPeerName() should equal the connected address");

531

503

  Simulator::Destroy ();

532

  Simulator::Destroy ();

504

533

505

534

(-)a/src/network/model/socket.h (+7 lines)

Lines 561-566	Link Here

561

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

561

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

562

563

/**

563

/**

564

   * \brief Get the peer address of a connected socket.

565

   * \param address the address this socket is connected to.

566

   * \returns 0 if success, -1 otherwise

567

*/

568

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

569

570

/**

564

   * \brief Bind a socket to specific device.

571

   * \brief Bind a socket to specific device.

565

572

566

   * This method corresponds to using setsockopt() SO_BINDTODEVICE

573

   * This method corresponds to using setsockopt() SO_BINDTODEVICE




  return 0;
}

int
PacketSocket::GetPeerName (Address &address) const
{
  NS_LOG_FUNCTION (this << address);

  if (m_state != STATE_CONNECTED)
    {
      m_errno = ERROR_NOTCONN;
      return -1;
    }

  address = m_destAddr;

  return 0;
}

bool
PacketSocket::SetAllowBroadcast (bool allowBroadcast)
{

(-)a/src/network/utils/packet-socket.h (-1 / +2 lines)

Lines 133-138	Link Here

133

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

133

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

134

                                Address &fromAddress);

134

                                Address &fromAddress);

135

  virtual int GetSockName (Address &address) const;

135

  virtual int GetSockName (Address &address) const;

136

  virtual int GetPeerName (Address &address) const;

136

  virtual bool SetAllowBroadcast (bool allowBroadcast);

137

  virtual bool SetAllowBroadcast (bool allowBroadcast);

137

  virtual bool GetAllowBroadcast () const;

138

  virtual bool GetAllowBroadcast () const;

138

139

Lines 177-183	Link Here

177

};

178

};

178

179

  Ptr<Node> m_node;         //!< the associated node

180

  Ptr<Node> m_node;         //!< the associated node

180

  enum SocketErrno m_errno; //!< Socket error code

181

  mutable enum SocketErrno m_errno; //!< Socket error code

181

  bool m_shutdownSend;      //!< Send no longer allowed

182

  bool m_shutdownSend;      //!< Send no longer allowed

182

  bool m_shutdownRecv;      //!< Receive no longer allowed

183

  bool m_shutdownRecv;      //!< Receive no longer allowed

183

  enum State m_state;       //!< Socket state

184

  enum State m_state;       //!< Socket state

Return to bug 1835