summaryrefslogtreecommitdiff
path: root/bgpd/bgp_updgrp_packet.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-02-24 09:32:47 -0500
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-02-24 09:32:47 -0500
commit3f3169a2e6d9d710135ea54100b3517fae59290c (patch)
treef4ff6b26113a4e8c2d6e1c479b1b5c61ce0a4936 /bgpd/bgp_updgrp_packet.c
parent8ba835eb69d897d67a46ede418c81387bd1cc55b (diff)
parente760cc82e7147fcfd09dad678427962f45ddabb4 (diff)
Merge remote-tracking branch 'origin/stable/2.0'
Diffstat (limited to 'bgpd/bgp_updgrp_packet.c')
-rw-r--r--bgpd/bgp_updgrp_packet.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c
index 02979602bf..8839de391e 100644
--- a/bgpd/bgp_updgrp_packet.c
+++ b/bgpd/bgp_updgrp_packet.c
@@ -547,7 +547,7 @@ bpacket_reformat_for_peer (struct bpacket *pkt, struct peer_af *paf)
}
if (gnh_modified)
- stream_put_in6_addr_at (s, vec->offset + 1 + (nhlen-IPV6_MAX_BYTELEN), mod_v6nhg);
+ stream_put_in6_addr_at (s, vec->offset + 1, mod_v6nhg);
if (lnh_modified)
stream_put_in6_addr_at (s, vec->offset + 1 + (nhlen-IPV6_MAX_BYTELEN), mod_v6nhl);
@@ -621,6 +621,8 @@ bgp_info_addpath_tx_str (int addpath_encode, u_int32_t addpath_tx_id,
buf[0] = '\0';
if (addpath_encode)
sprintf(buf, " with addpath ID %d", addpath_tx_id);
+ else
+ buf[0] = '\0';
}
/* Make BGP update packet. */