upstream/oracle/userland-gate: comparison components/docker/patches/0001-Solaris-v1.10.3.patch

equal deleted inserted replaced

-:a206d468357a
+:6f65cee26eca
-From 0102118524dffdc2917fafac5feeb2e410fd393e Mon Sep 17 00:00:00 2001
+From 2dd56e50d4e22a931b6b26de35a19321ee0e36a4 Mon Sep 17 00:00:00 2001
-From: Shreya Jain <[email protected]>
+From: "[email protected]" <[email protected]>
-Date: Tue, 15 Nov 2016 10:53:53 -0800
+Date: Mon, 21 Nov 2016 12:10:24 -0800
 Subject: [PATCH] Solaris-v1.10.3
 ---
 Dockerfile.solaris                                 |   26 +
 Makefile                                           |   35 +-
 .../docker/go-connections/sockets/unix_socket.go   |    2 +-
 .../docker/libnetwork/default_gateway_solaris.go   |    7 +
 .../libnetwork/drivers/solaris/bridge/bridge.go    | 1084 ++++++++++++++++++++
 .../drivers/solaris/bridge/bridge_store.go         |  212 ++++
 .../libnetwork/drivers/solaris/bridge/errors.go    |  341 ++++++
-.../drivers/solaris/bridge/port_mapping.go         |  218 ++++
+.../drivers/solaris/bridge/port_mapping.go         |  247 +++++
 .../docker/libnetwork/drivers_solaris.go           |   13 +
 .../docker/libnetwork/ipamutils/utils_solaris.go   |   92 ++
 vendor/src/github.com/docker/libnetwork/network.go |    2 -
 .../docker/libnetwork/osl/interface_solaris.go     |    6 +
 .../docker/libnetwork/osl/namespace_solaris.go     |   41 +
 vendor/src/gopkg.in/fsnotify.v1/fen.go             |  188 ++++
 vendor/src/gopkg.in/fsnotify.v1/fen_cgo.go         |   82 ++
 vendor/src/gopkg.in/fsnotify.v1/fsnotify.go        |    2 +-
 volume/local/local_unix.go                         |    2 +-
 volume/store/store_unix.go                         |    2 +-
-193 files changed, 9208 insertions(+), 1241 deletions(-)
+193 files changed, 9237 insertions(+), 1241 deletions(-)
 create mode 100644 Dockerfile.solaris
 create mode 100644 container/container_solaris.go
 create mode 100644 container/state_solaris.go
 create mode 100755 contrib/mkimage/solaris
 create mode 100644 daemon/config_solaris.go
 +func (c *controller) createGWNetwork() (Network, error) {
 +	return nil, types.NotImplementedErrorf("default gateway functionality is not implemented in solaris")
 +}
 diff --git a/vendor/src/github.com/docker/libnetwork/drivers/solaris/bridge/bridge.go b/vendor/src/github.com/docker/libnetwork/drivers/solaris/bridge/bridge.go
 new file mode 100644
-index 0000000..da5e3f6
+index 0000000..23db1d9
 --- /dev/null
 +++ b/vendor/src/github.com/docker/libnetwork/drivers/solaris/bridge/bridge.go
 @@ -0,0 +1,1084 @@
 +package bridge
 +
 +	c := n.config
 +
 +	// Program any required port mapping and store them in the endpoint
 +	endpoint.portMapping, err = n.allocatePorts(epConfig,
 +		endpoint, c.DefaultBindingIntf, c.DefaultBindingIP,
-+		c.BridgeName+"_gw0")
++		c.BridgeName+"_gw0", c.AddressIPv4)
 +	if err != nil {
 +		return err
 +	}
 +
 +	return nil
 +
 +// BadRequest denotes the type of this error
 +func (address InvalidLinkIPAddrError) BadRequest() {}
 diff --git a/vendor/src/github.com/docker/libnetwork/drivers/solaris/bridge/port_mapping.go b/vendor/src/github.com/docker/libnetwork/drivers/solaris/bridge/port_mapping.go
 new file mode 100644
-index 0000000..f2b1fd5
+index 0000000..a2e0599
 --- /dev/null
 +++ b/vendor/src/github.com/docker/libnetwork/drivers/solaris/bridge/port_mapping.go
-@@ -0,0 +1,218 @@
+@@ -0,0 +1,247 @@
 +package bridge
 +
 +import (
 +	"bytes"
 +	"errors"
 +const (
 +	maxAllocatePortAttempts = 10
 +)
 +
 +func addPFRules(epid, bindIntf string, bs []types.PortBinding,
-+	gwIntf string) {
++	gwIntf string, nwAddr *net.IPNet) {
 +	id := epid[:12]
 +	fname := "/var/lib/docker/network/files/pf." + id
 +
 +	f, err := os.OpenFile(fname,
 +		os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600)
 +	if err != nil {
 +		logrus.Warnf("cannot open temp pf file")
 +		return
 +	}
++	gwIPaddr := nwAddr.String()
++	_, gwNetwork, err := net.ParseCIDR(gwIPaddr)
++	if err != nil {
++		logrus.Warnf("ParseCIDR error.")
++		return
++	}
++
 +	for _, b := range bs {
++		// tag created for every container port must be unique. Hence a
++		// combination of epid + port number of the container is used
++		// to create the tag.
++		tag := fmt.Sprintf("%s%d", id, b.Port)
 +		r := fmt.Sprintf(
 +			"pass in on %s proto %s from any to (%s) " +
 +			"port %d rdr-to %s port %d\n", bindIntf,
 +			b.Proto.String(), bindIntf, b.HostPort,
 +			b.IP.String(), b.Port)
 +			bindIntf)
 +		_, err = f.WriteString(r)
 +		if err != nil {
 +			logrus.Warnf("cannot write to %s: %v", fname, err)
 +		}
++		r = fmt.Sprintf(
++			"pass in on %s inet proto %s from %s to (%s) " +
++			"port %d tag %s nat-to (%s) static-port route-to %s\n", gwIntf,
++			b.Proto.String(), gwNetwork, bindIntf, b.HostPort, tag, bindIntf,
++			gwIntf)
++		_, err = f.WriteString(r)
++		if err != nil {
++			logrus.Warnf("cannot write to %s: %v", fname, err)
++		}
++		r = fmt.Sprintf(
++			"pass out on %s inet proto %s from any to (%s) " +
++			"tagged %s rdr-to %s port %d reply-to %s\n", gwIntf,
++			b.Proto.String(), bindIntf, tag, b.IP.String(), b.Port,
++			gwIntf)
++		_, err = f.WriteString(r)
++		if err != nil {
++			logrus.Warnf("cannot write to %s: %v", fname, err)
++		}
 +	}
 +	f.Close()
 +
 +	anchor := fmt.Sprintf("_auto/docker/ep%s", id)
 +	err = exec.Command("/usr/sbin/pfctl", "-a", anchor, "-f", fname).Run()
 +	if err != nil {
 +		logrus.Warnf("pfctl -F failed: %v", err)
 +	}
 +}
 +
-+func (n *bridgeNetwork) allocatePorts(epc *endpointConfiguration, ep *bridgeEndpoint, bindIntf string, reqDefBindIP net.IP, gwIntf string) ([]types.PortBinding, error) {
++func (n *bridgeNetwork) allocatePorts(epc *endpointConfiguration, ep *bridgeEndpoint, bindIntf string, reqDefBindIP net.IP, gwIntf string, nwAddr *net.IPNet) ([]types.PortBinding, error) {
 +	if epc == nil || epc.PortBindings == nil || len(epc.PortBindings) == 0 {
 +		return nil, nil
 +	}
 +
 +	defHostIP := defaultBindingIP
 +	bs, err := n.allocatePortsInternal(epc.PortBindings,
 +		bindIntf, ep.addr.IP, defHostIP)
 +	if err != nil {
 +		return nil, err
 +	}
-+	addPFRules(ep.id, bindIntf, bs, gwIntf)
++	addPFRules(ep.id, bindIntf, bs, gwIntf, nwAddr)
 +	return bs, err
 +}
 +
 +func (n *bridgeNetwork) allocatePortsInternal(bindings []types.PortBinding, bindIntf string, containerIP, defHostIP net.IP) ([]types.PortBinding, error) {
 +	bs := make([]types.PortBinding, 0, len(bindings))

changeset 7370	6f65cee26eca
parent 7307	d01419ab9198
child 7480	aa7a775dd813