[src/trunk]: src/sys/netinet Use backing device to send advertisements. Other...

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5ef0bc1d51ee
branches:  trunk
changeset: 374030:5ef0bc1d51ee
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sun Mar 26 10:32:38 2023 +0000

description:
Use backing device to send advertisements. Otherwise the packets originate
from the virtual MAC address, which confuses switches.

diffstat:

 sys/netinet/ip_carp.c |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (56 lines):

diff -r 2313b454264d -r 5ef0bc1d51ee sys/netinet/ip_carp.c
--- a/sys/netinet/ip_carp.c     Sun Mar 26 01:04:16 2023 +0000
+++ b/sys/netinet/ip_carp.c     Sun Mar 26 10:32:38 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip_carp.c,v 1.117 2022/09/02 23:48:11 thorpej Exp $    */
+/*     $NetBSD: ip_carp.c,v 1.118 2023/03/26 10:32:38 mlelstv Exp $    */
 /*     $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $   */
 
 /*
@@ -33,7 +33,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.117 2022/09/02 23:48:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.118 2023/03/26 10:32:38 mlelstv Exp $");
 
 /*
  * TODO:
@@ -1876,6 +1876,9 @@ carp_join_multicast(struct carp_softc *s
        struct ip_moptions *imo = &sc->sc_imo, tmpimo;
        struct in_addr addr;
 
+       if (sc->sc_carpdev == NULL)
+               return (ENETDOWN);
+
        memset(&tmpimo, 0, sizeof(tmpimo));
        addr.s_addr = INADDR_CARP_GROUP;
        if ((tmpimo.imo_membership[0] =
@@ -1885,7 +1888,7 @@ carp_join_multicast(struct carp_softc *s
 
        imo->imo_membership[0] = tmpimo.imo_membership[0];
        imo->imo_num_memberships = 1;
-       imo->imo_multicast_if_index = sc->sc_if.if_index;
+       imo->imo_multicast_if_index = sc->sc_carpdev->if_index;
        imo->imo_multicast_ttl = CARP_DFLTTL;
        imo->imo_multicast_loop = 0;
        return (0);
@@ -1970,6 +1973,9 @@ carp_join_multicast6(struct carp_softc *
        struct sockaddr_in6 addr6;
        int error;
 
+       if (sc->sc_carpdev == NULL)
+               return (ENETDOWN);
+
        /* Join IPv6 CARP multicast group */
        memset(&addr6, 0, sizeof(addr6));
        addr6.sin6_family = AF_INET6;
@@ -1996,7 +2002,7 @@ carp_join_multicast6(struct carp_softc *
        }
 
        /* apply v6 multicast membership */
-       im6o->im6o_multicast_if_index = sc->sc_if.if_index;
+       im6o->im6o_multicast_if_index = sc->sc_carpdev->if_index;
        if (imm)
                LIST_INSERT_HEAD(&im6o->im6o_memberships, imm,
                    i6mm_chain);