From 32710d3e5ee39c9b160db236a536307fbf6e95dc Mon Sep 17 00:00:00 2001 From: Albin Kerouanton Date: Mon, 30 Jun 2025 04:13:36 +0200 Subject: [PATCH] libnet/portmapper: remove dead AppendForwardingTableEntry Prior to commit 4f09af626, AppendForwardingTableEntry had a Linux implementation. That's not the case anymore, and it's a no-op on Windows. Remove it. Signed-off-by: Albin Kerouanton --- daemon/libnetwork/portmapper/mapper.go | 3 --- daemon/libnetwork/portmapper/mapper_windows.go | 5 ----- 2 files changed, 8 deletions(-) diff --git a/daemon/libnetwork/portmapper/mapper.go b/daemon/libnetwork/portmapper/mapper.go index 0fa82a8b26..3f6cf2efec 100644 --- a/daemon/libnetwork/portmapper/mapper.go +++ b/daemon/libnetwork/portmapper/mapper.go @@ -124,9 +124,6 @@ func (pm *PortMapper) MapRange(container net.Addr, hostIP net.IP, hostPortStart, } containerIP, containerPort := getIPAndPort(m.container) - if err := pm.AppendForwardingTableEntry(m.proto, hostIP, allocatedHostPort, containerIP.String(), containerPort); err != nil { - return nil, err - } var err error m.stopUserlandProxy, err = newDummyProxy(m.proto, hostIP, allocatedHostPort) diff --git a/daemon/libnetwork/portmapper/mapper_windows.go b/daemon/libnetwork/portmapper/mapper_windows.go index cfa07ca38b..c10101c728 100644 --- a/daemon/libnetwork/portmapper/mapper_windows.go +++ b/daemon/libnetwork/portmapper/mapper_windows.go @@ -20,11 +20,6 @@ type PortMapper struct { allocator *portallocator.PortAllocator } -// AppendForwardingTableEntry adds a port mapping to the forwarding table -func (pm *PortMapper) AppendForwardingTableEntry(proto string, sourceIP net.IP, sourcePort int, containerIP string, containerPort int) error { - return nil -} - // DeleteForwardingTableEntry removes a port mapping from the forwarding table func (pm *PortMapper) DeleteForwardingTableEntry(proto string, sourceIP net.IP, sourcePort int, containerIP string, containerPort int) error { return nil