mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-10-18 09:58:43 +00:00
Code Releases Activity

Merge commit '4dd24f05f384ac14546d4bebbfcb0ecf9a976ec6' into integrated

Browse Source
This commit is contained in:
Ondrej Zajicek 2014-05-02 18:28:33 +02:00
commit cd50872c3b
6 changed files with 10 additions and 9 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

4
nest/proto.c
View File

@ -1236,7 +1236,7 @@ proto_want_core_up(struct proto *p)
static void static void
proto_want_export_up(struct proto *p) proto_want_export_up(struct proto *p)
{ {
ASSERT(p->core_state == CS_HAPPY); ASSERT(p->core_state == FS_HAPPY);
ASSERT(p->export_state == ES_DOWN); ASSERT(p->export_state == ES_DOWN);
proto_link_ahooks(p); proto_link_ahooks(p);
@ -1259,7 +1259,7 @@ proto_want_export_down(struct proto *p)
static void static void
proto_want_core_down(struct proto *p) proto_want_core_down(struct proto *p)
{ {
ASSERT(p->core_state == CS_HAPPY); ASSERT(p->core_state == FS_HAPPY);
ASSERT(p->export_state == ES_DOWN); ASSERT(p->export_state == ES_DOWN);
p->core_state = FS_FLUSHING; p->core_state = FS_FLUSHING;

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"
// XXXX temporary define // XXXX temporary define
#define IPV1 1 #define IPV1 1