all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Gabriel Goller <g.goller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH network] sdn: fabrics: split WireGuard endpoint port field
Date: Tue, 19 May 2026 21:06:32 +0200	[thread overview]
Message-ID: <20260519190645.265484-1-g.goller@proxmox.com> (raw)

Expose the WireGuard endpoint port as a separate optional field in the
node edit window, defaulting to the standard WireGuard port 51820.

Keep the API representation unchanged by splitting endpoint host and
port on load, and combining them again on submit. Wrap IPv6 addresses in
brackets when adding the port.

Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---

This makes the validation easier. Also endpoint ports are not optional anymore.
I know the "send default value to api" is not really pretty, but I think this
a convenience default anyway + changing this in the backend is a bit tricky
because we pull the generic `ServiceEndpoint` through the whole api.

 .../sdn/fabrics/wireguard/NodeEdit.js         | 55 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/www/manager6/sdn/fabrics/wireguard/NodeEdit.js b/www/manager6/sdn/fabrics/wireguard/NodeEdit.js
index ba5899cb9f1b..0943ac5a35ae 100644
--- a/www/manager6/sdn/fabrics/wireguard/NodeEdit.js
+++ b/www/manager6/sdn/fabrics/wireguard/NodeEdit.js
@@ -13,6 +13,8 @@ Ext.define('PVE.sdn.Fabric.WireGuard.Node.Edit', {
     hasIpv4Support: false,
     hasIpv6Support: false,
 
+    defaultEndpointPort: 51820,
+
     viewModel: {
         data: {
             current: {
@@ -58,11 +60,22 @@ Ext.define('PVE.sdn.Fabric.WireGuard.Node.Edit', {
         {
             xtype: 'proxmoxtextfield',
             fieldLabel: gettext('Endpoint'),
-            emptyText: gettext('Host or host:port that peers connect to'),
+            emptyText: gettext('Host that peers connect to'),
             labelWidth: 120,
             name: 'endpoint',
             allowBlank: false,
         },
+        {
+            xtype: 'proxmoxintegerfield',
+            fieldLabel: gettext('Endpoint Port'),
+            emptyText: gettext('Default') + ': 51820',
+            labelWidth: 120,
+            name: 'endpoint_port',
+            minValue: 1,
+            maxValue: 65535,
+            allowBlank: true,
+            submitValue: false,
+        },
         {
             xtype: 'proxmoxtextfield',
             fieldLabel: gettext('Allowed IPs'),
@@ -95,6 +108,45 @@ Ext.define('PVE.sdn.Fabric.WireGuard.Node.Edit', {
         },
     ],
 
+    combineEndpoint: function (endpoint, port) {
+        let me = this;
+
+        port = port || me.defaultEndpointPort;
+
+        if (Proxmox.Utils.IP6_match.test(endpoint)) {
+            endpoint = `[${endpoint}]`;
+        }
+
+        return `${endpoint}:${port}`;
+    },
+
+    splitEndpoint: function (endpoint) {
+        let match = endpoint?.match(/^\[([^\]]+)\]:(\d+)$/) ?? endpoint?.match(/^([^:]+):(\d+)$/);
+        if (!match) {
+            return { endpoint };
+        }
+
+        return {
+            endpoint: match[1],
+            endpoint_port: Number(match[2]),
+        };
+    },
+
+    getValues: function (dirtyOnly) {
+        let me = this;
+
+        let values = me.callParent([dirtyOnly]);
+        let endpointField = me.down('[name=endpoint]');
+        let portField = me.down('[name=endpoint_port]');
+
+        if (!dirtyOnly || values.endpoint || portField.isDirty()) {
+            values.endpoint = me.combineEndpoint(endpointField.getValue(), portField.getValue());
+        }
+        delete values.endpoint_port;
+
+        return values;
+    },
+
     loadAvailablePeers: async function () {
         let me = this;
 
@@ -141,6 +193,7 @@ Ext.define('PVE.sdn.Fabric.WireGuard.Node.Edit', {
             .then(([node, availablePeers]) => {
                 me.interfaceSelector.setAvailablePeers(availablePeers);
 
+                Ext.apply(node, me.splitEndpoint(node.endpoint));
                 node.interfaces = node.interfaces ?? [];
                 node.peers = node.peers ?? [];
                 me.interfaceSelector.setNode(node);
-- 
2.47.3





                 reply	other threads:[~2026-05-19 19:07 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260519190645.265484-1-g.goller@proxmox.com \
    --to=g.goller@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal