diff options
author | itojun <itojun@pkgsrc.org> | 1999-09-13 16:34:36 +0000 |
---|---|---|
committer | itojun <itojun@pkgsrc.org> | 1999-09-13 16:34:36 +0000 |
commit | 255f8ba55c6f5d7e6bf0bae9125245276a246ab9 (patch) | |
tree | 411827718d119b17f1c12e1bab6e67c2b13e71fb /net | |
parent | 61cb05422f94059a47d4d26b1e4b280674461d17 (diff) | |
download | pkgsrc-255f8ba55c6f5d7e6bf0bae9125245276a246ab9.tar.gz |
upgrade to 0.79.
---
New beta zebra-0.79 is out:
ftp://ftp.zebra.org/pub/zebra/zebra-0.79.tar.gz
This beta release's main topic is ospfd. Now it works pretty well!
We know it surely has bugs inside, so when you find it please let us
know. ABR,ASBR,Virtual Linux functionality is added. Flooding codes
and LSA database codes are almost rewritten. Terminal interface of
ospfd will show detailed information about LSAs.
There was a report about RIPv2's netmask is zero case. I've changed
ripd codes when netmask is not valid. ripd will ignore the entry.
Diffstat (limited to 'net')
-rw-r--r-- | net/zebra/Makefile | 4 | ||||
-rw-r--r-- | net/zebra/files/md5 | 4 | ||||
-rw-r--r-- | net/zebra/files/patch-sum | 5 | ||||
-rw-r--r-- | net/zebra/patches/patch-aa | 86 |
4 files changed, 92 insertions, 7 deletions
diff --git a/net/zebra/Makefile b/net/zebra/Makefile index 8d3564b3e95..51bad44ef12 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 1999/09/03 22:00:52 tron Exp $ +# $NetBSD: Makefile,v 1.16 1999/09/13 16:34:36 itojun Exp $ # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp # -DISTNAME= zebra-0.78a +DISTNAME= zebra-0.79 CATEGORIES= net MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/ # you might need debugging, it's a developer release ! diff --git a/net/zebra/files/md5 b/net/zebra/files/md5 index 661488875ee..1f2c62fa7bc 100644 --- a/net/zebra/files/md5 +++ b/net/zebra/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.10 1999/08/30 02:57:35 itojun Exp $ +$NetBSD: md5,v 1.11 1999/09/13 16:34:36 itojun Exp $ -MD5 (zebra-0.78a.tar.gz) = 5ce6762da80c3c6d156eeacf0d9fbe43 +MD5 (zebra-0.79.tar.gz) = 06018edc72ca9473fe60f51fe70fdcdf diff --git a/net/zebra/files/patch-sum b/net/zebra/files/patch-sum index df56353731c..bd9b6a280de 100644 --- a/net/zebra/files/patch-sum +++ b/net/zebra/files/patch-sum @@ -1,4 +1,3 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:12:32 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/09/13 16:34:37 itojun Exp $ -MD5 (patch-aa) = fe429d1a281f4f6826f5a41d9e486a36 -MD5 (patch-ab) = 271c1b9a584fad6c7b4b1e54fce3ec51 +MD5 (patch-aa) = f422b7b316f9b530eaac7ab6adfc550c diff --git a/net/zebra/patches/patch-aa b/net/zebra/patches/patch-aa new file mode 100644 index 00000000000..07223cc3d3b --- /dev/null +++ b/net/zebra/patches/patch-aa @@ -0,0 +1,86 @@ +$NetBSD: patch-aa,v 1.3 1999/09/13 16:34:37 itojun Exp $ + +Index: ospf6d/ospf6_network.c +=================================================================== +RCS file: /cvsroot/zebra/ospf6d/ospf6_network.c,v +retrieving revision 1.40 +diff -c -r1.40 ospf6_network.c +*** ospf6d/ospf6_network.c 1999/09/10 22:36:00 1.40 +--- ospf6d/ospf6_network.c 1999/09/13 16:20:01 +*************** +*** 347,366 **** + zlog_warn ("*** can't leave AllDRouters6 on ifindex %d", ifindex); + } + +- #ifndef s6_addr32 +- #define s6_addr32 u6_addr.u6_addr32 +- #define s6_addr16 u6_addr.u6_addr16 +- #define s6_addr8 u6_addr.u6_addr8 +- #define s6_addr u6_addr.u6_addr8 +- #endif +- + void + ospf6_ipv4_encode_ipv6 (struct in_addr *in4, struct in6_addr *in6) + { + /* IPv4 address to IPv4 Mapped Address */ + memset (in6, 0, sizeof (struct in6_addr)); +! in6->s6_addr16[5] = 0xffff; +! in6->s6_addr32[3] = in4->s_addr; + } + + void +--- 347,360 ---- + zlog_warn ("*** can't leave AllDRouters6 on ifindex %d", ifindex); + } + + void + ospf6_ipv4_encode_ipv6 (struct in_addr *in4, struct in6_addr *in6) + { + /* IPv4 address to IPv4 Mapped Address */ + memset (in6, 0, sizeof (struct in6_addr)); +! in6->s6_addr[10] = 0xff; +! in6->s6_addr[11] = 0xff; +! memcpy(&in6->s6_addr[12], in4, sizeof(*in4)); + } + + void +*************** +*** 371,377 **** + + /* IPv4 Mapped Address to IPv4 address*/ +! memset (in4, 0, sizeof (struct in_addr)); +! in4->s_addr = in6->s6_addr32[3]; + } + + int +--- 365,371 ---- + + /* IPv4 Mapped Address to IPv4 address*/ +! memset (in6, 0, sizeof (struct in6_addr)); +! memcpy(&in6->s6_addr[12], in4, sizeof(*in4)); + } + + int +Index: ospf6d/ospf6d.h +=================================================================== +RCS file: /cvsroot/zebra/ospf6d/ospf6d.h,v +retrieving revision 1.36 +diff -c -r1.36 ospf6d.h +*** ospf6d/ospf6d.h 1999/09/08 08:58:59 1.36 +--- ospf6d/ospf6d.h 1999/09/13 16:20:01 +*************** +*** 116,128 **** + #endif + + +- #ifndef s6_addr32 +- #define s6_addr32 u6_addr.u6_addr32 +- #define s6_addr16 u6_addr.u6_addr16 +- #define s6_addr8 u6_addr.u6_addr8 +- #define s6_addr u6_addr.u6_addr8 +- #endif +- + /* Command Description */ + #define V4NOTATION_STR "specify by IPv4 address notation(e.g. 0.0.0.0)\n" + #define OSPF6_NUMBER_STR "Specify by number\n" +--- 116,121 ---- |