diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-08-06 00:37:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-06 00:37:23 -0700 |
| commit | 34215c958ee74c9bd151c895a57613cd49434110 (patch) | |
| tree | 148c14114bc54096e6aba359e5717d138f2842dd | |
| parent | 8b004dbfbaaa085a19e42e38f2237e6333225a05 (diff) | |
| parent | b8ca6814ad83db8f42972db661a02dcab15c343c (diff) | |
Merge pull request #13020 from rittere/master
tayga: Added 64:ff9b:1::/48 as well-known prefix for NAT64 (RFC 8215)
| -rw-r--r-- | ipv6/tayga/Makefile | 2 | ||||
| -rw-r--r-- | ipv6/tayga/patches/003-RFC8215.patch | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ipv6/tayga/Makefile b/ipv6/tayga/Makefile index a3decdfe0..14607834f 100644 --- a/ipv6/tayga/Makefile +++ b/ipv6/tayga/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tayga PKG_VERSION:=0.9.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=tayga-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.litech.org/tayga/ diff --git a/ipv6/tayga/patches/003-RFC8215.patch b/ipv6/tayga/patches/003-RFC8215.patch new file mode 100644 index 000000000..3fbe61260 --- /dev/null +++ b/ipv6/tayga/patches/003-RFC8215.patch @@ -0,0 +1,14 @@ +diff -Naur tayga-0.9.2.orig/addrmap.c tayga-0.9.2/addrmap.c +--- tayga-0.9.2.orig/addrmap.c 2011-05-25 15:11:30.000000000 +0100 ++++ tayga-0.9.2/addrmap.c 2020-07-04 16:24:23.397081572 +0100 +@@ -44,7 +44,9 @@ + int validate_ip6_addr(const struct in6_addr *a) + { + /* Well-known prefix for NAT64 */ +- if (a->s6_addr32[0] == WKPF && !a->s6_addr32[1] && !a->s6_addr32[2]) ++ if (a->s6_addr32[0] == WKPF && ++ (!a->s6_addr32[1] || (a->s6_addr16[2] == htonl(0x0001))) ++ && !a->s6_addr32[2]) + return 0; + + /* Reserved per RFC 2373 */ |