diff options
| author | Thomas Haller <thaller@redhat.com> | 2022-05-09 21:15:08 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2022-05-09 21:15:08 +0200 |
| commit | 5d5e27528d6e72b305a7ac75c3336820b471d7d6 (patch) | |
| tree | 2dc38d076311d45c9e058a339494e47e588497e4 | |
| parent | 452158a036701ef286f2bbe8d43d0561e84ea1a3 (diff) | |
| parent | 928cd1cb151519fc66e528bf93e421143bec8875 (diff) | |
nmtui: merge branch 'gfm:nmtui-tun-tap'
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1214
| -rw-r--r-- | src/libnm-core-impl/nm-connection.c | 16 | ||||
| -rw-r--r-- | src/nmtui/nmt-connect-connection-list.c | 1 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/libnm-core-impl/nm-connection.c b/src/libnm-core-impl/nm-connection.c index 27cea2cb2b..5f1a157a65 100644 --- a/src/libnm-core-impl/nm-connection.c +++ b/src/libnm-core-impl/nm-connection.c @@ -3168,22 +3168,24 @@ nm_connection_get_virtual_device_description(NMConnection *connection) iface = nm_connection_get_interface_name(connection); - if (!strcmp(type, NM_SETTING_BOND_SETTING_NAME)) + if (nm_streq(type, NM_SETTING_BOND_SETTING_NAME)) display_type = _("Bond"); - else if (!strcmp(type, NM_SETTING_TEAM_SETTING_NAME)) + else if (nm_streq(type, NM_SETTING_TEAM_SETTING_NAME)) display_type = _("Team"); - else if (!strcmp(type, NM_SETTING_BRIDGE_SETTING_NAME)) + else if (nm_streq(type, NM_SETTING_BRIDGE_SETTING_NAME)) display_type = _("Bridge"); - else if (!strcmp(type, NM_SETTING_VLAN_SETTING_NAME)) + else if (nm_streq(type, NM_SETTING_VLAN_SETTING_NAME)) display_type = _("VLAN"); - else if (!strcmp(type, NM_SETTING_INFINIBAND_SETTING_NAME)) { + else if (nm_streq(type, NM_SETTING_INFINIBAND_SETTING_NAME)) { display_type = _("InfiniBand"); iface = nm_setting_infiniband_get_virtual_interface_name( nm_connection_get_setting_infiniband(connection)); - } else if (!strcmp(type, NM_SETTING_IP_TUNNEL_SETTING_NAME)) + } else if (nm_streq(type, NM_SETTING_IP_TUNNEL_SETTING_NAME)) display_type = _("IP Tunnel"); - else if (!strcmp(type, NM_SETTING_WIREGUARD_SETTING_NAME)) + else if (nm_streq(type, NM_SETTING_WIREGUARD_SETTING_NAME)) display_type = _("WireGuard"); + else if (nm_streq(type, NM_SETTING_TUN_SETTING_NAME)) + display_type = _("TUN/TAP"); if (!iface || !display_type) return NULL; diff --git a/src/nmtui/nmt-connect-connection-list.c b/src/nmtui/nmt-connect-connection-list.c index 535cf8fd26..f3197544b5 100644 --- a/src/nmtui/nmt-connect-connection-list.c +++ b/src/nmtui/nmt-connect-connection-list.c @@ -101,6 +101,7 @@ static const char *device_sort_order[] = {"NMDeviceEthernet", NM_SETTING_BRIDGE_SETTING_NAME, NM_SETTING_IP_TUNNEL_SETTING_NAME, NM_SETTING_WIREGUARD_SETTING_NAME, + NM_SETTING_TUN_SETTING_NAME, "NMDeviceModem", "NMDeviceBt"}; static const int device_sort_order_len = G_N_ELEMENTS(device_sort_order); |