Attachment #765 for bug #407

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

(-)a/src/helper/olsr-helper.cc (+32 lines)

Lines 33-38	Link Here

OlsrHelper::OlsrHelper (const OlsrHelper &o)

OlsrHelper::OlsrHelper (const OlsrHelper &o)

  : m_agentFactory (o.m_agentFactory)

  : m_agentFactory (o.m_agentFactory)

  std::map< Ptr<Node>, std::set<uint32_t> >::const_iterator i;

  for (i = o.m_interfaceExclusions.begin (); i != o.m_interfaceExclusions.end (); i++)

      m_interfaceExclusions.insert (std::make_pair (i->first, std::set<uint32_t> (i->second) ));

OlsrHelper*

OlsrHelper*

Lines 41-50	Link Here

  return new OlsrHelper (*this);

  return new OlsrHelper (*this);

void

OlsrHelper::ExcludeInterface (Ptr<Node> node, uint32_t interface)

  std::map< Ptr<Node>, std::set<uint32_t> >::iterator it = m_interfaceExclusions.find (node);

  if(it == m_interfaceExclusions.end ())

      std::set<uint32_t> interfaces;

      interfaces.insert (interface);

      m_interfaceExclusions.insert (std::make_pair (node, std::set<uint32_t> (interfaces) ));

  else

      it->second.insert (interface);

Ptr<Ipv4RoutingProtocol>

Ptr<Ipv4RoutingProtocol>

OlsrHelper::Create (Ptr<Node> node) const

OlsrHelper::Create (Ptr<Node> node) const

  Ptr<olsr::RoutingProtocol> agent = m_agentFactory.Create<olsr::RoutingProtocol> ();

  Ptr<olsr::RoutingProtocol> agent = m_agentFactory.Create<olsr::RoutingProtocol> ();

  std::map<Ptr<Node>, std::set<uint32_t> >::const_iterator it = m_interfaceExclusions.find (node);

  if(it != m_interfaceExclusions.end ())

      agent->SetInterfaceExclusions (it->second);

  node->AggregateObject (agent);

  node->AggregateObject (agent);

  return agent;

  return agent;

(-)a/src/helper/olsr-helper.h (+13 lines)

Lines 24-29	Link Here

#include "ns3/node.h"

#include "ns3/node.h"

#include "node-container.h"

#include "node-container.h"

#include "ipv4-routing-helper.h"

#include "ipv4-routing-helper.h"

#include <map>

#include <set>

namespace ns3 {

namespace ns3 {

Lines 57-62	Link Here

*/

*/

  OlsrHelper* Copy (void) const;

  OlsrHelper* Copy (void) const;

/**

   * \param node the node for which an exception is to be defined

   * \param interface an interface of node on which OLSR is not to be installed

   * This method allows the user to specify an interface on which OLSR is not to be installed on

*/

  void ExcludeInterface (Ptr<Node> node, uint32_t interface);

/**

/**

   * \param node the node on which the routing protocol will run

   * \param node the node on which the routing protocol will run

   * \returns a newly-created routing protocol

   * \returns a newly-created routing protocol

Lines 72-77	Link Here

   * This method controls the attributes of ns3::olsr::RoutingProtocol

   * This method controls the attributes of ns3::olsr::RoutingProtocol

*/

*/

  void Set (std::string name, const AttributeValue &value);

  void Set (std::string name, const AttributeValue &value);

private:

private:

/**

/**

   * \internal

   * \internal

Lines 80-85	Link Here

*/

*/

  OlsrHelper &operator = (const OlsrHelper &o);

  OlsrHelper &operator = (const OlsrHelper &o);

  ObjectFactory m_agentFactory;

  ObjectFactory m_agentFactory;

  std::map< Ptr<Node>, std::set<uint32_t> > m_interfaceExclusions;

};

};

} // namespace ns3

} // namespace ns3

(-)a/src/routing/olsr/olsr-routing-protocol.cc (-4 / +20 lines)

Lines 251-256	Link Here

251

  NS_LOG_DEBUG ("Starting OLSR on node " << m_mainAddress);

251

  NS_LOG_DEBUG ("Starting OLSR on node " << m_mainAddress);

252

253

  Ipv4Address loopback ("127.0.0.1");

253

  Ipv4Address loopback ("127.0.0.1");

254

255

  bool canRunOlsr = false;

254

  for (uint32_t i = 0; i < m_ipv4->GetNInterfaces (); i++)

256

  for (uint32_t i = 0; i < m_ipv4->GetNInterfaces (); i++)

255

257

256

      Ipv4Address addr = m_ipv4->GetAddress (i, 0).GetLocal ();

258

      Ipv4Address addr = m_ipv4->GetAddress (i, 0).GetLocal ();

Lines 269-274	Link Here

269

          NS_ASSERT (GetMainAddress (addr) == m_mainAddress);

271

          NS_ASSERT (GetMainAddress (addr) == m_mainAddress);

270

272

271

273

274

      const std::set<uint32_t> ifaceExclusions = GetInterfaceExclusions();

275

276

      if(ifaceExclusions.find(i) != ifaceExclusions.end ())

277

        continue;

278

272

      // Create a socket to listen only on this interface

279

      // Create a socket to listen only on this interface

273

      Ptr<Socket> socket = Socket::CreateSocket (GetObject<Node> (),

280

      Ptr<Socket> socket = Socket::CreateSocket (GetObject<Node> (),

274

        UdpSocketFactory::GetTypeId());

281

        UdpSocketFactory::GetTypeId());

Lines 279-291	Link Here

279

286

280

      socket->Connect (InetSocketAddress (Ipv4Address (0xffffffff), OLSR_PORT_NUMBER));

287

      socket->Connect (InetSocketAddress (Ipv4Address (0xffffffff), OLSR_PORT_NUMBER));

281

      m_socketAddresses[socket] = m_ipv4->GetAddress (i, 0);

288

      m_socketAddresses[socket] = m_ipv4->GetAddress (i, 0);

289

290

      canRunOlsr = true;

282

291

283

292

284

  HelloTimerExpire ();

293

  if(canRunOlsr)

285

  TcTimerExpire ();

294

286

  MidTimerExpire ();

295

      HelloTimerExpire ();

296

      TcTimerExpire ();

297

      MidTimerExpire ();

287

298

288

  NS_LOG_DEBUG ("OLSR on node " << m_mainAddress << " started");

299

      NS_LOG_DEBUG ("OLSR on node " << m_mainAddress << " started");

300

289

301

290

302

291

void RoutingProtocol::SetMainInterface (uint32_t interface)

303

void RoutingProtocol::SetMainInterface (uint32_t interface)

Lines 293-298	Link Here

293

  m_mainAddress = m_ipv4->GetAddress (interface, 0).GetLocal ();

305

  m_mainAddress = m_ipv4->GetAddress (interface, 0).GetLocal ();

294

306

295

307

308

void RoutingProtocol::SetInterfaceExclusions (std::set<uint32_t> exceptions)

309

310

  m_interfaceExclusions = exceptions;

311

296

312

297

//

313

//

298

// \brief Processes an incoming %OLSR packet following RFC 3626 specification.

314

// \brief Processes an incoming %OLSR packet following RFC 3626 specification.




   **/
  std::vector<RoutingTableEntry> GetRoutingTableEntries () const;

private:
  std::set<uint32_t> m_interfaceExclusions;

public:
  std::set<uint32_t> GetInterfaceExclusions ()
    {
      return m_interfaceExclusions;
    }
  void SetInterfaceExclusions (std::set<uint32_t> exceptions);

protected:
  virtual void DoStart (void);
private:

Return to bug 407