Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
| ... | ... |
@@ -5,12 +5,11 @@ import ( |
| 5 | 5 |
"errors" |
| 6 | 6 |
"github.com/dotcloud/docker/networkdriver" |
| 7 | 7 |
"github.com/dotcloud/docker/pkg/collections" |
| 8 |
- "github.com/dotcloud/docker/pkg/netlink" |
|
| 9 | 8 |
"net" |
| 10 | 9 |
"sync" |
| 11 | 10 |
) |
| 12 | 11 |
|
| 13 |
-type networkSet map[iPNet]*collections.OrderedIntSet |
|
| 12 |
+type networkSet map[string]*collections.OrderedIntSet |
|
| 14 | 13 |
|
| 15 | 14 |
var ( |
| 16 | 15 |
ErrNoAvailableIPs = errors.New("no available ip addresses on network")
|
| ... | ... |
@@ -149,7 +148,7 @@ func intToIP(n int32) *net.IP {
|
| 149 | 149 |
func checkAddress(address *net.IPNet) {
|
| 150 | 150 |
key := address.String() |
| 151 | 151 |
if _, exists := allocatedIPs[key]; !exists {
|
| 152 |
- allocatedIPs[key] = &iPSet{}
|
|
| 153 |
- availableIPS[key] = &iPSet{}
|
|
| 152 |
+ allocatedIPs[key] = collections.NewOrderedIntSet() |
|
| 153 |
+ availableIPS[key] = collections.NewOrderedIntSet() |
|
| 154 | 154 |
} |
| 155 | 155 |
} |