diff options
Diffstat (limited to 'proto/bgp')
| -rw-r--r-- | proto/bgp/attrs.c | 5 | ||||
| -rw-r--r-- | proto/bgp/packets.c | 27 |
2 files changed, 15 insertions, 17 deletions
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c index 82971c01..88639442 100644 --- a/proto/bgp/attrs.c +++ b/proto/bgp/attrs.c @@ -2691,8 +2691,7 @@ bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, continue; /* Store the tmp_linpool state to aggresively save memory */ - struct lp_state tmpp; - lp_save(tmp_linpool, &tmpp); + struct lp_state *tmpp = lp_save(tmp_linpool); /* Mark the route as LLGR */ rte e0 = *r; @@ -2705,7 +2704,7 @@ bgp_rte_modify_stale(struct rt_export_request *req, const net_addr *n, irh->stale_set++; /* Restore the memory state */ - lp_restore(tmp_linpool, &tmpp); + lp_restore(tmp_linpool, tmpp); } rpe_mark_seen_all(req->hook, first, last, NULL); diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c index 978a1891..b9fc38ce 100644 --- a/proto/bgp/packets.c +++ b/proto/bgp/packets.c @@ -2387,11 +2387,13 @@ bgp_create_update(struct bgp_channel *c, byte *buf) struct bgp_bucket *buck; byte *end = buf + (bgp_max_packet_length(p->conn) - BGP_HEADER_LENGTH); byte *res = NULL; + struct lp_state *tmpp = NULL; -again: ; +again: + if (tmpp) + lp_restore(tmp_linpool, tmpp); - struct lp_state tmpp; - lp_save(tmp_linpool, &tmpp); + tmpp = lp_save(tmp_linpool); /* Initialize write state */ struct bgp_write_state s = { @@ -2421,10 +2423,7 @@ again: ; /* Cleanup empty buckets */ if (bgp_done_bucket(c, buck)) - { - lp_restore(tmp_linpool, &tmpp); goto again; - } res = !s.mp_reach ? bgp_create_ip_reach(&s, buck, buf, end): @@ -2433,21 +2432,19 @@ again: ; bgp_done_bucket(c, buck); if (!res) - { - lp_restore(tmp_linpool, &tmpp); goto again; - } goto done; } /* No more prefixes to send */ + lp_restore(tmp_linpool, tmpp); return NULL; done: BGP_TRACE_RL(&rl_snd_update, D_PACKETS, "Sending UPDATE"); p->stats.tx_updates++; - lp_restore(tmp_linpool, &tmpp); + lp_restore(tmp_linpool, tmpp); return res; } @@ -2574,8 +2571,7 @@ bgp_rx_update(struct bgp_conn *conn, byte *pkt, uint len) bgp_start_timer(p, conn->hold_timer, conn->hold_time); - struct lp_state tmpp; - lp_save(tmp_linpool, &tmpp); + struct lp_state *tmpp = lp_save(tmp_linpool); /* Initialize parse state */ struct bgp_parse_state s = { @@ -2593,7 +2589,10 @@ bgp_rx_update(struct bgp_conn *conn, byte *pkt, uint len) /* Check minimal length */ if (len < 23) - { bgp_error(conn, 1, 2, pkt+16, 2); return; } + { + bgp_error(conn, 1, 2, pkt+16, 2); + goto done; + } /* Skip fixed header */ uint pos = 19; @@ -2658,7 +2657,7 @@ bgp_rx_update(struct bgp_conn *conn, byte *pkt, uint len) done: rta_free(s.cached_ea); - lp_restore(tmp_linpool, &tmpp); + lp_restore(tmp_linpool, tmpp); return; } |