]> git.proxmox.com Git - mirror_frr.git/blobdiff - bgpd/bgp_vpn.c
Merge pull request #5172 from donaldsharp/sa_clean_and_clean
[mirror_frr.git] / bgpd / bgp_vpn.c
index 351f91dd1a046ef45810a7d75e8d854b97a46305..e48eda72318b100b7624e9e297416811ffd1e36c 100644 (file)
 #include "bgpd/bgp_attr.h"
 #include "bgpd/bgp_mplsvpn.h"
 #include "bgpd/bgp_vpn.h"
+#include "bgpd/bgp_updgrp.h"
 
 int show_adj_route_vpn(struct vty *vty, struct peer *peer,
                       struct prefix_rd *prd, afi_t afi, safi_t safi,
-                      uint8_t use_json)
+                      bool use_json)
 {
        struct bgp *bgp;
        struct bgp_table *table;
        struct bgp_node *rn;
        struct bgp_node *rm;
-       struct attr *attr;
        int rd_header;
        int header = 1;
        json_object *json = NULL;
        json_object *json_scode = NULL;
        json_object *json_ocode = NULL;
+       json_object *json_adv = NULL;
        json_object *json_routes = NULL;
-       json_object *json_array = NULL;
+       char rd_str[BUFSIZ];
+       unsigned long output_count = 0;
 
        bgp = bgp_get_default();
        if (bgp == NULL) {
@@ -59,8 +61,8 @@ int show_adj_route_vpn(struct vty *vty, struct peer *peer,
        if (use_json) {
                json_scode = json_object_new_object();
                json_ocode = json_object_new_object();
-               json_routes = json_object_new_object();
                json = json_object_new_object();
+               json_adv = json_object_new_object();
 
                json_object_string_add(json_scode, "suppressed", "s");
                json_object_string_add(json_scode, "damped", "d");
@@ -74,177 +76,163 @@ int show_adj_route_vpn(struct vty *vty, struct peer *peer,
                json_object_string_add(json_ocode, "incomplete", "?");
        }
 
-       for (rn = bgp_table_top(bgp->rib[afi][SAFI_MPLS_VPN]); rn;
+       for (rn = bgp_table_top(bgp->rib[afi][safi]); rn;
             rn = bgp_route_next(rn)) {
                if (prd && memcmp(rn->p.u.val, prd->val, 8) != 0)
                        continue;
 
-               if ((table = rn->info) != NULL) {
-                       if (use_json)
-                               json_array = json_object_new_array();
-                       else
-                               json_array = NULL;
-
-                       rd_header = 1;
-
-                       for (rm = bgp_table_top(table); rm;
-                            rm = bgp_route_next(rm)) {
-                               if ((attr = rm->info) != NULL) {
-                                       if (header) {
-                                               if (use_json) {
-                                                       json_object_int_add(
-                                                               json,
-                                                               "bgpTableVersion",
-                                                               0);
-                                                       json_object_string_add(
-                                                               json,
-                                                               "bgpLocalRouterId",
-                                                               inet_ntoa(
-                                                                       bgp->router_id));
-                                                       json_object_object_add(
-                                                               json,
-                                                               "bgpStatusCodes",
-                                                               json_scode);
-                                                       json_object_object_add(
-                                                               json,
-                                                               "bgpOriginCodes",
-                                                               json_ocode);
-                                               } else {
-                                                       vty_out(vty,
-                                                               "BGP table version is 0, local router ID is %s\n",
-                                                               inet_ntoa(
-                                                                       bgp->router_id));
-                                                       vty_out(vty,
-                                                               "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal\n");
-                                                       vty_out(vty,
-                                                               "Origin codes: i - IGP, e - EGP, ? - incomplete\n\n");
-                                                       vty_out(vty, V4_HEADER);
-                                               }
-                                               header = 0;
-                                       }
-
-                                       if (rd_header) {
-                                               uint16_t type;
-                                               struct rd_as rd_as;
-                                               struct rd_ip rd_ip = {0};
+               table = bgp_node_get_bgp_table_info(rn);
+               if (table == NULL)
+                       continue;
+
+
+               rd_header = 1;
+               memset(rd_str, 0, sizeof(rd_str));
+
+               for (rm = bgp_table_top(table); rm; rm = bgp_route_next(rm)) {
+                       struct bgp_adj_out *adj = NULL;
+                       struct attr *attr = NULL;
+                       struct peer_af *paf = NULL;
+
+                       RB_FOREACH (adj, bgp_adj_out_rb, &rm->adj_out)
+                               SUBGRP_FOREACH_PEER (adj->subgroup, paf) {
+                                       if (paf->peer != peer || !adj->attr)
+                                               continue;
+
+                                       attr = adj->attr;
+                                       break;
+                       }
+
+                       if (bgp_node_get_bgp_path_info(rm) == NULL)
+                               continue;
+
+                       if (header) {
+                               if (use_json) {
+                                       json_object_int_add(
+                                               json, "bgpTableVersion", 0);
+                                       json_object_string_add(
+                                               json, "bgpLocalRouterId",
+                                               inet_ntoa(bgp->router_id));
+                                       json_object_int_add(
+                                               json,
+                                               "defaultLocPrf",
+                                               bgp->default_local_pref);
+                                       json_object_int_add(
+                                               json, "localAS",
+                                               bgp->as);
+                                       json_object_object_add(json,
+                                                              "bgpStatusCodes",
+                                                              json_scode);
+                                       json_object_object_add(json,
+                                                              "bgpOriginCodes",
+                                                              json_ocode);
+                               } else {
+                                       vty_out(vty,
+                                               "BGP table version is 0, local router ID is %s\n",
+                                               inet_ntoa(bgp->router_id));
+                                       vty_out(vty, "Default local pref %u, ",
+                                               bgp->default_local_pref);
+                                       vty_out(vty, "local AS %u\n", bgp->as);
+                                       vty_out(vty,
+                                               "Status codes: s suppressed, d damped, h history, * valid, > best, i - internal\n");
+                                       vty_out(vty,
+                                               "Origin codes: i - IGP, e - EGP, ? - incomplete\n\n");
+                                       vty_out(vty, V4_HEADER);
+                               }
+                               header = 0;
+                       }
+
+                       if (rd_header) {
+                               uint16_t type;
+                               struct rd_as rd_as = {0};
+                               struct rd_ip rd_ip = {0};
 #if ENABLE_BGP_VNC
-                                               struct rd_vnc_eth rd_vnc_eth = {
-                                                       0};
+                               struct rd_vnc_eth rd_vnc_eth = {0};
 #endif
-                                               uint8_t *pnt;
-
-                                               pnt = rn->p.u.val;
-
-                                               /* Decode RD type. */
-                                               type = decode_rd_type(pnt);
-                                               /* Decode RD value. */
-                                               if (type == RD_TYPE_AS)
-                                                       decode_rd_as(pnt + 2,
-                                                                    &rd_as);
-                                               else if (type == RD_TYPE_AS4)
-                                                       decode_rd_as4(pnt + 2,
-                                                                     &rd_as);
-                                               else if (type == RD_TYPE_IP)
-                                                       decode_rd_ip(pnt + 2,
-                                                                    &rd_ip);
+                               uint8_t *pnt;
+
+                               pnt = rn->p.u.val;
+
+                               /* Decode RD type. */
+                               type = decode_rd_type(pnt);
+                               /* Decode RD value. */
+                               if (type == RD_TYPE_AS)
+                                       decode_rd_as(pnt + 2, &rd_as);
+                               else if (type == RD_TYPE_AS4)
+                                       decode_rd_as4(pnt + 2, &rd_as);
+                               else if (type == RD_TYPE_IP)
+                                       decode_rd_ip(pnt + 2, &rd_ip);
 #if ENABLE_BGP_VNC
-                                               else if (type
-                                                        == RD_TYPE_VNC_ETH)
-                                                       decode_rd_vnc_eth(
-                                                               pnt,
-                                                               &rd_vnc_eth);
+                               else if (type == RD_TYPE_VNC_ETH)
+                                       decode_rd_vnc_eth(pnt, &rd_vnc_eth);
 #endif
-
-                                               if (use_json) {
-                                                       char buffer[BUFSIZ];
-                                                       if (type == RD_TYPE_AS
-                                                           || type == RD_TYPE_AS4)
-                                                               sprintf(buffer,
-                                                                       "%u:%d",
-                                                                       rd_as.as,
-                                                                       rd_as.val);
-                                                       else if (type
-                                                                == RD_TYPE_IP)
-                                                               sprintf(buffer,
-                                                                       "%s:%d",
-                                                                       inet_ntoa(
-                                                                               rd_ip.ip),
-                                                                       rd_ip.val);
-                                                       json_object_string_add(
-                                                               json_routes,
-                                                               "routeDistinguisher",
-                                                               buffer);
-                                               } else {
-                                                       vty_out(vty,
-                                                               "Route Distinguisher: ");
-
-                                                       if (type == RD_TYPE_AS
-                                                           || type == RD_TYPE_AS4)
-                                                               vty_out(vty,
-                                                                       "%u:%d",
-                                                                       rd_as.as,
-                                                                       rd_as.val);
-                                                       else if (type
-                                                                == RD_TYPE_IP)
-                                                               vty_out(vty,
-                                                                       "%s:%d",
-                                                                       inet_ntoa(
-                                                                               rd_ip.ip),
-                                                                       rd_ip.val);
+                               if (use_json) {
+                                       json_routes = json_object_new_object();
+
+                                       if (type == RD_TYPE_AS
+                                           || type == RD_TYPE_AS4)
+                                               sprintf(rd_str, "%u:%d",
+                                                       rd_as.as, rd_as.val);
+                                       else if (type == RD_TYPE_IP)
+                                               sprintf(rd_str, "%s:%d",
+                                                       inet_ntoa(rd_ip.ip),
+                                                       rd_ip.val);
+                                       json_object_string_add(
+                                               json_routes,
+                                               "rd", rd_str);
+                               } else {
+                                       vty_out(vty, "Route Distinguisher: ");
+
+                                       if (type == RD_TYPE_AS
+                                           || type == RD_TYPE_AS4)
+                                               vty_out(vty, "%u:%d", rd_as.as,
+                                                       rd_as.val);
+                                       else if (type == RD_TYPE_IP)
+                                               vty_out(vty, "%s:%d",
+                                                       inet_ntoa(rd_ip.ip),
+                                                       rd_ip.val);
 #if ENABLE_BGP_VNC
-                                                       else if (
-                                                               type
-                                                               == RD_TYPE_VNC_ETH)
-                                                               vty_out(vty,
-                                                                       "%u:%02x:%02x:%02x:%02x:%02x:%02x",
-                                                                       rd_vnc_eth
-                                                                               .local_nve_id,
-                                                                       rd_vnc_eth
-                                                                               .macaddr
-                                                                               .octet[0],
-                                                                       rd_vnc_eth
-                                                                               .macaddr
-                                                                               .octet[1],
-                                                                       rd_vnc_eth
-                                                                               .macaddr
-                                                                               .octet[2],
-                                                                       rd_vnc_eth
-                                                                               .macaddr
-                                                                               .octet[3],
-                                                                       rd_vnc_eth
-                                                                               .macaddr
-                                                                               .octet[4],
-                                                                       rd_vnc_eth
-                                                                               .macaddr
-                                                                               .octet[5]);
+                                       else if (type == RD_TYPE_VNC_ETH)
+                                               vty_out(vty,
+                                                       "%u:%02x:%02x:%02x:%02x:%02x:%02x",
+                                                       rd_vnc_eth.local_nve_id,
+                                                       rd_vnc_eth.macaddr
+                                                               .octet[0],
+                                                       rd_vnc_eth.macaddr
+                                                               .octet[1],
+                                                       rd_vnc_eth.macaddr
+                                                               .octet[2],
+                                                       rd_vnc_eth.macaddr
+                                                               .octet[3],
+                                                       rd_vnc_eth.macaddr
+                                                               .octet[4],
+                                                       rd_vnc_eth.macaddr
+                                                               .octet[5]);
 #endif
 
-                                                       vty_out(vty, "\n");
-                                               }
-                                               rd_header = 0;
-                                       }
-                                       route_vty_out_tmp(vty, &rm->p, attr,
-                                                         SAFI_MPLS_VPN,
-                                                         use_json, json_array);
+                                       vty_out(vty, "\n");
                                }
+                               rd_header = 0;
                        }
-                       if (use_json && rm) {
-                               char buf_a[BUFSIZ];
-                               char buf_b[BUFSIZ];
-                               sprintf(buf_a, "%s/%d",
-                                       inet_ntop(rm->p.family, rm->p.u.val,
-                                                 buf_b, BUFSIZ),
-                                       rm->p.prefixlen);
-                               json_object_object_add(json_routes, buf_a,
-                                                      json_array);
-                       }
+                       route_vty_out_tmp(vty, &rm->p, attr,
+                                         safi, use_json,
+                                         json_routes);
+                       output_count++;
                }
+
+               if (use_json)
+                       json_object_object_add(json_adv, rd_str, json_routes);
        }
+
        if (use_json) {
-               json_object_object_add(json, "routes", json_routes);
+               json_object_object_add(json, "advertisedRoutes", json_adv);
+               json_object_int_add(json,
+                       "totalPrefixCounter", output_count);
                vty_out(vty, "%s\n", json_object_to_json_string_ext(
                                             json, JSON_C_TO_STRING_PRETTY));
                json_object_free(json);
-       }
+       } else
+               vty_out(vty, "\nTotal number of prefixes %ld\n", output_count);
+
        return CMD_SUCCESS;
 }