Skip to content

Commit

Permalink
Merge 325cb28 into 27669b0
Browse files Browse the repository at this point in the history
  • Loading branch information
mavenugo committed Feb 8, 2015
2 parents 27669b0 + 325cb28 commit 81f2cc4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions daemon/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func NetworkSize(mask net.IPMask) int32 {
}

// Return the IPv4 address of a network interface
func GetIfaceAddr(name string) (net.Addr, error) {
func GetIfaceAddr(name string) (*net.IPNet, error) {
iface, err := netlink.LinkByName(name)
if err != nil {
return nil, err
Expand All @@ -85,7 +85,7 @@ func GetIfaceAddr(name string) (net.Addr, error) {
log.Info("Interface %v has more than 1 IPv4 address. Defaulting to using %v\n", name, addrs[0].IP)
}

return net.Addr(addrs[0]), nil
return addrs[0].IPNet, nil
}

func GetDefaultRouteIface() (int, error) {
Expand Down

0 comments on commit 81f2cc4

Please sign in to comment.