opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-20 12:43:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused existing IP addresses function

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:35:34 -05:00
committed by Atomic Bot
parent cd670ff839
commit d1abdebdcd
1 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libpod/container.go
View File

@ -663,7 +663,7 @@ func (c *Container) IPs() ([]net.IPNet, error) {
} }
if !c.config.CreateNetNS { if !c.config.CreateNetNS {
return errors.Wrapf(ErrInvalidArg, "container %s network namespace is not managed by libpod") return nil, 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))
@ -688,12 +688,12 @@ func (c *Container) Routes() ([]types.Route, error) {
} }
} }
routes := make([]types.Route, 0, len(c.state.Routes))
if !c.config.CreateNetNS { if !c.config.CreateNetNS {
return errors.Wrapf(ErrInvalidArg, "container %s network namespace is not managed by libpod") return nil, errors.Wrapf(ErrInvalidArg, "container %s network namespace is not managed by libpod")
} }
routes := make([]types.Route, 0, len(c.state.Routes))
for _, route := range c.state.Routes { for _, route := range c.state.Routes {
newRoute := types.Route{ newRoute := types.Route{
Dst: route.Dst, Dst: route.Dst,
@ -709,25 +709,6 @@ func (c *Container) Routes() ([]types.Route, error) {
// Misc Accessors // Misc Accessors
// Most will require locking // Most will require locking
// IPAddress returns the IP address of the container
// If the container does not have a network namespace, an error will be returned
func (c *Container) IPAddress() (net.IP, error) {
if !c.locked {
c.lock.Lock()
defer c.lock.Unlock()
if err := c.syncContainer(); err != nil {
return nil, errors.Wrapf(err, "error updating container %s state", c.ID())
}
}
if !c.config.CreateNetNS || c.state.NetNS == nil {
return nil, errors.Wrapf(ErrInvalidArg, "container %s does not have a network namespace", c.ID())
}
return c.runtime.getContainerIP(c)
}
// NamespacePath returns the path of one of the container's namespaces // NamespacePath returns the path of one of the container's namespaces
// If the container is not running, an error will be returned // If the container is not running, an error will be returned
func (c *Container) NamespacePath(ns LinuxNS) (string, error) { func (c *Container) NamespacePath(ns LinuxNS) (string, error) {