Attachment #821 for bug #857

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

(-)a/RELEASE_NOTES (-1 / +2 lines)

Lines 108-114	Link Here

108

   - bug 850 - Ipv4GlobalRouting::LookupGlobal bug

108

   - bug 850 - Ipv4GlobalRouting::LookupGlobal bug

109

   - bug 864 - Invalid return value in UdpSocketImpl::Send and Ipv4RawSocketImpl::Send

109

   - bug 864 - Invalid return value in UdpSocketImpl::Send and Ipv4RawSocketImpl::Send

110

   - bug 865 - Ipv4RawSocketImpl::RecvFrom does not return from address all the time.

110

   - bug 865 - Ipv4RawSocketImpl::RecvFrom does not return from address all the time.

111

   - Bug 859 - Output interface estimation for the source address bound socket in IPv4 Raw socket

111

   - bug 859 - Output interface estimation for the source address bound socket in IPv4 Raw socket

112

   - bug 857 - Link-Local Multicast handle in Ipv4 Output processing

112

113

Known issues

114

Known issues

114

------------

115

------------

(-)a/src/internet-stack/ipv4-l3-protocol.cc (-2 / +2 lines)

Lines 539-546	Link Here

539

  // 4) packet is not broadcast, and is passed in with a route entry but route->GetGateway is not set (e.g., on-demand)

539

  // 4) packet is not broadcast, and is passed in with a route entry but route->GetGateway is not set (e.g., on-demand)

540

  // 5) packet is not broadcast, and route is NULL (e.g., a raw socket call, or ICMP)

540

  // 5) packet is not broadcast, and route is NULL (e.g., a raw socket call, or ICMP)

541

542

  // 1) packet is destined to limited broadcast address

542

  // 1) packet is destined to limited broadcast address or link-local multicast address

543

  if (destination.IsBroadcast ())

543

  if (destination.IsBroadcast () || destination.IsLocalMulticast ())

544

545

      NS_LOG_LOGIC ("Ipv4L3Protocol::Send case 1:  limited broadcast");

545

      NS_LOG_LOGIC ("Ipv4L3Protocol::Send case 1:  limited broadcast");

546

      ipHeader = BuildHeader (source, destination, protocol, packet->GetSize (), ttl, mayFragment);

546

      ipHeader = BuildHeader (source, destination, protocol, packet->GetSize (), ttl, mayFragment);




  m_receivedPacket = 0;
  m_receivedPacket2 = 0;

  // Simple Link-local multicast test

  txSocket->BindToNetDevice (txDev1);
  SendData (txSocket, "224.0.0.9");
  NS_TEST_EXPECT_MSG_EQ (m_receivedPacket->GetSize (), 0, "first socket should not receive it (it is bound specifically to the second interface's address");
  NS_TEST_EXPECT_MSG_EQ (m_receivedPacket2->GetSize (), 123, "recv2: 224.0.0.9");

  m_receivedPacket->RemoveAllByteTags ();
  m_receivedPacket2->RemoveAllByteTags ();

  Simulator::Destroy ();

  return GetErrorStatus ();

(-)a/src/node/ipv4-address.cc (+7 lines)

Lines 240-245	Link Here

240

  return (m_address >= 0xe0000000 && m_address <= 0xefffffff);

240

  return (m_address >= 0xe0000000 && m_address <= 0xefffffff);

241

242

243

bool

244

Ipv4Address::IsLocalMulticast (void) const

245

246

  // Link-Local multicast address is 224.0.0.0/24

247

  return (m_address & 0xffffff00) == 0xe0000000;

248

249

243

void

250

void

244

Ipv4Address::Serialize (uint8_t buf[4]) const

251

Ipv4Address::Serialize (uint8_t buf[4]) const

245

252

(-)a/src/node/ipv4-address.h (+4 lines)

Lines 112-117	Link Here

112

*/

112

*/

113

  bool IsMulticast (void) const;

113

  bool IsMulticast (void) const;

114

/**

114

/**

115

    * \return true only if address is in local multicast address scope, 224.0.0.0/24

116

*/

117

  bool IsLocalMulticast (void) const;

118

/**

115

   * \brief Combine this address with a network mask

119

   * \brief Combine this address with a network mask

116

120

117

   * This method returns an IPv4 address that is this address combined

121

   * This method returns an IPv4 address that is this address combined




  Ptr<Ipv4Route> rtentry = 0;
  uint16_t longest_mask = 0;
  uint32_t shortest_metric = 0xffffffff;
  /* when sending on local multicast, there have to be interface specified */
  if (dest.IsLocalMulticast ())
    {
      NS_ASSERT_MSG (oif, "Try to send on link-local multicast address, and no interface index is given!");

      rtentry = Create<Ipv4Route> ();
      rtentry->SetDestination (dest);
      rtentry->SetGateway (Ipv4Address::GetZero ());
      rtentry->SetOutputDevice (oif);
      rtentry->SetSource (m_ipv4->GetAddress (oif->GetIfIndex (), 0).GetLocal ());
      return rtentry;
    }


  for (NetworkRoutesI i = m_networkRoutes.begin (); 
       i != m_networkRoutes.end (); 
       i++) 

Return to bug 857