From dd50a5199f1661c9d2226d8d5c01b0b485a9bc86 Mon Sep 17 00:00:00 2001 From: Jan Vaclav Date: Wed, 15 May 2024 12:57:41 +0200 Subject: [PATCH 1/2] nmtui: add veth page https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1943 (cherry picked from commit 187ff4c73b9ae1c3c020bd999633306b09eabead) --- Makefile.am | 2 + src/nmtui/meson.build | 1 + src/nmtui/nmt-editor.c | 3 ++ src/nmtui/nmt-page-veth.c | 92 +++++++++++++++++++++++++++++++++++++++ src/nmtui/nmt-page-veth.h | 32 ++++++++++++++ 5 files changed, 130 insertions(+) create mode 100644 src/nmtui/nmt-page-veth.c create mode 100644 src/nmtui/nmt-page-veth.h diff --git a/Makefile.am b/Makefile.am index a0daa95314..ee92a1de53 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5304,6 +5304,8 @@ src_nmtui_nmtui_SOURCES = \ src/nmtui/nmt-page-team-port.h \ src/nmtui/nmt-page-team.c \ src/nmtui/nmt-page-team.h \ + src/nmtui/nmt-page-veth.c \ + src/nmtui/nmt-page-veth.h \ src/nmtui/nmt-page-vlan.c \ src/nmtui/nmt-page-vlan.h \ src/nmtui/nmt-page-wifi.c \ diff --git a/src/nmtui/meson.build b/src/nmtui/meson.build index 13aa864750..eecfaa9927 100644 --- a/src/nmtui/meson.build +++ b/src/nmtui/meson.build @@ -32,6 +32,7 @@ executable( 'nmt-page-ppp.c', 'nmt-page-team.c', 'nmt-page-team-port.c', + 'nmt-page-veth.c', 'nmt-page-vlan.c', 'nmt-page-wifi.c', 'nmt-page-wireguard.c', diff --git a/src/nmtui/nmt-editor.c b/src/nmtui/nmt-editor.c index 6e502778d1..6205736a78 100644 --- a/src/nmtui/nmt-editor.c +++ b/src/nmtui/nmt-editor.c @@ -39,6 +39,7 @@ #include "nmt-page-ppp.h" #include "nmt-page-team.h" #include "nmt-page-team-port.h" +#include "nmt-page-veth.h" #include "nmt-page-vlan.h" #include "nmt-page-wifi.h" #include "nmt-page-wireguard.h" @@ -369,6 +370,8 @@ nmt_editor_constructed(GObject *object) page = nmt_page_dsl_new(priv->edit_connection, deventry); else if (nm_connection_is_type(priv->edit_connection, NM_SETTING_TEAM_SETTING_NAME)) page = nmt_page_team_new(priv->edit_connection, deventry); + else if (nm_connection_is_type(priv->edit_connection, NM_SETTING_VETH_SETTING_NAME)) + page = nmt_page_veth_new(priv->edit_connection, deventry); else if (nm_connection_is_type(priv->edit_connection, NM_SETTING_VLAN_SETTING_NAME)) page = nmt_page_vlan_new(priv->edit_connection, deventry); else if (nm_connection_is_type(priv->edit_connection, NM_SETTING_WIRED_SETTING_NAME)) diff --git a/src/nmtui/nmt-page-veth.c b/src/nmtui/nmt-page-veth.c new file mode 100644 index 0000000000..35d0d78d58 --- /dev/null +++ b/src/nmtui/nmt-page-veth.c @@ -0,0 +1,92 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2024 Red Hat, Inc. + */ +/** + * SECTION:nmt-page-veth + * @short_description: The editor page for veth connections + */ + +#include "libnm-client-aux-extern/nm-default-client.h" + +#include + +#include "nmt-page-veth.h" + +#include "libnm-core-aux-intern/nm-libnm-core-utils.h" +#include "nmt-device-entry.h" +#include "nmt-mac-entry.h" +#include "nmt-mtu-entry.h" + +G_DEFINE_TYPE(NmtPageVeth, nmt_page_veth, NMT_TYPE_EDITOR_PAGE_DEVICE) + +#define NMT_PAGE_VETH_GET_PRIVATE(o) _NM_GET_PRIVATE(self, NmtPageVeth, NMT_IS_PAGE_VETH) + +static void +nmt_page_veth_init(NmtPageVeth *veth) +{} + +NmtEditorPage * +nmt_page_veth_new(NMConnection *conn, NmtDeviceEntry *deventry) +{ + return g_object_new(NMT_TYPE_PAGE_VETH, "connection", conn, "device-entry", deventry, NULL); +} + +static void +nmt_page_veth_constructed(GObject *object) +{ + NmtPageVeth *veth = NMT_PAGE_VETH(object); + NmtEditorSection *section; + NmtEditorGrid *grid; + NMSettingVeth *s_veth; + NMSettingWired *s_wired; + NmtNewtWidget *widget; + NMConnection *conn; + + conn = nmt_editor_page_get_connection(NMT_EDITOR_PAGE(veth)); + s_veth = _nm_connection_ensure_setting(conn, NM_TYPE_SETTING_VETH); + s_wired = _nm_connection_ensure_setting(conn, NM_TYPE_SETTING_WIRED); + + section = nmt_editor_section_new(_("VETH"), NULL, TRUE); + grid = nmt_editor_section_get_body(section); + + widget = nmt_newt_entry_new(40, 0); + nmt_editor_grid_append(grid, _("Peer"), widget, NULL); + g_object_bind_property(s_veth, + NM_SETTING_VETH_PEER, + widget, + "text", + G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); + + nmt_editor_page_add_section(NMT_EDITOR_PAGE(veth), section); + + section = nmt_editor_section_new(_("ETHERNET"), NULL, FALSE); + grid = nmt_editor_section_get_body(section); + + widget = nmt_mac_entry_new(40, ETH_ALEN, NMT_MAC_ENTRY_TYPE_CLONED_ETHERNET); + g_object_bind_property(s_wired, + NM_SETTING_WIRED_CLONED_MAC_ADDRESS, + widget, + "mac-address", + G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); + nmt_editor_grid_append(grid, _("Cloned MAC address"), widget, NULL); + + widget = nmt_mtu_entry_new(); + g_object_bind_property(s_wired, + NM_SETTING_WIRED_MTU, + widget, + "mtu", + G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); + nmt_editor_grid_append(grid, _("MTU"), widget, NULL); + + nmt_editor_page_add_section(NMT_EDITOR_PAGE(veth), section); + + G_OBJECT_CLASS(nmt_page_veth_parent_class)->constructed(object); +} + +static void +nmt_page_veth_class_init(NmtPageVethClass *veth_class) +{ + GObjectClass *object_class = G_OBJECT_CLASS(veth_class); + object_class->constructed = nmt_page_veth_constructed; +} diff --git a/src/nmtui/nmt-page-veth.h b/src/nmtui/nmt-page-veth.h new file mode 100644 index 0000000000..8822f3a27d --- /dev/null +++ b/src/nmtui/nmt-page-veth.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2024 Red Hat, Inc. + */ + +#ifndef NMT_PAGE_VETH_H +#define NMT_PAGE_VETH_H + +#include "nmt-editor-page-device.h" + +#define NMT_TYPE_PAGE_VETH (nmt_page_veth_get_type()) +#define NMT_PAGE_VETH(obj) (_NM_G_TYPE_CHECK_INSTANCE_CAST((obj), NMT_TYPE_PAGE_VETH, NmtPageVeth)) +#define NMT_PAGE_VETH_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), NMT_TYPE_PAGE_VETH, NmtPageVethClass)) +#define NMT_IS_PAGE_VETH(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), NMT_TYPE_PAGE_VETH)) +#define NMT_IS_PAGE_VETH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NMT_TYPE_PAGE_VETH)) +#define NMT_PAGE_VETH_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS((obj), NMT_TYPE_PAGE_VETH, NmtPageVethClass)) + +typedef struct { + NmtEditorPageDevice parent; +} NmtPageVeth; + +typedef struct { + NmtEditorPageDeviceClass parent; +} NmtPageVethClass; + +GType nmt_page_veth_get_type(void); + +NmtEditorPage *nmt_page_veth_new(NMConnection *conn, NmtDeviceEntry *deventry); + +#endif /* NMT_PAGE_VETH_H */ -- 2.47.1 From 7d9ed27897d90e6dbd97aef6e7bbb0a181c961df Mon Sep 17 00:00:00 2001 From: Jan Vaclav Date: Mon, 20 May 2024 14:04:18 +0200 Subject: [PATCH 2/2] nmtui: include veth devices in activation dialog (cherry picked from commit e74f506b81595112893997f08cbad8482e7777aa) --- src/libnm-core-impl/nm-connection.c | 2 ++ src/nmtui/nmt-connect-connection-list.c | 1 + 2 files changed, 3 insertions(+) diff --git a/src/libnm-core-impl/nm-connection.c b/src/libnm-core-impl/nm-connection.c index 95fe89a87c..6dace2b73c 100644 --- a/src/libnm-core-impl/nm-connection.c +++ b/src/libnm-core-impl/nm-connection.c @@ -3258,6 +3258,8 @@ nm_connection_get_virtual_device_description(NMConnection *connection) display_type = _("WireGuard"); else if (nm_streq(type, NM_SETTING_TUN_SETTING_NAME)) display_type = _("TUN/TAP"); + else if (nm_streq(type, NM_SETTING_VETH_SETTING_NAME)) + display_type = _("Veth"); 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 70264d3ec2..1fd44b2957 100644 --- a/src/nmtui/nmt-connect-connection-list.c +++ b/src/nmtui/nmt-connect-connection-list.c @@ -96,6 +96,7 @@ static const char *device_sort_order[] = {"NMDeviceEthernet", "NMDeviceInfiniband", "NMDeviceWifi", NM_SETTING_VLAN_SETTING_NAME, + NM_SETTING_VETH_SETTING_NAME, NM_SETTING_BOND_SETTING_NAME, NM_SETTING_TEAM_SETTING_NAME, NM_SETTING_BRIDGE_SETTING_NAME, -- 2.47.1