From bc06d287d100c0845eb065b96838c81aebf83468 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 9 Sep 2016 08:48:23 -0400 Subject: [PATCH] bgpd: Fix standalone to better handle getsockopt failure When getsockopt(...,SO_BINDTODEVICE,...); fails assume the bgp instance we are interested is the default one. Signed-off-by: Donald Sharp --- bgpd/bgp_network.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c index ecfc3f9fe8..a6e9b7de00 100644 --- a/bgpd/bgp_network.c +++ b/bgpd/bgp_network.c @@ -257,13 +257,14 @@ bgp_get_instance_for_inc_conn (int sock, struct bgp **bgp_inst) zlog_err ("[Error] BGP SO_BINDTODEVICE get failed (%s), sock %d", safe_strerror (errno), sock); return -1; -#else - strcpy (name, VRF_DEFAULT_NAME); #endif } if (!strlen(name)) - return 0; /* default instance. */ + { + *bgp_inst = bgp_get_default (); + return 0; /* default instance. */ + } /* First try match to instance; if that fails, check for interfaces. */ bgp = bgp_lookup_by_name (name); -- 2.39.5