Merge commit 'origin/master'

NEWS

@@ -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.
 

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;
 }
 

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

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;
 

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"