@@ -22,14 +22,14 @@ clone git github.com/vdemeester/shakers 3c10293ce22b900c27acad7b28656196fcc2f73b

 clone git golang.org/x/net 47990a1ba55743e6ef1affd3a14e5bac8553615d https://github.com/golang/net.git

 #get libnetwork packages

-clone git github.com/docker/libnetwork 04cc1fa0a89f8c407b7be8cab883d4b17531ea7d

+clone git github.com/docker/libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90

 clone git github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec

 clone git github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b

 clone git github.com/hashicorp/memberlist 9a1e242e454d2443df330bdd51a436d5a9058fc4

 clone git github.com/hashicorp/serf 7151adcef72687bf95f451a2e0ba15cb19412bf2

 clone git github.com/docker/libkv c2aac5dbbaa5c872211edea7c0f32b3bd67e7410

 clone git github.com/vishvananda/netns 604eaf189ee867d8c147fafc28def2394e878d25

-clone git github.com/vishvananda/netlink 4b5dce31de6d42af5bb9811c6d265472199e0fec

+clone git github.com/vishvananda/netlink 8e810149a2e531fed9b837c0c7d8a8922d2bedf7

 clone git github.com/BurntSushi/toml f706d00e3de6abe700c994cdd545a1a4915af060

 clone git github.com/samuel/go-zookeeper d0e0d8e11f318e000a8cc434616d69e329edc374

 clone git github.com/deckarep/golang-set ef32fa3046d9f249d399f98ebaf9be944430fd1d

@@ -569,6 +569,9 @@ func (s *DockerDaemonSuite) TestDockerNetworkNoDiscoveryDefaultBridgeNetwork(c *

 	out, err = s.d.Cmd("network", "connect", network, cid1)

 	c.Assert(err, check.IsNil, check.Commentf(out))

+	hosts, err = s.d.Cmd("exec", cid1, "cat", hostsFile)

+	c.Assert(err, checker.IsNil)

+

 	hostsPost, err = s.d.Cmd("exec", cid1, "cat", hostsFile)

 	c.Assert(err, checker.IsNil)

 	c.Assert(string(hosts), checker.Equals, string(hostsPost),

@@ -631,6 +634,9 @@ func (s *DockerNetworkSuite) TestDockerNetworkAnonymousEndpoint(c *check.C) {

 	dockerCmd(c, "network", "connect", cstmBridgeNw1, cid2)

+	hosts2, err = readContainerFileWithExec(cid2, hostsFile)

+	c.Assert(err, checker.IsNil)

+

 	hosts1post, err = readContainerFileWithExec(cid1, hostsFile)

 	c.Assert(err, checker.IsNil)

 	c.Assert(string(hosts1), checker.Equals, string(hosts1post),

@@ -1,5 +1,52 @@

-Alessandro Boch <aboch@docker.com> (@aboch)

-Alexandr Morozov <lk4d4@docker.com> (@LK4D4)

-Arnaud Porterie <arnaud@docker.com> (@icecrime)

-Jana Radhakrishnan <mrjana@docker.com> (@mrjana)

-Madhu Venugopal <madhu@docker.com> (@mavenugo)

+# Libnetwork maintainers file

+#

+# This file describes who runs the docker/libnetwork project and how.

+# This is a living document - if you see something out of date or missing, speak up!

+#

+# It is structured to be consumable by both humans and programs.

+# To extract its contents programmatically, use any TOML-compliant parser.

+#

+# This file is compiled into the MAINTAINERS file in docker/opensource.

+#

+[Org]

+	[Org."Core maintainers"]

+		people = [

+			"aboch",

+			"LK4D4",

+			"icecrime",

+			"mrjana",

+			"mavenugo",

+		]

+

+[people]

+

+# A reference list of all people associated with the project.

+# All other sections should refer to people by their canonical key

+# in the people section.

+

+	# ADD YOURSELF HERE IN ALPHABETICAL ORDER

+

+	[people.aboch]

+	Name = "Alessandro Boch"

+	Email = "aboch@docker.com"

+	GitHub = "aboch"

+

+	[people.LK4D4]

+	Name = "Alexandr Morozov"

+	Email = "lk4d4@docker.com"

+	GitHub = "LK4D4"

+

+	[people.icecrime]

+	Name = "Arnaud Porterie"

+	Email = "arnaud@docker.com"

+	GitHub = "icecrime"

+

+	[people.mrjana]

+	Name = "Jana Radhakrishnan"

+	Email = "mrjana@docker.com"

+	GitHub = "mrjana"

+

+	[people.mavenugo]

+	Name = "Madhu Venugopal"

+	Email = "madhu@docker.com"

+	GitHub = "mavenugo"

@@ -6,8 +6,6 @@ Libnetwork provides a native Go implementation for connecting containers

 The goal of libnetwork is to deliver a robust Container Network Model that provides a consistent programming interface and the required network abstractions for applications.

-**NOTE**: libnetwork project is under heavy development and is not ready for general use.

-

 #### Design

 Please refer to the [design](docs/design.md) for more information.

@@ -67,10 +65,6 @@ There are many networking solutions available to suit a broad range of use-cases

 		}

 	}

 ```

-#### Current Status

-Please watch this space for updates on the progress.

-

-Currently libnetwork is nothing more than an attempt to modularize the Docker platform's networking subsystem by moving it into libnetwork as a library.

 ## Future

 Please refer to [roadmap](ROADMAP.md) for more information.

@@ -24,7 +24,10 @@ const (

 )

 var (

-	errNoBitAvailable = fmt.Errorf("no bit available")

+	// ErrNoBitAvailable is returned when no more bits are available to set

+	ErrNoBitAvailable = fmt.Errorf("no bit available")

+	// ErrBitAllocated is returned when the specific bit requested is already set

+	ErrBitAllocated = fmt.Errorf("requested bit is already allocated")

 )

 // Handle contains the sequece representing the bitmask and its identifier

@@ -94,7 +97,7 @@ func (s *sequence) toString() string {

 // GetAvailableBit returns the position of the first unset bit in the bitmask represented by this sequence

 func (s *sequence) getAvailableBit(from uint64) (uint64, uint64, error) {

 	if s.block == blockMAX || s.count == 0 {

-		return invalidPos, invalidPos, errNoBitAvailable

+		return invalidPos, invalidPos, ErrNoBitAvailable

 	}

 	bits := from

 	bitSel := blockFirstBit >> from

@@ -197,7 +200,7 @@ func (h *Handle) SetAnyInRange(start, end uint64) (uint64, error) {

 		return invalidPos, fmt.Errorf("invalid bit range [%d, %d]", start, end)

 	}

 	if h.Unselected() == 0 {

-		return invalidPos, errNoBitAvailable

+		return invalidPos, ErrNoBitAvailable

 	}

 	return h.set(0, start, end, true, false)

 }

@@ -205,7 +208,7 @@ func (h *Handle) SetAnyInRange(start, end uint64) (uint64, error) {

 // SetAny atomically sets the first unset bit in the sequence and returns the corresponding ordinal

 func (h *Handle) SetAny() (uint64, error) {

 	if h.Unselected() == 0 {

-		return invalidPos, errNoBitAvailable

+		return invalidPos, ErrNoBitAvailable

 	}

 	return h.set(0, 0, h.bits-1, true, false)

 }

@@ -250,8 +253,12 @@ func (h *Handle) set(ordinal, start, end uint64, any bool, release bool) (uint64

 	)

 	for {

-		if h.store != nil {

-			if err := h.store.GetObject(datastore.Key(h.Key()...), h); err != nil && err != datastore.ErrKeyNotFound {

+		var store datastore.DataStore

+		h.Lock()

+		store = h.store

+		h.Unlock()

+		if store != nil {

+			if err := store.GetObject(datastore.Key(h.Key()...), h); err != nil && err != datastore.ErrKeyNotFound {

 				return ret, err

 			}

 		}

@@ -265,7 +272,7 @@ func (h *Handle) set(ordinal, start, end uint64, any bool, release bool) (uint64

 				bytePos, bitPos, err = getFirstAvailable(h.head, start)

 				ret = posToOrdinal(bytePos, bitPos)

 				if end < ret {

-					err = errNoBitAvailable

+					err = ErrNoBitAvailable

 				}

 			} else {

 				bytePos, bitPos, err = checkIfAvailable(h.head, ordinal)

@@ -445,7 +452,7 @@ func getFirstAvailable(head *sequence, start uint64) (uint64, uint64, error) {

 		byteOffset += current.count * blockBytes

 		current = current.next

 	}

-	return invalidPos, invalidPos, errNoBitAvailable

+	return invalidPos, invalidPos, ErrNoBitAvailable

 }

 // checkIfAvailable checks if the bit correspondent to the specified ordinal is unset

@@ -463,7 +470,7 @@ func checkIfAvailable(head *sequence, ordinal uint64) (uint64, uint64, error) {

 		}

 	}

-	return invalidPos, invalidPos, fmt.Errorf("requested bit is not available")

+	return invalidPos, invalidPos, ErrBitAllocated

 }

 // Given the byte position and the sequences list head, return the pointer to the

@@ -4,7 +4,7 @@ machine:

 dependencies:

   override:

-    - sudo apt-get update; sudo apt-get install -y iptables zookeeperd

+    - sudo apt-get update; sudo apt-get install -y iptables zookeeperd 

     - go get golang.org/x/tools/cmd/vet

     - go get golang.org/x/tools/cmd/goimports

     - go get golang.org/x/tools/cmd/cover

@@ -315,17 +315,17 @@ func (c *controller) RegisterIpamDriver(name string, driver ipamapi.Ipam) error

 	_, ok := c.ipamDrivers[name]

 	c.Unlock()

 	if ok {

-		return driverapi.ErrActiveRegistration(name)

+		return types.ForbiddenErrorf("ipam driver %q already registered", name)

 	}

 	locAS, glbAS, err := driver.GetDefaultAddressSpaces()

 	if err != nil {

-		return fmt.Errorf("ipam driver %s failed to return default address spaces: %v", name, err)

+		return types.InternalErrorf("ipam driver %q failed to return default address spaces: %v", name, err)

 	}

 	c.Lock()

 	c.ipamDrivers[name] = &ipamData{driver: driver, defaultLocalAddressSpace: locAS, defaultGlobalAddressSpace: glbAS}

 	c.Unlock()

-	log.Debugf("Registering ipam provider: %s", name)

+	log.Debugf("Registering ipam driver: %q", name)

 	return nil

 }

@@ -667,7 +667,7 @@ func (c *controller) loadIpamDriver(name string) (*ipamData, error) {

 	id, ok := c.ipamDrivers[name]

 	c.Unlock()

 	if !ok {

-		return nil, ErrInvalidNetworkDriver(name)

+		return nil, types.BadRequestErrorf("invalid ipam driver: %q", name)

 	}

 	return id, nil

 }

@@ -103,10 +103,18 @@ func (sb *sandbox) needDefaultGW() bool {

 		if ep.getNetwork().Type() == "null" || ep.getNetwork().Type() == "host" {

 			continue

 		}

+		if ep.joinInfo.disableGatewayService {

+			return false

+		}

 		// TODO v6 needs to be handled.

 		if len(ep.Gateway()) > 0 {

 			return false

 		}

+		for _, r := range ep.StaticRoutes() {

+			if r.Destination.String() == "0.0.0.0/0" {

+				return false

+			}

+		}

 		needGW = true

 	}

 	return needGW

@@ -91,6 +91,9 @@ type JoinInfo interface {

 	// AddStaticRoute adds a routes to the sandbox.

 	// It may be used in addtion to or instead of a default gateway (as above).

 	AddStaticRoute(destination *net.IPNet, routeType int, nextHop net.IP) error

+

+	// DisableGatewayService tells libnetwork not to provide Default GW for the container

+	DisableGatewayService()

 }

 // DriverCallback provides a Callback interface for Drivers into LibNetwork

@@ -151,6 +151,10 @@ func (d *driver) processQuery(q *serf.Query) {

 }

 func (d *driver) resolvePeer(nid string, peerIP net.IP) (net.HardwareAddr, net.IPMask, net.IP, error) {

+	if d.serfInstance == nil {

+		return nil, nil, nil, fmt.Errorf("could not resolve peer: serf instance not initialized")

+	}

+

 	qPayload := fmt.Sprintf("%s %s", string(nid), peerIP.String())

 	resp, err := d.serfInstance.Query("peerlookup", []byte(qPayload), nil)

 	if err != nil {

@@ -134,10 +134,11 @@ type StaticRoute struct {

 // JoinResponse is the response to a JoinRequest.

 type JoinResponse struct {

 	Response

-	InterfaceName *InterfaceName

-	Gateway       string

-	GatewayIPv6   string

-	StaticRoutes  []StaticRoute

+	InterfaceName         *InterfaceName

+	Gateway               string

+	GatewayIPv6           string

+	StaticRoutes          []StaticRoute

+	DisableGatewayService bool

 }

 // LeaveRequest describes the API for detaching an endpoint from a sandbox.

@@ -231,6 +231,9 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,

 			}

 		}

 	}

+	if res.DisableGatewayService {

+		jinfo.DisableGatewayService()

+	}

 	return nil

 }

@@ -60,6 +60,8 @@ type endpoint struct {

 	anonymous     bool

 	generic       map[string]interface{}

 	joinLeaveDone chan struct{}

+	prefAddress   net.IP

+	ipamOptions   map[string]string

 	dbIndex       uint64

 	dbExists      bool

 	sync.Mutex

@@ -386,6 +388,9 @@ func (ep *endpoint) sbJoin(sbox Sandbox, options ...EndpointOption) error {

 		}

 	}()

+	// Watch for service records

+	network.getController().watchSvcRecord(ep)

+

 	address := ""

 	if ip := ep.getFirstInterfaceAddress(); ip != nil {

 		address = ip.String()

@@ -394,9 +399,6 @@ func (ep *endpoint) sbJoin(sbox Sandbox, options ...EndpointOption) error {

 		return err

 	}

-	// Watch for service records

-	network.getController().watchSvcRecord(ep)

-

 	if err = sb.updateDNS(network.enableIPv6); err != nil {

 		return err

 	}

@@ -559,7 +561,7 @@ func (ep *endpoint) sbLeave(sbox Sandbox, options ...EndpointOption) error {

 	sb.deleteHostsEntries(n.getSvcRecords(ep))

-	if sb.needDefaultGW() {

+	if !sb.inDelete && sb.needDefaultGW() {

 		ep := sb.getEPwithoutGateway()

 		if ep == nil {

 			return fmt.Errorf("endpoint without GW expected, but not found")

@@ -685,6 +687,14 @@ func EndpointOptionGeneric(generic map[string]interface{}) EndpointOption {

 	}

 }

+// CreateOptionIpam function returns an option setter for the ipam configuration for this endpoint

+func CreateOptionIpam(prefAddress net.IP, ipamOptions map[string]string) EndpointOption {

+	return func(ep *endpoint) {

+		ep.prefAddress = prefAddress

+		ep.ipamOptions = ipamOptions

+	}

+}

+

 // CreateOptionExposedPorts function returns an option setter for the container exposed

 // ports option to be passed to network.CreateEndpoint() method.

 func CreateOptionExposedPorts(exposedPorts []types.TransportPort) EndpointOption {

@@ -799,7 +809,7 @@ func (ep *endpoint) assignAddressVersion(ipVer int, ipam ipamapi.Ipam) error {

 		if *address != nil {

 			prefIP = (*address).IP

 		}

-		addr, _, err := ipam.RequestAddress(d.PoolID, prefIP, nil)

+		addr, _, err := ipam.RequestAddress(d.PoolID, prefIP, ep.ipamOptions)

 		if err == nil {

 			ep.Lock()

 			*address = addr

@@ -25,6 +25,10 @@ type EndpointInfo interface {

 	// This will only return a valid value if a container has joined the endpoint.

 	GatewayIPv6() net.IP

+	// StaticRoutes returns the list of static routes configured by the network

+	// driver when the container joins a network

+	StaticRoutes() []*types.StaticRoute

+

 	// Sandbox returns the attached sandbox if there, nil otherwise.

 	Sandbox() Sandbox

 }

@@ -136,9 +140,10 @@ func (epi *endpointInterface) CopyTo(dstEpi *endpointInterface) error {

 }

 type endpointJoinInfo struct {

-	gw           net.IP

-	gw6          net.IP

-	StaticRoutes []*types.StaticRoute

+	gw                    net.IP

+	gw6                   net.IP

+	StaticRoutes          []*types.StaticRoute

+	disableGatewayService bool

 }

 func (ep *endpoint) Info() EndpointInfo {

@@ -295,6 +300,17 @@ func (ep *endpoint) Sandbox() Sandbox {

 	return cnt

 }

+func (ep *endpoint) StaticRoutes() []*types.StaticRoute {

+	ep.Lock()

+	defer ep.Unlock()

+

+	if ep.joinInfo == nil {

+		return nil

+	}

+

+	return ep.joinInfo.StaticRoutes

+}

+

 func (ep *endpoint) Gateway() net.IP {

 	ep.Lock()

 	defer ep.Unlock()

@@ -340,3 +356,10 @@ func (ep *endpoint) retrieveFromStore() (*endpoint, error) {

 	}

 	return n.getEndpointFromStore(ep.ID())

 }

+

+func (ep *endpoint) DisableGatewayService() {

+	ep.Lock()

+	defer ep.Unlock()

+

+	ep.joinInfo.disableGatewayService = true

+}

@@ -1,6 +1,7 @@

 package etchosts

 import (

+	"bufio"

 	"bytes"

 	"fmt"

 	"io"

@@ -138,19 +139,36 @@ func Delete(path string, recs []Record) error {

 	if len(recs) == 0 {

 		return nil

 	}

-

-	old, err := ioutil.ReadFile(path)

+	old, err := os.Open(path)

 	if err != nil {

 		return err

 	}

-	regexpStr := fmt.Sprintf("\\S*\\t%s\\n", regexp.QuoteMeta(recs[0].Hosts))

-	for _, r := range recs[1:] {

-		regexpStr = regexpStr + "|" + fmt.Sprintf("\\S*\\t%s\\n", regexp.QuoteMeta(r.Hosts))

+	var buf bytes.Buffer

+

+	s := bufio.NewScanner(old)

+	eol := []byte{'\n'}

+loop:

+	for s.Scan() {

+		b := s.Bytes()

+		if b[0] == '#' {

+			buf.Write(b)

+			buf.Write(eol)

+			continue

+		}

+		for _, r := range recs {

+			if bytes.HasSuffix(b, []byte("\t"+r.Hosts)) {

+				continue loop

+			}

+		}

+		buf.Write(b)

+		buf.Write(eol)

 	}

-

-	var re = regexp.MustCompile(regexpStr)

-	return ioutil.WriteFile(path, re.ReplaceAll(old, []byte("")), 0644)

+	old.Close()

+	if err := s.Err(); err != nil {

+		return err

+	}

+	return ioutil.WriteFile(path, buf.Bytes(), 0644)

 }

 // Update all IP addresses where hostname matches.

@@ -76,8 +76,7 @@ func NewAllocator(lcDs, glDs datastore.DataStore) (*Allocator, error) {

 func (a *Allocator) refresh(as string) error {

 	aSpace, err := a.getAddressSpaceFromStore(as)

 	if err != nil {

-		return fmt.Errorf("error getting pools config from store during init: %v",

-			err)

+		return types.InternalErrorf("error getting pools config from store: %v", err)

 	}

 	if aSpace == nil {

@@ -239,7 +238,7 @@ func (a *Allocator) insertBitMask(key SubnetKey, pool *net.IPNet) error {

 	store := a.getStore(key.AddressSpace)

 	if store == nil {

-		return fmt.Errorf("could not find store for address space %s while inserting bit mask", key.AddressSpace)

+		return types.InternalErrorf("could not find store for address space %s while inserting bit mask", key.AddressSpace)

 	}

 	ipVer := getAddressVersion(pool.IP)

@@ -279,7 +278,7 @@ func (a *Allocator) retrieveBitmask(k SubnetKey, n *net.IPNet) (*bitseq.Handle,

 	if !ok {

 		log.Debugf("Retrieving bitmask (%s, %s)", k.String(), n.String())

 		if err := a.insertBitMask(k, n); err != nil {

-			return nil, fmt.Errorf("could not find bitmask in datastore for %s", k.String())

+			return nil, types.InternalErrorf("could not find bitmask in datastore for %s", k.String())

 		}

 		a.Lock()

 		bm = a.addresses[k]

@@ -306,7 +305,7 @@ func (a *Allocator) getPredefinedPool(as string, ipV6 bool) (*net.IPNet, error)

 	}

 	if as != localAddressSpace && as != globalAddressSpace {

-		return nil, fmt.Errorf("no default pool availbale for non-default addresss spaces")

+		return nil, types.NotImplementedErrorf("no default pool availbale for non-default addresss spaces")

 	}

 	aSpace, err := a.getAddrSpace(as)

@@ -378,7 +377,7 @@ func (a *Allocator) RequestAddress(poolID string, prefAddress net.IP, opts map[s

 	bm, err := a.retrieveBitmask(k, c.Pool)

 	if err != nil {

-		return nil, nil, fmt.Errorf("could not find bitmask in datastore for %s on address %v request from pool %s: %v",

+		return nil, nil, types.InternalErrorf("could not find bitmask in datastore for %s on address %v request from pool %s: %v",

 			k.String(), prefAddress, poolID, err)

 	}

 	ip, err := a.getAddress(p.Pool, bm, prefAddress, p.Range)

@@ -410,12 +409,12 @@ func (a *Allocator) ReleaseAddress(poolID string, address net.IP) error {

 	p, ok := aSpace.subnets[k]

 	if !ok {

 		aSpace.Unlock()

-		return ipamapi.ErrBadPool

+		return types.NotFoundErrorf("cannot find address pool for poolID:%s", poolID)

 	}

 	if address == nil {

 		aSpace.Unlock()

-		return ipamapi.ErrInvalidRequest

+		return types.BadRequestErrorf("invalid address: nil")

 	}

 	if !p.Pool.Contains(address) {

@@ -434,12 +433,12 @@ func (a *Allocator) ReleaseAddress(poolID string, address net.IP) error {

 	h, err := types.GetHostPartIP(address, mask)

 	if err != nil {

-		return fmt.Errorf("failed to release address %s: %v", address.String(), err)

+		return types.InternalErrorf("failed to release address %s: %v", address.String(), err)

 	}

 	bm, err := a.retrieveBitmask(k, c.Pool)

 	if err != nil {

-		return fmt.Errorf("could not find bitmask in datastore for %s on address %v release from pool %s: %v",

+		return types.InternalErrorf("could not find bitmask in datastore for %s on address %v release from pool %s: %v",

 			k.String(), address, poolID, err)

 	}

@@ -463,19 +462,25 @@ func (a *Allocator) getAddress(nw *net.IPNet, bitmask *bitseq.Handle, prefAddres

 	} else if prefAddress != nil {

 		hostPart, e := types.GetHostPartIP(prefAddress, base.Mask)

 		if e != nil {

-			return nil, fmt.Errorf("failed to allocate preferred address %s: %v", prefAddress.String(), e)

+			return nil, types.InternalErrorf("failed to allocate preferred address %s: %v", prefAddress.String(), e)

 		}

 		ordinal = ipToUint64(types.GetMinimalIP(hostPart))

 		err = bitmask.Set(ordinal)

 	} else {

 		ordinal, err = bitmask.SetAnyInRange(ipr.Start, ipr.End)

 	}

-	if err != nil {

+

+	switch err {

+	case nil:

+		// Convert IP ordinal for this subnet into IP address

+		return generateAddress(ordinal, base), nil

+	case bitseq.ErrBitAllocated:

+		return nil, ipamapi.ErrIPAlreadyAllocated

+	case bitseq.ErrNoBitAvailable:

 		return nil, ipamapi.ErrNoAvailableIPs

+	default:

+		return nil, err

 	}

-

-	// Convert IP ordinal for this subnet into IP address

-	return generateAddress(ordinal, base), nil

 }

 // DumpDatabase dumps the internal info

@@ -2,7 +2,6 @@ package ipam

 import (

 	"encoding/json"

-	"fmt"

 	log "github.com/Sirupsen/logrus"

 	"github.com/docker/libnetwork/datastore"

@@ -84,7 +83,7 @@ func (a *Allocator) getStore(as string) datastore.DataStore {

 func (a *Allocator) getAddressSpaceFromStore(as string) (*addrSpace, error) {

 	store := a.getStore(as)

 	if store == nil {

-		return nil, fmt.Errorf("store for address space %s not found", as)

+		return nil, types.InternalErrorf("store for address space %s not found", as)

 	}

 	pc := &addrSpace{id: dsConfigKey + "/" + as, ds: store, alloc: a}

@@ -93,7 +92,7 @@ func (a *Allocator) getAddressSpaceFromStore(as string) (*addrSpace, error) {

 			return nil, nil

 		}

-		return nil, fmt.Errorf("could not get pools config from store: %v", err)

+		return nil, types.InternalErrorf("could not get pools config from store: %v", err)

 	}

 	return pc, nil

@@ -102,7 +101,7 @@ func (a *Allocator) getAddressSpaceFromStore(as string) (*addrSpace, error) {

 func (a *Allocator) writeToStore(aSpace *addrSpace) error {

 	store := aSpace.store()

 	if store == nil {

-		return fmt.Errorf("invalid store while trying to write %s address space", aSpace.DataScope())

+		return types.InternalErrorf("invalid store while trying to write %s address space", aSpace.DataScope())

 	}

 	err := store.PutObjectAtomic(aSpace)

@@ -116,7 +115,7 @@ func (a *Allocator) writeToStore(aSpace *addrSpace) error {

 func (a *Allocator) deleteFromStore(aSpace *addrSpace) error {

 	store := aSpace.store()

 	if store == nil {

-		return fmt.Errorf("invalid store while trying to delete %s address space", aSpace.DataScope())

+		return types.InternalErrorf("invalid store while trying to delete %s address space", aSpace.DataScope())

 	}

 	return store.DeleteObjectAtomic(aSpace)

@@ -88,12 +88,12 @@ func (s *SubnetKey) String() string {

 // FromString populate the SubnetKey object reading it from string

 func (s *SubnetKey) FromString(str string) error {

 	if str == "" || !strings.Contains(str, "/") {

-		return fmt.Errorf("invalid string form for subnetkey: %s", str)

+		return types.BadRequestErrorf("invalid string form for subnetkey: %s", str)

 	}

 	p := strings.Split(str, "/")

 	if len(p) != 3 && len(p) != 5 {

-		return fmt.Errorf("invalid string form for subnetkey: %s", str)

+		return types.BadRequestErrorf("invalid string form for subnetkey: %s", str)

 	}

 	s.AddressSpace = p[0]

 	s.Subnet = fmt.Sprintf("%s/%s", p[1], p[2])

@@ -317,7 +317,7 @@ func (aSpace *addrSpace) updatePoolDBOnRemoval(k SubnetKey) (func() error, error

 				return func() error {

 					bm, err := aSpace.alloc.retrieveBitmask(k, c.Pool)

 					if err != nil {

-						return fmt.Errorf("could not find bitmask in datastore for pool %s removal: %v", k.String(), err)

+						return types.InternalErrorf("could not find bitmask in datastore for pool %s removal: %v", k.String(), err)

 					}

 					return bm.Destroy()

 				}, nil

@@ -2,8 +2,9 @@

 package ipamapi

 import (

-	"errors"

 	"net"

+

+	"github.com/docker/libnetwork/types"

 )

 /********************

@@ -15,6 +16,8 @@ const (

 	DefaultIPAM = "default"

 	// PluginEndpointType represents the Endpoint Type used by Plugin system

 	PluginEndpointType = "IpamDriver"

+	// RequestAddressType represents the Address Type used when requesting an address

+	RequestAddressType = "RequestAddressType"

 )

 // Callback provides a Callback interface for registering an IPAM instance into LibNetwork

@@ -29,22 +32,19 @@ type Callback interface {

 // Weel-known errors returned by IPAM

 var (

-	ErrInvalidIpamService       = errors.New("Invalid IPAM Service")

-	ErrInvalidIpamConfigService = errors.New("Invalid IPAM Config Service")

-	ErrIpamNotAvailable         = errors.New("IPAM Service not available")

-	ErrIpamInternalError        = errors.New("IPAM Internal Error")

-	ErrInvalidAddressSpace      = errors.New("Invalid Address Space")

-	ErrInvalidPool              = errors.New("Invalid Address Pool")

-	ErrInvalidSubPool           = errors.New("Invalid Address SubPool")

-	ErrInvalidRequest           = errors.New("Invalid Request")

-	ErrPoolNotFound             = errors.New("Address Pool not found")

-	ErrOverlapPool              = errors.New("Address pool overlaps with existing pool on this address space")

-	ErrNoAvailablePool          = errors.New("No available pool")

-	ErrNoAvailableIPs           = errors.New("No available addresses on this pool")

-	ErrIPAlreadyAllocated       = errors.New("Address already in use")

-	ErrIPOutOfRange             = errors.New("Requested address is out of range")

-	ErrPoolOverlap              = errors.New("Pool overlaps with other one on this address space")

-	ErrBadPool                  = errors.New("Address space does not contain specified address pool")

+	ErrIpamInternalError   = types.InternalErrorf("IPAM Internal Error")

+	ErrInvalidAddressSpace = types.BadRequestErrorf("Invalid Address Space")

+	ErrInvalidPool         = types.BadRequestErrorf("Invalid Address Pool")

+	ErrInvalidSubPool      = types.BadRequestErrorf("Invalid Address SubPool")

+	ErrInvalidRequest      = types.BadRequestErrorf("Invalid Request")

+	ErrPoolNotFound        = types.BadRequestErrorf("Address Pool not found")

+	ErrOverlapPool         = types.ForbiddenErrorf("Address pool overlaps with existing pool on this address space")

+	ErrNoAvailablePool     = types.NoServiceErrorf("No available pool")

+	ErrNoAvailableIPs      = types.NoServiceErrorf("No available addresses on this pool")

+	ErrIPAlreadyAllocated  = types.ForbiddenErrorf("Address already in use")

+	ErrIPOutOfRange        = types.BadRequestErrorf("Requested address is out of range")

+	ErrPoolOverlap         = types.ForbiddenErrorf("Pool overlaps with other one on this address space")

+	ErrBadPool             = types.BadRequestErrorf("Address space does not contain specified address pool")

 )

 /*******************************

@@ -603,12 +603,13 @@ func (n *network) Delete() error {

 	if err = n.getController().deleteFromStore(n.getEpCnt()); err != nil {

 		return fmt.Errorf("error deleting network endpoint count from store: %v", err)

 	}

+

+	n.ipamRelease()

+

 	if err = n.getController().deleteFromStore(n); err != nil {

 		return fmt.Errorf("error deleting network from store: %v", err)

 	}

-	n.ipamRelease()

-

 	return nil

 }

@@ -970,7 +971,10 @@ func (n *network) ipamAllocateVersion(ipVer int, ipam ipamapi.Ipam) error {

 		// irrespective of whether ipam driver returned a gateway already.

 		// If none of the above is true, libnetwork will allocate one.

 		if cfg.Gateway != "" || d.Gateway == nil {

-			if d.Gateway, _, err = ipam.RequestAddress(d.PoolID, net.ParseIP(cfg.Gateway), nil); err != nil {

+			var gatewayOpts = map[string]string{

+				ipamapi.RequestAddressType: netlabel.Gateway,

+			}

+			if d.Gateway, _, err = ipam.RequestAddress(d.PoolID, net.ParseIP(cfg.Gateway), gatewayOpts); err != nil {

 				return types.InternalErrorf("failed to allocate gateway (%v): %v", cfg.Gateway, err)

 			}

 		}

@@ -62,7 +62,6 @@ type sandbox struct {

 	osSbox        osl.Sandbox

 	controller    *controller

 	refCnt        int

-	hostsOnce     sync.Once

 	endpoints     epHeap

 	epPriority    map[string]int

 	joinLeaveDone chan struct{}

@@ -601,41 +600,21 @@ func (sb *sandbox) buildHostsFile() error {

 }

 func (sb *sandbox) updateHostsFile(ifaceIP string, svcRecords []etchosts.Record) error {

-	var err error

+	var mhost string

 	if sb.config.originHostsPath != "" {

 		return nil

 	}

-	max := func(a, b int) int {

-		if a < b {

-			return b

-		}

-

-		return a

-	}

-

-	extraContent := make([]etchosts.Record, 0,

-		max(len(sb.config.extraHosts), len(svcRecords)))

-

-	sb.hostsOnce.Do(func() {

-		// Rebuild the hosts file accounting for the passed

-		// interface IP and service records

-

-		for _, extraHost := range sb.config.extraHosts {

-			extraContent = append(extraContent,

-				etchosts.Record{Hosts: extraHost.name, IP: extraHost.IP})

-		}

-

-		err = etchosts.Build(sb.config.hostsPath, ifaceIP,

-			sb.config.hostName, sb.config.domainName, extraContent)

-	})

-

-	if err != nil {

-		return err

+	if sb.config.domainName != "" {

+		mhost = fmt.Sprintf("%s.%s %s", sb.config.hostName, sb.config.domainName,

+			sb.config.hostName)

+	} else {

+		mhost = sb.config.hostName

 	}

-	extraContent = extraContent[:0]

+	extraContent := make([]etchosts.Record, 0, len(svcRecords)+1)

+	extraContent = append(extraContent, etchosts.Record{Hosts: mhost, IP: ifaceIP})

 	for _, svc := range svcRecords {

 		extraContent = append(extraContent, svc)

 	}

new file mode 100644

@@ -0,0 +1,110 @@

+package netlink

+

+import (

+	"fmt"

+)

+

+type Class interface {

+	Attrs() *ClassAttrs

+	Type() string

+}

+

+// Class represents a netlink class. A filter is associated with a link,

+// has a handle and a parent. The root filter of a device should have a

+// parent == HANDLE_ROOT.

+type ClassAttrs struct {

+	LinkIndex int

+	Handle    uint32

+	Parent    uint32

+	Leaf      uint32

+}

+

+func (q ClassAttrs) String() string {

+	return fmt.Sprintf("{LinkIndex: %d, Handle: %s, Parent: %s, Leaf: %s}", q.LinkIndex, HandleStr(q.Handle), HandleStr(q.Parent), q.Leaf)

+}

+

+type HtbClassAttrs struct {

+	// TODO handle all attributes

+	Rate    uint64

+	Ceil    uint64

+	Buffer  uint32

+	Cbuffer uint32

+	Quantum uint32

+	Level   uint32

+	Prio    uint32

+}

+

+func (q HtbClassAttrs) String() string {

+	return fmt.Sprintf("{Rate: %d, Ceil: %d, Buffer: %d, Cbuffer: %d}", q.Rate, q.Ceil, q.Buffer, q.Cbuffer)

+}

+

+// Htb class

+type HtbClass struct {

+	ClassAttrs

+	Rate    uint64

+	Ceil    uint64

+	Buffer  uint32

+	Cbuffer uint32

+	Quantum uint32

+	Level   uint32

+	Prio    uint32

+}

+

+func NewHtbClass(attrs ClassAttrs, cattrs HtbClassAttrs) *HtbClass {

+	mtu := 1600

+	rate := cattrs.Rate / 8

+	ceil := cattrs.Ceil / 8

+	buffer := cattrs.Buffer

+	cbuffer := cattrs.Cbuffer

+	if ceil == 0 {

+		ceil = rate

+	}

+

+	if buffer == 0 {

+		buffer = uint32(float64(rate)/Hz() + float64(mtu))

+	}

+	buffer = uint32(Xmittime(rate, buffer))

+

+	if cbuffer == 0 {

+		cbuffer = uint32(float64(ceil)/Hz() + float64(mtu))

+	}

+	cbuffer = uint32(Xmittime(ceil, cbuffer))

+