diff --git a/pkg/config/bridge.go b/pkg/config/bridge.go index d9345ab..ea46f9c 100755 --- a/pkg/config/bridge.go +++ b/pkg/config/bridge.go @@ -2,7 +2,6 @@ package config type Bridge struct { Network string `json:"-" yaml:"-"` - Share string `json:"share,omitempty" yaml:"share,omitempty"` Name string `json:"name,omitempty" yaml:"name,omitempty"` IPMtu int `json:"mtu,omitempty" yaml:"mtu,omitempty"` Address string `json:"address,omitempty" yaml:"address,omitempty"` diff --git a/pkg/switch/network_linux.go b/pkg/switch/network_linux.go index 2b8dc21..4a2e22c 100755 --- a/pkg/switch/network_linux.go +++ b/pkg/switch/network_linux.go @@ -927,7 +927,6 @@ func (w *WorkerImpl) forwardSubnet() { input = w.br.L3Name() w.forwardZone(input) } - share := cfg.Bridge.Share ifAddr := strings.SplitN(cfg.Bridge.Address, "/", 2)[0] if ifAddr == "" { @@ -936,9 +935,6 @@ func (w *WorkerImpl) forwardSubnet() { // Enable MASQUERADE, and FORWARD it. w.toRelated(input, "Accept related") - if share != "" { - w.toRelated(share, "Accept related") - } for _, rt := range cfg.Routes { if !w.addIpSet(rt) { break @@ -948,19 +944,13 @@ func (w *WorkerImpl) forwardSubnet() { if w.vrf != nil { w.toForward_i(w.vrf.Name(), w.setR.Name, "To route") } else { - if share != "" { - w.toForward_i(share, w.setR.Name, "To route") - } - w.toForward_i(input, w.setR.Name, "To route") + w.toForward_i("", w.setR.Name, "To route") } if vpn != nil { w.toMasq_s(w.setR.Name, vpn.Subnet, "To VPN") } - if share != "" { - w.toMasq_i(share, w.setR.Name, "To Masq") - } - w.toMasq_i(input, w.setR.Name, "To Masq") + w.toMasq_i("", w.setR.Name, "To Masq") } func (w *WorkerImpl) createVPN() {