[bgpd] Remove dead code in ORIGINATOR_ID packet forming code

2006-05-12 Paul Jakma <paul.jakma@sun.com>

	* bgp_attr.c: (bgp_packet_attribute) Remove dead code, Coverity
	  CID #1
This commit is contained in:
Paul Jakma 2006-05-12 23:25:37 +00:00
parent 5fc60519ed
commit 34c3f81b54
2 changed files with 7 additions and 7 deletions

View File

@ -1,3 +1,8 @@
2006-05-12 Paul Jakma <paul.jakma@sun.com>
* bgp_attr.c: (bgp_packet_attribute) Remove dead code, Coverity
CID #1
2006-05-08 Paul Jakma <paul.jakma@sun.com> 2006-05-08 Paul Jakma <paul.jakma@sun.com>
* bgp_community.c: (community_str2com) Coverity CID#62, fix * bgp_community.c: (community_str2com) Coverity CID#62, fix

View File

@ -1505,13 +1505,8 @@ bgp_packet_attribute (struct bgp *bgp, struct peer *peer,
if (attr->flag & ATTR_FLAG_BIT(BGP_ATTR_ORIGINATOR_ID)) if (attr->flag & ATTR_FLAG_BIT(BGP_ATTR_ORIGINATOR_ID))
stream_put_in_addr (s, &attr->originator_id); stream_put_in_addr (s, &attr->originator_id);
else else
{ stream_put_in_addr (s, &from->remote_id);
if (from)
stream_put_in_addr (s, &from->remote_id);
else
stream_put_in_addr (s, &attr->originator_id);
}
/* Cluster list. */ /* Cluster list. */
stream_putc (s, BGP_ATTR_FLAG_OPTIONAL); stream_putc (s, BGP_ATTR_FLAG_OPTIONAL);