Adds "const" on:
- peer_update_source_addr_set()
- peer_description_set()
Adds parameter names on:
- bgp_timers_set()
(really confusing, this one, with 2 unexplained args of same type)
Adds new setter:
- peer_afc_set(), calling peer_activate/peer_deactivate.
(intended for API consumers, matches peer->afc)
Signed-off-by: David Lamparter <equi...@opensourcerouting.org>
---
bgpd/bgpd.c | 13 +++++++++++--
bgpd/bgpd.h | 9 +++++----
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 249d20f..cadca11 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -1179,6 +1179,15 @@ peer_deactivate (struct peer *peer, afi_t afi, safi_t
safi)
return 0;
}
+int
+peer_afc_set (struct peer *peer, afi_t afi, safi_t safi, int enable)
+{
+ if (enable)
+ return peer_activate (peer, afi, safi);
+ else
+ return peer_deactivate (peer, afi, safi);
+}
+
static void
peer_nsf_stop (struct peer *peer)
{
@@ -2905,7 +2914,7 @@ peer_ebgp_multihop_unset (struct peer *peer)
/* Neighbor description. */
int
-peer_description_set (struct peer *peer, char *desc)
+peer_description_set (struct peer *peer, const char *desc)
{
if (peer->desc)
XFREE (MTYPE_PEER_DESC, peer->desc);
@@ -2998,7 +3007,7 @@ peer_update_source_if_set (struct peer *peer, const char
*ifname)
}
int
-peer_update_source_addr_set (struct peer *peer, union sockunion *su)
+peer_update_source_addr_set (struct peer *peer, const union sockunion *su)
{
struct peer_group *group;
struct listnode *node, *nnode;
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index 7665d9d..25bb1e8 100644
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -896,7 +896,7 @@ extern int bgp_confederation_peers_check (struct bgp *,
as_t);
extern int bgp_confederation_peers_add (struct bgp *, as_t);
extern int bgp_confederation_peers_remove (struct bgp *, as_t);
-extern int bgp_timers_set (struct bgp *, u_int32_t, u_int32_t);
+extern int bgp_timers_set (struct bgp *, u_int32_t keepalive, u_int32_t
holdtime);
extern int bgp_timers_unset (struct bgp *);
extern int bgp_default_local_preference_set (struct bgp *, u_int32_t);
@@ -912,6 +912,7 @@ extern int peer_group_remote_as_delete (struct peer_group
*);
extern int peer_activate (struct peer *, afi_t, safi_t);
extern int peer_deactivate (struct peer *, afi_t, safi_t);
+extern int peer_afc_set (struct peer *, afi_t, safi_t, int);
extern int peer_group_bind (struct bgp *, union sockunion *, struct peer_group
*,
afi_t, safi_t, as_t *);
@@ -928,11 +929,11 @@ extern int peer_af_flag_check (struct peer *, afi_t,
safi_t, u_int32_t);
extern int peer_ebgp_multihop_set (struct peer *, int);
extern int peer_ebgp_multihop_unset (struct peer *);
-extern int peer_description_set (struct peer *, char *);
+extern int peer_description_set (struct peer *, const char *);
extern int peer_description_unset (struct peer *);
extern int peer_update_source_if_set (struct peer *, const char *);
-extern int peer_update_source_addr_set (struct peer *, union sockunion *);
+extern int peer_update_source_addr_set (struct peer *, const union sockunion
*);
extern int peer_update_source_unset (struct peer *);
extern int peer_default_originate_set (struct peer *, afi_t, safi_t, const
char *);
@@ -944,7 +945,7 @@ extern int peer_port_unset (struct peer *);
extern int peer_weight_set (struct peer *, u_int16_t);
extern int peer_weight_unset (struct peer *);
-extern int peer_timers_set (struct peer *, u_int32_t, u_int32_t);
+extern int peer_timers_set (struct peer *, u_int32_t keepalive, u_int32_t
holdtime);
extern int peer_timers_unset (struct peer *);
extern int peer_timers_connect_set (struct peer *, u_int32_t);
--
2.3.6
_______________________________________________
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev
