From: Maria Matejka <mq@ucw.cz>
Date: Thu, 28 Nov 2024 11:08:43 +0000 (+0100)
Subject: Merge commit 'df22b314' into thread-merge-2.16
X-Git-Tag: v3.0.0~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bbe0ec25184ee6834034fbf388b0f84c4784be7;p=thirdparty%2Fbird.git

Merge commit 'df22b314' into thread-merge-2.16
---

3bbe0ec25184ee6834034fbf388b0f84c4784be7
diff --cc sysdep/unix/io.c
index f5155cd65,987c7a6ba..f02a554d7
--- a/sysdep/unix/io.c
+++ b/sysdep/unix/io.c
@@@ -1108,10 -971,11 +1108,11 @@@ sk_setup(sock *s
    }
  #endif
  
-   if (s->vrf && (s->vrf != &default_vrf) && !s->iface)
 -  if (s->vrf && !s->iface && (s->type != SK_TCP))
++  if (s->vrf && (s->vrf != &default_vrf) && !s->iface && (s->type != SK_TCP))
    {
      /* Bind socket to associated VRF interface.
-        This is Linux-specific, but so is SO_BINDTODEVICE. */
+        This is Linux-specific, but so is SO_BINDTODEVICE.
+        For accepted TCP sockets it is inherited from the listening one. */
  #ifdef SO_BINDTODEVICE
      struct ifreq ifr = {};
      strcpy(ifr.ifr_name, s->vrf->name);