New upstream version 1.49.90 upstream/1.49.90

5 files changed, 129 insertions, 0 deletions

diff --git a/src/nmtui/meson.build b/src/nmtui/meson.build
index 13aa8647..eecfaa99 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-connect-connection-list.c b/src/nmtui/nmt-connect-connection-list.c
index 70264d3e..1fd44b29 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,
diff --git a/src/nmtui/nmt-editor.c b/src/nmtui/nmt-editor.c
index 6e502778..6205736a 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 00000000..35d0d78d
--- /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 <linux/if_ether.h>
+
+#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 00000000..8822f3a2
--- /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 */