Merge pull request #4377 from ton31337/feature/show_fqdn_in_show_ip_bgp

bgpd: Show FQDN in `show [ip] bgp` output

diff --combined bgpd/bgp_route.c
index d526afd77bfa46e832e2616959e20c0f8680ecea,e554b905f3c9acb82d9520717da63f1208d63305..31243c899dc2219e6709b8998d54d99fd58aa6ac
--- 1/bgpd/bgp_route.c
--- 2/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@@ -6930,6 -6930,13 +6930,13 @@@ static void route_vty_short_status_out(
                vty_out(vty, " ");
  }
  
+ static char *bgp_nexthop_fqdn(struct peer *peer)
+ {
+       if (peer->hostname && bgp_flag_check(peer->bgp, BGP_FLAG_SHOW_HOSTNAME))
+               return peer->hostname;
+       return NULL;
+ }
+ 
  /* called from terminal list command */
  void route_vty_out(struct vty *vty, struct prefix *p,
                   struct bgp_path_info *path, int display, safi_t safi,
@@@ -6946,6 -6953,7 +6953,7 @@@
        bool nexthop_othervrf = false;
        vrf_id_t nexthop_vrfid = VRF_DEFAULT;
        const char *nexthop_vrfname = VRF_DEFAULT_NAME;
+       char *nexthop_fqdn = bgp_nexthop_fqdn(path->peer);
  
        if (json_paths)
                json_path = json_object_new_object();
@@@ -7041,42 -7049,58 +7049,58 @@@
                if (json_paths) {
                        json_nexthop_global = json_object_new_object();
  
-                       json_object_string_add(json_nexthop_global, "afi",
-                                              (af == AF_INET) ? "ip" : "ipv6");
-                       json_object_string_add(json_nexthop_global,
-                                              (af == AF_INET) ? "ip" : "ipv6",
-                                              nexthop);
+                       json_object_string_add(
+                               json_nexthop_global, "afi",
+                               nexthop_fqdn ? "fqdn"
+                                            : (af == AF_INET) ? "ip" : "ipv6");
+                       json_object_string_add(
+                               json_nexthop_global,
+                               nexthop_fqdn ? "fqdn"
+                                            : (af == AF_INET) ? "ip" : "ipv6",
+                               nexthop_fqdn ? nexthop_fqdn : nexthop);
                        json_object_boolean_true_add(json_nexthop_global,
                                                     "used");
                } else
-                       vty_out(vty, "%s%s", nexthop, vrf_id_str);
+                       vty_out(vty, "%s%s",
+                               nexthop_fqdn ? nexthop_fqdn : nexthop,
+                               vrf_id_str);
        } else if (safi == SAFI_EVPN) {
                if (json_paths) {
                        json_nexthop_global = json_object_new_object();
  
-                       json_object_string_add(json_nexthop_global, "ip",
-                                              inet_ntoa(attr->nexthop));
+                       json_object_string_add(
+                               json_nexthop_global,
+                               nexthop_fqdn ? "fqdn" : "ip",
+                               nexthop_fqdn ? nexthop_fqdn
+                                            : inet_ntoa(attr->nexthop));
                        json_object_string_add(json_nexthop_global, "afi",
                                               "ipv4");
                        json_object_boolean_true_add(json_nexthop_global,
                                                     "used");
                } else
-                       vty_out(vty, "%-16s%s", inet_ntoa(attr->nexthop),
+                       vty_out(vty, "%-16s%s",
+                               nexthop_fqdn ?: inet_ntoa(attr->nexthop),
                                vrf_id_str);
        } else if (safi == SAFI_FLOWSPEC) {
                if (attr->nexthop.s_addr != 0) {
                        if (json_paths) {
                                json_nexthop_global = json_object_new_object();
                                json_object_string_add(
-                                              json_nexthop_global, "ip",
-                                              inet_ntoa(attr->nexthop));
+                                       json_nexthop_global,
+                                       nexthop_fqdn ? "fqdn" : "ip",
+                                       nexthop_fqdn
+                                               ? nexthop_fqdn
+                                               : inet_ntoa(attr->nexthop));
                                json_object_string_add(json_nexthop_global,
                                                       "afi", "ipv4");
                                json_object_boolean_true_add(
                                                        json_nexthop_global,
                                                             "used");
                        } else {
-                               vty_out(vty, "%-16s", inet_ntoa(attr->nexthop));
+                               vty_out(vty, "%-16s",
+                                       nexthop_fqdn
+                                               ? nexthop_fqdn
+                                               : inet_ntoa(attr->nexthop));
                        }
                }
        } else if (p->family == AF_INET && !BGP_ATTR_NEXTHOP_AFI_IP6(attr)) {
@@@ -7085,12 -7109,19 +7109,19 @@@
  
                        if ((safi == SAFI_MPLS_VPN) || (safi == SAFI_EVPN))
                                json_object_string_add(
-                                       json_nexthop_global, "ip",
-                                       inet_ntoa(attr->mp_nexthop_global_in));
+                                       json_nexthop_global,
+                                       nexthop_fqdn ? "fqdn" : "ip",
+                                       nexthop_fqdn
+                                               ? nexthop_fqdn
+                                               : inet_ntoa(
+                                                         attr->mp_nexthop_global_in));
                        else
                                json_object_string_add(
-                                       json_nexthop_global, "ip",
-                                       inet_ntoa(attr->nexthop));
+                                       json_nexthop_global,
+                                       nexthop_fqdn ? "fqdn" : "ip",
+                                       nexthop_fqdn
+                                               ? nexthop_fqdn
+                                               : inet_ntoa(attr->nexthop));
  
                        json_object_string_add(json_nexthop_global, "afi",
                                               "ipv4");
@@@ -7100,7 -7131,9 +7131,9 @@@
                        char buf[BUFSIZ];
  
                        snprintf(buf, sizeof(buf), "%s%s",
-                               inet_ntoa(attr->nexthop), vrf_id_str);
+                                nexthop_fqdn ? nexthop_fqdn
+                                             : inet_ntoa(attr->nexthop),
+                                vrf_id_str);
                        vty_out(vty, "%-16s", buf);
                }
        }
@@@ -7113,9 -7146,13 +7146,13 @@@
                if (json_paths) {
                        json_nexthop_global = json_object_new_object();
                        json_object_string_add(
-                               json_nexthop_global, "ip",
-                               inet_ntop(AF_INET6, &attr->mp_nexthop_global,
-                                         buf, BUFSIZ));
+                               json_nexthop_global,
+                               nexthop_fqdn ? "fqdn" : "ip",
+                               nexthop_fqdn
+                                       ? nexthop_fqdn
+                                       : inet_ntop(AF_INET6,
+                                                   &attr->mp_nexthop_global,
+                                                   buf, BUFSIZ));
                        json_object_string_add(json_nexthop_global, "afi",
                                               "ipv6");
                        json_object_string_add(json_nexthop_global, "scope",
@@@ -7127,10 -7164,14 +7164,14 @@@
                            || (path->peer->conf_if)) {
                                json_nexthop_ll = json_object_new_object();
                                json_object_string_add(
-                                       json_nexthop_ll, "ip",
-                                       inet_ntop(AF_INET6,
-                                                 &attr->mp_nexthop_local, buf,
-                                                 BUFSIZ));
+                                       json_nexthop_ll,
+                                       nexthop_fqdn ? "fqdn" : "ip",
+                                       nexthop_fqdn
+                                               ? nexthop_fqdn
+                                               : inet_ntop(
+                                                         AF_INET6,
+                                                         &attr->mp_nexthop_local,
+                                                         buf, BUFSIZ));
                                json_object_string_add(json_nexthop_ll, "afi",
                                                       "ipv6");
                                json_object_string_add(json_nexthop_ll, "scope",
@@@ -7169,10 -7210,12 +7210,12 @@@
                                } else {
                                        len = vty_out(
                                                vty, "%s%s",
-                                               inet_ntop(
-                                                       AF_INET6,
-                                                       &attr->mp_nexthop_local,
-                                                       buf, BUFSIZ),
+                                               nexthop_fqdn
+                                                       ? nexthop_fqdn
+                                                       : inet_ntop(
+                                                                 AF_INET6,
+                                                                 &attr->mp_nexthop_local,
+                                                                 buf, BUFSIZ),
                                                vrf_id_str);
                                        len = 16 - len;
  
@@@ -7184,10 -7227,13 +7227,13 @@@
                        } else {
                                len = vty_out(
                                        vty, "%s%s",
-                                       inet_ntop(AF_INET6,
-                                                 &attr->mp_nexthop_global, buf,
-                                                 BUFSIZ),
-                                                 vrf_id_str);
+                                       nexthop_fqdn
+                                               ? nexthop_fqdn
+                                               : inet_ntop(
+                                                         AF_INET6,
+                                                         &attr->mp_nexthop_global,
+                                                         buf, BUFSIZ),
+                                       vrf_id_str);
                                len = 16 - len;
  
                                if (len < 1)
@@@ -7664,7 -7710,7 +7710,7 @@@ void route_vty_out_overlay(struct vty *
                        vty_out(vty, "%s", str);
                else
                        json_object_string_add(json_overlay, "esi", str);
-               
+ 
                XFREE(MTYPE_TMP, str);
  
                if (is_evpn_prefix_ipaddr_v4((struct prefix_evpn *)p)) {
@@@ -8005,7 -8051,6 +8051,7 @@@ static const char *bgp_path_selection_r
                return "Nothing left to compare";
                break;
        }
 +      return "Invalid (internal error)";
  }
  
  void route_vty_out_detail(struct vty *vty, struct bgp *bgp,
@@@ -8040,6 -8085,7 +8086,7 @@@
        bool nexthop_self =
                CHECK_FLAG(path->flags, BGP_PATH_ANNC_NH_SELF) ? true : false;
        int i;
+       char *nexthop_fqdn = bgp_nexthop_fqdn(path->peer);
  
        if (json_paths) {
                json_path = json_object_new_object();
@@@ -8175,21 -8221,33 +8222,33 @@@
                            || safi == SAFI_EVPN) {
                                if (json_paths)
                                        json_object_string_add(
-                                               json_nexthop_global, "ip",
-                                               inet_ntoa(
-                                                       attr->mp_nexthop_global_in));
+                                               json_nexthop_global,
+                                               nexthop_fqdn ? "fqdn" : "ip",
+                                               nexthop_fqdn
+                                                       ? nexthop_fqdn
+                                                       : inet_ntoa(
+                                                                 attr->mp_nexthop_global_in));
                                else
                                        vty_out(vty, "    %s",
-                                               inet_ntoa(
-                                                       attr->mp_nexthop_global_in));
+                                               nexthop_fqdn
+                                                       ? nexthop_fqdn
+                                                       : inet_ntoa(
+                                                                 attr->mp_nexthop_global_in));
                        } else {
                                if (json_paths)
                                        json_object_string_add(
-                                               json_nexthop_global, "ip",
-                                               inet_ntoa(attr->nexthop));
+                                               json_nexthop_global,
+                                               nexthop_fqdn ? "fqdn" : "ip",
+                                               nexthop_fqdn
+                                                       ? nexthop_fqdn
+                                                       : inet_ntoa(
+                                                                 attr->nexthop));
                                else
                                        vty_out(vty, "    %s",
-                                               inet_ntoa(attr->nexthop));
+                                               nexthop_fqdn
+                                                       ? nexthop_fqdn
+                                                       : inet_ntoa(
+                                                                 attr->nexthop));
                        }
  
                        if (json_paths)
@@@ -8198,19 -8256,28 +8257,28 @@@
                } else {
                        if (json_paths) {
                                json_object_string_add(
-                                       json_nexthop_global, "ip",
-                                       inet_ntop(AF_INET6,
-                                                 &attr->mp_nexthop_global, buf,
-                                                 INET6_ADDRSTRLEN));
+                                       json_nexthop_global,
+                                       nexthop_fqdn ? "fqdn" : "ip",
+                                       nexthop_fqdn
+                                               ? nexthop_fqdn
+                                               : inet_ntop(
+                                                         AF_INET6,
+                                                         &attr->mp_nexthop_global,
+                                                         buf,
+                                                         INET6_ADDRSTRLEN));
                                json_object_string_add(json_nexthop_global,
                                                       "afi", "ipv6");
                                json_object_string_add(json_nexthop_global,
                                                       "scope", "global");
                        } else {
                                vty_out(vty, "    %s",
-                                       inet_ntop(AF_INET6,
-                                                 &attr->mp_nexthop_global, buf,
-                                                 INET6_ADDRSTRLEN));
+                                       nexthop_fqdn
+                                               ? nexthop_fqdn
+                                               : inet_ntop(
+                                                         AF_INET6,
+                                                         &attr->mp_nexthop_global,
+                                                         buf,
+                                                         INET6_ADDRSTRLEN));
                        }
                }
  
@@@ -8392,10 -8459,15 +8460,15 @@@
                        if (json_paths) {
                                json_nexthop_ll = json_object_new_object();
                                json_object_string_add(
-                                       json_nexthop_ll, "ip",
-                                       inet_ntop(AF_INET6,
-                                                 &attr->mp_nexthop_local, buf,
-                                                 INET6_ADDRSTRLEN));
+                                       json_nexthop_ll,
+                                       nexthop_fqdn ? "fqdn" : "ip",
+                                       nexthop_fqdn
+                                               ? nexthop_fqdn
+                                               : inet_ntop(
+                                                         AF_INET6,
+                                                         &attr->mp_nexthop_local,
+                                                         buf,
+                                                         INET6_ADDRSTRLEN));
                                json_object_string_add(json_nexthop_ll, "afi",
                                                       "ipv6");
                                json_object_string_add(json_nexthop_ll, "scope",