Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge commit 'origin/master'

Browse source
This commit is contained in:
Ondrej Zajicek 2014-04-23 13:52:15 +02:00
commit 4dd24f05f3
5 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -1,3 +1,6 @@
Version 1.4.3 (2014-04-14)
o Important bugfix in IPv6 BGP.
Version 1.4.2 (2014-04-02) Version 1.4.2 (2014-04-02)
o Important bugfix in BFD. o Important bugfix in BFD.

2
lib/mempool.c
View file

@ -250,7 +250,7 @@ lp_memsize(resource *r)
cnt++; cnt++;
return ALLOC_OVERHEAD + sizeof(struct linpool) + return ALLOC_OVERHEAD + sizeof(struct linpool) +
cnt * (ALLOC_OVERHEAD + sizeof(sizeof(struct lp_chunk))) + cnt * (ALLOC_OVERHEAD + sizeof(struct lp_chunk)) +
m->total + m->total_large; m->total + m->total_large;
} }

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.4.2 Version: 1.4.3
Release: 1 Release: 1
Copyright: GPL Copyright: GPL
Group: Networking/Daemons Group: Networking/Daemons

6
proto/bgp/packets.c
View file

@ -1082,7 +1082,7 @@ bgp_do_rx_update(struct bgp_conn *conn,
{ {
struct bgp_proto *p = conn->bgp; struct bgp_proto *p = conn->bgp;
struct rte_src *src = p->p.main_source; struct rte_src *src = p->p.main_source;
rta *a0, *a; rta *a0, *a = NULL;
ip_addr prefix; ip_addr prefix;
int pxlen, err = 0; int pxlen, err = 0;
u32 path_id = 0; u32 path_id = 0;
@ -1115,7 +1115,6 @@ bgp_do_rx_update(struct bgp_conn *conn,
if (a0 && ! bgp_set_next_hop(p, a0)) if (a0 && ! bgp_set_next_hop(p, a0))
a0 = NULL; a0 = NULL;
a = NULL;
last_id = 0; last_id = 0;
src = p->p.main_source; src = p->p.main_source;
@ -1187,7 +1186,7 @@ bgp_do_rx_update(struct bgp_conn *conn,
byte *start, *x; byte *start, *x;
int len, len0; int len, len0;
unsigned af, sub; unsigned af, sub;
rta *a0, *a; rta *a0, *a = NULL;
ip_addr prefix; ip_addr prefix;
int pxlen, err = 0; int pxlen, err = 0;
u32 path_id = 0; u32 path_id = 0;
@ -1234,7 +1233,6 @@ bgp_do_rx_update(struct bgp_conn *conn,
if (a0 && ! bgp_set_next_hop(p, a0)) if (a0 && ! bgp_set_next_hop(p, a0))
a0 = NULL; a0 = NULL;
a = NULL;
last_id = 0; last_id = 0;
src = p->p.main_source; src = p->p.main_source;

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.4.2" #define BIRD_VERSION "1.4.3"
/* Include parameters determined by configure script */ /* Include parameters determined by configure script */
#include "sysdep/autoconf.h" #include "sysdep/autoconf.h"