ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Merge pull request #391 from tangle329/master

Browse Source 
Validate rangeStart and rangeEnd specified in conf
This commit is contained in:
Dan Williams
2017-04-24 22:00:07 -05:00
committed by GitHub
parent 8eddd61fed 1b65890795
commit 21d96393ea
2 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/ipam/host-local/backend/allocator/allocator.go
View File

@ -57,13 +57,13 @@ func NewIPAllocator(conf *IPAMConfig, store backend.Store) (*IPAllocator, error)
start = ip.NextIP(start)
if conf.RangeStart != nil {
if err := validateRangeIP(conf.RangeStart, (*net.IPNet)(&conf.Subnet), nil, nil); err != nil {
if err := validateRangeIP(conf.RangeStart, (*net.IPNet)(&conf.Subnet), start, end); err != nil {
return nil, err
}
start = conf.RangeStart
}
if conf.RangeEnd != nil {
if err := validateRangeIP(conf.RangeEnd, (*net.IPNet)(&conf.Subnet), start, nil); err != nil {
if err := validateRangeIP(conf.RangeEnd, (*net.IPNet)(&conf.Subnet), start, end); err != nil {
return nil, err
}
end = conf.RangeEnd