summaryrefslogtreecommitdiff
path: root/proto
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2014-04-23 13:52:15 +0200
committerOndrej Zajicek <santiago@crfreenet.org>2014-04-23 13:52:15 +0200
commit4dd24f05f384ac14546d4bebbfcb0ecf9a976ec6 (patch)
tree2750238d0577b03f159f8f35c20540b40aa581df /proto
parent1cb0f83d291d9bb3da06067bc2ea838238d5c487 (diff)
parent6c6ebd64c3e44a2658a7ae8729159f1653c00a89 (diff)
Merge commit 'origin/master'
Diffstat (limited to 'proto')
-rw-r--r--proto/bgp/packets.c6
1 files changed, 2 insertions, 4 deletions
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;