Merge branch 'master' into add-path (736e143f) · Commits · 戴 / Bird

NEWS

+42 −1

Original line number	Diff line number	Diff line
		Version 1.3.12 (2013-11-23)
		o BFD protocol (RFC 5880).
		o BFD support for OSPF and BGP.
		o New 'allow local as' option for BGP.
		o Filters allows setting gw, ifname and ifindex.
		o Filter operator 'delete/filter' extended to bgp_paths.
		o Filter operator 'len' extended to [e]clists.
		o PID file support.
		o Several bugfixes and minor improvements.

		Version 1.3.11 (2013-07-27)
		o OSPF stub router option (RFC 3137).
		o TTL security for OSPF and RIP.
		o Protocol packet priority and traffic class handling.
		o Multiple routing tables support for FreeBSD and OpenBSD.
		o Extends constants to all filter data types.
		o Implements eval command.
		o 'bgppath ~ int set' filter operation.
		o Several bugfixes.

		Version 1.3.10 (2013-04-30)
		o Lightweight BIRD client for embedded environments.
		o Dynamic IPv6 router advertisements.
		o New 'next hop keep' option for BGP.
		o Smart default routing table for 'show route export/preexport/protocol'.
		o Automatic router ID selection could be configured to use address of loopback.
		o Allows configured global addresses of NBMA neighbors in OSPFv3.
		o Allows BIRD commands from UNIX shell even in restricted mode.
		o Route limits inherited from templates can be disabled.
		o Symbol names enclosed by apostrophes can contain dots.
		o Several bugfixes.

		Version 1.3.9 (2013-01-11)
		o BIRD can be configured to keep and show filtered routes.
		o Separate receive and import limits.
		o Several new reconfiguration cmd options (undo, timeout, check).
		o Configurable automatic router ID selection.
		o Dragonfly BSD support.
		o Fixed OSPFv3 vlinks.
		o Several minor bugfixes.

		Version 1.3.8 (2012-08-07)
		o Generalized import and export route limits.
		o RDNSS and DNSSL support for RAdv.

README

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		(c) 1998--2008 Martin Mares <mj@ucw.cz>
		(c) 1998--2000 Pavel Machek <pavel@ucw.cz>
		(c) 1998--2008 Ondrej Filip <feela@network.cz>
		(c) 2009--2011 CZ.NIC z.s.p.o.
		(c) 2009--2013 CZ.NIC z.s.p.o.

		================================================================================

aclocal.m4

+29 −13

Original line number	Diff line number	Diff line
		@@ -133,19 +133,35 @@ if test "$bird_cv_struct_ip_mreqn" = yes ; then
		fi
		])

		AC_DEFUN(BIRD_CHECK_GCC_OPTIONS,
		[AC_CACHE_VAL(bird_cv_c_option_no_pointer_sign, [
		cat >conftest.c <<EOF
		int main(void)
		{ return 0; }
		EOF
		if $CC -Wall -Wno-pointer-sign conftest.c >&AS_MESSAGE_LOG_FD 2>&1 ; then
		bird_cv_c_option_no_pointer_sign=yes
		else
		bird_cv_c_option_no_pointer_sign=no
		AC_DEFUN(BIRD_CHECK_PTHREADS,
		[
		bird_tmp_cflags="$CFLAGS"

		CFLAGS="$CFLAGS -pthread"
		AC_CACHE_CHECK([whether POSIX threads are available], bird_cv_lib_pthreads,
		[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], [[pthread_t pt; pthread_create(&pt, NULL, NULL, NULL); pthread_spinlock_t lock; pthread_spin_lock(&lock); ]])],
		[bird_cv_lib_pthreads=yes], [bird_cv_lib_pthreads=no])])

		CFLAGS="$bird_tmp_cflags"
		])

		AC_DEFUN(BIRD_CHECK_GCC_OPTION,
		[
		bird_tmp_cflags="$CFLAGS"

		CFLAGS="$3 $2"
		AC_CACHE_CHECK([whether CC supports $2], $1,
		[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [$1=yes], [$1=no])])

		CFLAGS="$bird_tmp_cflags"
		])

		AC_DEFUN(BIRD_ADD_GCC_OPTION,
		[
		if test "$$1" = yes ; then
		CFLAGS="$CFLAGS $2"
		fi
		rm -rf conftest* a.out
		])])
		])

		# BIRD_CHECK_PROG_FLAVOR_GNU(PROGRAM-PATH, IF-SUCCESS, [IF-FAILURE])
		# copied autoconf internal _AC_PATH_PROG_FLAVOR_GNU

bird.conf

+5 −5

Original line number	Diff line number	Diff line
		@@ -25,14 +25,14 @@ protocol kernel {
		protocol static {
		# disabled;

		route fec0:2::/64 reject;
		route fec0:3::/64 reject;
		route fec0:4::/64 reject;
		route fec0:2::/64 blackhole;
		route fec0:3::/64 unreachable;
		route fec0:4::/64 prohibit;

		# route 0.0.0.0/0 via 195.113.31.113;
		# route 62.168.0.0/25 reject;
		# route 62.168.0.0/25 unreachable;
		# route 1.2.3.4/32 via 195.113.31.124;
		# route 10.0.0.0/8 reject;
		# route 10.0.0.0/8 unreachable;
		# route 10.1.1.0:255.255.255.0 via 62.168.0.3;
		# route 10.1.2.0:255.255.255.0 via 62.168.0.3;
		# route 10.1.3.0:255.255.255.0 via 62.168.0.4;

client/Makefile

+7 −1

Original line number	Diff line number	Diff line
		source=client.c commands.c util.c
		source=commands.c util.c client.c
		root-rel=../
		dir-name=client

		clients := $(client) birdcl

		source-dep := $(source) $(addsuffix .c,$(clients))

		subdir: $(addsuffix .o,$(clients))

		include ../Rules

Admin message