diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2011-03-24 10:51:59 +0000 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2011-03-24 10:51:59 +0000 |
| commit | 89b6d1f8e2759cc38bc768067abe3a296d93f454 (patch) | |
| tree | ebf4d27f1d93558bba8d0bf6f1022182f7066404 /bgpd/bgp_vty.c | |
| parent | fa411a212b55bba650d68fd0456686f3e47b7395 (diff) | |
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.
Diffstat (limited to 'bgpd/bgp_vty.c')
| -rw-r--r-- | bgpd/bgp_vty.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index e1c47f4e..d93c5d36 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -2629,7 +2629,6 @@ peer_ebgp_multihop_set_vty (struct vty *vty, const char *ip_str, { struct peer *peer; unsigned int ttl; - int ret; peer = peer_and_group_lookup_vty (vty, ip_str); if (! peer) @@ -2640,24 +2639,19 @@ peer_ebgp_multihop_set_vty (struct vty *vty, const char *ip_str, else VTY_GET_INTEGER_RANGE ("TTL", ttl, ttl_str, 1, 255); - ret = peer_ebgp_multihop_set (peer, ttl); - - return bgp_vty_return (vty, ret); + return bgp_vty_return (vty, peer_ebgp_multihop_set (peer, ttl)); } static int peer_ebgp_multihop_unset_vty (struct vty *vty, const char *ip_str) { struct peer *peer; - int ret; peer = peer_and_group_lookup_vty (vty, ip_str); if (! peer) return CMD_WARNING; - ret = peer_ebgp_multihop_unset (peer); - - return bgp_vty_return (vty, ret); + return bgp_vty_return (vty, peer_ebgp_multihop_unset (peer)); } /* neighbor ebgp-multihop. */ @@ -3967,7 +3961,7 @@ DEFUN (neighbor_ttl_security, "Specify the maximum number of hops to the BGP peer\n") { struct peer *peer; - int ret, gtsm_hops; + int gtsm_hops; peer = peer_and_group_lookup_vty (vty, argv[0]); if (! peer) @@ -3975,9 +3969,7 @@ DEFUN (neighbor_ttl_security, VTY_GET_INTEGER_RANGE ("", gtsm_hops, argv[1], 1, 254); - ret = peer_ttl_security_hops_set (peer, gtsm_hops); - - return bgp_vty_return (vty, ret); + return bgp_vty_return (vty, peer_ttl_security_hops_set (peer, gtsm_hops)); } DEFUN (no_neighbor_ttl_security, @@ -3989,15 +3981,12 @@ DEFUN (no_neighbor_ttl_security, "Specify the maximum number of hops to the BGP peer\n") { struct peer *peer; - int ret; peer = peer_and_group_lookup_vty (vty, argv[0]); if (! peer) return CMD_WARNING; - ret = peer_ttl_security_hops_unset (peer); - - return bgp_vty_return (vty, ret); + return bgp_vty_return (vty, peer_ttl_security_hops_unset (peer)); } /* Address family configuration. */ |