bgpd: apply clang style changes to bgp_attr

Now that an additional attribute has been added, clang
format has to be applied.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>

diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 1e2698cd929465b8b42417fe6b162a8cb3fd66bb..ebf1cdef6531459203c56bed067e16f3e3a532f5 100644 (file)
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -810,55 +810,55 @@ bool attrhash_cmp(const void *p1, const void *p2)
                && attr1->med == attr2->med
            && attr1->local_pref == attr2->local_pref
            && attr1->rmap_change_flags == attr2->rmap_change_flags) {
-               if (attr1->aggregator_as == attr2->aggregator_as
-                   && attr1->aggregator_addr.s_addr
-                              == attr2->aggregator_addr.s_addr
-                   && attr1->weight == attr2->weight
-                   && attr1->tag == attr2->tag
-                   && attr1->label_index == attr2->label_index
-                   && attr1->mp_nexthop_len == attr2->mp_nexthop_len
-                   && bgp_attr_get_ecommunity(attr1)
-                              == bgp_attr_get_ecommunity(attr2)
-                   && bgp_attr_get_ipv6_ecommunity(attr1)
-                              == bgp_attr_get_ipv6_ecommunity(attr2)
-                   && bgp_attr_get_lcommunity(attr1)
-                                  == bgp_attr_get_lcommunity(attr2)
-                   && bgp_attr_get_cluster(attr1)
-                              == bgp_attr_get_cluster(attr2)
-                   && bgp_attr_get_transit(attr1)
-                              == bgp_attr_get_transit(attr2)
-                   && bgp_attr_get_aigp_metric(attr1)
-                              == bgp_attr_get_aigp_metric(attr2)
-                   && attr1->rmap_table_id == attr2->rmap_table_id
-                   && (attr1->encap_tunneltype == attr2->encap_tunneltype)
-                   && encap_same(attr1->encap_subtlvs, attr2->encap_subtlvs)
+               if (attr1->aggregator_as == attr2->aggregator_as &&
+                   attr1->aggregator_addr.s_addr ==
+                           attr2->aggregator_addr.s_addr &&
+                   attr1->weight == attr2->weight &&
+                   attr1->tag == attr2->tag &&
+                   attr1->label_index == attr2->label_index &&
+                   attr1->mp_nexthop_len == attr2->mp_nexthop_len &&
+                   bgp_attr_get_ecommunity(attr1) ==
+                           bgp_attr_get_ecommunity(attr2) &&
+                   bgp_attr_get_ipv6_ecommunity(attr1) ==
+                           bgp_attr_get_ipv6_ecommunity(attr2) &&
+                   bgp_attr_get_lcommunity(attr1) ==
+                           bgp_attr_get_lcommunity(attr2) &&
+                   bgp_attr_get_cluster(attr1) ==
+                           bgp_attr_get_cluster(attr2) &&
+                   bgp_attr_get_transit(attr1) ==
+                           bgp_attr_get_transit(attr2) &&
+                   bgp_attr_get_aigp_metric(attr1) ==
+                           bgp_attr_get_aigp_metric(attr2) &&
+                   attr1->rmap_table_id == attr2->rmap_table_id &&
+                   (attr1->encap_tunneltype == attr2->encap_tunneltype) &&
+                   encap_same(attr1->encap_subtlvs, attr2->encap_subtlvs)
 #ifdef ENABLE_BGP_VNC
                    && encap_same(bgp_attr_get_vnc_subtlvs(attr1),
                                  bgp_attr_get_vnc_subtlvs(attr2))
 #endif
                    && IPV6_ADDR_SAME(&attr1->mp_nexthop_global,
-                                     &attr2->mp_nexthop_global)
-                   && IPV6_ADDR_SAME(&attr1->mp_nexthop_local,
-                                     &attr2->mp_nexthop_local)
-                   && IPV4_ADDR_SAME(&attr1->mp_nexthop_global_in,
-                                     &attr2->mp_nexthop_global_in)
-                   && IPV4_ADDR_SAME(&attr1->originator_id,
-                                     &attr2->originator_id)
-                   && overlay_index_same(attr1, attr2)
-                   && !memcmp(&attr1->esi, &attr2->esi, sizeof(esi_t))
-                   && attr1->es_flags == attr2->es_flags
-                   && attr1->mm_sync_seqnum == attr2->mm_sync_seqnum
-                   && attr1->df_pref == attr2->df_pref
-                   && attr1->df_alg == attr2->df_alg
-                   && attr1->nh_ifindex == attr2->nh_ifindex
-                   && attr1->nh_lla_ifindex == attr2->nh_lla_ifindex
-                   && attr1->distance == attr2->distance
-                   && srv6_l3vpn_same(attr1->srv6_l3vpn, attr2->srv6_l3vpn)
-                   && srv6_vpn_same(attr1->srv6_vpn, attr2->srv6_vpn)
-                   && attr1->srte_color == attr2->srte_color
-                   && attr1->nh_type == attr2->nh_type
-                   && attr1->bh_type == attr2->bh_type
-                   && attr1->otc == attr2->otc)
+                                     &attr2->mp_nexthop_global) &&
+                   IPV6_ADDR_SAME(&attr1->mp_nexthop_local,
+                                  &attr2->mp_nexthop_local) &&
+                   IPV4_ADDR_SAME(&attr1->mp_nexthop_global_in,
+                                  &attr2->mp_nexthop_global_in) &&
+                   IPV4_ADDR_SAME(&attr1->originator_id,
+                                  &attr2->originator_id) &&
+                   overlay_index_same(attr1, attr2) &&
+                   !memcmp(&attr1->esi, &attr2->esi, sizeof(esi_t)) &&
+                   attr1->es_flags == attr2->es_flags &&
+                   attr1->mm_sync_seqnum == attr2->mm_sync_seqnum &&
+                   attr1->df_pref == attr2->df_pref &&
+                   attr1->df_alg == attr2->df_alg &&
+                   attr1->nh_ifindex == attr2->nh_ifindex &&
+                   attr1->nh_lla_ifindex == attr2->nh_lla_ifindex &&
+                   attr1->distance == attr2->distance &&
+                   srv6_l3vpn_same(attr1->srv6_l3vpn, attr2->srv6_l3vpn) &&
+                   srv6_vpn_same(attr1->srv6_vpn, attr2->srv6_vpn) &&
+                   attr1->srte_color == attr2->srte_color &&
+                   attr1->nh_type == attr2->nh_type &&
+                   attr1->bh_type == attr2->bh_type &&
+                   attr1->otc == attr2->otc)
                        return true;
        }