if (!peer)
return CMD_WARNING_CONFIG_FAILED;
+ /*
+ * If 'neighbor <interface>', then this is for directly connected peers,
+ * we should not accept disable-connected-check.
+ */
+ if (peer->conf_if && (flag == PEER_FLAG_DISABLE_CONNECTED_CHECK)) {
+ vty_out(vty,
+ "%s is directly connected peer, cannot accept disable-"
+ "connected-check\n",
+ ip_str);
+ return CMD_WARNING_CONFIG_FAILED;
+ }
+
if (!set && flag == PEER_FLAG_SHUTDOWN)
peer_tx_shutdown_message_unset(peer);
/* disable-connected-check */
DEFUN (neighbor_disable_connected_check,
neighbor_disable_connected_check_cmd,
- "neighbor <A.B.C.D|X:X::X:X> <disable-connected-check|enforce-multihop>",
+ "neighbor <A.B.C.D|X:X::X:X|WORD> <disable-connected-check|enforce-multihop>",
NEIGHBOR_STR
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR2
"one-hop away EBGP peer using loopback address\n"
"Enforce EBGP neighbors perform multihop\n")
{
DEFUN (no_neighbor_disable_connected_check,
no_neighbor_disable_connected_check_cmd,
- "no neighbor <A.B.C.D|X:X::X:X> <disable-connected-check|enforce-multihop>",
+ "no neighbor <A.B.C.D|X:X::X:X|WORD> <disable-connected-check|enforce-multihop>",
NO_STR
NEIGHBOR_STR
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR2
"one-hop away EBGP peer using loopback address\n"
"Enforce EBGP neighbors perform multihop\n")
{
DEFUN (neighbor_ttl_security,
neighbor_ttl_security_cmd,
- "neighbor <A.B.C.D|X:X::X:X> ttl-security hops (1-254)",
+ "neighbor <A.B.C.D|X:X::X:X|WORD> ttl-security hops (1-254)",
NEIGHBOR_STR
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR2
"BGP ttl-security parameters\n"
"Specify the maximum number of hops to the BGP peer\n"
"Number of hops to BGP peer\n")
gtsm_hops = strtoul(argv[idx_number]->arg, NULL, 10);
+ /*
+ * If 'neighbor swpX', then this is for directly connected peers,
+ * we should not accept a ttl-security hops value greater than 1.
+ */
+ if (peer->conf_if && (gtsm_hops > 1)) {
+ vty_out(vty,
+ "%s is directly connected peer, hops cannot exceed 1\n",
+ argv[idx_peer]->arg);
+ return CMD_WARNING_CONFIG_FAILED;
+ }
+
return bgp_vty_return(vty, peer_ttl_security_hops_set(peer, gtsm_hops));
}
DEFUN (no_neighbor_ttl_security,
no_neighbor_ttl_security_cmd,
- "no neighbor <A.B.C.D|X:X::X:X> ttl-security hops (1-254)",
+ "no neighbor <A.B.C.D|X:X::X:X|WORD> ttl-security hops (1-254)",
NO_STR
NEIGHBOR_STR
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR2
"BGP ttl-security parameters\n"
"Specify the maximum number of hops to the BGP peer\n"
"Number of hops to BGP peer\n")