From ce60e8eb3d64ff298ed7ae4dd09d2fcfd2411250 Mon Sep 17 00:00:00 2001 From: Nathan Gieseker Date: Wed, 26 Jun 2019 01:25:22 -0700 Subject: [PATCH] dhcp module update --- go.mod | 15 ++++- go.sum | 43 +++++++++++--- vendor/github.com/d2g/dhcp4/option.go | 2 +- vendor/github.com/d2g/dhcp4/packet.go | 5 +- .../d2g/dhcp4server/leasepool/lease.go | 59 +++++++++++-------- .../d2g/dhcp4server/leasepool/leasepool.go | 4 +- .../leasepool/memorypool/memorypool.go | 17 +++++- vendor/github.com/d2g/dhcp4server/server.go | 26 ++++++-- vendor/modules.txt | 4 +- 9 files changed, 123 insertions(+), 52 deletions(-) diff --git a/go.mod b/go.mod index e7df0985..a77083bf 100644 --- a/go.mod +++ b/go.mod @@ -10,20 +10,31 @@ require ( github.com/containernetworking/cni v0.7.0 github.com/coreos/go-iptables v0.3.0 github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 - github.com/d2g/dhcp4 v0.0.0-20150413103026-f0e4d29ff023 + github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c github.com/d2g/dhcp4client v1.0.0 - github.com/d2g/dhcp4server v0.0.0-20180209090800-477b11cea4dc + github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5 + github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4 // indirect github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c + github.com/golang/protobuf v1.3.1 // indirect github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56 github.com/juju/errors v0.0.0-20180806074554-22422dad46e1 + github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8 // indirect + github.com/juju/testing v0.0.0-20190613124551-e81189438503 // indirect + github.com/kr/pretty v0.1.0 // indirect github.com/mattn/go-shellwords v1.0.3 github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8 github.com/sirupsen/logrus v1.0.6 // indirect + github.com/stretchr/testify v1.3.0 // indirect github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc // indirect golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941 // indirect golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1 // indirect golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f + gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect + gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect + gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect + gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect + gopkg.in/yaml.v2 v2.2.2 // indirect ) diff --git a/go.sum b/go.sum index a36fe564..37ab0f4b 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ github.com/Microsoft/go-winio v0.4.11 h1:zoIOcVf0xPN1tnMVbTtEdI+P8OofVk3NObnwOQ6nK2Q= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= -github.com/Microsoft/hcsshim v0.7.4 h1:MomrXI50FljY9gWLHckIk1wP6Y9NbMzZqKVufTDfwm0= -github.com/Microsoft/hcsshim v0.7.4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA= github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae h1:AMzIhMUqU3jMrZiTuW0zkYeKlKDAFD+DG20IoO421/Y= @@ -16,30 +14,50 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 h1:u9SHYsPQNyt5t github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/d2g/dhcp4 v0.0.0-20150413103026-f0e4d29ff023 h1:V8CudRUx05/Y7gMvaz8QM5i3nj1aNHTvgEX2bklfFN8= github.com/d2g/dhcp4 v0.0.0-20150413103026-f0e4d29ff023/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= -github.com/d2g/dhcp4client v0.0.0-20150519145404-bed07e1bc5b8 h1:vuhSWIYet7jjN/SsyX0fI89xw2v8q0hjM+AsGhadMJ4= -github.com/d2g/dhcp4client v0.0.0-20150519145404-bed07e1bc5b8/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= +github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c h1:Xo2rK1pzOm0jO6abTPIQwbAmqBIOj132otexc1mmzFc= +github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= github.com/d2g/dhcp4client v1.0.0 h1:suYBsYZIkSlUMEz4TAYCczKf62IA2UWC+O8+KtdOhCo= github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= github.com/d2g/dhcp4server v0.0.0-20180209090800-477b11cea4dc h1:uZyv74u2GQcs7Co/gTUlhpl4UH8qftOCL4mUU+Ri7qs= github.com/d2g/dhcp4server v0.0.0-20180209090800-477b11cea4dc/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= +github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5 h1:+CpLbZIeUn94m02LdEKPcgErLJ347NUwxPKs5u8ieiY= +github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= +github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4 h1:itqmmf1PFpC4n5JW+j4BU7X4MTfVurhYRTjODoPb2Y8= +github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c h1:RBUpb2b14UnmRHNd2uHz20ZHLDK+SW5Us/vWF5IHRaY= github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= +github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56 h1:742eGXur0715JMq73aD95/FU0XpVKXqNuTnEfXsLOYQ= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= github.com/juju/errors v0.0.0-20180806074554-22422dad46e1 h1:wnhMXidtb70kDZCeLt/EfsVtkXS5c8zLnE9y/6DIRAU= github.com/juju/errors v0.0.0-20180806074554-22422dad46e1/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q= +github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8 h1:UUHMLvzt/31azWTN/ifGWef4WUqvXk0iRqdhdy/2uzI= +github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= +github.com/juju/testing v0.0.0-20190613124551-e81189438503 h1:ZUgTbk8oHgP0jpMieifGC9Lv47mHn8Pb3mFX3/Ew4iY= +github.com/juju/testing v0.0.0-20190613124551-e81189438503/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/mattn/go-shellwords v1.0.3 h1:K/VxK7SZ+cvuPgFSLKi5QPI9Vr/ipOf4C1gN+ntueUk= github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b h1:Ey6yH0acn50T/v6CB75bGP4EMJqnv9WvnjN7oZaj+xE= github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a h1:KfNOeFvoAssuZLT7IntKZElKwi/5LRuxY71k+t6rfaM= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/safchain/ethtool v0.0.0-20170622225139-7ff1ba29eca2 h1:f10KcdY8NPt2w0/M2o+O9uCiH8sHpS6OVAHcf4BPL7Y= -github.com/safchain/ethtool v0.0.0-20170622225139-7ff1ba29eca2/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8 h1:2c1EFnZHIPCW8qKWgHMH/fX2PkSabFc5mrVzfUNdg5U= github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/sirupsen/logrus v1.0.6 h1:hcP1GmhGigz/O7h1WVUM5KklBp1JoNS9FggWKdj/j3s= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf h1:3J37+NPjNyGW/dbfXtj3yWuF9OEepIdGOXRaJGbORV8= github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc h1:R83G5ikgLMxrBvLh22JhdfI8K6YXEPHx5P03Uu3DRs4= @@ -48,7 +66,16 @@ golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941 h1:qBTHLajHecfu+xzRI9PqVD golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1 h1:Y/KGZSOdz/2r0WJ9Mkmz6NJBusp0kiNx1Cn82lzJQ6w= golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f h1:25KHgbfyiSm6vwQLbM3zZIe1v9p/3ea4Rz+nnM5K/i4= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo= +gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 h1:OAj3g0cR6Dx/R07QgQe8wkA9RNjB2u4i700xBkIT4e0= +gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= +gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce h1:xcEWjVhvbDy+nHP67nPDDpbYrY+ILlfndk4bRioVHaU= +gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/vendor/github.com/d2g/dhcp4/option.go b/vendor/github.com/d2g/dhcp4/option.go index f3239e19..fbf86e65 100644 --- a/vendor/github.com/d2g/dhcp4/option.go +++ b/vendor/github.com/d2g/dhcp4/option.go @@ -11,7 +11,7 @@ type Option struct { type Options map[OptionCode][]byte // SelectOrderOrAll has same functionality as SelectOrder, except if the order -// param is nil, whereby all options are added (in arbitary order). +// param is nil, whereby all options are added (in arbitrary order). func (o Options) SelectOrderOrAll(order []byte) []Option { if order == nil { opts := make([]Option, 0, len(o)) diff --git a/vendor/github.com/d2g/dhcp4/packet.go b/vendor/github.com/d2g/dhcp4/packet.go index 5e547c86..25d69fb9 100644 --- a/vendor/github.com/d2g/dhcp4/packet.go +++ b/vendor/github.com/d2g/dhcp4/packet.go @@ -127,10 +127,11 @@ func ReplyPacket(req Packet, mt MessageType, serverId, yIAddr net.IP, leaseDurat p.SetYIAddr(yIAddr) p.SetGIAddr(req.GIAddr()) p.SetCHAddr(req.CHAddr()) - p.SetSecs(req.Secs()) p.AddOption(OptionDHCPMessageType, []byte{byte(mt)}) p.AddOption(OptionServerIdentifier, []byte(serverId)) - p.AddOption(OptionIPAddressLeaseTime, OptionsLeaseTime(leaseDuration)) + if leaseDuration > 0 { + p.AddOption(OptionIPAddressLeaseTime, OptionsLeaseTime(leaseDuration)) + } for _, o := range options { p.AddOption(o.Code, o.Value) } diff --git a/vendor/github.com/d2g/dhcp4server/leasepool/lease.go b/vendor/github.com/d2g/dhcp4server/leasepool/lease.go index 18f9d128..98306eca 100644 --- a/vendor/github.com/d2g/dhcp4server/leasepool/lease.go +++ b/vendor/github.com/d2g/dhcp4server/leasepool/lease.go @@ -1,7 +1,10 @@ package leasepool import ( + "bytes" + "encoding/hex" "encoding/json" + "fmt" "net" "time" ) @@ -18,37 +21,35 @@ type Lease struct { IP net.IP //The IP of the Lease Status LeaseStatus //Are Reserved, Active or Free MACAddress net.HardwareAddr //Mac Address of the Device + ClientID []byte //ClientID of the request Hostname string //Hostname From option 12 Expiry time.Time //Expiry Time } -func (this Lease) MarshalJSON() ([]byte, error) { - stringMarshal := struct { - IP string - Status int - MACAddress string - Hostname string - Expiry time.Time - }{ - (this.IP.String()), - int(this.Status), - (this.MACAddress.String()), - this.Hostname, - this.Expiry, - } +//leaseMarshal is a mirror of Lease used for marshalling, since +//net.HardwareAddr has no native marshalling capability. +type leaseMarshal struct { + IP string + Status int + MACAddress string + ClientID string + Hostname string + Expiry time.Time +} - return json.Marshal(stringMarshal) +func (this Lease) MarshalJSON() ([]byte, error) { + return json.Marshal(leaseMarshal{ + IP: this.IP.String(), + Status: int(this.Status), + MACAddress: this.MACAddress.String(), + ClientID: hex.EncodeToString(this.ClientID), + Hostname: this.Hostname, + Expiry: this.Expiry, + }) } func (this *Lease) UnmarshalJSON(data []byte) error { - stringUnMarshal := struct { - IP string - Status int - MACAddress string - Hostname string - Expiry time.Time - }{} - + stringUnMarshal := leaseMarshal{} err := json.Unmarshal(data, &stringUnMarshal) if err != nil { return err @@ -58,12 +59,14 @@ func (this *Lease) UnmarshalJSON(data []byte) error { this.Status = LeaseStatus(stringUnMarshal.Status) if stringUnMarshal.MACAddress != "" { this.MACAddress, err = net.ParseMAC(stringUnMarshal.MACAddress) + if err != nil { + return fmt.Errorf("error parsing MAC address: %v", err) + } } - + this.ClientID, err = hex.DecodeString(stringUnMarshal.ClientID) if err != nil { - return err + return fmt.Errorf("error decoding clientID: %v", err) } - this.Hostname = stringUnMarshal.Hostname this.Expiry = stringUnMarshal.Expiry @@ -83,6 +86,10 @@ func (this Lease) Equal(other Lease) bool { return false } + if !bytes.Equal(this.ClientID, other.ClientID) { + return false + } + if this.Hostname != other.Hostname { return false } diff --git a/vendor/github.com/d2g/dhcp4server/leasepool/leasepool.go b/vendor/github.com/d2g/dhcp4server/leasepool/leasepool.go index e4c9523a..a620b4b9 100644 --- a/vendor/github.com/d2g/dhcp4server/leasepool/leasepool.go +++ b/vendor/github.com/d2g/dhcp4server/leasepool/leasepool.go @@ -25,8 +25,8 @@ type LeasePool interface { */ GetLease(net.IP) (bool, Lease, error) - //Get the lease already in use by that hardware address. - GetLeaseForHardwareAddress(net.HardwareAddr) (bool, Lease, error) + //Get the lease already in use by that hardware address and/or client identifier. + GetLeaseForClient(net.HardwareAddr, []byte) (bool, Lease, error) /* * -Lease Available diff --git a/vendor/github.com/d2g/dhcp4server/leasepool/memorypool/memorypool.go b/vendor/github.com/d2g/dhcp4server/leasepool/memorypool/memorypool.go index 29ff97c2..7cd8d2d5 100644 --- a/vendor/github.com/d2g/dhcp4server/leasepool/memorypool/memorypool.go +++ b/vendor/github.com/d2g/dhcp4server/leasepool/memorypool/memorypool.go @@ -81,13 +81,23 @@ func (t *MemoryPool) GetLease(leaseIP net.IP) (bool, leasepool.Lease, error) { return false, leasepool.Lease{}, nil } -//Get the lease already in use by that hardware address. -func (t *MemoryPool) GetLeaseForHardwareAddress(macAddress net.HardwareAddr) (bool, leasepool.Lease, error) { +func makeKey(macAddress net.HardwareAddr, clientID []byte) []byte { + key := []byte(macAddress) + if len(clientID) > 0 { + key = append(key, clientID...) + } + return key +} + +//Get the lease already in use by that hardware address and/or client identifier. +func (t *MemoryPool) GetLeaseForClient(macAddress net.HardwareAddr, clientID []byte) (bool, leasepool.Lease, error) { t.poolLock.Lock() defer t.poolLock.Unlock() + needleKey := makeKey(macAddress, clientID) for i := range t.pool { - if bytes.Equal(t.pool[i].MACAddress, macAddress) { + haystackKey := makeKey(t.pool[i].MACAddress, t.pool[i].ClientID) + if bytes.Equal(needleKey, haystackKey) { return true, t.pool[i], nil } } @@ -139,6 +149,7 @@ func (t *MemoryPool) UpdateLease(lease leasepool.Lease) (bool, error) { if t.pool[i].IP.Equal(lease.IP) { t.pool[i].MACAddress = lease.MACAddress + t.pool[i].ClientID = lease.ClientID t.pool[i].Hostname = lease.Hostname t.pool[i].Expiry = lease.Expiry t.pool[i].Status = lease.Status diff --git a/vendor/github.com/d2g/dhcp4server/server.go b/vendor/github.com/d2g/dhcp4server/server.go index 9a4b57ff..7b1d374d 100644 --- a/vendor/github.com/d2g/dhcp4server/server.go +++ b/vendor/github.com/d2g/dhcp4server/server.go @@ -172,9 +172,6 @@ func (s *Server) ListenAndServe() error { // return err //} - //Make Our Buffer (Max Buffer is 574) "I believe this 576 size comes from RFC 791" - Random Mailing list quote of the day. - buffer := make([]byte, 576) - log.Println("Trace: DHCP Server Listening.") for { @@ -183,6 +180,9 @@ func (s *Server) ListenAndServe() error { return nil } + //Make Our Buffer (Max Buffer is 574) "I believe this 576 size comes from RFC 791" - Random Mailing list quote of the day. + buffer := make([]byte, 576) + //Set Read Deadline s.connection.SetReadDeadline(time.Now().Add(time.Second)) // Read Packet @@ -213,7 +213,6 @@ func (s *Server) ListenAndServe() error { } log.Printf("Debug: Unexpect Error from Connection Read From: %v\n", err) - log.Printf("Debug: err type %T %#v\n", err, err) return err } @@ -281,6 +280,13 @@ func (s *Server) ListenAndServe() error { } } +func getClientID(packetOptions dhcp4.Options) []byte { + if clientID, ok := packetOptions[dhcp4.OptionClientIdentifier]; ok { + return clientID + } + return nil +} + func (s *Server) ServeDHCP(packet dhcp4.Packet) (dhcp4.Packet, error) { packetOptions := packet.ParseOptions() @@ -307,6 +313,7 @@ func (s *Server) ServeDHCP(packet dhcp4.Packet) (dhcp4.Packet, error) { lease.Status = leasepool.Reserved lease.MACAddress = packet.CHAddr() + lease.ClientID = getClientID(packetOptions) //If the lease expires within the next 5 Mins increase the lease expiary (Giving the Client 5 mins to complete) if lease.Expiry.Before(time.Now().Add(time.Minute * 5)) { @@ -351,6 +358,7 @@ func (s *Server) ServeDHCP(packet dhcp4.Packet) (dhcp4.Packet, error) { } else { lease.Status = leasepool.Active lease.MACAddress = packet.CHAddr() + lease.ClientID = getClientID(packetOptions) lease.Expiry = time.Now().Add(s.leaseDuration) @@ -498,6 +506,8 @@ func (s *Server) DeclinePacket(requestPacket dhcp4.Packet) dhcp4.Packet { func (s *Server) GetLease(packet dhcp4.Packet) (found bool, lease leasepool.Lease, err error) { packetOptions := packet.ParseOptions() + clientID := getClientID(packetOptions) + //Requested an IP if (len(packetOptions) > 0) && packetOptions[dhcp4.OptionRequestedIPAddress] != nil && @@ -510,11 +520,15 @@ func (s *Server) GetLease(packet dhcp4.Packet) (found bool, lease leasepool.Leas } if found { + //If lease is free, return it to client. If it is not + //free match against the MAC address and client + //identifier. if lease.Status == leasepool.Free { //Lease Is Free you Can Have it. return } - if lease.Status != leasepool.Free && bytes.Equal(lease.MACAddress, packet.CHAddr()) { + if bytes.Equal(lease.MACAddress, packet.CHAddr()) && + bytes.Equal(lease.ClientID, clientID) { //Lease isn't free but it's yours return } @@ -522,7 +536,7 @@ func (s *Server) GetLease(packet dhcp4.Packet) (found bool, lease leasepool.Leas } //Ok Even if you requested an IP you can't have it. - found, lease, err = s.leasePool.GetLeaseForHardwareAddress(packet.CHAddr()) + found, lease, err = s.leasePool.GetLeaseForClient(packet.CHAddr(), clientID) if found || err != nil { return } diff --git a/vendor/modules.txt b/vendor/modules.txt index 4674836c..edde941b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -36,11 +36,11 @@ github.com/containernetworking/cni/libcni github.com/coreos/go-iptables/iptables # github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 github.com/coreos/go-systemd/activation -# github.com/d2g/dhcp4 v0.0.0-20150413103026-f0e4d29ff023 +# github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c github.com/d2g/dhcp4 # github.com/d2g/dhcp4client v1.0.0 github.com/d2g/dhcp4client -# github.com/d2g/dhcp4server v0.0.0-20180209090800-477b11cea4dc +# github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5 github.com/d2g/dhcp4server github.com/d2g/dhcp4server/leasepool github.com/d2g/dhcp4server/leasepool/memorypool