[systemd-commits] 4 commits - src/network
Lennart Poettering
lennart at kemper.freedesktop.org
Fri Dec 12 10:14:35 PST 2014
src/network/networkctl.c | 136 +++++++++++++++++++++++++++++++----------------
1 file changed, 91 insertions(+), 45 deletions(-)
New commits:
commit b1acce80cd60fe95f16df2f1ad23ff2ad82d08e5
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Dec 12 19:11:35 2014 +0100
networkctl: also draw a nice unicode cirlce when "networkctl status" is run without parameters
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 3760de7..a2511fd 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -580,9 +580,6 @@ static int link_status_one(
sprintf(devid, "n%i", ifindex);
d = udev_device_new_from_device_id(udev, devid);
-
- 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");
@@ -597,6 +594,8 @@ static int link_status_one(
model = udev_device_get_property_value(d, "ID_MODEL");
}
+ link_get_type_string(iftype, d, &t);
+
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);
@@ -676,7 +675,9 @@ static int link_status(char **args, unsigned n) {
sd_network_get_operational_state(&operational_state);
operational_state_to_color(operational_state, &on_color_operational, &off_color_operational);
- printf(" State: %s%s%s\n", on_color_operational, strna(operational_state), off_color_operational);
+ printf("%s%s%s State: %s%s%s\n",
+ on_color_operational, draw_special_char(DRAW_BLACK_CIRCLE), off_color_operational,
+ on_color_operational, strna(operational_state), off_color_operational);
dump_addresses(rtnl, " Address: ", 0);
dump_gateways(rtnl, hwdb, " Gateway: ", 0);
commit 1693a943ca581aca2beebb4c812ec6c9f17b8164
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Dec 12 19:07:26 2014 +0100
networkctl: show interface names next to IP addresses if we dump adresses from all interfaces
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index c892869..3760de7 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -21,6 +21,7 @@
#include <stdbool.h>
#include <getopt.h>
+#include <net/if.h>
#include "sd-network.h"
#include "sd-rtnl.h"
@@ -407,16 +408,27 @@ static int dump_gateways(
if (r < 0)
log_debug_errno(r, "Could not get description of gateway: %m");
+ printf("%*s%s",
+ (int) strlen(prefix),
+ i == 0 ? prefix : "",
+ gateway);
+
if (description)
- printf("%*s%s (%s)\n",
- (int) strlen(prefix),
- i == 0 ? prefix : "",
- gateway, description);
- else
- printf("%*s%s\n",
- (int) strlen(prefix),
- i == 0 ? prefix : "",
- gateway);
+ printf(" (%s)", description);
+
+ /* Show interface name for the entry if we show
+ * entries for all interfaces */
+ if (ifindex <= 0) {
+ char name[IF_NAMESIZE+1];
+
+ if (if_indextoname(local[i].ifindex, name)) {
+ fputs(" on ", stdout);
+ fputs(name, stdout);
+ } else
+ printf(" on %%%i", local[i].ifindex);
+ }
+
+ fputc('\n', stdout);
}
return 0;
@@ -441,10 +453,22 @@ static int dump_addresses(
if (r < 0)
return r;
- printf("%*s%s\n",
+ printf("%*s%s",
(int) strlen(prefix),
i == 0 ? prefix : "",
pretty);
+
+ if (ifindex <= 0) {
+ char name[IF_NAMESIZE+1];
+
+ if (if_indextoname(local[i].ifindex, name)) {
+ fputs(" on ", stdout);
+ fputs(name, stdout);
+ } else
+ printf(" on %%%i", local[i].ifindex);
+ }
+
+ fputc('\n', stdout);
}
return 0;
@@ -648,25 +672,13 @@ static int link_status(char **args, unsigned n) {
_cleanup_strv_free_ char **dns = NULL, **ntp = NULL, **domains = NULL;
_cleanup_free_ struct local_address *addresses = NULL;
const char *on_color_operational, *off_color_operational;
- int i, c;
sd_network_get_operational_state(&operational_state);
operational_state_to_color(operational_state, &on_color_operational, &off_color_operational);
printf(" State: %s%s%s\n", on_color_operational, strna(operational_state), off_color_operational);
- c = local_addresses(rtnl, 0, AF_UNSPEC, &addresses);
- for (i = 0; i < c; i++) {
- _cleanup_free_ char *pretty = NULL;
-
- r = in_addr_to_string(addresses[i].family, &addresses[i].address, &pretty);
- if (r < 0)
- return log_oom();
-
- printf("%13s %s\n",
- i > 0 ? "" : "Address:", pretty);
- }
-
+ dump_addresses(rtnl, " Address: ", 0);
dump_gateways(rtnl, hwdb, " Gateway: ", 0);
sd_network_get_dns(&dns);
commit 69fb1176c403e437c4fba763ba242b540c73898f
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Dec 12 18:57:15 2014 +0100
networkctl: also show gateway address when "networkctl status" without further arguments is passed
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index b3c5a6c..c892869 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -276,8 +276,14 @@ static int ieee_oui(struct udev_hwdb *hwdb, struct ether_addr *mac, char **ret)
return -ENODATA;
}
-static int get_gateway_description(sd_rtnl *rtnl, struct udev_hwdb *hwdb, int ifindex, int family,
- union in_addr_union *gateway, char **gateway_description) {
+static int get_gateway_description(
+ sd_rtnl *rtnl,
+ struct udev_hwdb *hwdb,
+ int ifindex,
+ int family,
+ union in_addr_union *gateway,
+ char **gateway_description) {
+
_cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
sd_rtnl_message *m;
int r;
@@ -377,7 +383,12 @@ static int get_gateway_description(sd_rtnl *rtnl, struct udev_hwdb *hwdb, int if
return -ENODATA;
}
-static int dump_gateways(sd_rtnl *rtnl, struct udev_hwdb *hwdb, const char *prefix, int ifindex) {
+static int dump_gateways(
+ sd_rtnl *rtnl,
+ struct udev_hwdb *hwdb,
+ const char *prefix,
+ int ifindex) {
+
_cleanup_free_ struct local_address *local = NULL;
int r, n, i;
@@ -392,7 +403,7 @@ static int dump_gateways(sd_rtnl *rtnl, struct udev_hwdb *hwdb, const char *pref
if (r < 0)
return r;
- r = get_gateway_description(rtnl, hwdb, ifindex, local[i].family, &local[i].address, &description);
+ r = get_gateway_description(rtnl, hwdb, local[i].ifindex, local[i].family, &local[i].address, &description);
if (r < 0)
log_debug_errno(r, "Could not get description of gateway: %m");
@@ -411,7 +422,11 @@ static int dump_gateways(sd_rtnl *rtnl, struct udev_hwdb *hwdb, const char *pref
return 0;
}
-static int dump_addresses(sd_rtnl *rtnl, const char *prefix, int ifindex) {
+static int dump_addresses(
+ sd_rtnl *rtnl,
+ const char *prefix,
+ int ifindex) {
+
_cleanup_free_ struct local_address *local = NULL;
int r, n, i;
@@ -446,12 +461,16 @@ static void dump_list(const char *prefix, char **l) {
}
}
-static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
+static int link_status_one(
+ sd_rtnl *rtnl,
+ struct udev *udev,
+ struct udev_hwdb *hwdb,
+ const char *name) {
+
_cleanup_strv_free_ char **dns = NULL, **ntp = NULL, **domains = NULL;
_cleanup_free_ char *setup_state = NULL, *operational_state = NULL;
_cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
_cleanup_udev_device_unref_ struct udev_device *d = NULL;
- _cleanup_udev_hwdb_unref_ struct udev_hwdb *hwdb = NULL;
char devid[2 + DECIMAL_STR_MAX(int)];
_cleanup_free_ char *t = NULL, *network = NULL;
const char *driver = NULL, *path = NULL, *vendor = NULL, *model = NULL, *link = NULL;
@@ -577,8 +596,6 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
if (model)
printf(" Model: %s\n", model);
- hwdb = udev_hwdb_new(udev);
-
if (have_mac) {
_cleanup_free_ char *description = NULL;
char ea[ETHER_ADDR_TO_STRING_MAX];
@@ -608,6 +625,7 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
}
static int link_status(char **args, unsigned n) {
+ _cleanup_udev_hwdb_unref_ struct udev_hwdb *hwdb = NULL;
_cleanup_udev_unref_ struct udev *udev = NULL;
_cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL;
char **name;
@@ -621,6 +639,10 @@ static int link_status(char **args, unsigned n) {
if (!udev)
return log_error_errno(errno, "Failed to connect to udev: %m");
+ hwdb = udev_hwdb_new(udev);
+ if (!hwdb)
+ log_debug_errno(errno, "Failed to open hardware database: %m");
+
if (n <= 1 && !arg_all) {
_cleanup_free_ char *operational_state = NULL;
_cleanup_strv_free_ char **dns = NULL, **ntp = NULL, **domains = NULL;
@@ -645,6 +667,8 @@ static int link_status(char **args, unsigned n) {
i > 0 ? "" : "Address:", pretty);
}
+ dump_gateways(rtnl, hwdb, " Gateway: ", 0);
+
sd_network_get_dns(&dns);
if (!strv_isempty(dns))
dump_list(" DNS: ", dns);
@@ -687,15 +711,15 @@ static int link_status(char **args, unsigned n) {
if (i > 0)
fputc('\n', stdout);
- link_status_one(rtnl, udev, links[i].name);
+ link_status_one(rtnl, udev, hwdb, links[i].name);
}
- }
-
- STRV_FOREACH(name, args + 1) {
- if (name != args+1)
- fputc('\n', stdout);
+ } else {
+ STRV_FOREACH(name, args + 1) {
+ if (name != args+1)
+ fputc('\n', stdout);
- link_status_one(rtnl, udev, *name);
+ link_status_one(rtnl, udev, hwdb, *name);
+ }
}
return 0;
commit 888943fc6246b2917168fff59380b58b678ba157
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Dec 12 18:50:06 2014 +0100
networkctl: show MAC address OUI vendor next to MAC addresses
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 815ea16..b3c5a6c 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -254,6 +254,9 @@ static int ieee_oui(struct udev_hwdb *hwdb, struct ether_addr *mac, char **ret)
char *description;
char str[strlen("OUI:XXYYXXYYXXYY") + 1];
+ if (!hwdb)
+ return -EINVAL;
+
/* skip commonly misused 00:00:00 (Xerox) prefix */
if (memcmp(mac, "\0\0\0", 3) == 0)
return -EINVAL;
@@ -574,19 +577,25 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
if (model)
printf(" Model: %s\n", model);
+ hwdb = udev_hwdb_new(udev);
+
if (have_mac) {
+ _cleanup_free_ char *description = NULL;
char ea[ETHER_ADDR_TO_STRING_MAX];
- printf(" HW Address: %s\n", ether_addr_to_string(&e, ea));
+
+ ieee_oui(hwdb, &e, &description);
+
+ if (description)
+ printf(" HW Address: %s (%s)\n", ether_addr_to_string(&e, ea), description);
+ else
+ printf(" HW Address: %s\n", ether_addr_to_string(&e, ea));
}
if (mtu > 0)
printf(" MTU: %u\n", mtu);
- hwdb = udev_hwdb_new(udev);
-
- dump_gateways(rtnl, hwdb, " Gateway: ", ifindex);
-
dump_addresses(rtnl, " Address: ", ifindex);
+ dump_gateways(rtnl, hwdb, " Gateway: ", ifindex);
if (!strv_isempty(dns))
dump_list(" DNS: ", dns);
More information about the systemd-commits
mailing list