vendor: update vendored lif

Updates golang_org/x/net/lif to rev 084869a for:
- lif: rename internal types and constants generated by cgo

Change-Id: Icf478d60f5ef35800966c62dcf046f7fe50204ff
Reviewed-on: https://go-review.googlesource.com/30731
Run-TryBot: Mikio Hara <mikioh.mikioh@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/vendor/golang_org/x/net/lif/address.go b/src/vendor/golang_org/x/net/lif/address.go
index 3b9a133919b0f32e201f2db04f5a54d3c04c83e9..f9b34aed03e4a2ff15faf1188a8c68439a9dfefd 100644 (file)
--- a/src/vendor/golang_org/x/net/lif/address.go
+++ b/src/vendor/golang_org/x/net/lif/address.go
@@ -56,7 +56,7 @@ func Addrs(af int, name string) ([]Addr, error) {
        }
        var as []Addr
        for _, ll := range lls {
-               var lifr sysLifreq
+               var lifr lifreq
                for i := 0; i < len(ll.Name); i++ {
                        lifr.Name[i] = int8(ll.Name[i])
                }
@@ -66,7 +66,7 @@ func Addrs(af int, name string) ([]Addr, error) {
                        if err != nil {
                                continue
                        }
-                       sa := (*sysSockaddrStorage)(unsafe.Pointer(&lifr.Lifru[0]))
+                       sa := (*sockaddrStorage)(unsafe.Pointer(&lifr.Lifru[0]))
                        l := int(littleEndian.Uint32(lifr.Lifru1[:4]))
                        if l == 0 {
                                continue

diff --git a/src/vendor/golang_org/x/net/lif/defs_solaris.go b/src/vendor/golang_org/x/net/lif/defs_solaris.go
index 79e3ed0f4f18eecf6174f088473ff8f4f8131957..8b84ba5e33f375b43b24bc5c4a6abaf1a0c0ebe7 100644 (file)
--- a/src/vendor/golang_org/x/net/lif/defs_solaris.go
+++ b/src/vendor/golang_org/x/net/lif/defs_solaris.go
@@ -26,7 +26,7 @@ const (
        sysSOCK_DGRAM = C.SOCK_DGRAM
 )
 
-type sysSockaddrStorage C.struct_sockaddr_storage
+type sockaddrStorage C.struct_sockaddr_storage
 
 const (
        sysLIFC_NOXMIT          = C.LIFC_NOXMIT
@@ -77,11 +77,11 @@ const (
 
 type sysLifnum C.struct_lifnum
 
-type sysLifreq C.struct_lifreq
+type lifreq C.struct_lifreq
 
-type sysLifconf C.struct_lifconf
+type lifconf C.struct_lifconf
 
-type sysLifIfinfoReq C.struct_lif_ifinfo_req
+type lifIfinfoReq C.struct_lif_ifinfo_req
 
 const (
        sysIFT_IPV4 = C.IFT_IPV4

diff --git a/src/vendor/golang_org/x/net/lif/link.go b/src/vendor/golang_org/x/net/lif/link.go
index 09bf682b5e70dc208d68de5f06c2647d5f3a9cdc..76fa6c68756a94a51d9ad161e59f1f3b26af7963 100644 (file)
--- a/src/vendor/golang_org/x/net/lif/link.go
+++ b/src/vendor/golang_org/x/net/lif/link.go
@@ -25,7 +25,7 @@ type Link struct {
 }
 
 func (ll *Link) fetch(s uintptr) {
-       var lifr sysLifreq
+       var lifr lifreq
        for i := 0; i < len(ll.Name); i++ {
                lifr.Name[i] = int8(ll.Name[i])
        }
@@ -71,7 +71,7 @@ func Links(af int, name string) ([]Link, error) {
 func links(eps []endpoint, name string) ([]Link, error) {
        var lls []Link
        lifn := sysLifnum{Flags: sysLIFC_NOXMIT | sysLIFC_TEMPORARY | sysLIFC_ALLZONES | sysLIFC_UNDER_IPMP}
-       lifc := sysLifconf{Flags: sysLIFC_NOXMIT | sysLIFC_TEMPORARY | sysLIFC_ALLZONES | sysLIFC_UNDER_IPMP}
+       lifc := lifconf{Flags: sysLIFC_NOXMIT | sysLIFC_TEMPORARY | sysLIFC_ALLZONES | sysLIFC_UNDER_IPMP}
        for _, ep := range eps {
                lifn.Family = uint16(ep.af)
                ioc := int64(sysSIOCGLIFNUM)
@@ -91,7 +91,7 @@ func links(eps []endpoint, name string) ([]Link, error) {
                }
                nb := make([]byte, 32) // see LIFNAMSIZ in net/if.h
                for i := 0; i < int(lifn.Count); i++ {
-                       lifr := (*sysLifreq)(unsafe.Pointer(&b[i*sizeofLifreq]))
+                       lifr := (*lifreq)(unsafe.Pointer(&b[i*sizeofLifreq]))
                        for i := 0; i < 32; i++ {
                                if lifr.Name[i] == 0 {
                                        nb = nb[:i]

diff --git a/src/vendor/golang_org/x/net/lif/zsys_solaris_amd64.go b/src/vendor/golang_org/x/net/lif/zsys_solaris_amd64.go
index d5b044481e59565a31f08e6b8f28e04d6d4b62fa..94231c49c9617e560980b9a6e39e2d78c37a9fe9 100644 (file)
--- a/src/vendor/golang_org/x/net/lif/zsys_solaris_amd64.go
+++ b/src/vendor/golang_org/x/net/lif/zsys_solaris_amd64.go
@@ -11,7 +11,7 @@ const (
        sysSOCK_DGRAM = 0x1
 )
 
-type sysSockaddrStorage struct {
+type sockaddrStorage struct {
        Family     uint16
        X_ss_pad1  [6]int8
        X_ss_align float64
@@ -72,14 +72,14 @@ type sysLifnum struct {
        Count     int32
 }
 
-type sysLifreq struct {
+type lifreq struct {
        Name   [32]int8
        Lifru1 [4]byte
        Type   uint32
        Lifru  [336]byte
 }
 
-type sysLifconf struct {
+type lifconf struct {
        Family    uint16
        Pad_cgo_0 [2]byte
        Flags     int32
@@ -88,7 +88,7 @@ type sysLifconf struct {
        Lifcu     [8]byte
 }
 
-type sysLifIfinfoReq struct {
+type lifIfinfoReq struct {
        Maxhops      uint8
        Pad_cgo_0    [3]byte
        Reachtime    uint32