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

(-)a/src/internet/model/arp-cache.cc (-1 / +7 lines)
 Lines 393-399   void Link Here 
393 
ArpCache::Entry::MarkPermanent (void)
 393 
ArpCache::Entry::MarkPermanent (void)
394 
{
 394 
{
395 
  NS_LOG_FUNCTION (this);
 395 
  NS_LOG_FUNCTION (this);
396 
  NS_ASSERT (m_state == ALIVE);
 396 
  NS_ASSERT (m_macAddress != 0);
397 
  m_state = PERMANENT;
 397 
  m_state = PERMANENT;
398 
  ClearRetries ();
 398 
  ClearRetries ();
399 
  UpdateSeen ();
 399 
  UpdateSeen ();
 Lines 440-445   ArpCache::Entry::GetIpv4Address (void) const Link Here 
440 
  return m_ipv4Address;
 440 
  return m_ipv4Address;
441 
}
 441 
}
442 
void
442 
void
443 
ArpCache::Entry::SetMacAddresss (Address macAddress)
444 
{
445 
  NS_LOG_FUNCTION (this);
446 
  m_macAddress = macAddress;
447 
}
448 
void
443 
ArpCache::Entry::SetIpv4Address (Ipv4Address destination)
 449 
ArpCache::Entry::SetIpv4Address (Ipv4Address destination)
444 
{
 450 
{
445 
  NS_LOG_FUNCTION (this << destination);
 451 
  NS_LOG_FUNCTION (this << destination);
(-)a/src/internet/model/arp-cache.h (+4 lines)
 Lines 225-230   public: Link Here 
225 
     */
 225 
     */
226 
    Ipv4Address GetIpv4Address (void) const;
 226 
    Ipv4Address GetIpv4Address (void) const;
227 
    /**
 227 
    /**
228 
     * \param macAddress The MacAddress for this entry
229 
     */
230 
    void SetMacAddresss (Address macAddress);
231 
    /**
228 
     * \param destination The Ipv4Address for this entry
 232 
     * \param destination The Ipv4Address for this entry
229 
     */
 233 
     */
230 
    void SetIpv4Address (Ipv4Address destination);
 234 
    void SetIpv4Address (Ipv4Address destination);
(-)a/src/internet/model/arp-l3-protocol.cc (-1 / +5 lines)
 Lines 289-295   ArpL3Protocol::Lookup (Ptr<Packet> packet, Ipv4Address destination, Link Here 
289 
              entry->MarkWaitReply (packet);
 289 
              entry->MarkWaitReply (packet);
290 
              Simulator::Schedule (Time (MilliSeconds (m_requestJitter->GetValue ())), &ArpL3Protocol::SendArpRequest, this, cache, destination);
 290 
              Simulator::Schedule (Time (MilliSeconds (m_requestJitter->GetValue ())), &ArpL3Protocol::SendArpRequest, this, cache, destination);
291 
            }
291 
            }
292 
          else if (entry->IsWaitReply ())
292 
          else
293 
            {
 293 
            {
294 
              NS_FATAL_ERROR ("Test for possibly unreachable code-- please file a bug report, with a test case, if this is ever hit");
 294 
              NS_FATAL_ERROR ("Test for possibly unreachable code-- please file a bug report, with a test case, if this is ever hit");
295 
            }
 295 
            }
 Lines 325-330   ArpL3Protocol::Lookup (Ptr<Packet> packet, Ipv4Address destination, Link Here 
325 
              *hardwareDestination = entry->GetMacAddress ();
 325 
              *hardwareDestination = entry->GetMacAddress ();
326 
              return true;
 326 
              return true;
327 
            }
 327 
            }
328 
          else
329 
            {
330 
              NS_LOG_LOGIC ("Test for possibly unreachable code-- please file a bug report, with a test case, if this is ever hit");
331 
            }
328 
        }
 332 
        }
329 
    }
 333 
    }
330 
  else
 334 
  else

Return to bug 2145