mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
proxy: optimize timeout handling in udp copy
This commit is contained in:
1 parent
4b313a3fe1
commit
2ad3498abd
15 files changed
+46
-41
No files matched your search
@@ -19,7 +19,7 @@ func discovery(intf *net.Interface) (found bool) {
|
||||
}
|
||||
defer pc.Close()
|
||||
|
||||
discovery, err := dhcpv4.NewDiscovery(intf.HardwareAddr, dhcpv4.WithBroadcast(true), dhcpv4.WithRequestedOptions(dhcpv4.OptionDomainNameServer))
|
||||
discovery, err := dhcpv4.NewDiscovery(intf.HardwareAddr, dhcpv4.WithBroadcast(true))
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
+13
-15
@@ -100,7 +100,7 @@ func New(failover bool, args ...string) (*dhcpd, error) {
|
||||
}
|
||||
|
||||
log.F("[dhcpd] Listening on interface %s(%s/%d.%d.%d.%d), failover mode: %t",
|
||||
iface, ip, mask[0], mask[1], mask[2], mask[3], dhcpd.getFailover())
|
||||
iface, ip, mask[0], mask[1], mask[2], mask[3], dhcpd.isFailover())
|
||||
|
||||
return dhcpd, nil
|
||||
}
|
||||
@@ -109,7 +109,12 @@ func New(failover bool, args ...string) (*dhcpd, error) {
|
||||
func (d *dhcpd) Run() {
|
||||
if d.failover {
|
||||
d.setFailover(discovery(d.iface))
|
||||
go d.detect(time.Second * 60)
|
||||
go func() {
|
||||
for {
|
||||
d.setFailover(discovery(d.iface))
|
||||
time.Sleep(time.Second * 60)
|
||||
}
|
||||
}()
|
||||
}
|
||||
d.server.Serve()
|
||||
}
|
||||
@@ -117,6 +122,10 @@ func (d *dhcpd) Run() {
|
||||
func (d *dhcpd) handleDHCP(serverIP net.IP, mask net.IPMask, pool *Pool) server4.Handler {
|
||||
return func(conn net.PacketConn, peer net.Addr, m *dhcpv4.DHCPv4) {
|
||||
|
||||
if d.isFailover() || bytes.Equal(d.iface.HardwareAddr, m.ClientHWAddr) {
|
||||
return
|
||||
}
|
||||
|
||||
var reqType, replyType dhcpv4.MessageType
|
||||
switch reqType = m.MessageType(); reqType {
|
||||
case dhcpv4.MessageTypeDiscover:
|
||||
@@ -136,10 +145,6 @@ func (d *dhcpd) handleDHCP(serverIP net.IP, mask net.IPMask, pool *Pool) server4
|
||||
return
|
||||
}
|
||||
|
||||
if d.getFailover() || bytes.Equal(d.iface.HardwareAddr, m.ClientHWAddr) {
|
||||
return
|
||||
}
|
||||
|
||||
replyIP, err := pool.LeaseIP(m.ClientHWAddr)
|
||||
if err != nil {
|
||||
log.F("[dpcpd] %s: can not assign IP, error %s", d.name, err)
|
||||
@@ -176,7 +181,7 @@ func (d *dhcpd) handleDHCP(serverIP net.IP, mask net.IPMask, pool *Pool) server4
|
||||
}
|
||||
}
|
||||
|
||||
func (d *dhcpd) getFailover() bool {
|
||||
func (d *dhcpd) isFailover() bool {
|
||||
d.mu.Lock()
|
||||
defer d.mu.Unlock()
|
||||
return d.failover
|
||||
@@ -190,19 +195,12 @@ func (d *dhcpd) setFailover(v bool) {
|
||||
if v {
|
||||
log.F("[dpcpd] %s: dhcp server detected, enter failover mode", d.iface.Name)
|
||||
} else {
|
||||
log.F("[dpcpd] %s: no dhcp server detected, exit failover mode", d.iface.Name)
|
||||
log.F("[dpcpd] %s: no dhcp server detected, exit failover mode and serve requests", d.iface.Name)
|
||||
}
|
||||
}
|
||||
d.failover = v
|
||||
}
|
||||
|
||||
func (d *dhcpd) detect(interval time.Duration) {
|
||||
for {
|
||||
d.setFailover(discovery(d.iface))
|
||||
time.Sleep(interval)
|
||||
}
|
||||
}
|
||||
|
||||
func ifaceAddr(iface string) (*net.Interface, net.IP, net.IPMask, error) {
|
||||
intf, err := net.InterfaceByName(iface)
|
||||
if err != nil {
|
||||
|
||||
Reference in new issue
Block a user