Revert "*: reindent pt. 2"

[mirror_frr.git] / bgpd / bgp_open.c

diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index d31e54c6729bb2782d695d7abc25f0df27a0f8e1..b18a4b7c46e6237bc63c2349dc5c0191066861ee 100644 (file)
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -744,18 +744,18 @@ static const struct message capcode_str[] = {
 
 /* Minimum sizes for length field of each cap (so not inc. the header) */
 static const size_t cap_minsizes[] = {
-       [CAPABILITY_CODE_MP] = CAPABILITY_CODE_MP_LEN,
-       [CAPABILITY_CODE_REFRESH] = CAPABILITY_CODE_REFRESH_LEN,
-       [CAPABILITY_CODE_ORF] = CAPABILITY_CODE_ORF_LEN,
-       [CAPABILITY_CODE_RESTART] = CAPABILITY_CODE_RESTART_LEN,
-       [CAPABILITY_CODE_AS4] = CAPABILITY_CODE_AS4_LEN,
-       [CAPABILITY_CODE_ADDPATH] = CAPABILITY_CODE_ADDPATH_LEN,
-       [CAPABILITY_CODE_DYNAMIC] = CAPABILITY_CODE_DYNAMIC_LEN,
-       [CAPABILITY_CODE_DYNAMIC_OLD] = CAPABILITY_CODE_DYNAMIC_LEN,
-       [CAPABILITY_CODE_ENHE] = CAPABILITY_CODE_ENHE_LEN,
-       [CAPABILITY_CODE_REFRESH_OLD] = CAPABILITY_CODE_REFRESH_LEN,
-       [CAPABILITY_CODE_ORF_OLD] = CAPABILITY_CODE_ORF_LEN,
-       [CAPABILITY_CODE_FQDN] = CAPABILITY_CODE_MIN_FQDN_LEN,
+               [CAPABILITY_CODE_MP] = CAPABILITY_CODE_MP_LEN,
+               [CAPABILITY_CODE_REFRESH] = CAPABILITY_CODE_REFRESH_LEN,
+               [CAPABILITY_CODE_ORF] = CAPABILITY_CODE_ORF_LEN,
+               [CAPABILITY_CODE_RESTART] = CAPABILITY_CODE_RESTART_LEN,
+               [CAPABILITY_CODE_AS4] = CAPABILITY_CODE_AS4_LEN,
+               [CAPABILITY_CODE_ADDPATH] = CAPABILITY_CODE_ADDPATH_LEN,
+               [CAPABILITY_CODE_DYNAMIC] = CAPABILITY_CODE_DYNAMIC_LEN,
+               [CAPABILITY_CODE_DYNAMIC_OLD] = CAPABILITY_CODE_DYNAMIC_LEN,
+               [CAPABILITY_CODE_ENHE] = CAPABILITY_CODE_ENHE_LEN,
+               [CAPABILITY_CODE_REFRESH_OLD] = CAPABILITY_CODE_REFRESH_LEN,
+               [CAPABILITY_CODE_ORF_OLD] = CAPABILITY_CODE_ORF_LEN,
+               [CAPABILITY_CODE_FQDN] = CAPABILITY_CODE_MIN_FQDN_LEN,
 };
 
 /* value the capability must be a multiple of.
@@ -764,12 +764,18 @@ static const size_t cap_minsizes[] = {
  * table should be set to 1.
  */
 static const size_t cap_modsizes[] = {
-       [CAPABILITY_CODE_MP] = 4,      [CAPABILITY_CODE_REFRESH] = 1,
-       [CAPABILITY_CODE_ORF] = 1,     [CAPABILITY_CODE_RESTART] = 1,
-       [CAPABILITY_CODE_AS4] = 4,     [CAPABILITY_CODE_ADDPATH] = 4,
-       [CAPABILITY_CODE_DYNAMIC] = 1, [CAPABILITY_CODE_DYNAMIC_OLD] = 1,
-       [CAPABILITY_CODE_ENHE] = 6,    [CAPABILITY_CODE_REFRESH_OLD] = 1,
-       [CAPABILITY_CODE_ORF_OLD] = 1, [CAPABILITY_CODE_FQDN] = 1,
+               [CAPABILITY_CODE_MP] = 4,
+               [CAPABILITY_CODE_REFRESH] = 1,
+               [CAPABILITY_CODE_ORF] = 1,
+               [CAPABILITY_CODE_RESTART] = 1,
+               [CAPABILITY_CODE_AS4] = 4,
+               [CAPABILITY_CODE_ADDPATH] = 4,
+               [CAPABILITY_CODE_DYNAMIC] = 1,
+               [CAPABILITY_CODE_DYNAMIC_OLD] = 1,
+               [CAPABILITY_CODE_ENHE] = 6,
+               [CAPABILITY_CODE_REFRESH_OLD] = 1,
+               [CAPABILITY_CODE_ORF_OLD] = 1,
+               [CAPABILITY_CODE_FQDN] = 1,
 };
 
 /**
@@ -1309,8 +1315,9 @@ void bgp_open_capability(struct stream *s, struct peer *peer)
                                         */
                                        SET_FLAG(peer->cap, PEER_CAP_ENHE_ADV);
                                        stream_putc(s, BGP_OPEN_OPT_CAP);
-                                       stream_putc(s, CAPABILITY_CODE_ENHE_LEN
-                                                              + 2);
+                                       stream_putc(s,
+                                                   CAPABILITY_CODE_ENHE_LEN
+                                                           + 2);
                                        stream_putc(s, CAPABILITY_CODE_ENHE);
                                        stream_putc(s,
                                                    CAPABILITY_CODE_ENHE_LEN);