X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mx1.tetrasec.net (mx1.tetrasec.net [74.117.190.25]) by lists.alpinelinux.org (Postfix) with ESMTP id 92FDF5C5122 for ; Tue, 26 Jun 2018 09:50:35 +0000 (GMT) Received: from mx1.tetrasec.net (mail.local [127.0.0.1]) by mx1.tetrasec.net (Postfix) with ESMTP id 213149E22C2; Tue, 26 Jun 2018 09:50:35 +0000 (GMT) Received: from ncopa-desktop.copa.dup.pw (67.63.200.37.customer.cdi.no [37.200.63.67]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: n@tanael.org) by mx1.tetrasec.net (Postfix) with ESMTPSA id 6827D9E03A1; Tue, 26 Jun 2018 09:50:34 +0000 (GMT) Date: Tue, 26 Jun 2018 11:50:30 +0200 From: Natanael Copa To: Tyler A Cc: alpine-aports@lists.alpinelinux.org Subject: Re: [alpine-aports] [PATCH] main/dhcpcd: Fixes link local addresses being deleted on VLAN interfaces. Message-ID: <20180626115030.5a1943d0@ncopa-desktop.copa.dup.pw> In-Reply-To: <20180623202532.2303-1-tylera@privatedemail.net> References: <20180623202532.2303-1-tylera@privatedemail.net> X-Mailer: Claws Mail 3.15.1-dirty (GTK+ 2.24.31; x86_64-alpine-linux-musl) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit We need update the APKBUILD and bump pkgrel too or builders will not pick this up. -nc On Sun, 24 Jun 2018 05:55:32 +0930 Tyler A wrote: > Patch from upstream, will appear in next release. Written by Roy Marples. > --- > main/dhcpcd/dhcpcd-slaac-vlanid.patch | 43 +++++++++++++++++++++++++++ > 1 file changed, 43 insertions(+) > create mode 100644 main/dhcpcd/dhcpcd-slaac-vlanid.patch > > diff --git a/main/dhcpcd/dhcpcd-slaac-vlanid.patch b/main/dhcpcd/dhcpcd-slaac-vlanid.patch > new file mode 100644 > index 0000000000..57390a9448 > --- /dev/null > +++ b/main/dhcpcd/dhcpcd-slaac-vlanid.patch > @@ -0,0 +1,43 @@ > +diff --git a/src/ipv6.c b/src/ipv6.c > +index b3b026b3..2d516d99 100644 > +--- a/src/ipv6.c > ++++ b/src/ipv6.c > +@@ -253,6 +253,7 @@ ipv6_makestableprivate1(struct in6_addr *addr, > + const struct in6_addr *prefix, int prefix_len, > + const unsigned char *netiface, size_t netiface_len, > + const unsigned char *netid, size_t netid_len, > ++ unsigned short vlanid, > + uint32_t *dad_counter, > + const unsigned char *secret, size_t secret_len) > + { > +@@ -267,6 +268,8 @@ ipv6_makestableprivate1(struct in6_addr *addr, > + > + l = (size_t)(ROUNDUP8(prefix_len) / NBBY); > + len = l + netiface_len + netid_len + sizeof(*dad_counter) + secret_len; > ++ if (vlanid != 0) > ++ len += sizeof(vlanid); > + if (len > sizeof(buf)) { > + errno = ENOBUFS; > + return -1; > +@@ -281,6 +284,12 @@ ipv6_makestableprivate1(struct in6_addr *addr, > + p += netiface_len; > + memcpy(p, netid, netid_len); > + p += netid_len; > ++ /* Don't use a vlanid if not set. > ++ * This ensures prior versions have the same unique address. */ > ++ if (vlanid != 0) { > ++ memcpy(p, &vlanid, sizeof(vlanid)); > ++ p += sizeof(vlanid); > ++ } > + memcpy(p, dad_counter, sizeof(*dad_counter)); > + p += sizeof(*dad_counter); > + memcpy(p, secret, secret_len); > +@@ -333,7 +342,7 @@ ipv6_makestableprivate(struct in6_addr *addr, > + r = ipv6_makestableprivate1(addr, prefix, prefix_len, > + ifp->hwaddr, ifp->hwlen, > + ifp->ssid, ifp->ssid_len, > +- &dad, > ++ ifp->vlanid, &dad, > + ifp->ctx->secret, ifp->ctx->secret_len); > + > + if (r == 0) --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---