struct peer *peer;
u_int32_t connect;
- peer = peer_lookup_vty (vty, ip_str);
+ peer = peer_and_group_lookup_vty (vty, ip_str);
if (! peer)
return CMD_WARNING;
ret = peer_timers_connect_set (peer, connect);
- return CMD_SUCCESS;
+ return bgp_vty_return (vty, ret);
}
static int
ret = peer_timers_connect_unset (peer);
- return CMD_SUCCESS;
+ return bgp_vty_return (vty, ret);
}
DEFUN (neighbor_timers_connect,
neighbor_timers_connect_cmd,
- NEIGHBOR_CMD "timers connect <0-65535>",
+ NEIGHBOR_CMD2 "timers connect <0-65535>",
NEIGHBOR_STR
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR2
"BGP per neighbor timers\n"
"BGP connect timer\n"
"Connect timer\n")
DEFUN (no_neighbor_timers_connect,
no_neighbor_timers_connect_cmd,
- NO_NEIGHBOR_CMD "timers connect",
+ NO_NEIGHBOR_CMD2 "timers connect",
NO_STR
NEIGHBOR_STR
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR2
"BGP per neighbor timers\n"
"BGP connect timer\n")
{
ALIAS (no_neighbor_timers_connect,
no_neighbor_timers_connect_val_cmd,
- NO_NEIGHBOR_CMD "timers connect <0-65535>",
+ NO_NEIGHBOR_CMD2 "timers connect <0-65535>",
NO_STR
NEIGHBOR_STR
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR2
"BGP per neighbor timers\n"
"BGP connect timer\n"
"Connect timer\n")
struct peer *peer;
u_int32_t routeadv = 0;
- peer = peer_lookup_vty (vty, ip_str);
+ peer = peer_and_group_lookup_vty (vty, ip_str);
if (! peer)
return CMD_WARNING;
else
ret = peer_advertise_interval_unset (peer);
- return CMD_SUCCESS;
+ return bgp_vty_return (vty, ret);
}
DEFUN (neighbor_advertise_interval,
neighbor_advertise_interval_cmd,
- NEIGHBOR_CMD "advertisement-interval <0-600>",
+ NEIGHBOR_CMD2 "advertisement-interval <0-600>",
NEIGHBOR_STR
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR2
"Minimum interval between sending BGP routing updates\n"
"time in seconds\n")
{
DEFUN (no_neighbor_advertise_interval,
no_neighbor_advertise_interval_cmd,
- NO_NEIGHBOR_CMD "advertisement-interval",
+ NO_NEIGHBOR_CMD2 "advertisement-interval",
NO_STR
NEIGHBOR_STR
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR2
"Minimum interval between sending BGP routing updates\n")
{
return peer_advertise_interval_vty (vty, argv[0], NULL, 0);
ALIAS (no_neighbor_advertise_interval,
no_neighbor_advertise_interval_val_cmd,
- NO_NEIGHBOR_CMD "advertisement-interval <0-600>",
+ NO_NEIGHBOR_CMD2 "advertisement-interval <0-600>",
NO_STR
NEIGHBOR_STR
- NEIGHBOR_ADDR_STR
+ NEIGHBOR_ADDR_STR2
"Minimum interval between sending BGP routing updates\n"
"time in seconds\n")
peer_as_change (struct peer *peer, as_t as)
{
bgp_peer_sort_t type;
+ struct peer *conf;
/* Stop peer. */
if (! CHECK_FLAG (peer->sflags, PEER_STATUS_GROUP))
peer->local_as = peer->bgp->as;
/* Advertisement-interval reset */
- if (peer_sort (peer) == BGP_PEER_IBGP)
- peer->v_routeadv = BGP_DEFAULT_IBGP_ROUTEADV;
+ conf = NULL;
+ if (peer->group)
+ conf = peer->group->conf;
+
+ if (conf && CHECK_FLAG (conf->config, PEER_CONFIG_ROUTEADV))
+ peer->v_routeadv = conf->routeadv;
else
- peer->v_routeadv = BGP_DEFAULT_EBGP_ROUTEADV;
+ if (peer_sort (peer) == BGP_PEER_IBGP)
+ peer->v_routeadv = BGP_DEFAULT_IBGP_ROUTEADV;
+ else
+ peer->v_routeadv = BGP_DEFAULT_EBGP_ROUTEADV;
/* TTL reset */
if (peer_sort (peer) == BGP_PEER_IBGP)
peer->v_connect = BGP_DEFAULT_CONNECT_RETRY;
/* advertisement-interval reset */
- if (peer_sort (peer) == BGP_PEER_IBGP)
- peer->v_routeadv = BGP_DEFAULT_IBGP_ROUTEADV;
+ if (CHECK_FLAG (conf->config, PEER_CONFIG_ROUTEADV))
+ peer->v_routeadv = conf->routeadv;
else
- peer->v_routeadv = BGP_DEFAULT_EBGP_ROUTEADV;
+ if (peer_sort (peer) == BGP_PEER_IBGP)
+ peer->v_routeadv = BGP_DEFAULT_IBGP_ROUTEADV;
+ else
+ peer->v_routeadv = BGP_DEFAULT_EBGP_ROUTEADV;
/* password apply */
if (conf->password && !peer->password)
if (first_member)
{
/* Advertisement-interval reset */
- if (peer_sort (group->conf) == BGP_PEER_IBGP)
- group->conf->v_routeadv = BGP_DEFAULT_IBGP_ROUTEADV;
- else
- group->conf->v_routeadv = BGP_DEFAULT_EBGP_ROUTEADV;
+ if (! CHECK_FLAG (group->conf->config, PEER_CONFIG_ROUTEADV))
+ if (peer_sort (group->conf) == BGP_PEER_IBGP)
+ group->conf->v_routeadv = BGP_DEFAULT_IBGP_ROUTEADV;
+ else
+ group->conf->v_routeadv = BGP_DEFAULT_EBGP_ROUTEADV;
/* ebgp-multihop reset */
if (peer_sort (group->conf) == BGP_PEER_IBGP)
int
peer_timers_connect_set (struct peer *peer, u_int32_t connect)
{
+ struct peer_group *group;
+ struct listnode *node, *nnode;
+
if (peer_group_active (peer))
return BGP_ERR_INVALID_FOR_PEER_GROUP_MEMBER;
/* Set value to timer setting. */
peer->v_connect = connect;
+ if (! CHECK_FLAG (peer->sflags, PEER_STATUS_GROUP))
+ return 0;
+
+ /* peer-group member updates. */
+ group = peer->group;
+ for (ALL_LIST_ELEMENTS (group->peer, node, nnode, peer))
+ {
+ SET_FLAG (peer->config, PEER_CONFIG_CONNECT);
+ peer->connect = connect;
+ peer->v_connect = connect;
+ }
return 0;
}
int
peer_timers_connect_unset (struct peer *peer)
{
+ struct peer_group *group;
+ struct listnode *node, *nnode;
+
if (peer_group_active (peer))
return BGP_ERR_INVALID_FOR_PEER_GROUP_MEMBER;
/* Set timer setting to default value. */
peer->v_connect = BGP_DEFAULT_CONNECT_RETRY;
+ if (! CHECK_FLAG (peer->sflags, PEER_STATUS_GROUP))
+ return 0;
+
+ /* peer-group member updates. */
+ group = peer->group;
+ for (ALL_LIST_ELEMENTS (group->peer, node, nnode, peer))
+ {
+ UNSET_FLAG (peer->config, PEER_CONFIG_CONNECT);
+ peer->connect = 0;
+ peer->v_connect = BGP_DEFAULT_CONNECT_RETRY;
+ }
return 0;
}
int
peer_advertise_interval_set (struct peer *peer, u_int32_t routeadv)
{
+ struct peer_group *group;
+ struct listnode *node, *nnode;
+
if (peer_group_active (peer))
return BGP_ERR_INVALID_FOR_PEER_GROUP_MEMBER;
peer->routeadv = routeadv;
peer->v_routeadv = routeadv;
+ if (! CHECK_FLAG (peer->sflags, PEER_STATUS_GROUP))
+ return 0;
+
+ /* peer-group member updates. */
+ group = peer->group;
+ for (ALL_LIST_ELEMENTS (group->peer, node, nnode, peer))
+ {
+ SET_FLAG (peer->config, PEER_CONFIG_ROUTEADV);
+ peer->routeadv = routeadv;
+ peer->v_routeadv = routeadv;
+ }
+
return 0;
}
int
peer_advertise_interval_unset (struct peer *peer)
{
+ struct peer_group *group;
+ struct listnode *node, *nnode;
+
if (peer_group_active (peer))
return BGP_ERR_INVALID_FOR_PEER_GROUP_MEMBER;
peer->v_routeadv = BGP_DEFAULT_IBGP_ROUTEADV;
else
peer->v_routeadv = BGP_DEFAULT_EBGP_ROUTEADV;
+
+ if (! CHECK_FLAG (peer->sflags, PEER_STATUS_GROUP))
+ return 0;
+
+ /* peer-group member updates. */
+ group = peer->group;
+ for (ALL_LIST_ELEMENTS (group->peer, node, nnode, peer))
+ {
+ UNSET_FLAG (peer->config, PEER_CONFIG_ROUTEADV);
+ peer->routeadv = 0;
+
+ if (peer->sort == BGP_PEER_IBGP)
+ peer->v_routeadv = BGP_DEFAULT_IBGP_ROUTEADV;
+ else
+ peer->v_routeadv = BGP_DEFAULT_EBGP_ROUTEADV;
+ }
return 0;
}
VTY_NEWLINE);
/* advertisement-interval */
- if (CHECK_FLAG (peer->config, PEER_CONFIG_ROUTEADV))
+ if (CHECK_FLAG (peer->config, PEER_CONFIG_ROUTEADV) &&
+ ! peer_group_active (peer))
vty_out (vty, " neighbor %s advertisement-interval %d%s",
addr, peer->v_routeadv, VTY_NEWLINE);
vty_out (vty, " neighbor %s timers %d %d%s", addr,
peer->keepalive, peer->holdtime, VTY_NEWLINE);
- if (CHECK_FLAG (peer->config, PEER_CONFIG_CONNECT))
+ if (CHECK_FLAG (peer->config, PEER_CONFIG_CONNECT) &&
+ ! peer_group_active (peer))
vty_out (vty, " neighbor %s timers connect %d%s", addr,
peer->connect, VTY_NEWLINE);