For now handle only multicast addresses, we still use routes to

LLA unicasts yet.

Sponsored by:	Yandex LLC

diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index d721fb9cdd9a9525c15b261eb714139db6da2d75..227f234206a8d3cec8124b5ba274067fcd07bb25 100644 (file)
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -586,11 +586,19 @@ selectroute(struct sockaddr_in6 *dstsock, struct ip6_pktopts *opts,
                } else
                        goto getroute;
        }
+       /*
+        * If the destination address is a multicast address and the outgoing
+        * interface for the address is specified by the caller, use it.
+        */
+       if (IN6_IS_ADDR_MULTICAST(dst) &&
+           mopts != NULL && (ifp = mopts->im6o_multicast_ifp) != NULL) {
+               goto done; /* we do not need a route for multicast. */
+       }
        /*
         * If destination address is LLA or link- or node-local multicast,
         * use it's embedded scope zone id to determine outgoing interface.
         */
-       if (IN6_IS_SCOPE_LINKLOCAL(dst) ||
+       if (IN6_IS_ADDR_MC_LINKLOCAL(dst) ||
            IN6_IS_ADDR_MC_NODELOCAL(dst)) {
                zoneid = ntohs(in6_getscope(dst));
                if (zoneid > 0) {
@@ -598,14 +606,6 @@ selectroute(struct sockaddr_in6 *dstsock, struct ip6_pktopts *opts,
                        goto done;
                }
        }
-       /*
-        * If the destination address is a multicast address and the outgoing
-        * interface for the address is specified by the caller, use it.
-        */
-       if (IN6_IS_ADDR_MULTICAST(dst) &&
-           mopts != NULL && (ifp = mopts->im6o_multicast_ifp) != NULL) {
-               goto done; /* we do not need a route for multicast. */
-       }
 
   getroute:
        /*