Update xorp to 1.4.
Patch provided by Mustafa Dogan in PR 37058.
Release 1.4 (2007/03/20)
=========================
ALL:
- XORP now builds on DragonFlyBSD-1.8, FreeBSD-6.2, Linux Fedora
Core6, Linux Debian-3.1 (sarge), NetBSD-3.1 and OpenBSD-4.0.
- XORP now can be compiled with the Intel C/C++ compiler 9.* on
Linux.
- XORP now can be cross-compiled for IA-64, MIPS (Broadcom for
Linksys WRT54G), PowerPC-603, Sparc64, and XScale processors.
- Implementation of OSPFv3 (draft-ietf-ospf-ospfv3-update-14.txt).
- Implementation of floating static routes (i.e., static routes
for the same prefix with different next hop and metrics).
CONFIGURATION:
- Allow static routes to have "nexthop4" and "nexthop6" policy
matching conditions in the "from" block.
- Addition of new FEA configuration statements to retain XORP
unicast forwarding entries on startup or shutdown:
fea {
unicast-forwarding4 {
forwarding-entries {
retain-on-startup: false
retain-on-shutdown: false
}
}
unicast-forwarding6 {
forwarding-entries {
retain-on-startup: false
retain-on-shutdown: false
}
}
}
The default value for each statement is false.
Note that those statements prevent the FEA itself from deleting
the forwarding entries and does not prevent the RIB or any of the
unicast routing protocols from deleting the entries on shutdown.
- The "elements" policy statements for configuring sets of network
routes have been deprecated:
policy {
network4-list foo {
elements: "1.2.0.0/16,3.4.0.0/16"
}
network6-list bar {
elements: "2222::/64,3333::/64"
}
}
The new replacement statement is "network" and can be used to
specify one element per line:
policy {
network4-list foo {
network 1.2.0.0/16
network 3.4.0.0/16
}
network6-list bar {
network 2222::/64
network 3333::/64
}
}
- The following keywords are supported inside the policy
configuration when comparing IPv4 or IPv6 network prefixes:
exact, longer, orlonger, shorter, orshorter, not. For example:
"network4 exact 10.0.0.0/8" SAME AS "network4 == 10.0.0.0/8"
"network4 longer 10.0.0.0/8" SAME AS "network4 < 10.0.0.0/8"
"network4 orlonger 10.0.0.0/8" SAME AS "network4 <= 10.0.0.0/8"
"network4 shorter 10.0.0.0/8" SAME AS "network4 > 10.0.0.0/8"
"network4 orshorter 10.0.0.0/8" SAME AS "network4 >= 10.0.0.0/8"
"network4 not 10.0.0.0/8" SAME AS "network4 != 10.0.0.0/8"
The original operators are supported as well.
- A floating static route (also called "qualified" by some router
vendors) can be added with a configuration like:
protocols {
static {
route 10.10.0.0/16 {
next-hop: 172.16.0.1
metric: 1
qualified-next-hop 172.17.0.2 {
metric: 10
}
}
interface-route 10.30.30.0/24 {
next-hop-interface: "rl0"
next-hop-vif: "rl0"
next-hop-router: 172.16.0.1
metric: 1
qualified-next-hop-interface rl1 {
qualified-next-hop-vif rl1 {
next-hop-router: 172.17.0.2
metric: 10
}
}
}
}
}
LIBXORP:
- The XORP scheduler now has support for priority-based tasks.
LIBXIPC:
- No significant changes.
LIBFEACLIENT:
- No significant changes.
XRL:
- No significant changes.
RTRMGR:
- Bug fix in the semantics of the rtrmgr template %activate keyword.
XORPSH:
- No significant changes.
POLICY:
- Bug fix related to creating export policies that match protocol's
its own routes (e.g., a policy that modifies the BGP routes
exported to its peers).
- Various other bug fixes.
FEA/MFEA:
- Fix the routing socket based mechanism (used by BSD-derived
systems) for obtaining the interface name (toward the destination)
for a routing entry.
- Apply a performance improvement when configuring a large number of
interfaces/VIFs, each of them with the "default-system-config"
configuration statement.
- Bug fix related to atomically modifying the IP address of an interface.
RIB:
- Bug fix related to (not) installing redundant host-specific
entries for the other side of a point-to-point interface if the
netmask for the interface covers the host-specific entry.
RIP:
- No significant changes.
OSPF:
- OSPFv3 is now available.
- The OSPFv3 protocol requires that link-local addresses are used,
therefore it is necessary to configure a link-local address for
each interface, this restriction will be removed in the future.
- The OSPFv3 configuration allows multiple instances to be configured
however only one instance will be created. Configuring multiple
OSPFv3 instances is guaranteed to cause problems.
- Bug fix related to the processing of previously generated LSAs
on startup has been fixed. Restarting a router that was the
designated router could exhibit this problem.
- Bug fix on a broadcast interface if the router was not the
designated router then the nexthop was incorrectly
unconditionally set to the designated router; introducing an
unnecessary extra hop.
BGP:
- BGP has taken advantage of the priority-based tasks in the XORP
scheduler and background tasks are run at a low priority;
leading to improved performance.
STATIC_ROUTES:
- Bug fix related to declaring some of the policy matching
conditions in the "from" block.
MLD/IGMP:
- Bug fix related to atomically modifying the IP address of an
interface.
- Bug fix related to ignoring protocol messages that are not
recognized by the configured protocol version on an interface.
- Ignore control messages if the source address is not directly
connected.
- Don't send the periodic Group-Specific or Group-and-Source-Specific
Queries for entries that are in IGMPv1 mode.
PIM-SM:
- Bug fix related to atomically modifying the IP address of an
interface.
- The PIM-SM control messages do not include the IP Router Alert
option anymore, because it has been included from the newer
revisions of the PIM-SM protocol specification (RFC 4601 and
draft-ietf-pim-sm-bsr-09.txt,.ps).
- Don't send PIM Hello message with DR Priority of 0 when shutting
down an interface, because this is not part of the protocol
specification.
FIB2MRIB:
- Bug fix related to updating the interface and vif name of a
forwarding entry received from the FEA.
CLI:
- Performance improvement if the CLI is processing a large amount
of data. E.g., if xorpsh is used in a pipe like:
cat commands.txt | xorpsh
SNMP:
- Bug fix with the snmpd arguments when sampling whether snmpd
can start and its version is >= 5.2.
Release 1.3 (2006/08/02)
=========================
ALL:
- Numerous improvements, bug fixes and cleanup.
- XORP now builds on Linux Fedora Core5, DragonFlyBSD-1.4,
FreeBSD-6.1.
- Implementation of IGMPv3 (RFC 3376) and MLDv2 (RFC 3810).
Those are necessary to complete the Source-Specific Multicast
support.
CONFIGURATION:
- Addition of new OSPF configuration statement as part of the MD5
keys:
* max-time-drift: u32 (default to 3600, i.e., 1 hour)
It is used to set the maximum time drift (in seconds) among all
OSPF routers. The allowed values are in the range [0--65535]. If
the value is 65535, the time drift is unlimited.
- The following statements for configuring static routes have been
deprecated:
route4, route6, interface-route4, interface-route6, mrib-route4,
mrib-route6, mrib-interface-route4, mrib-interface-route6.
The new replacement statements are:
route, interface-route, mrib-route, mrib-interface-route.
Each of the new statements can be used to configure either IPv4Net
or IPv6Net route.
- The following statements for configuring RIP and RIPng have been
renamed:
* route-expiry-secs -> route-timeout
* route-deletion-secs -> deletion-delay
* table-request-secs -> request-interval
* interpacket-delay-msecs -> interpacket-delay
- The following statements for configuring RIP and RIPng random
intervals have been replaced:
* triggered-update-min-secs and triggered-update-max-secs with
triggered-delay and triggered-jitter
* table-announce-min-secs and table-announce-max-secs with
update-interval and update-jitter
Previously, each interval was specified as [foo-min, foo-max].
Now each interval is specified as
[foo - foo * jitter / 100, foo + foo * jitter / 100]
where "jitter" is specified as a percentage (an integer in the
interval [0, 100]) of the value of "foo".
- The "version" statement for configuring an IGMP interface/vif
allows values in the range [1-3]. Previously, the allowed range
was [1-2].
- The "version" statement for configuring a MLD interface/vif allows
values in the range [1-2]. Previously, the allowed range was [1-1].
- The following statement for configuring PIM-SM (pimsm4 and pimsm6)
has been renamed:
interval-sec -> interval
- If a "then" policy block contains "accept" or "reject" statement,
now all statements inside the "then" block are evaluated
regardless of their position.
- Addition of a new "exit" operational mode command that is
equivalent to the "quit" operational mode command.
- The "create" and "set" configuration commands are merged, so now
the new "set" command can be used for setting values and for
creating new configuration nodes. For backward compatibility,
the obsoleted "create" command is preserved as an alias for the
new "set" command, though it may be removed in the future.
LIBXORP:
- Few bug fixes in the RefTrie implementation.
LIBXIPC:
- Minor improvement in parsing XRL requests.
LIBFEACLIENT:
- No significant changes.
XRL:
- No significant changes.
RTRMGR:
- Various bug fixes.
XORPSH:
- Previously, the "commit" command was not available in
configuration mode if there were no pending configuration changes.
Now the "commit" command is always available, but the following
message will be printed instead:
"No configuration changes to commit."
- Various bug fixes.
POLICY:
- Various bug fixes.
FEA/MFEA:
- Bug fix in transmitting large packets on Linux when using IP raw
sockets.
- Linux-related netlink socket code refactoring and bug fix.
- Bug fix in obtaining the incoming interface for raw packets
(in case of *BSD).
- Bug fix in parsing the ancillary data from recvmsg().
- Accept zeroed source addresses of raw packets, because of
protocols like IGMPv3.
- Bug fix in restoring kernel routes that were automatically removed
when the MAC address or MTU on an interface is modified.
- Bug fix in processing IPv4 raw packets if they contain an IP option
with a bogus option length.
RIB:
- Several bug fixes and improvements.
RIP:
- Various bug fixes in the MD5 authentication support.
- Remove route flap when applying/deleting RIP-related import
policies.
- Fix an issue with INFINITY cost routes that might be bounced
indefinitely between two XORP routers.
OSPF:
- Various bug fixes in the MD5 authentication support.
BGP:
- Prefix limits on a per peer basis.
- Various bug fixes.
STATIC_ROUTES:
- No significant changes.
MLD/IGMP:
- Implementation of IGMPv3 (RFC 3376) and MLDv2 (RFC 3810).
- Unification of the IGMP and MLD execution path.
PIM-SM:
- Bug fix related to the SPT switch (the bug is *BSD specific).
- Use the RPF interface toward the BSR when transmitting a Cand-RP
Advertisement message. Previously the first interface that is UP
was chosen.
- Use the RPF interface toward the RP when transmitting PIM Register
messages toward the RP. Previously the interface of the directly
connected source was chosen.
FIB2MRIB:
- No significant changes.
CLI:
- Bug fix related to tracking the window size when it is resized.
SNMP:
- No significant changes.
This commit is contained in:
obache
parent
fb84bbc16e
commit
69fa17cffa
9 changed files with 21 additions and 98 deletions
|
|
@ -1,9 +1,9 @@
|
|||
# $NetBSD: Makefile,v 1.19 2006/05/09 21:18:49 joerg Exp $
|
||||
# $NetBSD: Makefile,v 1.20 2007/10/13 15:15:48 obache Exp $
|
||||
#
|
||||
|
||||
DISTNAME= xorp-1.2
|
||||
DISTNAME= xorp-1.4
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= http://www.xorp.org/releases/1.2/
|
||||
MASTER_SITES= http://www.xorp.org/releases/1.4/
|
||||
|
||||
MAINTAINER= pkgsrc-users@NetBSD.org
|
||||
HOMEPAGE= http://www.xorp.org/
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.3 2006/03/11 21:01:59 rillig Exp $
|
||||
@comment $NetBSD: PLIST,v 1.4 2007/10/13 15:15:49 obache Exp $
|
||||
xorp/bgp/tools/xorpsh_print_peers
|
||||
xorp/bgp/tools/xorpsh_print_routes
|
||||
xorp/bgp/xorp_bgp
|
||||
|
|
@ -25,6 +25,8 @@ xorp/etc/templates/mld.cmds
|
|||
xorp/etc/templates/mld.tp
|
||||
xorp/etc/templates/ospfv2.cmds
|
||||
xorp/etc/templates/ospfv2.tp
|
||||
xorp/etc/templates/ospfv3.cmds
|
||||
xorp/etc/templates/ospfv3.tp
|
||||
xorp/etc/templates/pim.cmds
|
||||
xorp/etc/templates/pim6.cmds
|
||||
xorp/etc/templates/pimsm4.tp
|
||||
|
|
@ -75,7 +77,6 @@ xorp/xrl/targets/finder.xrls
|
|||
xorp/xrl/targets/finder_client.xrls
|
||||
xorp/xrl/targets/mfea.xrls
|
||||
xorp/xrl/targets/mld6igmp.xrls
|
||||
xorp/xrl/targets/ospf.xrls
|
||||
xorp/xrl/targets/ospfv2.xrls
|
||||
xorp/xrl/targets/ospfv3.xrls
|
||||
xorp/xrl/targets/packet_acl.xrls
|
||||
|
|
|
|||
|
|
@ -1,11 +1,7 @@
|
|||
$NetBSD: distinfo,v 1.8 2006/12/17 20:20:04 joerg Exp $
|
||||
$NetBSD: distinfo,v 1.9 2007/10/13 15:15:50 obache Exp $
|
||||
|
||||
SHA1 (xorp-1.2.tar.gz) = 061792f0810c7cf8ea9782457c8408a7f7b44516
|
||||
RMD160 (xorp-1.2.tar.gz) = 8ea6865adc587d58a6f98222a2c6b61bbedc805b
|
||||
Size (xorp-1.2.tar.gz) = 8765558 bytes
|
||||
SHA1 (patch-aa) = b4949c9ea56002a964fd530696b8477aed2c280b
|
||||
SHA1 (patch-ab) = 7dc2cc400a1b917e0962152a99cab3fcca6b1153
|
||||
SHA1 (patch-ac) = 69a3b9526262dcb4cf7f09f1d408acd43d22de6f
|
||||
SHA1 (patch-ad) = e836d2cc8f6bbca16682bf884cdaae5ed826dedd
|
||||
SHA1 (patch-ae) = 6ec968d497bc69d437ac888c4eff16f74011066a
|
||||
SHA1 (patch-af) = e13032a386dc4d6956cd668e5b1d571b8bd0771d
|
||||
SHA1 (xorp-1.4.tar.gz) = 28f27ab220ddb571a244143c87d18685d72266ee
|
||||
RMD160 (xorp-1.4.tar.gz) = 4ebbc506d52e996bf15f43c0df1960cefd0dbaf6
|
||||
Size (xorp-1.4.tar.gz) = 8496928 bytes
|
||||
SHA1 (patch-ab) = a3782f5ff1d2e8de640ecb72b7473e35d17ff56e
|
||||
SHA1 (patch-af) = 0b05653dda8067856967fe033851f7466525cf40
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
$NetBSD: patch-aa,v 1.3 2006/05/09 21:18:50 joerg Exp $
|
||||
|
||||
--- mrt/include/ip_mroute.h.orig 2006-05-09 18:33:35.000000000 +0000
|
||||
+++ mrt/include/ip_mroute.h
|
||||
@@ -56,6 +56,10 @@
|
||||
# include <netinet/ip_mroute.h>
|
||||
#endif
|
||||
|
||||
+#if defined(HOST_OS_DRAGONFLY)
|
||||
+#include <net/ip_mroute/ip_mroute.h>
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* NetBSD (all versions)
|
||||
* OpenBSD (all versions)
|
||||
|
|
@ -1,27 +1,8 @@
|
|||
$NetBSD: patch-ab,v 1.2 2006/10/05 02:40:25 rillig Exp $
|
||||
$NetBSD: patch-ab,v 1.3 2007/10/13 15:15:51 obache Exp $
|
||||
|
||||
--- configure.orig 2006-03-08 03:23:22.000000000 +0100
|
||||
+++ configure 2006-10-05 04:38:58.000000000 +0200
|
||||
@@ -1806,6 +1806,18 @@ cat >>confdefs.h <<\_ACEOF
|
||||
_ACEOF
|
||||
|
||||
;;
|
||||
+ dragonfly* )
|
||||
+
|
||||
+cat >>confdefs.h <<\_ACEOF
|
||||
+#define HOST_OS_DRAGONFLY 1
|
||||
+_ACEOF
|
||||
+
|
||||
+
|
||||
+cat >>confdefs.h <<\_ACEOF
|
||||
+#define HOST_OS_NAME "DragonFly"
|
||||
+_ACEOF
|
||||
+
|
||||
+ ;;
|
||||
linux* )
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
@@ -15815,7 +15827,7 @@ echo "${ECHO_T}no" >&6
|
||||
--- configure.orig 2007-03-14 18:59:03.000000000 +0000
|
||||
+++ configure
|
||||
@@ -19612,7 +19612,7 @@ echo "${ECHO_T}no" >&6
|
||||
done
|
||||
|
||||
|
||||
|
|
@ -29,4 +10,4 @@ $NetBSD: patch-ab,v 1.2 2006/10/05 02:40:25 rillig Exp $
|
|||
+ if test "${enable_compiler_pipe}" = "yes" ; then
|
||||
for ac_flag in "-pipe"
|
||||
do
|
||||
ac_safe=`echo "$ac_flag" | sed 'y%./+- %__p__%'`
|
||||
ac_safe=xr_check_cflag
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-ac,v 1.1 2006/05/09 21:18:50 joerg Exp $
|
||||
|
||||
--- libxipc/sockutil.cc.orig 2006-05-09 20:01:15.000000000 +0000
|
||||
+++ libxipc/sockutil.cc
|
||||
@@ -390,7 +390,7 @@ get_preferred_ipv4_addr()
|
||||
static uint32_t
|
||||
if_count()
|
||||
{
|
||||
-#ifdef HOST_OS_FREEBSD
|
||||
+#if defined(HOST_OS_FREEBSD) || defined(HOST_OS_DRAGONFLY)
|
||||
int cnt, error;
|
||||
size_t cntlen = sizeof(cnt);
|
||||
error = sysctlbyname("net.link.generic.system.ifcount",
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-ad,v 1.1 2006/05/09 21:18:50 joerg Exp $
|
||||
|
||||
--- fea/ifconfig_set_ioctl.cc.orig 2006-05-09 20:01:45.000000000 +0000
|
||||
+++ fea/ifconfig_set_ioctl.cc
|
||||
@@ -175,7 +175,7 @@ IfConfigSetIoctl::is_discard_emulated(co
|
||||
{
|
||||
UNUSED(i);
|
||||
|
||||
-#if defined(HOST_OS_BSDI) || defined(HOST_OS_FREEBSD) || defined(HOST_OS_MACOSX) || defined(HOST_OS_NETBSD) || defined(HOST_OS_OPENBSD)
|
||||
+#if defined(HOST_OS_BSDI) || defined(HOST_OS_FREEBSD) || defined(HOST_OS_MACOSX) || defined(HOST_OS_NETBSD) || defined(HOST_OS_OPENBSD) || defined(HOST_OS_DRAGONFLY)
|
||||
return (true);
|
||||
#else
|
||||
return (false);
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
$NetBSD: patch-ae,v 1.1 2006/05/16 18:19:14 joerg Exp $
|
||||
|
||||
--- config.h.in.orig 2006-05-16 16:57:36.000000000 +0000
|
||||
+++ config.h.in
|
||||
@@ -536,6 +536,9 @@
|
||||
/* Define to 1 if the OS is FreeBSD */
|
||||
#undef HOST_OS_FREEBSD
|
||||
|
||||
+/* Define to 1 if the OS is DragonFly */
|
||||
+#undef HOST_OS_DRAGONFLY
|
||||
+
|
||||
/* Define to 1 if the OS is Linux */
|
||||
#undef HOST_OS_LINUX
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-af,v 1.1 2006/12/17 20:20:04 joerg Exp $
|
||||
$NetBSD: patch-af,v 1.2 2007/10/13 15:15:52 obache Exp $
|
||||
|
||||
--- mibs/configure.orig 2006-12-17 19:16:39.000000000 +0000
|
||||
--- mibs/configure.orig 2007-03-14 18:59:04.000000000 +0000
|
||||
+++ mibs/configure
|
||||
@@ -7678,7 +7678,7 @@ echo "${ECHO_T}no" >&6
|
||||
@@ -6415,7 +6415,7 @@ echo "${ECHO_T}no" >&6
|
||||
done
|
||||
|
||||
|
||||
|
|
@ -10,4 +10,4 @@ $NetBSD: patch-af,v 1.1 2006/12/17 20:20:04 joerg Exp $
|
|||
+ if test "${enable_compiler_pipe}" = "yes" ; then
|
||||
for ac_flag in "-pipe"
|
||||
do
|
||||
ac_safe=`echo "$ac_flag" | sed 'y%./+- %__p__%'`
|
||||
ac_safe=xr_check_cflag
|
||||
|
|
|
|||
Loading…
Reference in a new issue