diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2014-04-23 13:52:15 +0200 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2014-04-23 13:52:15 +0200 |
| commit | 4dd24f05f384ac14546d4bebbfcb0ecf9a976ec6 (patch) | |
| tree | 2750238d0577b03f159f8f35c20540b40aa581df | |
| parent | 1cb0f83d291d9bb3da06067bc2ea838238d5c487 (diff) | |
| parent | 6c6ebd64c3e44a2658a7ae8729159f1653c00a89 (diff) | |
Merge commit 'origin/master'
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | lib/mempool.c | 2 | ||||
| -rw-r--r-- | misc/bird.spec | 2 | ||||
| -rw-r--r-- | proto/bgp/packets.c | 6 | ||||
| -rw-r--r-- | sysdep/config.h | 2 |
5 files changed, 8 insertions, 7 deletions
@@ -1,3 +1,6 @@ +Version 1.4.3 (2014-04-14) + o Important bugfix in IPv6 BGP. + Version 1.4.2 (2014-04-02) o Important bugfix in BFD. diff --git a/lib/mempool.c b/lib/mempool.c index 65072f9a..ec9854a9 100644 --- a/lib/mempool.c +++ b/lib/mempool.c @@ -250,7 +250,7 @@ lp_memsize(resource *r) cnt++; 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; } diff --git a/misc/bird.spec b/misc/bird.spec index 69f2dc78..0c730982 100644 --- a/misc/bird.spec +++ b/misc/bird.spec @@ -1,6 +1,6 @@ Summary: BIRD Internet Routing Daemon Name: bird -Version: 1.4.2 +Version: 1.4.3 Release: 1 Copyright: GPL Group: Networking/Daemons diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c index 808afaa9..b6239025 100644 --- a/proto/bgp/packets.c +++ b/proto/bgp/packets.c @@ -1082,7 +1082,7 @@ bgp_do_rx_update(struct bgp_conn *conn, { struct bgp_proto *p = conn->bgp; struct rte_src *src = p->p.main_source; - rta *a0, *a; + rta *a0, *a = NULL; ip_addr prefix; int pxlen, err = 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)) a0 = NULL; - a = NULL; last_id = 0; src = p->p.main_source; @@ -1187,7 +1186,7 @@ bgp_do_rx_update(struct bgp_conn *conn, byte *start, *x; int len, len0; unsigned af, sub; - rta *a0, *a; + rta *a0, *a = NULL; ip_addr prefix; int pxlen, err = 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)) a0 = NULL; - a = NULL; last_id = 0; src = p->p.main_source; diff --git a/sysdep/config.h b/sysdep/config.h index b4aa7528..e2ea7642 100644 --- a/sysdep/config.h +++ b/sysdep/config.h @@ -7,7 +7,7 @@ #define _BIRD_CONFIG_H_ /* BIRD version */ -#define BIRD_VERSION "1.4.2" +#define BIRD_VERSION "1.4.3" /* Include parameters determined by configure script */ #include "sysdep/autoconf.h" |