Page MenuHomeFreeBSD
Files F145452631

D50847.1777947633.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D50847.1777947633.diff
View Options

Index: net/containernetworking-plugins/Makefile
===================================================================
--- net/containernetworking-plugins/Makefile
+++ net/containernetworking-plugins/Makefile
@@ -1,7 +1,7 @@
PORTNAME= containernetworking-plugins
DISTVERSIONPREFIX= freebsd-v
DISTVERSION= 0.5
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= net
MAINTAINER= dfr@FreeBSD.org
Index: net/containernetworking-plugins/files/patch-plugins_freebsd_meta_portmap_portmap.go
===================================================================
--- /dev/null
+++ net/containernetworking-plugins/files/patch-plugins_freebsd_meta_portmap_portmap.go
@@ -0,0 +1,61 @@
+--- plugins/freebsd/meta/portmap/portmap.go.orig 2023-09-05 15:58:59 UTC
++++ plugins/freebsd/meta/portmap/portmap.go
+@@ -78,28 +78,49 @@ func forwardPorts(config *PortMapConf, containerNet ne
+
+ func forwardPorts(config *PortMapConf, containerNet net.IPNet) ([]string, error) {
+ var res []string
++ containerIP := containerNet.IP.String()
++
++ // Determine container's address family
++ var containerAF string
++ if containerNet.IP.To4() != nil {
++ containerAF = "inet"
++ } else {
++ containerAF = "inet6"
++ }
++
+ for _, pmap := range config.RuntimeConfig.PortMaps {
+- // rdr inet proto tcp from any to ! 10.89.0.77 port 8080 -> 10.89.0.77 port 80
+- containerIP := containerNet.IP.String()
+- var af string
+- if containerNet.IP.To4() != nil {
+- af = "inet"
+- } else {
+- af = "inet6"
++ // Only create rules if host IP is compatible with container IP family
++ if pmap.HostIP != "" {
++ // Parse the host IP to determine if it's IPv4 or IPv6
++ hostIPParsed := net.ParseIP(pmap.HostIP)
++ if hostIPParsed == nil {
++ return nil, fmt.Errorf("invalid host IP: %s", pmap.HostIP)
++ }
++
++ // Check if host IP family matches container IP family
++ hostIsIPv4 := hostIPParsed.To4() != nil
++ containerIsIPv4 := containerNet.IP.To4() != nil
++
++ if hostIsIPv4 != containerIsIPv4 {
++ // Skip this rule - address families don't match
++ continue
++ }
+ }
++
+ hostIP := pmap.HostIP
+ if hostIP == "" {
+ hostIP = "self"
+ }
++
+ res = append(res,
+ fmt.Sprintf(
+ "rdr pass %s proto %s from any to %s port %d -> %s port %d",
+- af, pmap.Protocol, hostIP, pmap.HostPort, containerIP, pmap.ContainerPort))
++ containerAF, pmap.Protocol, hostIP, pmap.HostPort, containerIP, pmap.ContainerPort))
+ if *config.SNAT {
+ res = append(res,
+ fmt.Sprintf(
+ "nat on %s %s proto %s from (lo0) to %s port %d -> (%s)",
+- config.BrName, af, pmap.Protocol, containerIP, pmap.ContainerPort, config.BrName))
++ config.BrName, containerAF, pmap.Protocol, containerIP, pmap.ContainerPort, config.BrName))
+ }
+ }
+ return res, nil

File Metadata

Mime Type
text/plain
Expires
Tue, May 5, 2:20 AM (2 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28558026
Default Alt Text
D50847.1777947633.diff (2 KB)

Event Timeline