networkctl: show the link file applied to each link

[elogind.git] / src / network / networkctl.c

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 6253cbf582c9a1b776521dd02b2538bdafbb48bf..b374121fbc8d80cbe84beb2a5f33b6da417c2331 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -141,7 +141,7 @@ static int decode_and_sort_links(sd_rtnl_message *m, LinkInfo **ret) {
                 c++;
         }
 
                 c++;
         }
 

-        qsort(links, c, sizeof(LinkInfo), link_info_compare);
+        qsort_safe(links, c, sizeof(LinkInfo), link_info_compare);

 
         *ret = links;
         links = NULL;
 
         *ret = links;
         links = NULL;


@@ -294,8 +294,8 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
         _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
         _cleanup_udev_device_unref_ struct udev_device *d = NULL;
         char devid[2 + DECIMAL_STR_MAX(int)];
         _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
         _cleanup_udev_device_unref_ struct udev_device *d = NULL;
         char devid[2 + DECIMAL_STR_MAX(int)];

-        _cleanup_free_ char *t = NULL;
-        const char *driver = NULL, *path = NULL, *vendor = NULL, *model = NULL;
+        _cleanup_free_ char *t = NULL, *network = NULL;
+        const char *driver = NULL, *path = NULL, *vendor = NULL, *model = NULL, *link = NULL;

         const char *on_color_operational, *off_color_operational,
                    *on_color_setup, *off_color_setup;
         struct ether_addr e;
         const char *on_color_operational, *off_color_operational,
                    *on_color_setup, *off_color_setup;
         struct ether_addr e;


@@ -384,6 +384,7 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
         link_get_type_string(iftype, d, &t);
 
         if (d) {
         link_get_type_string(iftype, d, &t);
 
         if (d) {

+                link = udev_device_get_property_value(d, "ID_NET_LINK_FILE");

                 driver = udev_device_get_property_value(d, "ID_NET_DRIVER");
                 path = udev_device_get_property_value(d, "ID_PATH");
 
                 driver = udev_device_get_property_value(d, "ID_NET_DRIVER");
                 path = udev_device_get_property_value(d, "ID_PATH");
 


@@ -396,11 +397,16 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
                         model = udev_device_get_property_value(d, "ID_MODEL");
         }
 
                         model = udev_device_get_property_value(d, "ID_MODEL");
         }
 

+        sd_network_link_get_network_file(ifindex, &network);

 
         printf("%s%s%s %i: %s\n", on_color_operational, draw_special_char(DRAW_BLACK_CIRCLE), off_color_operational, ifindex, name);
 
 
         printf("%s%s%s %i: %s\n", on_color_operational, draw_special_char(DRAW_BLACK_CIRCLE), off_color_operational, ifindex, name);
 

-        printf("        Type: %s\n"
+        printf("   Link File: %s\n"
+               "Network File: %s\n"
+               "        Type: %s\n"

                "       State: %s%s%s (%s%s%s)\n",
                "       State: %s%s%s (%s%s%s)\n",

+               strna(link),
+               strna(network),

                strna(t),
                on_color_operational, strna(operational_state), off_color_operational,
                on_color_setup, strna(setup_state), off_color_setup);
                strna(t),
                on_color_operational, strna(operational_state), off_color_operational,
                on_color_setup, strna(setup_state), off_color_setup);


@@ -484,7 +490,7 @@ static int link_status(char **args, unsigned n) {
                 if (!strv_isempty(domains))
                         dump_list("      Domain: ", domains);
 
                 if (!strv_isempty(domains))
                         dump_list("      Domain: ", domains);
 

-                sd_network_get_dns(&ntp);
+                sd_network_get_ntp(&ntp);

                 if (!strv_isempty(ntp))
                         dump_list("         NTP: ", ntp);
 
                 if (!strv_isempty(ntp))
                         dump_list("         NTP: ", ntp);