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

bgpd: Actually make --v6-with-v4-nexthops it work (backport #16971) #16979

Merged
merged 1 commit into from
Oct 3, 2024

bgpd: Actually make ` --v6-with-v4-nexthops` it work

16421ea
Select commit
Loading
Failed to load commit list.
Merged

bgpd: Actually make --v6-with-v4-nexthops it work (backport #16971) #16979

bgpd: Actually make ` --v6-with-v4-nexthops` it work
16421ea
Select commit
Loading
Failed to load commit list.
frrbot / frrbot completed Oct 2, 2024 in 7s

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_main.c b/bgpd/bgp_main.c
index 01649c882..cc60ca02d 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -62,16 +62,18 @@ DEFINE_HOOK(bgp_hook_vrf_update, (struct vrf *vrf, bool enabled),
 	    (vrf, enabled));
 
 /* bgpd options, we use GNU getopt library. */
-static const struct option longopts[] = { { "bgp_port", required_argument, NULL, 'p' },
-					  { "listenon", required_argument, NULL, 'l' },
-					  { "no_kernel", no_argument, NULL, 'n' },
-					  { "skip_runas", no_argument, NULL, 'S' },
-					  { "ecmp", required_argument, NULL, 'e' },
-					  { "int_num", required_argument, NULL, 'I' },
-					  { "no_zebra", no_argument, NULL, 'Z' },
-					  { "socket_size", required_argument, NULL, 's' },
-					  { "v6-with-v4-nexthops", no_argument, NULL, 'x' },
-					  { 0 } };
+static const struct option longopts[] = {
+	{ "bgp_port", required_argument, NULL, 'p' },
+	{ "listenon", required_argument, NULL, 'l' },
+	{ "no_kernel", no_argument, NULL, 'n' },
+	{ "skip_runas", no_argument, NULL, 'S' },
+	{ "ecmp", required_argument, NULL, 'e' },
+	{ "int_num", required_argument, NULL, 'I' },
+	{ "no_zebra", no_argument, NULL, 'Z' },
+	{ "socket_size", required_argument, NULL, 's' },
+	{ "v6-with-v4-nexthops", no_argument, NULL, 'x' },
+	{ 0 }
+};
 
 /* signal definitions */
 void sighup(void);

To apply the style suggestions:

curl https://gist.githubusercontent.com/polychaeta/22c7a00a3f3e9575eaf911df1ef49771/raw/b4224e14f1c554023e58cbb691d36ea0c5b884bc/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.