beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libnetwork/iptables: un-export IPTable.Version

Browse source 
We have the GetIptable "constructor". Let's make that the canonical way
to initialize.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-07-16 13:18:51 +02:00
parent 9c2cd65c0d
commit 47063ca3ae
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnetwork/drivers/bridge/setup_ip_tables.go
View file

@ -376,7 +376,7 @@ func setINC(version iptables.IPVersion, iface string, enable bool) error {
const oldIsolationChain = "DOCKER-ISOLATION"
func removeIPChains(version iptables.IPVersion) {
ipt := iptables.IPTable{Version: version}
ipt := iptables.GetIptable(version)
// Remove obsolete rules from default chains
ipt.ProgramRule(iptables.Filter, "FORWARD", iptables.Delete, []string{"-j", oldIsolationChain})

16
libnetwork/iptables/iptables.go
View file

@ -71,9 +71,9 @@ var (
initOnce sync.Once
)
// IPTable defines struct with IPVersion
// IPTable defines struct with [IPVersion].
type IPTable struct {
Version IPVersion
ipVersion IPVersion
}
// ChainInfo defines the iptables chain.
@ -146,7 +146,7 @@ func initCheck() error {
// GetIptable returns an instance of IPTable with specified version
func GetIptable(version IPVersion) *IPTable {
return &IPTable{Version: version}
return &IPTable{ipVersion: version}
}
// NewChain adds a new chain to ip table.
@ -169,13 +169,13 @@ func (iptable IPTable) NewChain(name string, table Table, hairpinMode bool) (*Ch
Name: name,
Table: table,
HairpinMode: hairpinMode,
IPVersion: iptable.Version,
IPVersion: iptable.ipVersion,
}, nil
}
// LoopbackByVersion returns loopback address by version
func (iptable IPTable) LoopbackByVersion() string {
if iptable.Version == IPv6 {
if iptable.ipVersion == IPv6 {
return "::1/128"
}
return "127.0.0.0/8"
@ -292,7 +292,7 @@ func (iptable IPTable) RemoveExistingChain(name string, table Table) error {
c := &ChainInfo{
Name: name,
Table: table,
IPVersion: iptable.Version,
IPVersion: iptable.ipVersion,
}
return c.Remove()
}
@ -506,7 +506,7 @@ func (iptable IPTable) Raw(args ...string) ([]byte, error) {
if firewalldRunning {
// select correct IP version for firewalld
ipv := Iptables
if iptable.Version == IPv6 {
if iptable.ipVersion == IPv6 {
ipv = IP6Tables
}
@ -525,7 +525,7 @@ func (iptable IPTable) raw(args ...string) ([]byte, error) {
}
path := iptablesPath
commandName := "iptables"
if iptable.Version == IPv6 {
if iptable.ipVersion == IPv6 {
if ip6tablesPath == "" {
return nil, fmt.Errorf("ip6tables is missing")
}