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

Validate rangeStart and rangeEnd specified in conf

Browse Source 
Signed-off-by: Tang Le <tangle3@wanda.cn>
This commit is contained in:
Tang Le
2017-03-10 10:22:25 +08:00
parent 1f6efc28b5
commit 1b65890795
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

@ -56,13 +56,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