summaryrefslogtreecommitdiff
path: root/bgpd/bgp_packet.c
diff options
context:
space:
mode:
authorPaul Jakma <paul@quagga.net>2012-03-05 11:55:53 +0000
committerPaul Jakma <paul@quagga.net>2012-03-05 11:55:53 +0000
commit9fc75742397cf942ca9d684815ce63058b2576ff (patch)
tree3655b28f06ac2bdf9639b86e2df7c3abc525cd73 /bgpd/bgp_packet.c
parent543fb49c316df9af2d25f08ba7e0da0305c36b5e (diff)
parent5861739f8c38bc36ea9955e5cb2be2bf2f482d70 (diff)
Merge remote-tracking branch 'quagga-gnu.org/master'
Diffstat (limited to 'bgpd/bgp_packet.c')
-rw-r--r--bgpd/bgp_packet.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index f5a74d1b..5d8087a8 100644
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -1459,9 +1459,13 @@ bgp_open_receive (struct peer *peer, bgp_size_t size)
/* Open option part parse. */
if (optlen != 0)
{
- ret = bgp_open_option_parse (peer, optlen, &capability);
- if (ret < 0)
- return ret;
+ if ((ret = bgp_open_option_parse (peer, optlen, &capability)) < 0)
+ {
+ bgp_notify_send (peer,
+ BGP_NOTIFY_OPEN_ERR,
+ BGP_NOTIFY_OPEN_UNACEP_HOLDTIME);
+ return ret;
+ }
}
else
{