From 07040f354c9ac99e602109e631f508fe0ff2dde9 Mon Sep 17 00:00:00 2001
From: Tommaso Pecorella <tommaso.pecorella@unifi.it>
Date: Sat, 30 Aug 2014 18:20:10 +0200
Subject: [PATCH] Improve IPv6 LL multicast interface selection

---
 src/internet/model/ipv6-l3-protocol.cc | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/internet/model/ipv6-l3-protocol.cc b/src/internet/model/ipv6-l3-protocol.cc
index 9666823e7..8f7d51c5d 100644
--- a/src/internet/model/ipv6-l3-protocol.cc
+++ b/src/internet/model/ipv6-l3-protocol.cc
@@ -820,13 +820,10 @@ void Ipv6L3Protocol::Send (Ptr<Packet> packet, Ipv6Address source, Ipv6Address d
   //for link-local traffic, we need to determine the interface
   if (source.IsLinkLocal ()
       || destination.IsLinkLocal ()
-      || destination.IsAllNodesMulticast ()
-      || destination.IsAllRoutersMulticast ()
-      || destination.IsAllHostsMulticast ()
-      || destination.IsSolicitedMulticast ())
+      || destination.IsLinkLocalMulticast ())
     {
       int32_t index = GetInterfaceForAddress (source);
-      NS_ASSERT (index >= 0);
+      NS_ASSERT_MSG (index >= 0, "Can not find an outgoing interface for a packet with src " << source << " and dst " << destination);
       oif = GetNetDevice (index);
     }