net/frr5/files/patch-bgpd_bgpd.c

   1 --- bgpd/bgpd.c.orig    2019-01-08 08:53:23 UTC
   2 +++ bgpd/bgpd.c
   3 @@ -243,7 +243,7 @@ static int bgp_router_id_set(struct bgp *bgp, const st
   4
   5         /* EVPN uses router id in RD, withdraw them */
   6         if (is_evpn_enabled())
   7 -               bgp_evpn_handle_router_id_update(bgp, TRUE);
   8 +               bgp_evpn_handle_router_id_update(bgp, true);
   9
  10         IPV4_ADDR_COPY(&bgp->router_id, id);
  11
  12 @@ -260,7 +260,7 @@ static int bgp_router_id_set(struct bgp *bgp, const st
  13
  14         /* EVPN uses router id in RD, update them */
  15         if (is_evpn_enabled())
  16 -               bgp_evpn_handle_router_id_update(bgp, FALSE);
  17 +               bgp_evpn_handle_router_id_update(bgp, false);
  18
  19         return 0;
  20  }
  21 @@ -3098,7 +3098,7 @@ int bgp_handle_socket(struct bgp *bgp, struct vrf *vrf
  22                 /*
  23                  * suppress vrf socket
  24                  */
  25 -               if (create == FALSE) {
  26 +               if (create == false) {
  27                         bgp_close_vrf_socket(bgp);
  28                         return 0;
  29                 }
  30 @@ -6861,8 +6861,8 @@ static void bgp_config_write_peer_global(struct vty *v
  31         struct peer *g_peer = NULL;
  32         char buf[SU_ADDRSTRLEN];
  33         char *addr;
  34 -       int if_pg_printed = FALSE;
  35 -       int if_ras_printed = FALSE;
  36 +       int if_pg_printed = false;
  37 +       int if_ras_printed = false;
  38
  39         /* Skip dynamic neighbors. */
  40         if (peer_dynamic_neighbor(peer))
  41 @@ -6884,16 +6884,16 @@ static void bgp_config_write_peer_global(struct vty *v
  42
  43                 if (peer_group_active(peer)) {
  44                         vty_out(vty, " peer-group %s", peer->group->name);
  45 -                       if_pg_printed = TRUE;
  46 +                       if_pg_printed = true;
  47                 } else if (peer->as_type == AS_SPECIFIED) {
  48                         vty_out(vty, " remote-as %u", peer->as);
  49 -                       if_ras_printed = TRUE;
  50 +                       if_ras_printed = true;
  51                 } else if (peer->as_type == AS_INTERNAL) {
  52                         vty_out(vty, " remote-as internal");
  53 -                       if_ras_printed = TRUE;
  54 +                       if_ras_printed = true;
  55                 } else if (peer->as_type == AS_EXTERNAL) {
  56                         vty_out(vty, " remote-as external");
  57 -                       if_ras_printed = TRUE;
  58 +                       if_ras_printed = true;
  59                 }
  60
  61                 vty_out(vty, "\n");