Attachment #570 for bug #653

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

(-)a/CHANGES.html (+7 lines)

Lines 86-91	Link Here

<li><b>WifiMode</b>

<li><b>WifiMode</b>

<p>WifiMode now has a WifiPhyStandard attribute which identifies the standard the WifiMode belongs to. To properly set this attribute when creating a new WifiMode, it is now required to explicitly pass a WifiPhyStandard parameter to all WifiModeFactory::CreateXXXX() methods. The WifiPhyStandard value of an existing WifiMode can be retrieved using the new method WifiMode::GetStandard().</p>

<p>WifiMode now has a WifiPhyStandard attribute which identifies the standard the WifiMode belongs to. To properly set this attribute when creating a new WifiMode, it is now required to explicitly pass a WifiPhyStandard parameter to all WifiModeFactory::CreateXXXX() methods. The WifiPhyStandard value of an existing WifiMode can be retrieved using the new method WifiMode::GetStandard().</p>

</li>

</li>

<li><b>NetDevice</b>

<p>In order to have multiple link change callback in NetDevice (i.e. to flush ARP and IPv6 neighbor discovery caches), the following member method has been renamed:</p>

<pre>

- virtual void SetLinkChangeCallback (Callback&lt;void&gt; callback);

+ virtual void AddLinkChangeCallback (Callback&lt;void&gt; callback);</pre>

Now each NetDevice subclasses have a TracedCallback&lt;&gt; object (list of callbacks) instead of Callback&lt;void&gt; ones.

</li>

</ul>

</ul>

<hr>

<hr>

(-)a/src/devices/bridge/bridge-net-device.cc (-1 / +1 lines)

Lines 317-323	Link Here

317

318

319

void

319

void

320

BridgeNetDevice::SetLinkChangeCallback (Callback<void> callback)

320

BridgeNetDevice::AddLinkChangeCallback (Callback<void> callback)

321

{}

321

{}

322

323

(-)a/src/devices/bridge/bridge-net-device.h (-1 / +1 lines)

Lines 96-102	Link Here

  virtual bool SetMtu (const uint16_t mtu);

  virtual bool SetMtu (const uint16_t mtu);

  virtual uint16_t GetMtu (void) const;

  virtual uint16_t GetMtu (void) const;

  virtual bool IsLinkUp (void) const;

  virtual bool IsLinkUp (void) const;

  virtual void SetLinkChangeCallback (Callback<void> callback);

  virtual void AddLinkChangeCallback (Callback<void> callback);

100

  virtual bool IsBroadcast (void) const;

100

  virtual bool IsBroadcast (void) const;

101

  virtual Address GetBroadcast (void) const;

101

  virtual Address GetBroadcast (void) const;

102

  virtual bool IsMulticast (void) const;

102

  virtual bool IsMulticast (void) const;




CsmaNetDevice::NotifyLinkUp (void)
{
  NS_LOG_FUNCTION_NOARGS ();

  m_linkUp = true;
  m_linkChangeCallbacks ();
    {
      m_linkChangeCallback ();
    }
}

  void 

}

  void 
CsmaNetDevice::AddLinkChangeCallback (Callback<void> callback)
{
  NS_LOG_FUNCTION (&callback);
  m_linkChangeCallbacks.ConnectWithoutContext (callback);
}

  bool 




  virtual void SetAddress (Address address);
  virtual Address GetAddress (void) const;
  virtual bool IsLinkUp (void) const;
  virtual void AddLinkChangeCallback (Callback<void> callback);
  virtual bool IsBroadcast (void) const;
  virtual Address GetBroadcast (void) const;
  virtual bool IsMulticast (void) const;

  bool m_linkUp;

  /**
   * List of callbacks to fire if the link changes state (up or down).
   */
  TracedCallback<> m_linkChangeCallbacks;

  static const uint16_t DEFAULT_FRAME_SIZE = 1518;
  static const uint16_t ETHERNET_OVERHEAD = 18;




EmuNetDevice::NotifyLinkUp (void)
{
  m_linkUp = true;
  m_linkChangeCallbacks ();
    {
      m_linkChangeCallback ();
    }
}

void 

}

void 
EmuNetDevice::AddLinkChangeCallback (Callback<void> callback)
{
  m_linkChangeCallbacks.ConnectWithoutContext (callback);
}

bool 





  virtual bool IsLinkUp (void) const;

  virtual void AddLinkChangeCallback (Callback<void> callback);

  virtual bool IsBroadcast (void) const;
  virtual Address GetBroadcast (void) const;

  bool m_isMulticast;

  /**
   * Callbacks to fire if the link changes state (up or down).
   */
  TracedCallback<> m_linkChangeCallbacks;

  /**
   * The unix/linux name of the underlying device (e.g., eth0)




PointToPointNetDevice::NotifyLinkUp (void)
{
  m_linkUp = true;
  m_linkChangeCallbacks ();
    {
      m_linkChangeCallback ();
    }
}

  void 

}

  void 
PointToPointNetDevice::AddLinkChangeCallback (Callback<void> callback)
{
  m_linkChangeCallbacks.ConnectWithoutContext (callback);
}

//

(-)a/src/devices/point-to-point/point-to-point-net-device.h (-2 / +2 lines)

Lines 231-237	Link Here

231

232

  virtual bool IsLinkUp (void) const;

232

  virtual bool IsLinkUp (void) const;

233

234

  virtual void SetLinkChangeCallback (Callback<void> callback);

234

  virtual void AddLinkChangeCallback (Callback<void> callback);

235

236

  virtual bool IsBroadcast (void) const;

236

  virtual bool IsBroadcast (void) const;

237

  virtual Address GetBroadcast (void) const;

237

  virtual Address GetBroadcast (void) const;

Lines 520-526	Link Here

520

  NetDevice::PromiscReceiveCallback m_promiscCallback;

520

  NetDevice::PromiscReceiveCallback m_promiscCallback;

521

  uint32_t m_ifIndex;

521

  uint32_t m_ifIndex;

522

  bool m_linkUp;

522

  bool m_linkUp;

523

  Callback<void> m_linkChangeCallback;

523

  TracedCallback<> m_linkChangeCallbacks;

524

525

  static const uint16_t DEFAULT_MTU = 1500;

525

  static const uint16_t DEFAULT_MTU = 1500;

526

  static const uint16_t PPP_OVERHEAD = 2;

526

  static const uint16_t PPP_OVERHEAD = 2;

(-)a/src/devices/tap-bridge/tap-bridge.cc (-1 / +1 lines)

Lines 1026-1032	Link Here

1026

1027

1028

void

1028

void

1029

TapBridge::SetLinkChangeCallback (Callback<void> callback)

1029

TapBridge::AddLinkChangeCallback (Callback<void> callback)

1030

1031

  NS_LOG_FUNCTION_NOARGS ();

1031

  NS_LOG_FUNCTION_NOARGS ();

1032

(-)a/src/devices/tap-bridge/tap-bridge.h (-1 / +1 lines)

Lines 181-187	Link Here

181

  virtual bool SetMtu (const uint16_t mtu);

181

  virtual bool SetMtu (const uint16_t mtu);

182

  virtual uint16_t GetMtu (void) const;

182

  virtual uint16_t GetMtu (void) const;

183

  virtual bool IsLinkUp (void) const;

183

  virtual bool IsLinkUp (void) const;

184

  virtual void SetLinkChangeCallback (Callback<void> callback);

184

  virtual void AddLinkChangeCallback (Callback<void> callback);

185

  virtual bool IsBroadcast (void) const;

185

  virtual bool IsBroadcast (void) const;

186

  virtual Address GetBroadcast (void) const;

186

  virtual Address GetBroadcast (void) const;

187

  virtual bool IsMulticast (void) const;

187

  virtual bool IsMulticast (void) const;

(-)a/src/devices/virtual-net-device/virtual-net-device.cc (-1 / +1 lines)

Lines 194-200	Link Here

194

195

196

void

196

void

197

VirtualNetDevice::SetLinkChangeCallback (Callback<void> callback)

197

VirtualNetDevice::AddLinkChangeCallback (Callback<void> callback)

198

199

200

(-)a/src/devices/virtual-net-device/virtual-net-device.h (-1 / +1 lines)

Lines 122-128	Link Here

122

  virtual Address GetAddress (void) const;

122

  virtual Address GetAddress (void) const;

123

  virtual uint16_t GetMtu (void) const;

123

  virtual uint16_t GetMtu (void) const;

124

  virtual bool IsLinkUp (void) const;

124

  virtual bool IsLinkUp (void) const;

125

  virtual void SetLinkChangeCallback (Callback<void> callback);

125

  virtual void AddLinkChangeCallback (Callback<void> callback);

126

  virtual bool IsBroadcast (void) const;

126

  virtual bool IsBroadcast (void) const;

127

  virtual Address GetBroadcast (void) const;

127

  virtual Address GetBroadcast (void) const;

128

  virtual bool IsMulticast (void) const;

128

  virtual bool IsMulticast (void) const;




  return m_phy != 0 && m_linkUp;
}
void 
WifiNetDevice::AddLinkChangeCallback (Callback<void> callback)
{
  m_linkChanges.ConnectWithoutContext (callback);
}
bool 
WifiNetDevice::IsBroadcast (void) const

WifiNetDevice::LinkUp (void)
{
  m_linkUp = true;
  m_linkChanges ();
    {
      m_linkChange ();
    }
}
void
WifiNetDevice::LinkDown (void)
{
  m_linkUp = false;
  m_linkChanges ();
    {
      m_linkChange ();
    }
}

bool

(-)a/src/devices/wifi/wifi-net-device.h (-2 / +2 lines)

Lines 83-89	Link Here

  virtual bool SetMtu (const uint16_t mtu);

  virtual bool SetMtu (const uint16_t mtu);

  virtual uint16_t GetMtu (void) const;

  virtual uint16_t GetMtu (void) const;

  virtual bool IsLinkUp (void) const;

  virtual bool IsLinkUp (void) const;

  virtual void SetLinkChangeCallback (Callback<void> callback);

  virtual void AddLinkChangeCallback (Callback<void> callback);

  virtual bool IsBroadcast (void) const;

  virtual bool IsBroadcast (void) const;

  virtual Address GetBroadcast (void) const;

  virtual Address GetBroadcast (void) const;

  virtual bool IsMulticast (void) const;

  virtual bool IsMulticast (void) const;

Lines 123-129	Link Here

123

124

  uint32_t m_ifIndex;

124

  uint32_t m_ifIndex;

125

  bool m_linkUp;

125

  bool m_linkUp;

126

  Callback<void> m_linkChange;

126

  TracedCallback<> m_linkChanges;

127

  mutable uint16_t m_mtu;

127

  mutable uint16_t m_mtu;

128

  bool m_configComplete;

128

  bool m_configComplete;

129

};

129

};

(-)a/src/internet-stack/arp-l3-protocol.cc (-1 / +1 lines)

Lines 116-122	Link Here

116

  Ptr<ArpCache> cache = CreateObject<ArpCache> ();

116

  Ptr<ArpCache> cache = CreateObject<ArpCache> ();

117

  cache->SetDevice (device, interface);

117

  cache->SetDevice (device, interface);

118

  NS_ASSERT (device->IsBroadcast ());

118

  NS_ASSERT (device->IsBroadcast ());

119

  device->SetLinkChangeCallback (MakeCallback (&ArpCache::Flush, cache));

119

  device->AddLinkChangeCallback (MakeCallback (&ArpCache::Flush, cache));

120

  cache->SetArpRequestCallback (MakeCallback (&ArpL3Protocol::SendArpRequest, this));

120

  cache->SetArpRequestCallback (MakeCallback (&ArpL3Protocol::SendArpRequest, this));

121

  m_cacheList.push_back (cache);

121

  m_cacheList.push_back (cache);

122

  return cache;

122

  return cache;




{
  Ptr<Ipv6L3Protocol> ipv6 = m_node->GetObject<Ipv6L3Protocol> ();
  Ptr<NdiscCache> cache = CreateObject<NdiscCache> ();
  
  cache->SetDevice (device, interface);
  device->AddLinkChangeCallback (MakeCallback (&NdiscCache::Flush, cache));
  /* XXX : make a list of callback in net-device.cc
   * else we override IPv4 flushing ARP table...
   */
/* device->SetLinkChangeCallback (MakeCallback (&NdiscCache::Flush, cache)); */
  m_cacheList.push_back (cache);
  return cache;
}

(-)a/src/internet-stack/loopback-net-device.cc (-1 / +1 lines)

Lines 125-131	Link Here

125

126

127

void

127

void

128

LoopbackNetDevice::SetLinkChangeCallback (Callback<void> callback)

128

LoopbackNetDevice::AddLinkChangeCallback (Callback<void> callback)

129

{}

129

{}

130

131

bool

131

bool

(-)a/src/internet-stack/loopback-net-device.h (-1 / +1 lines)

Lines 50-56	Link Here

  virtual bool SetMtu (const uint16_t mtu);

  virtual bool SetMtu (const uint16_t mtu);

  virtual uint16_t GetMtu (void) const;

  virtual uint16_t GetMtu (void) const;

  virtual bool IsLinkUp (void) const;

  virtual bool IsLinkUp (void) const;

  virtual void SetLinkChangeCallback (Callback<void> callback);

  virtual void AddLinkChangeCallback (Callback<void> callback);

  virtual bool IsBroadcast (void) const;

  virtual bool IsBroadcast (void) const;

  virtual Address GetBroadcast (void) const;

  virtual Address GetBroadcast (void) const;

  virtual bool IsMulticast (void) const;

  virtual bool IsMulticast (void) const;




  /**
   * \param callback the callback to invoke
   *
   * Add a callback invoked whenever the link 
   * status changes to UP. This callback is typically used
   * by the IP/ARP layer to flush the ARP cache and by IPv6 stack
   * to flush NDISC cache whenever the link goes up.
   */
  virtual void AddLinkChangeCallback (Callback<void> callback) = 0;
  /**
   * \return true if this interface supports a broadcast address,
   *         false otherwise.

(-)a/src/node/simple-net-device.cc (-1 / +1 lines)

Lines 121-127	Link Here

121

  return true;

121

  return true;

122

123

void

123

void

124

SimpleNetDevice::SetLinkChangeCallback (Callback<void> callback)

124

SimpleNetDevice::AddLinkChangeCallback (Callback<void> callback)

125

{}

125

{}

126

bool

126

bool

127

SimpleNetDevice::IsBroadcast (void) const

127

SimpleNetDevice::IsBroadcast (void) const

(-)a/src/node/simple-net-device.h (-1 / +1 lines)

Lines 53-59	Link Here

  virtual bool SetMtu (const uint16_t mtu);

  virtual bool SetMtu (const uint16_t mtu);

  virtual uint16_t GetMtu (void) const;

  virtual uint16_t GetMtu (void) const;

  virtual bool IsLinkUp (void) const;

  virtual bool IsLinkUp (void) const;

  virtual void SetLinkChangeCallback (Callback<void> callback);

  virtual void AddLinkChangeCallback (Callback<void> callback);

  virtual bool IsBroadcast (void) const;

  virtual bool IsBroadcast (void) const;

  virtual Address GetBroadcast (void) const;

  virtual Address GetBroadcast (void) const;

  virtual bool IsMulticast (void) const;

  virtual bool IsMulticast (void) const;

Return to bug 653