commit 084869ab42e10ccb0ca6ecccb5833c1bddd899ed
author Mikio Hara <mikioh.mikioh@gmail.com> Fri Oct 07 12:21:36 2016 +0900
committer Mikio Hara <mikioh.mikioh@gmail.com> Fri Oct 07 03:59:10 2016 +0000
tree 1ee0f49150be435c1f7bf5ccae4614abe45867a5
parent 30df40a6a17d00a985343756f9b1418c6897866e

lif: rename internal types and constants generated by cgo

To match up with other packages that work with IP protocol stack.

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

lif/address.go

diff --git a/lif/address.go b/lif/address.go
index 3b9a133..f9b34ae 100644
--- a/lif/address.go
+++ b/lif/address.go
@@ -56,7 +56,7 @@
 	}
 	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 @@
 			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

lif/defs_solaris.go

diff --git a/lif/defs_solaris.go b/lif/defs_solaris.go
index 79e3ed0..8b84ba5 100644
--- a/lif/defs_solaris.go
+++ b/lif/defs_solaris.go
@@ -26,7 +26,7 @@
 	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 @@
 
 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

lif/link.go

diff --git a/lif/link.go b/lif/link.go
index 09bf682..76fa6c6 100644
--- a/lif/link.go
+++ b/lif/link.go
@@ -25,7 +25,7 @@
 }
 
 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(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 @@
 		}
 		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]

lif/zsys_solaris_amd64.go

diff --git a/lif/zsys_solaris_amd64.go b/lif/zsys_solaris_amd64.go
index d5b0444..94231c4 100644
--- a/lif/zsys_solaris_amd64.go
+++ b/lif/zsys_solaris_amd64.go
@@ -11,7 +11,7 @@
 	sysSOCK_DGRAM = 0x1
 )
 
-type sysSockaddrStorage struct {
+type sockaddrStorage struct {
 	Family     uint16
 	X_ss_pad1  [6]int8
 	X_ss_align float64
@@ -72,14 +72,14 @@
 	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 @@
 	Lifcu     [8]byte
 }
 
-type sysLifIfinfoReq struct {
+type lifIfinfoReq struct {
 	Maxhops      uint8
 	Pad_cgo_0    [3]byte
 	Reachtime    uint32