New version 2.13
This commit is contained in:
parent
f01095e006
commit
8dcb3a063f
1
.gitignore
vendored
1
.gitignore
vendored
@ -23,3 +23,4 @@ radvd-1.6.tar.gz
|
||||
/radvd-2.8.tar.bz2
|
||||
/radvd-2.10.tar.bz2
|
||||
/radvd-2.11.tar.xz
|
||||
/radvd-2.13.tar.xz
|
||||
|
@ -1,58 +0,0 @@
|
||||
From 11b4e773af7d2463751190edb240ec26c1a70bbf Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Pavel=20=C5=A0imerda?= <psimerda@redhat.com>
|
||||
Date: Sun, 12 Apr 2015 21:45:53 +0200
|
||||
Subject: [PATCH] radvdump: show routes with prefixlen > 64
|
||||
|
||||
Current radvdump code blindly copies over eight bytes of route prefix
|
||||
but its size in bytes can actually be zero, eight or sixteen.
|
||||
|
||||
Use the following `/etc/radvd.conf` to reproduce:
|
||||
|
||||
interface eth0 {
|
||||
AdvSendAdvert on;
|
||||
MinRtrAdvInterval 3;
|
||||
MaxRtrAdvInterval 4;
|
||||
route 2001:db8:0:0:11::/80 {};
|
||||
};
|
||||
|
||||
Output before the change:
|
||||
|
||||
route 2001:db8::/80
|
||||
{
|
||||
AdvRoutePreference medium;
|
||||
AdvRouteLifetime 12;
|
||||
}; # End of route definition
|
||||
|
||||
Output after the change:
|
||||
|
||||
route 2001:db8:0:0:11::/80
|
||||
{
|
||||
AdvRoutePreference medium;
|
||||
AdvRouteLifetime 12;
|
||||
}; # End of route definition
|
||||
|
||||
See also:
|
||||
|
||||
* https://bugzilla.redhat.com/show_bug.cgi?id=1188891
|
||||
* https://tools.ietf.org/html/rfc4191#section-2.3
|
||||
---
|
||||
radvdump.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/radvdump.c b/radvdump.c
|
||||
index 9789c85..7d55146 100644
|
||||
--- a/radvdump.c
|
||||
+++ b/radvdump.c
|
||||
@@ -352,7 +352,8 @@ static void print_ff(unsigned char *msg, int len, struct sockaddr_in6 *addr, int
|
||||
} else {
|
||||
struct in6_addr addr;
|
||||
memset(&addr, 0, sizeof(addr));
|
||||
- memcpy(&addr, &rinfo->nd_opt_ri_prefix, 8);
|
||||
+ if (rinfo->nd_opt_ri_len > 1)
|
||||
+ memcpy(&addr, &rinfo->nd_opt_ri_prefix, (rinfo->nd_opt_ri_len - 1) * 8);
|
||||
addrtostr(&addr, prefix_str, sizeof(prefix_str));
|
||||
printf("\n\troute %s/%d\n\t{\n", prefix_str, rinfo->nd_opt_ri_prefix_len);
|
||||
}
|
||||
--
|
||||
2.0.5
|
||||
|
@ -1,7 +1,7 @@
|
||||
Summary: A Router Advertisement daemon
|
||||
Name: radvd
|
||||
Version: 2.11
|
||||
Release: 4%{?dist}
|
||||
Version: 2.13
|
||||
Release: 1%{?dist}
|
||||
# The code includes the advertising clause, so it's GPL-incompatible
|
||||
License: BSD with advertising
|
||||
Group: System Environment/Daemons
|
||||
@ -15,7 +15,6 @@ Source2: radvd.service
|
||||
# https://github.com/reubenhwk/radvd/pull/42
|
||||
#
|
||||
# Submitted upstream.
|
||||
Patch0: radvd-2.11-route-info.patch
|
||||
BuildRequires: bison
|
||||
BuildRequires: flex
|
||||
BuildRequires: flex-static
|
||||
@ -40,7 +39,6 @@ services.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
for F in CHANGES; do
|
||||
iconv -f iso-8859-1 -t utf-8 < "$F" > "${F}.new"
|
||||
touch -r "$F" "${F}.new"
|
||||
@ -102,6 +100,9 @@ exit 0
|
||||
%{_sbindir}/radvdump
|
||||
|
||||
%changelog
|
||||
* Wed Jun 22 2016 Pavel Šimerda <psimerda@redhat.com> - 2.13-1
|
||||
- New version 2.13
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.11-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user