mirror of
https://github.com/nadoo/glider.git
synced 2026-11-19 07:09:42 +08:00
dhcpd: assign random ip
This commit is contained in:
1 parent
5b774cf90e
commit
de8c08c7b2
8 files changed
+46
-49
No files matched your search
@@ -46,10 +46,10 @@ func (*dpcpd) Run(args ...string) {
|
||||
return
|
||||
}
|
||||
|
||||
server, err := server4.NewServer(
|
||||
iface, &net.UDPAddr{IP: net.IPv4(0, 0, 0, 0), Port: 67}, handleDHCP(ip, mask, pool))
|
||||
laddr := net.UDPAddr{IP: net.IPv4(0, 0, 0, 0), Port: 67}
|
||||
server, err := server4.NewServer(iface, &laddr, handleDHCP(ip, mask, pool))
|
||||
if err != nil {
|
||||
log.F("[dhcpd] error in server new: %s", err)
|
||||
log.F("[dhcpd] error in server creation: %s", err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ func (*dpcpd) Run(args ...string) {
|
||||
|
||||
func handleDHCP(serverIP net.IP, mask net.IPMask, pool *Pool) server4.Handler {
|
||||
return func(conn net.PacketConn, peer net.Addr, m *dhcpv4.DHCPv4) {
|
||||
log.F("[dpcpd] received request from client %v", m.ClientHWAddr)
|
||||
// log.F("[dpcpd] received request from client %v", m.ClientHWAddr)
|
||||
|
||||
var replyType dhcpv4.MessageType
|
||||
switch mt := m.MessageType(); mt {
|
||||
@@ -99,7 +99,7 @@ func handleDHCP(serverIP net.IP, mask net.IPMask, pool *Pool) server4.Handler {
|
||||
}
|
||||
|
||||
if _, err := conn.WriteTo(reply.ToBytes(), peer); err != nil {
|
||||
log.F("[dpcpd] could not write %v: %s", reply, err)
|
||||
log.F("[dpcpd] could not write to client %s(%s): %s", peer, reply.ClientHWAddr, err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -136,20 +136,10 @@ func ifaceIPMask4(iface string) (net.IP, net.IPMask) {
|
||||
}
|
||||
|
||||
for _, addr := range addrs {
|
||||
var ip net.IP
|
||||
var mask net.IPMask
|
||||
|
||||
switch v := addr.(type) {
|
||||
case *net.IPNet:
|
||||
ip = v.IP
|
||||
mask = v.Mask
|
||||
case *net.IPAddr:
|
||||
ip = v.IP
|
||||
mask = ip.DefaultMask()
|
||||
}
|
||||
|
||||
if ip4 := ip.To4(); ip4 != nil {
|
||||
return ip4, mask
|
||||
if ipnet, ok := addr.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
|
||||
if ip4 := ipnet.IP.To4(); ip4 != nil {
|
||||
return ip4, ipnet.Mask
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+25
-21
@@ -3,38 +3,43 @@ package dhcpd
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"math/rand"
|
||||
"net"
|
||||
"time"
|
||||
)
|
||||
|
||||
type Pool struct {
|
||||
lease time.Duration
|
||||
items []*item
|
||||
}
|
||||
|
||||
func NewPool(lease time.Duration, ipStart, ipEnd net.IP) (*Pool, error) {
|
||||
items := make([]*item, 0)
|
||||
var currentIp = ipStart.To4()
|
||||
for bytes.Compare(currentIp, ipEnd.To4()) <= 0 {
|
||||
curip := ipStart.To4()
|
||||
for bytes.Compare(curip, ipEnd.To4()) <= 0 {
|
||||
ip := make([]byte, 4)
|
||||
copy(ip, currentIp)
|
||||
i := &item{
|
||||
lease: lease,
|
||||
ip: ip,
|
||||
}
|
||||
items = append(items, i)
|
||||
currentIp[3]++
|
||||
copy(ip, curip)
|
||||
items = append(items, &item{lease: lease, ip: ip})
|
||||
curip[3]++
|
||||
}
|
||||
return &Pool{lease: lease, items: items}, nil
|
||||
rand.Seed(time.Now().Unix())
|
||||
return &Pool{items: items}, nil
|
||||
}
|
||||
|
||||
func (p *Pool) AssignIP(mac net.HardwareAddr) (net.IP, error) {
|
||||
var ip net.IP
|
||||
for _, item := range p.items {
|
||||
if mac.String() == item.hardwareAddr.String() {
|
||||
if bytes.Equal(mac, item.mac) {
|
||||
return item.ip, nil
|
||||
}
|
||||
}
|
||||
|
||||
idx := rand.Intn(len(p.items))
|
||||
for _, item := range p.items[idx:] {
|
||||
if ip = item.take(mac); ip != nil {
|
||||
return ip, nil
|
||||
}
|
||||
}
|
||||
|
||||
for _, item := range p.items {
|
||||
if ip = item.take(mac); ip != nil {
|
||||
return ip, nil
|
||||
@@ -44,24 +49,23 @@ func (p *Pool) AssignIP(mac net.HardwareAddr) (net.IP, error) {
|
||||
}
|
||||
|
||||
type item struct {
|
||||
ip net.IP
|
||||
lease time.Duration
|
||||
taken bool
|
||||
hardwareAddr net.HardwareAddr
|
||||
taken bool
|
||||
ip net.IP
|
||||
lease time.Duration
|
||||
mac net.HardwareAddr
|
||||
}
|
||||
|
||||
func (i *item) take(addr net.HardwareAddr) net.IP {
|
||||
if i.taken {
|
||||
return nil
|
||||
} else {
|
||||
if !i.taken {
|
||||
i.taken = true
|
||||
go func() {
|
||||
timer := time.NewTimer(i.lease)
|
||||
<-timer.C
|
||||
i.hardwareAddr = nil
|
||||
i.mac = nil
|
||||
i.taken = false
|
||||
}()
|
||||
i.hardwareAddr = addr
|
||||
i.mac = addr
|
||||
return i.ip
|
||||
}
|
||||
return nil
|
||||
}
|
||||
Reference in new issue
Block a user