opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-15 03:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix gofmt & golint

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #440
Approved by: baude
This commit is contained in:
Matthew Heon
2018-03-02 12:33:25 -05:00
committed by Atomic Bot
parent 02c6ba9949
commit cd670ff839
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libpod/container.go
View File

@ -145,11 +145,11 @@ type containerState struct {
// IPs contains IP addresses assigned to the container // IPs contains IP addresses assigned to the container
// Only populated if we created a network namespace for the container, // Only populated if we created a network namespace for the container,
// and the network namespace is currently active // and the network namespace is currently active
IPs []*cnitypes.IPConfig `json:"ipAddresses,omitempty"` IPs []*cnitypes.IPConfig `json:"ipAddresses,omitempty"`
// Routes contains network routes present in the container // Routes contains network routes present in the container
// Only populated if we created a network namespace for the container, // Only populated if we created a network namespace for the container,
// and the network namespace is currently active // and the network namespace is currently active
Routes []*types.Route `json:"routes,omitempty"` Routes []*types.Route `json:"routes,omitempty"`
} }
// ExecSession contains information on an active exec session // ExecSession contains information on an active exec session
@ -649,7 +649,7 @@ func (c *Container) ExecSession(id string) (*ExecSession, error) {
return returnSession, nil return returnSession, nil
} }
// IPs() retrieves a container's IP addresses // IPs retrieves a container's IP address(es)
// This will only be populated if the container is configured to created a new // This will only be populated if the container is configured to created a new
// network namespace, and that namespace is presently active // network namespace, and that namespace is presently active
func (c *Container) IPs() ([]net.IPNet, error) { func (c *Container) IPs() ([]net.IPNet, error) {
@ -662,6 +662,10 @@ func (c *Container) IPs() ([]net.IPNet, error) {
} }
} }
if !c.config.CreateNetNS {
return errors.Wrapf(ErrInvalidArg, "container %s network namespace is not managed by libpod")
}
ips := make([]net.IPNet, 0, len(c.state.IPs)) ips := make([]net.IPNet, 0, len(c.state.IPs))
for _, ip := range c.state.IPs { for _, ip := range c.state.IPs {
@ -686,10 +690,14 @@ func (c *Container) Routes() ([]types.Route, error) {
routes := make([]types.Route, 0, len(c.state.Routes)) routes := make([]types.Route, 0, len(c.state.Routes))
if !c.config.CreateNetNS {
return errors.Wrapf(ErrInvalidArg, "container %s network namespace is not managed by libpod")
}
for _, route := range c.state.Routes { for _, route := range c.state.Routes {
newRoute := types.Route{ newRoute := types.Route{
Dst: route.Dst, Dst: route.Dst,
GW: route.GW, GW: route.GW,
} }
routes = append(routes, newRoute) routes = append(routes, newRoute)