mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-23 02:01:55 +00:00
Code Releases Activity

Merge commit '2b3d52aa421ae1c31e30107beefd82fddbb42854' into integrated

Browse Source
This commit is contained in:
Ondrej Zajicek 2014-04-29 16:25:09 +02:00
commit b1c680a680
13 changed files with 42 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NEWS
View File

@ -1,3 +1,13 @@
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) Version 1.3.11 (2013-07-27)
o OSPF stub router option (RFC 3137). o OSPF stub router option (RFC 3137).
o TTL security for OSPF and RIP. o TTL security for OSPF and RIP.

8
configure.in
View File

@ -68,6 +68,14 @@ if test -z "$GCC" ; then
AC_MSG_ERROR([This program requires the GNU C Compiler.]) AC_MSG_ERROR([This program requires the GNU C Compiler.])
fi fi
# Enable threads by default just in Linux and FreeBSD
if test "$enable_pthreads" = try ; then
case "$host_os" in
(linux* | freebsd*) enable_pthreads=try ;;
(*) enable_pthreads=no ;;
esac
fi
if test "$enable_pthreads" != no ; then if test "$enable_pthreads" != no ; then
BIRD_CHECK_PTHREADS BIRD_CHECK_PTHREADS

6
filter/test.conf
View File

@ -267,7 +267,7 @@ pair set ps;
ec set ecs; ec set ecs;
ip set ips; ip set ips;
prefix set pxs; prefix set pxs;
string s; string st;
{ {
print "1a-a1 = 30: ", '1a-a1'; print "1a-a1 = 30: ", '1a-a1';
print "Testing filter language:"; print "Testing filter language:";
@ -352,8 +352,8 @@ string s;
print "Testing EC set, false: ", (ro, 10, 20) ~ ecs, " ", (rt, 10, 21) ~ ecs, " ", (ro, 100000, 99) ~ ecs, print "Testing EC set, false: ", (ro, 10, 20) ~ ecs, " ", (rt, 10, 21) ~ ecs, " ", (ro, 100000, 99) ~ ecs,
" ", (ro, 12345, 10) ~ ecs, " ", (rt, 12346, 0) ~ ecs, " ", (ro, 0.1.134.160, 150) ~ ecs; " ", (ro, 12345, 10) ~ ecs, " ", (rt, 12346, 0) ~ ecs, " ", (ro, 0.1.134.160, 150) ~ ecs;
s = "Hello"; st = "Hello";
print "Testing string: ", s, " true: ", s ~ "Hell*", " false: ", s ~ "ell*"; print "Testing string: ", st, " true: ", st ~ "Hell*", " false: ", st ~ "ell*";
b = true; b = true;
print "Testing bool: ", b, ", ", !b; print "Testing bool: ", b, ", ", !b;

20
lib/birdlib.h
View File

@ -20,14 +20,14 @@
/* Utility macros */ /* Utility macros */
#define _MIN(a,b) (((a)<(b))?(a):(b)) #define MIN_(a,b) (((a)<(b))?(a):(b))
#define _MAX(a,b) (((a)>(b))?(a):(b)) #define MAX_(a,b) (((a)>(b))?(a):(b))
#ifndef PARSER #ifndef PARSER
#undef MIN #undef MIN
#undef MAX #undef MAX
#define MIN(a,b) _MIN(a,b) #define MIN(a,b) MIN_(a,b)
#define MAX(a,b) _MAX(a,b) #define MAX(a,b) MAX_(a,b)
#endif #endif
#define ABS(a) ((a)>=0 ? (a) : -(a)) #define ABS(a) ((a)>=0 ? (a) : -(a))
@ -54,17 +54,17 @@
typedef s64 btime; typedef s64 btime;
#define _S *1000000 #define S_ *1000000
#define _MS *1000 #define MS_ *1000
#define _US *1 #define US_ *1
#define TO_S /1000000 #define TO_S /1000000
#define TO_MS /1000 #define TO_MS /1000
#define TO_US /1 #define TO_US /1
#ifndef PARSER #ifndef PARSER
#define S _S #define S S_
#define MS _MS #define MS MS_
#define US _US #define US US_
#endif #endif

2
misc/bird.spec
View File

@ -1,6 +1,6 @@
Summary: BIRD Internet Routing Daemon Summary: BIRD Internet Routing Daemon
Name: bird Name: bird
Version: 1.3.11 Version: 1.3.12
Release: 1 Release: 1
Copyright: GPL Copyright: GPL
Group: Networking/Daemons Group: Networking/Daemons

6
proto/bfd/bfd.h
View File

@ -28,9 +28,9 @@
#define BFD_ECHO_PORT 3785 #define BFD_ECHO_PORT 3785
#define BFD_MULTI_CTL_PORT 4784 #define BFD_MULTI_CTL_PORT 4784
#define BFD_DEFAULT_MIN_RX_INT (10 _MS) #define BFD_DEFAULT_MIN_RX_INT (10 MS_)
#define BFD_DEFAULT_MIN_TX_INT (100 _MS) #define BFD_DEFAULT_MIN_TX_INT (100 MS_)
#define BFD_DEFAULT_IDLE_TX_INT (1 _S) #define BFD_DEFAULT_IDLE_TX_INT (1 S_)
#define BFD_DEFAULT_MULTIPLIER 5 #define BFD_DEFAULT_MULTIPLIER 5

2
proto/bfd/io.h
View File

@ -75,7 +75,7 @@ static inline void
tm2_start_max(timer2 *t, btime after) tm2_start_max(timer2 *t, btime after)
{ {
btime rem = tm2_remains(t); btime rem = tm2_remains(t);
tm2_start(t, _MAX(rem, after)); tm2_start(t, MAX_(rem, after));
} }
*/ */

1
proto/bgp/bgp.c
View File

@ -59,7 +59,6 @@
#include "nest/iface.h" #include "nest/iface.h"
#include "nest/protocol.h" #include "nest/protocol.h"
#include "nest/route.h" #include "nest/route.h"
#include "nest/bfd.h"
#include "nest/cli.h" #include "nest/cli.h"
#include "nest/locks.h" #include "nest/locks.h"
#include "conf/conf.h" #include "conf/conf.h"

2
proto/bgp/bgp.h
View File

@ -11,10 +11,10 @@
#include <stdint.h> #include <stdint.h>
#include "nest/route.h" #include "nest/route.h"
#include "nest/bfd.h"
struct linpool; struct linpool;
struct eattr; struct eattr;
struct bfd_request;
struct bgp_config { struct bgp_config {
struct proto_config c; struct proto_config c;

2
proto/ospf/config.Y
View File

@ -113,7 +113,7 @@ CF_KEYWORDS(NEIGHBORS, RFC1583COMPAT, STUB, TICK, COST, COST2, RETRANSMIT)
CF_KEYWORDS(HELLO, TRANSMIT, PRIORITY, DEAD, TYPE, BROADCAST, BCAST, DEFAULT) CF_KEYWORDS(HELLO, TRANSMIT, PRIORITY, DEAD, TYPE, BROADCAST, BCAST, DEFAULT)
CF_KEYWORDS(NONBROADCAST, NBMA, POINTOPOINT, PTP, POINTOMULTIPOINT, PTMP) CF_KEYWORDS(NONBROADCAST, NBMA, POINTOPOINT, PTP, POINTOMULTIPOINT, PTMP)
CF_KEYWORDS(NONE, SIMPLE, AUTHENTICATION, STRICT, CRYPTOGRAPHIC, TTL, SECURITY) CF_KEYWORDS(NONE, SIMPLE, AUTHENTICATION, STRICT, CRYPTOGRAPHIC, TTL, SECURITY)
CF_KEYWORDS(ELIGIBLE, POLL, NETWORKS, HIDDEN, VIRTUAL, CHECK, LINK, ONLY) CF_KEYWORDS(ELIGIBLE, POLL, NETWORKS, HIDDEN, VIRTUAL, CHECK, LINK, ONLY, BFD)
CF_KEYWORDS(RX, BUFFER, LARGE, NORMAL, STUBNET, HIDDEN, SUMMARY, TAG, EXTERNAL) CF_KEYWORDS(RX, BUFFER, LARGE, NORMAL, STUBNET, HIDDEN, SUMMARY, TAG, EXTERNAL)
CF_KEYWORDS(WAIT, DELAY, LSADB, ECMP, LIMIT, WEIGHT, NSSA, TRANSLATOR, STABILITY) CF_KEYWORDS(WAIT, DELAY, LSADB, ECMP, LIMIT, WEIGHT, NSSA, TRANSLATOR, STABILITY)
CF_KEYWORDS(GLOBAL, LSID, ROUTER, SELF, INSTANCE, REAL, NETMASK, TX, PRIORITY) CF_KEYWORDS(GLOBAL, LSID, ROUTER, SELF, INSTANCE, REAL, NETMASK, TX, PRIORITY)

2
proto/radv/config.Y
View File

@ -113,7 +113,7 @@ radv_iface_finish:
struct radv_iface_config *ic = RADV_IFACE; struct radv_iface_config *ic = RADV_IFACE;
if (ic->min_ra_int == (u32) -1) if (ic->min_ra_int == (u32) -1)
ic->min_ra_int = _MAX(ic->max_ra_int / 3, 3); ic->min_ra_int = MAX_(ic->max_ra_int / 3, 3);
if (ic->default_lifetime == (u32) -1) if (ic->default_lifetime == (u32) -1)
ic->default_lifetime = 3 * ic->max_ra_int; ic->default_lifetime = 3 * ic->max_ra_int;

2
sysdep/config.h
View File

@ -7,7 +7,7 @@
#define _BIRD_CONFIG_H_ #define _BIRD_CONFIG_H_
/* BIRD version */ /* BIRD version */
#define BIRD_VERSION "1.3.11" #define BIRD_VERSION "1.3.12"
// XXXX temporary define // XXXX temporary define
#define IPV1 1 #define IPV1 1

2
sysdep/unix/log.c
View File

@ -130,6 +130,8 @@ log_commit(int class, buffer *buf)
/* FIXME: cli_echo is not thread-safe */ /* FIXME: cli_echo is not thread-safe */
cli_echo(class, buf->start); cli_echo(class, buf->start);
buf->pos = buf->start;
} }
int buffer_vprint(buffer *buf, const char *fmt, va_list args); int buffer_vprint(buffer *buf, const char *fmt, va_list args);