bgpd: Cleanups & fixes for minttl / GTSM
* bgp_vty.c: (peer_ebgp_multihop_{un,}set_vty) tail-call cleanup.
({no_,}neighbor_ttl_security) ditto.
* bgpd.c: (peer_ttl_security_hops_set) Peer group checks and TTL set only
need to be done on transition.
* sockunion.c: (sockopt_minttl) remove always-on debug and improve readability.
diff --git a/lib/sockunion.c b/lib/sockunion.c
index a32809c..df05acb 100644
--- a/lib/sockunion.c
+++ b/lib/sockunion.c
@@ -540,23 +540,23 @@
int
sockopt_minttl (int family, int sock, int minttl)
{
+#ifdef IP_MINTTL
int ret;
- zlog_debug ("sockopt_minttl: set minttl to %d", minttl);
-
-#ifdef IP_MINTTL
ret = setsockopt (sock, IPPROTO_IP, IP_MINTTL, &minttl, sizeof(minttl));
-#else
- ret = -1;
- errno = EOPNOTSUPP;
-#endif /* IP_MINTTL */
if (ret < 0)
{
- zlog (NULL, LOG_WARNING, "can't set sockopt IP_MINTTL to %d on socket %d: %s", minttl, sock, safe_strerror (errno));
+ zlog (NULL, LOG_WARNING,
+ "can't set sockopt IP_MINTTL to %d on socket %d: %s",
+ minttl, sock, safe_strerror (errno));
return -1;
}
return 0;
+#else
+ errno = EOPNOTSUPP;
+ return -1;
+#endif /* IP_MINTTL */
}
/* If same family and same prefix return 1. */