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:support tcp-mss for neighbor group (backport #17341) #17390

Closed
wants to merge 1 commit into from

bgpd:support tcp-mss for neighbor group

147f5e9
Select commit
Loading
Failed to load commit list.
Closed

bgpd:support tcp-mss for neighbor group (backport #17341) #17390

bgpd:support tcp-mss for neighbor group
147f5e9
Select commit
Loading
Failed to load commit list.
frrbot / frrbot completed Nov 8, 2024 in 34s

Style and/or linter errors found

Style and/or linter errors found

Details

Thanks for your contribution to FRR!


Pylint found errors in source files changed by this PR:

Pylint report for my_frr-202009/tests/topotests/bgp_tcp_mss/test_bgp_tcp_mss.py:
************* Module bgp_tcp_mss.test_bgp_tcp_mss
 my_frr-202009/tests/topotests/bgp_tcp_mss/test_bgp_tcp_mss.py:121: error (E0001, syntax-error, ) Parsing failed: 'invalid syntax (<unknown>, line 121)'
 


Click for style suggestions

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 3827f4b63..10ce90301 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -4540,43 +4540,44 @@ struct peer_flag_action {
 };
 
 static const struct peer_flag_action peer_flag_action_list[] = {
-	{PEER_FLAG_PASSIVE, 0, peer_change_reset},
-	{PEER_FLAG_SHUTDOWN, 0, peer_change_reset},
-	{PEER_FLAG_RTT_SHUTDOWN, 0, peer_change_none},
-	{PEER_FLAG_DONT_CAPABILITY, 0, peer_change_none},
-	{PEER_FLAG_OVERRIDE_CAPABILITY, 0, peer_change_none},
-	{PEER_FLAG_STRICT_CAP_MATCH, 0, peer_change_none},
-	{PEER_FLAG_DYNAMIC_CAPABILITY, 0, peer_change_reset},
-	{PEER_FLAG_DISABLE_CONNECTED_CHECK, 0, peer_change_reset},
-	{PEER_FLAG_CAPABILITY_ENHE, 0, peer_change_reset},
-	{PEER_FLAG_ENFORCE_FIRST_AS, 0, peer_change_reset_in},
-	{PEER_FLAG_IFPEER_V6ONLY, 0, peer_change_reset},
-	{PEER_FLAG_ROUTEADV, 0, peer_change_none},
-	{PEER_FLAG_TIMER, 0, peer_change_none},
-	{PEER_FLAG_TIMER_CONNECT, 0, peer_change_none},
-	{PEER_FLAG_TIMER_DELAYOPEN, 0, peer_change_none},
-	{PEER_FLAG_PASSWORD, 0, peer_change_none},
-	{PEER_FLAG_LOCAL_AS, 0, peer_change_reset},
-	{PEER_FLAG_LOCAL_AS_NO_PREPEND, 0, peer_change_reset},
-	{PEER_FLAG_LOCAL_AS_REPLACE_AS, 0, peer_change_reset},
-	{PEER_FLAG_UPDATE_SOURCE, 0, peer_change_none},
-	{PEER_FLAG_DISABLE_LINK_BW_ENCODING_IEEE, 0, peer_change_none},
-	{PEER_FLAG_EXTENDED_OPT_PARAMS, 0, peer_change_reset},
-	{PEER_FLAG_ROLE_STRICT_MODE, 0, peer_change_none},
-	{PEER_FLAG_ROLE, 0, peer_change_none},
-	{PEER_FLAG_PORT, 0, peer_change_reset},
-	{PEER_FLAG_AIGP, 0, peer_change_none},
-	{PEER_FLAG_GRACEFUL_SHUTDOWN, 0, peer_change_none},
-	{PEER_FLAG_CAPABILITY_SOFT_VERSION, 0, peer_change_none},
+	{ PEER_FLAG_PASSIVE, 0, peer_change_reset },
+	{ PEER_FLAG_SHUTDOWN, 0, peer_change_reset },
+	{ PEER_FLAG_RTT_SHUTDOWN, 0, peer_change_none },
+	{ PEER_FLAG_DONT_CAPABILITY, 0, peer_change_none },
+	{ PEER_FLAG_OVERRIDE_CAPABILITY, 0, peer_change_none },
+	{ PEER_FLAG_STRICT_CAP_MATCH, 0, peer_change_none },
+	{ PEER_FLAG_DYNAMIC_CAPABILITY, 0, peer_change_reset },
+	{ PEER_FLAG_DISABLE_CONNECTED_CHECK, 0, peer_change_reset },
+	{ PEER_FLAG_CAPABILITY_ENHE, 0, peer_change_reset },
+	{ PEER_FLAG_ENFORCE_FIRST_AS, 0, peer_change_reset_in },
+	{ PEER_FLAG_IFPEER_V6ONLY, 0, peer_change_reset },
+	{ PEER_FLAG_ROUTEADV, 0, peer_change_none },
+	{ PEER_FLAG_TIMER, 0, peer_change_none },
+	{ PEER_FLAG_TIMER_CONNECT, 0, peer_change_none },
+	{ PEER_FLAG_TIMER_DELAYOPEN, 0, peer_change_none },
+	{ PEER_FLAG_PASSWORD, 0, peer_change_none },
+	{ PEER_FLAG_LOCAL_AS, 0, peer_change_reset },
+	{ PEER_FLAG_LOCAL_AS_NO_PREPEND, 0, peer_change_reset },
+	{ PEER_FLAG_LOCAL_AS_REPLACE_AS, 0, peer_change_reset },
+	{ PEER_FLAG_UPDATE_SOURCE, 0, peer_change_none },
+	{ PEER_FLAG_DISABLE_LINK_BW_ENCODING_IEEE, 0, peer_change_none },
+	{ PEER_FLAG_EXTENDED_OPT_PARAMS, 0, peer_change_reset },
+	{ PEER_FLAG_ROLE_STRICT_MODE, 0, peer_change_none },
+	{ PEER_FLAG_ROLE, 0, peer_change_none },
+	{ PEER_FLAG_PORT, 0, peer_change_reset },
+	{ PEER_FLAG_AIGP, 0, peer_change_none },
+	{ PEER_FLAG_GRACEFUL_SHUTDOWN, 0, peer_change_none },
+	{ PEER_FLAG_CAPABILITY_SOFT_VERSION, 0, peer_change_none },
 <<<<<<< HEAD
 =======
-	{PEER_FLAG_CAPABILITY_FQDN, 0, peer_change_none},
-	{PEER_FLAG_AS_LOOP_DETECTION, 0, peer_change_none},
-	{PEER_FLAG_EXTENDED_LINK_BANDWIDTH, 0, peer_change_none},
-	{PEER_FLAG_LONESOUL, 0, peer_change_reset_out},
-	{PEER_FLAG_TCP_MSS, 0, peer_change_none},
+	{ PEER_FLAG_CAPABILITY_FQDN, 0, peer_change_none },
+	{ PEER_FLAG_AS_LOOP_DETECTION, 0, peer_change_none },
+	{ PEER_FLAG_EXTENDED_LINK_BANDWIDTH, 0, peer_change_none },
+	{ PEER_FLAG_LONESOUL, 0, peer_change_reset_out },
+	{ PEER_FLAG_TCP_MSS, 0, peer_change_none },
 >>>>>>> 9fa56a03c7 (bgpd:support tcp-mss for neighbor group)
-	{0, 0, 0}};
+	{ 0, 0, 0 }
+};
 
 static const struct peer_flag_action peer_af_flag_action_list[] = {
 	{PEER_FLAG_SEND_COMMUNITY, 1, peer_change_reset_out},

To apply the style suggestions:

curl https://gist.githubusercontent.com/polychaeta/60b92a72dce7331d2585ce1158931ee3/raw/59a1b71a0aad307182d40ebcadcebfa7bb9665a0/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.