Attachment #935 for bug #943

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

(-)a/src/applications/onoff/onoff-application.cc (-4 / +1 lines)

Lines 133-142	Link Here

133

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

133

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

134

      m_socket->Bind ();

134

      m_socket->Bind ();

135

      m_socket->Connect (m_peer);

135

      m_socket->Connect (m_peer);

136

      if (m_socket->GetAllowBroadcast ())

136

      m_socket->SetAllowBroadcast (true);

137

138

          m_socket->SetAllowBroadcast (true);

139

140

      m_socket->ShutdownRecv ();

137

      m_socket->ShutdownRecv ();

141

138

142

  // Insure no pending event

139

  // Insure no pending event




  return false;
}

bool
Ipv4RawSocketImpl::SetAllowBroadcast (bool allowBroadcast)
{
  if (!allowBroadcast)
    {
      return false;
    }
  return true;
}

bool

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

Lines 43-49	Link Here

  void SetProtocol (uint16_t protocol);

  void SetProtocol (uint16_t protocol);

  bool ForwardUp (Ptr<const Packet> p, Ipv4Header ipHeader, Ptr<Ipv4Interface> incomingInterface);

  bool ForwardUp (Ptr<const Packet> p, Ipv4Header ipHeader, Ptr<Ipv4Interface> incomingInterface);

  virtual void SetAllowBroadcast (bool allowBroadcast);

  virtual bool SetAllowBroadcast (bool allowBroadcast);

  virtual bool GetAllowBroadcast () const;

  virtual bool GetAllowBroadcast () const;

private:

private:




  return false;
}

bool
Ipv6RawSocketImpl::SetAllowBroadcast (bool allowBroadcast)
{
  if (!allowBroadcast)
    {
      return false;
    }
  return true;
}

bool

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

Lines 186-192	Link Here

186

*/

186

*/

187

  bool ForwardUp (Ptr<const Packet> p, Ipv6Header hdr, Ptr<NetDevice> device);

187

  bool ForwardUp (Ptr<const Packet> p, Ipv6Header hdr, Ptr<NetDevice> device);

188

189

  virtual void SetAllowBroadcast (bool allowBroadcast);

189

  virtual bool SetAllowBroadcast (bool allowBroadcast);

190

  virtual bool GetAllowBroadcast () const;

190

  virtual bool GetAllowBroadcast () const;

191

192

private:

192

private:




  return ERROR_INVAL;
}

bool
NscTcpSocketImpl::SetAllowBroadcast (bool allowBroadcast)
{
  if (allowBroadcast)
    {
      return false;
    }
  return true;
}

bool

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

Lines 82-88	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 void SetAllowBroadcast (bool allowBroadcast);

  virtual bool SetAllowBroadcast (bool allowBroadcast);

  virtual bool GetAllowBroadcast () const;

  virtual bool GetAllowBroadcast () const;

private:

private:

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

Lines 1856-1865	Link Here

1856

  return m_delAckMaxCount;

1856

  return m_delAckMaxCount;

1857

1858

1859

void

1859

bool

1860

TcpSocketImpl::SetAllowBroadcast (bool allowBroadcast)

1860

TcpSocketImpl::SetAllowBroadcast (bool allowBroadcast)

1861

1862

  NS_FATAL_ERROR ("not implemented");

1862

  if (allowBroadcast)

1863

1864

      return false;

1865

1866

  return true;

1863

1867

1864

1868

1865

bool

1869

bool

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

Lines 98-104	Link Here

    Address &fromAddress);

    Address &fromAddress);

  virtual int GetSockName (Address &address) const;

  virtual int GetSockName (Address &address) const;

100

  virtual void BindToNetDevice (Ptr<NetDevice> netdevice);

100

  virtual void BindToNetDevice (Ptr<NetDevice> netdevice);

101

  virtual void SetAllowBroadcast (bool allowBroadcast);

101

  virtual bool SetAllowBroadcast (bool allowBroadcast);

102

  virtual bool GetAllowBroadcast () const;

102

  virtual bool GetAllowBroadcast () const;

103

104

private:

104

private:

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

Lines 736-745	Link Here

736

  return m_mtuDiscover;

736

  return m_mtuDiscover;

737

738

739

void

739

bool

740

UdpSocketImpl::SetAllowBroadcast (bool allowBroadcast)

740

UdpSocketImpl::SetAllowBroadcast (bool allowBroadcast)

741

742

  m_allowBroadcast = allowBroadcast;

742

  m_allowBroadcast = allowBroadcast;

743

  return true;

743

744

745

bool

746

bool

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

Lines 79-85	Link Here

  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);

  virtual void SetAllowBroadcast (bool allowBroadcast);

  virtual bool SetAllowBroadcast (bool allowBroadcast);

  virtual bool GetAllowBroadcast () const;

  virtual bool GetAllowBroadcast () const;

private:

private:

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

Lines 463-472	Link Here

463

  return 0;

463

  return 0;

464

465

466

void

466

bool

467

PacketSocket::SetAllowBroadcast (bool allowBroadcast)

467

PacketSocket::SetAllowBroadcast (bool allowBroadcast)

468

469

  NS_FATAL_ERROR ("not implemented");

469

  if (allowBroadcast)

470

471

      return false;

472

473

  return true;

470

474

471

475

472

bool

476

bool

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

Lines 102-108	Link Here

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

  virtual int GetSockName (Address &address) const;

105

  virtual void SetAllowBroadcast (bool allowBroadcast);

105

  virtual bool SetAllowBroadcast (bool allowBroadcast);

106

  virtual bool GetAllowBroadcast () const;

106

  virtual bool GetAllowBroadcast () const;

107

108

private:

108

private:

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

Lines 557-564	Link Here

557

   * destination addresses.

557

   * destination addresses.

558

559

   * \param allowBroadcast Whether broadcast is allowed

559

   * \param allowBroadcast Whether broadcast is allowed

560

   * \return true if operation succeeds

560

*/

561

*/

561

  virtual void SetAllowBroadcast (bool allowBroadcast) = 0;

562

  virtual bool SetAllowBroadcast (bool allowBroadcast) = 0;

562

563

/**

564

/**

564

   * \brief Query whether broadcast datagram transmissions are allowed

565

   * \brief Query whether broadcast datagram transmissions are allowed

Return to bug 943