jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Address6 -> IPv6Address and Gateway6 -> IPv6Gateway 

Docker-DCO-1.1-Signed-off-by: Malte Janduda <mail@janduda.net> (github: MalteJ)
This commit is contained in:
Malte Janduda 2014-09-24 20:47:23 +02:00
parent dd9e42732e
commit 4a14248dc8
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
network/types.go
View File

@ -20,14 +20,14 @@ type Network struct {
// Address contains the IPv4 and mask to set on the network interface // Address contains the IPv4 and mask to set on the network interface
Address string `json:"address,omitempty"` Address string `json:"address,omitempty"`
// Address contains the IPv6 and mask to set on the network interface // IPv6Address contains the IPv6 and mask to set on the network interface
Address6 string `json:"address6,omitempty"` IPv6Address string `json:"ipv6_address,omitempty"`
// Gateway sets the gateway address that is used as the default for the interface // Gateway sets the gateway address that is used as the default for the interface
Gateway string `json:"gateway,omitempty"` Gateway string `json:"gateway,omitempty"`
// Gateway sets the ipv6 gateway address that is used as the default for the interface // IPv6Gateway sets the ipv6 gateway address that is used as the default for the interface
Gateway6 string `json:"gateway6,omitempty"` IPv6Gateway string `json:"ipv6_gateway,omitempty"`
// Mtu sets the mtu value for the interface and will be mirrored on both the host and // Mtu sets the mtu value for the interface and will be mirrored on both the host and
// container's interfaces if a pair is created, specifically in the case of type veth // container's interfaces if a pair is created, specifically in the case of type veth

10
network/veth.go
View File

@ -63,8 +63,8 @@ func (v *Veth) Initialize(config *Network, networkState *NetworkState) error {
if err := SetInterfaceIp(defaultDevice, config.Address); err != nil { if err := SetInterfaceIp(defaultDevice, config.Address); err != nil {
return fmt.Errorf("set %s ip %s", defaultDevice, err) return fmt.Errorf("set %s ip %s", defaultDevice, err)
} }
if config.Address6 != "" { if config.IPv6Address != "" {
if err := SetInterfaceIp(defaultDevice, config.Address6); err != nil { if err := SetInterfaceIp(defaultDevice, config.IPv6Address); err != nil {
return fmt.Errorf("set %s ipv6 %s", defaultDevice, err) return fmt.Errorf("set %s ipv6 %s", defaultDevice, err)
} }
} }
@ -80,9 +80,9 @@ func (v *Veth) Initialize(config *Network, networkState *NetworkState) error {
return fmt.Errorf("set gateway to %s on device %s failed with %s", config.Gateway, defaultDevice, err) return fmt.Errorf("set gateway to %s on device %s failed with %s", config.Gateway, defaultDevice, err)
} }
} }
if config.Gateway6 != "" { if config.IPv6Gateway != "" {
if err := SetDefaultGateway(config.Gateway6, defaultDevice); err != nil { if err := SetDefaultGateway(config.IPv6Gateway, defaultDevice); err != nil {
return fmt.Errorf("set gateway for ipv6 to %s on device %s failed with %s", config.Gateway6, defaultDevice, err) return fmt.Errorf("set gateway for ipv6 to %s on device %s failed with %s", config.IPv6Gateway, defaultDevice, err)
} }
} }
return nil return nil