Attachment #269 for bug #357

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

(-)a/src/applications/packet-sink/packet-sink.cc (-1 / +1 lines)

Lines 87-93	Link Here

      m_socket = Socket::CreateSocket (GetNode(), m_tid);

      m_socket = Socket::CreateSocket (GetNode(), m_tid);

      m_socket->Bind (m_local);

      m_socket->Bind (m_local);

      m_socket->Listen (0);

      m_socket->Listen ();

  m_socket->SetRecvCallback (MakeCallback(&PacketSink::HandleRead, this));

  m_socket->SetRecvCallback (MakeCallback(&PacketSink::HandleRead, this));

(-)a/src/internet-stack/nsc-tcp-socket-impl.cc (-2 / +2 lines)

Lines 395-403	Link Here

395

396

397

int

397

int

398

NscTcpSocketImpl::Listen (uint32_t q)

398

NscTcpSocketImpl::Listen (void)

399

400

  NS_LOG_FUNCTION (this << q);

400

  NS_LOG_FUNCTION (this);

401

  m_nscTcpSocket->listen(m_localPort);

401

  m_nscTcpSocket->listen(m_localPort);

402

  m_state = LISTEN;

402

  m_state = LISTEN;

403

  return 0;

403

  return 0;

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

Lines 73-79	Link Here

  virtual int ShutdownSend (void);

  virtual int ShutdownSend (void);

  virtual int ShutdownRecv (void);

  virtual int ShutdownRecv (void);

  virtual int Connect(const Address &address);

  virtual int Connect(const Address &address);

  virtual int Listen(uint32_t queueLimit);

  virtual int Listen(void);

  virtual uint32_t GetTxAvailable (void) const;

  virtual uint32_t GetTxAvailable (void) const;

  virtual int Send (Ptr<Packet> p, uint32_t flags);

  virtual int Send (Ptr<Packet> p, uint32_t flags);

  virtual int SendTo(Ptr<Packet> p, uint32_t flags, const Address &toAddress);

  virtual int SendTo(Ptr<Packet> p, uint32_t flags, const Address &toAddress);




}

int
TcpSocketImpl::Listen (void)
{
  NS_LOG_FUNCTION (this);
  Actions_t action = ProcessEvent (APP_LISTEN);
  ProcessAction (action);
  return 0;

  InetSocketAddress serverremoteaddr (Ipv4Address(ipaddr0), port);

  listeningSock->Bind(serverlocaladdr);
  listeningSock->Listen ();

  sock1->Connect(serverremoteaddr);
}

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

Lines 86-92	Link Here

  virtual int ShutdownSend (void);

  virtual int ShutdownSend (void);

  virtual int ShutdownRecv (void);

  virtual int ShutdownRecv (void);

  virtual int Connect(const Address &address);

  virtual int Connect(const Address &address);

  virtual int Listen(uint32_t queueLimit);

  virtual int Listen(void);

  virtual uint32_t GetTxAvailable (void) const;

  virtual uint32_t GetTxAvailable (void) const;

  virtual int Send (Ptr<Packet> p, uint32_t flags);

  virtual int Send (Ptr<Packet> p, uint32_t flags);

  virtual int SendTo(Ptr<Packet> p, uint32_t flags, const Address &toAddress);

  virtual int SendTo(Ptr<Packet> p, uint32_t flags, const Address &toAddress);

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

Lines 216-222	Link Here

216

217

218

int

218

int

219

UdpSocketImpl::Listen (uint32_t queueLimit)

219

UdpSocketImpl::Listen (void)

220

221

  m_errno = Socket::ERROR_OPNOTSUPP;

221

  m_errno = Socket::ERROR_OPNOTSUPP;

222

  return -1;

222

  return -1;

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

Lines 65-71	Link Here

  virtual int ShutdownSend (void);

  virtual int ShutdownSend (void);

  virtual int ShutdownRecv (void);

  virtual int ShutdownRecv (void);

  virtual int Connect(const Address &address);

  virtual int Connect(const Address &address);

  virtual int Listen (uint32_t queueLimit);

  virtual int Listen (void);

  virtual uint32_t GetTxAvailable (void) const;

  virtual uint32_t GetTxAvailable (void) const;

  virtual int Send (Ptr<Packet> p, uint32_t flags);

  virtual int Send (Ptr<Packet> p, uint32_t flags);

  virtual int SendTo (Ptr<Packet> p, uint32_t flags, const Address &address);

  virtual int SendTo (Ptr<Packet> p, uint32_t flags, const Address &address);

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

Lines 222-228	Link Here

222

  return -1;

222

  return -1;

223

224

int

224

int

225

PacketSocket::Listen(uint32_t queueLimit)

225

PacketSocket::Listen(void)

226

227

  m_errno = Socket::ERROR_OPNOTSUPP;

227

  m_errno = Socket::ERROR_OPNOTSUPP;

228

  return -1;

228

  return -1;

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

Lines 93-99	Link Here

  virtual int ShutdownSend (void);

  virtual int ShutdownSend (void);

  virtual int ShutdownRecv (void);

  virtual int ShutdownRecv (void);

  virtual int Connect(const Address &address);

  virtual int Connect(const Address &address);

  virtual int Listen(uint32_t queueLimit);

  virtual int Listen(void);

  virtual uint32_t GetTxAvailable (void) const;

  virtual uint32_t GetTxAvailable (void) const;

  virtual int Send (Ptr<Packet> p, uint32_t flags);

  virtual int Send (Ptr<Packet> p, uint32_t flags);

  virtual int SendTo(Ptr<Packet> p, uint32_t flags, const Address &toAddress);

  virtual int SendTo(Ptr<Packet> p, uint32_t flags, const Address &toAddress);




  return Send (p, 0);
}


int Socket::Listen (uint32_t queueLimit)
{
  return 0; //XXX the base class version does nothing
}

int 
Socket::Send (const uint8_t* buf, uint32_t size, uint32_t flags)
{

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

Lines 222-228	Link Here

222

   * \param queueLimit maximum number of incoming request to queue

222

   * \param queueLimit maximum number of incoming request to queue

223

   * \returns 0 on success, -1 on error (in which case errno is set).

223

   * \returns 0 on success, -1 on error (in which case errno is set).

224

*/

224

*/

225

  virtual int Listen (uint32_t queueLimit) = 0;

225

  virtual int Listen (void) = 0;

226

227

/**

227

/**

228

   * \brief Returns the number of bytes which can be sent in a single call

228

   * \brief Returns the number of bytes which can be sent in a single call

Return to bug 357