From: Susant Sahani Date: Sun, 22 Mar 2020 09:40:00 +0000 (+0100) Subject: networkctl: Add support to display SIP servers X-Git-Tag: v246-rc1~714^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F15185%2Fhead;p=thirdparty%2Fsystemd.git networkctl: Add support to display SIP servers ``` ❯ build/networkctl status veth99 ─╯ ● 17: veth99 Link File: /usr/lib/systemd/network/99-default.link Network File: /usr/lib/systemd/network/veth99.network Type: ether State: routable (configured) Driver: veth HW Address: 1e:04:f8:b8:2f:d4 MTU: 1500 (min: 68, max: 65535) QDisc: noqueue IPv6 Address Generation Mode: eui64 Queue Length (Tx/Rx): 1/1 Auto negotiation: no Speed: 10Gbps Duplex: full Port: tp Address: 192.168.5.35 (DHCP4) fe80::1c04:f8ff:feb8:2fd4 Gateway: 192.168.5.1 DNS: 192.168.5.1 NTP: 192.168.5.1 SIP: 192.168.5.4 192.168.5.5 Time Zone: Europe/Berlin Mar 21 23:26:32 Zeus systemd-networkd[671]: veth99: Link DOWN Mar 21 23:26:32 Zeus systemd-networkd[671]: veth99: Lost carrier Mar 22 10:25:35 Zeus systemd-networkd[671]: veth99: Link UP Mar 22 10:25:35 Zeus systemd-networkd[671]: veth99: Gained carrier Mar 22 10:25:36 Zeus systemd-networkd[671]: veth99: Gained IPv6LL Mar 22 10:29:02 Zeus systemd-networkd[671]: veth99: Link DOWN Mar 22 10:29:02 Zeus systemd-networkd[671]: veth99: Lost carrier Mar 22 10:29:13 Zeus systemd-networkd[671]: veth99: Link UP Mar 22 10:29:13 Zeus systemd-networkd[671]: veth99: Gained carrier Mar 22 10:29:14 Zeus systemd-networkd[671]: veth99: Gained IPv6LL ``` --- diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 772e6a95c22..5f445ece983 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -1221,7 +1221,7 @@ static int link_status_one( sd_hwdb *hwdb, const LinkInfo *info) { - _cleanup_strv_free_ char **dns = NULL, **ntp = NULL, **search_domains = NULL, **route_domains = NULL; + _cleanup_strv_free_ char **dns = NULL, **ntp = NULL, **sip = NULL, **search_domains = NULL, **route_domains = NULL; _cleanup_free_ char *setup_state = NULL, *operational_state = NULL, *tz = NULL; _cleanup_free_ char *t = NULL, *network = NULL; const char *driver = NULL, *path = NULL, *vendor = NULL, *model = NULL, *link = NULL; @@ -1247,6 +1247,7 @@ static int link_status_one( (void) sd_network_link_get_search_domains(info->ifindex, &search_domains); (void) sd_network_link_get_route_domains(info->ifindex, &route_domains); (void) sd_network_link_get_ntp(info->ifindex, &ntp); + (void) sd_network_link_get_sip(info->ifindex, &sip); if (info->sd_device) { (void) sd_device_get_property_value(info->sd_device, "ID_NET_LINK_FILE", &link); @@ -1749,6 +1750,9 @@ static int link_status_one( if (r < 0) return r; r = dump_list(table, "NTP:", ntp); + if (r < 0) + return r; + r = dump_list(table, "SIP:", sip); if (r < 0) return r; r = dump_ifindexes(table, "Carrier Bound To:", carrier_bound_to);