Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ability to import BMP information from a separate BGP instance #17639

Open
wants to merge 34 commits into
base: master
Choose a base branch
from

doc: add bmp import-vrf-view on the bmp user guide

dbf848c
Select commit
Loading
Failed to load commit list.
Open

Ability to import BMP information from a separate BGP instance #17639

doc: add bmp import-vrf-view on the bmp user guide
dbf848c
Select commit
Loading
Failed to load commit list.
frrbot / frrbot completed Dec 20, 2024 in 23s

Style and/or linter errors found

Style and/or linter errors found

Details

Thanks for your contribution to FRR!

Click for style suggestions

diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c
index 164e2300c..c47473c5e 100644
--- a/bgpd/bgp_nht.c
+++ b/bgpd/bgp_nht.c
@@ -41,7 +41,7 @@ static void unregister_zebra_rnh(struct bgp_nexthop_cache *bnc);
 static int make_prefix(int afi, struct bgp_path_info *pi, struct prefix *p);
 static void bgp_nht_ifp_initial(struct event *thread);
 
-DEFINE_HOOK(bgp_nht_path_update, (struct bgp *bgp, struct bgp_path_info *pi, bool valid),
+DEFINE_HOOK(bgp_nht_path_update, (struct bgp * bgp, struct bgp_path_info *pi, bool valid),
 	    (bgp, pi, valid));
 
 static int bgp_isvalid_nexthop(struct bgp_nexthop_cache *bnc)
diff --git a/bgpd/bgp_nht.h b/bgpd/bgp_nht.h
index 345089ac5..0279837b0 100644
--- a/bgpd/bgp_nht.h
+++ b/bgpd/bgp_nht.h
@@ -85,7 +85,7 @@ extern void bgp_nht_ifp_down(struct interface *ifp);
 extern void bgp_nht_interface_events(struct peer *peer);
 
 /* called when a path becomes valid or invalid, because of nexthop tracking */
-DECLARE_HOOK(bgp_nht_path_update, (struct bgp *bgp, struct bgp_path_info *pi, bool valid),
+DECLARE_HOOK(bgp_nht_path_update, (struct bgp * bgp, struct bgp_path_info *pi, bool valid),
 	     (bgp, pi, valid));
 
 #endif /* _BGP_NHT_H */
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 5692575ed..52793d8df 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -141,7 +141,7 @@ DEFINE_HOOK(bgp_inst_config_write,
 DEFINE_HOOK(bgp_snmp_update_last_changed, (struct bgp *bgp), (bgp));
 DEFINE_HOOK(bgp_snmp_init_stats, (struct bgp *bgp), (bgp));
 DEFINE_HOOK(bgp_snmp_traps_config_write, (struct vty * vty), (vty));
-DEFINE_HOOK(bgp_route_distinguisher_update, (struct bgp *bgp, afi_t afi, bool preconfig),
+DEFINE_HOOK(bgp_route_distinguisher_update, (struct bgp * bgp, afi_t afi, bool preconfig),
 	    (bgp, afi, preconfig));
 
 static struct peer_group *listen_range_exists(struct bgp *bgp,
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index e92de5e93..fe392a8e3 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -86,7 +86,7 @@ DEFINE_QOBJ_TYPE(bgp);
 DEFINE_QOBJ_TYPE(peer);
 DEFINE_HOOK(bgp_inst_delete, (struct bgp *bgp), (bgp));
 DEFINE_HOOK(bgp_instance_state, (struct bgp *bgp), (bgp));
-DEFINE_HOOK(bgp_routerid_update, (struct bgp *bgp, bool withdraw), (bgp, withdraw));
+DEFINE_HOOK(bgp_routerid_update, (struct bgp * bgp, bool withdraw), (bgp, withdraw));
 
 /* BGP process wide configuration.  */
 static struct bgp_master bgp_master;
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index 937037907..66cc474a9 100644
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -904,8 +904,8 @@ DECLARE_HOOK(bgp_config_end, (struct bgp *bgp), (bgp));
 DECLARE_HOOK(bgp_hook_vrf_update, (struct vrf *vrf, bool enabled),
 	     (vrf, enabled));
 DECLARE_HOOK(bgp_instance_state, (struct bgp *bgp), (bgp));
-DECLARE_HOOK(bgp_routerid_update, (struct bgp *bgp, bool withdraw), (bgp, withdraw));
-DECLARE_HOOK(bgp_route_distinguisher_update, (struct bgp *bgp, afi_t afi, bool preconfig),
+DECLARE_HOOK(bgp_routerid_update, (struct bgp * bgp, bool withdraw), (bgp, withdraw));
+DECLARE_HOOK(bgp_route_distinguisher_update, (struct bgp * bgp, afi_t afi, bool preconfig),
 	     (bgp, afi, preconfig));
 
 /* Thread callback information */

To apply the style suggestions:

curl https://gist.githubusercontent.com/polychaeta/fe232622fbe94fe0062dae3d1f3971b1/raw/4d9a48a0f1ae71f6ca6c20d209dd757953c85837/style.diff | git apply -

If you are a new contributor to FRR, please see our contributing guidelines.

After making changes, you do not need to create a new PR. You should perform an amend or interactive rebase followed by a force push.