kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #1807 from msabansal/transparentfix

Browse source 
Fixes docker daemon not starting after endpoint leak
This commit is contained in:
Santhosh Manohar 2017-06-16 11:42:08 -07:00 committed by GitHub
commit eca6a26e0b
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libnetwork/drivers/windows/windows_store.go
View file

@ -232,9 +232,12 @@ func (ep *hnsEndpoint) MarshalJSON() ([]byte, error) {
epMap["Type"] = ep.Type epMap["Type"] = ep.Type
epMap["profileID"] = ep.profileID epMap["profileID"] = ep.profileID
epMap["MacAddress"] = ep.macAddress.String() epMap["MacAddress"] = ep.macAddress.String()
epMap["Addr"] = ep.addr.String() if ep.addr.IP != nil {
epMap["gateway"] = ep.gateway.String() epMap["Addr"] = ep.addr.String()
}
if ep.gateway != nil {
epMap["gateway"] = ep.gateway.String()
}
epMap["epOption"] = ep.epOption epMap["epOption"] = ep.epOption
epMap["epConnectivity"] = ep.epConnectivity epMap["epConnectivity"] = ep.epConnectivity
epMap["PortMapping"] = ep.portMapping epMap["PortMapping"] = ep.portMapping
@ -251,7 +254,6 @@ func (ep *hnsEndpoint) UnmarshalJSON(b []byte) error {
if err = json.Unmarshal(b, &epMap); err != nil { if err = json.Unmarshal(b, &epMap); err != nil {
return fmt.Errorf("Failed to unmarshal to endpoint: %v", err) return fmt.Errorf("Failed to unmarshal to endpoint: %v", err)
} }
if v, ok := epMap["MacAddress"]; ok { if v, ok := epMap["MacAddress"]; ok {
if ep.macAddress, err = net.ParseMAC(v.(string)); err != nil { if ep.macAddress, err = net.ParseMAC(v.(string)); err != nil {
return types.InternalErrorf("failed to decode endpoint MAC address (%s) after json unmarshal: %v", v.(string), err) return types.InternalErrorf("failed to decode endpoint MAC address (%s) after json unmarshal: %v", v.(string), err)
@ -262,7 +264,9 @@ func (ep *hnsEndpoint) UnmarshalJSON(b []byte) error {
return types.InternalErrorf("failed to decode endpoint IPv4 address (%s) after json unmarshal: %v", v.(string), err) return types.InternalErrorf("failed to decode endpoint IPv4 address (%s) after json unmarshal: %v", v.(string), err)
} }
} }
if v, ok := epMap["gateway"]; ok {
ep.gateway = net.ParseIP(v.(string))
}
ep.id = epMap["id"].(string) ep.id = epMap["id"].(string)
ep.Type = epMap["Type"].(string) ep.Type = epMap["Type"].(string)
ep.nid = epMap["nid"].(string) ep.nid = epMap["nid"].(string)