mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2025-07-05 07:50:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

feat: retry for broken UDP endpoint

Browse Source
This commit is contained in:
mzz2017
2023-02-13 10:52:40 +08:00
parent 87511472c4
commit d4c8dba14a
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
control/control_plane_core.go
View File

@ -228,11 +228,11 @@ tryRuleAddAgain:
func (c *ControlPlaneCore) bindLan(ifname string) error {
c.log.Infof("Bind to LAN: %v", ifname)
err := CheckIpforward(ifname)
link, err := netlink.LinkByName(ifname)
if err != nil {
return err
}
link, err := netlink.LinkByName(ifname)
err = CheckIpforward(ifname)
if err != nil {
return err
}

22
control/udp.go
View File

@ -25,6 +25,7 @@ import (
const (
DefaultNatTimeout = 3 * time.Minute
DnsNatTimeout = 17 * time.Second // RFC 5452
MaxRetry = 2
)
var (
@ -294,7 +295,11 @@ func (c *ControlPlane) handlePkt(lConn *net.UDPConn, data []byte, src, pktDst, r
case consts.L4ProtoStr_UDP:
// Get udp endpoint.
var ue *UdpEndpoint
retry := 0
getNew:
if retry > MaxRetry {
return fmt.Errorf("touch max retry limit")
}
ue, isNew, err = DefaultUdpEndpointPool.GetOrCreate(src, &UdpEndpointOptions{
Handler: udpHandler,
NatTimeout: natTimeout,
@ -310,10 +315,12 @@ func (c *ControlPlane) handlePkt(lConn *net.UDPConn, data []byte, src, pktDst, r
if !isNew && !ue.Dialer.MustGetAlive(networkType) {
c.log.WithFields(logrus.Fields{
"src": RefineSourceToShow(src, realDst.Addr()),
"network": string(l4proto) + string(ipversion),
"network": networkType.String(),
"dialer": ue.Dialer.Name(),
}).Debugln("Old udp endpoint is not alive and removed")
"retry": retry,
}).Debugln("Old udp endpoint was not alive and removed.")
_ = DefaultUdpEndpointPool.Remove(src, ue)
retry++
goto getNew
}
// This is real dialer.
@ -322,7 +329,16 @@ func (c *ControlPlane) handlePkt(lConn *net.UDPConn, data []byte, src, pktDst, r
//log.Printf("WriteToUDPAddrPort->%v", destToSend)
_, err = ue.WriteToUDPAddrPort(data, destToSend)
if err != nil {
return fmt.Errorf("failed to write UDP packet req: %w", err)
c.log.WithFields(logrus.Fields{
"to": destToSend.String(),
"from": realSrc.String(),
"network": networkType.String(),
"err": err.Error(),
"retry": retry,
}).Debugln("Failed to write UDP packet request. Try to remove old UDP endpoint and retry.")
_ = DefaultUdpEndpointPool.Remove(src, ue)
retry++
goto getNew
}
case consts.L4ProtoStr_TCP:
// MUST be DNS.