apps/openlan
1
0
Fork 0
mirror of https://github.com/luscis/openlan.git synced 2025-10-07 09:30:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fea: support share network to a port.
Some checks failed
Coverage CI / build (push) Has been cancelled
Details
CodeQL / Analyze (go) (push) Has been cancelled
Details
Ubuntu CI / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Daniel Ding
2025-04-30 15:59:38 +08:00
parent b025178053
commit 986d5cb861
3 changed files with 15 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
pkg/switch/openlan_linux.go
View File

@@ -6,9 +6,7 @@ import (
"github.com/luscis/openlan/pkg/api"
"github.com/luscis/openlan/pkg/cache"
co "github.com/luscis/openlan/pkg/config"
"github.com/luscis/openlan/pkg/libol"
cn "github.com/luscis/openlan/pkg/network"
nl "github.com/vishvananda/netlink"
)
func PeerName(name, prefix string) (string, string) {
@@ -83,49 +81,11 @@ func (w *OpenLANWorker) UpBridge(cfg *co.Bridge) {
if err := master.Delay(cfg.Delay); err != nil {
w.out.Warn("OpenLANWorker.UpBridge: Delay %s", err)
}
w.connectPeer(cfg)
if err := master.CallIptables(0); err != nil {
w.out.Warn("OpenLANWorker.Start: CallIptables %s", err)
}
}
func (w *OpenLANWorker) connectPeer(cfg *co.Bridge) {
if cfg.Peer == "" {
return
}
in, ex := PeerName(cfg.Network, "-e")
link := &nl.Veth{
LinkAttrs: nl.LinkAttrs{Name: in},
PeerName: ex,
}
br := cn.NewBrCtl(cfg.Peer, cfg.IPMtu)
promise := &libol.Promise{
First: time.Second * 2,
MaxInt: time.Minute,
MinInt: time.Second * 10,
}
promise.Go(func() error {
if !br.Has() {
w.out.Warn("%s notFound", br.Name)
return libol.NewErr("%s notFound", br.Name)
}
err := nl.LinkAdd(link)
if err != nil {
w.out.Error("OpenLANWorker.connectPeer: %s", err)
return nil
}
br0 := cn.NewBrCtl(cfg.Name, cfg.IPMtu)
if err := br0.AddPort(in); err != nil {
w.out.Error("OpenLANWorker.connectPeer: %s", err)
}
br1 := cn.NewBrCtl(cfg.Peer, cfg.IPMtu)
if err := br1.AddPort(ex); err != nil {
w.out.Error("OpenLANWorker.connectPeer: %s", err)
}
return nil
})
}
func (w *OpenLANWorker) Start(v api.Switcher) {
w.uuid = v.UUID()
w.startTime = time.Now().Unix()
@@ -138,33 +98,16 @@ func (w *OpenLANWorker) Start(v api.Switcher) {
w.WorkerImpl.Start(v)
}
func (w *OpenLANWorker) downBridge(cfg *co.Bridge) {
w.closePeer(cfg)
func (w *OpenLANWorker) downBridge() {
_ = w.br.Close()
}
func (w *OpenLANWorker) closePeer(cfg *co.Bridge) {
if cfg.Peer == "" {
return
}
in, ex := PeerName(cfg.Network, "-e")
link := &nl.Veth{
LinkAttrs: nl.LinkAttrs{Name: in},
PeerName: ex,
}
err := nl.LinkDel(link)
if err != nil {
w.out.Error("OpenLANWorker.closePeer: %s", err)
return
}
}
func (w *OpenLANWorker) Stop() {
w.out.Info("OpenLANWorker.Close")
w.WorkerImpl.Stop()
w.UnLoadLinks()
w.startTime = 0
w.downBridge(w.cfg.Bridge)
w.downBridge()
}
func (w *OpenLANWorker) UpTime() int64 {