update host file

files_darwin.go

@@ -3,11 +3,81 @@
 package staros
 
 import (
+	"b612.me/stario"
 	"os"
 	"syscall"
 	"time"
 )
 
+type FileLock struct {
+	fd       int
+	filepath string
+}
+
+func (f *FileLock) openFileForLock() error {
+	fd, err := syscall.Open(f.filepath, syscall.O_CREAT|syscall.O_RDONLY, 0600)
+	if err != nil {
+		return err
+	}
+	f.filepath = f.filepath
+	f.fd = fd
+	return nil
+}
+
+func (f *FileLock) Lock(Exclusive bool) error {
+	var lockType int
+	if Exclusive {
+		lockType = syscall.LOCK_EX
+	} else {
+		lockType = syscall.LOCK_SH
+	}
+	if err := f.openFileForLock(); err != nil {
+		return err
+	}
+	return syscall.Flock(f.fd, lockType)
+}
+
+func (f *FileLock) LockNoBlocking(Exclusive bool) error {
+	var lockType int
+	if Exclusive {
+		lockType = syscall.LOCK_EX
+	} else {
+		lockType = syscall.LOCK_SH
+	}
+	if err := f.openFileForLock(); err != nil {
+		return err
+	}
+	err := syscall.Flock(f.fd, lockType|syscall.LOCK_NB)
+	if err != nil {
+		syscall.Close(f.fd)
+		if err == syscall.EWOULDBLOCK {
+			return ERR_ALREADY_LOCKED
+		}
+	}
+	return err
+}
+
+func (f *FileLock) Unlock() error {
+	err := syscall.Flock(f.fd, syscall.LOCK_UN)
+	if err != nil {
+		return err
+	}
+	return syscall.Close(f.fd)
+}
+
+func (f *FileLock) LockWithTimeout(tm time.Duration, Exclusive bool) error {
+	return stario.WaitUntilTimeout(tm, func(tmout chan struct{}) error {
+		err := f.Lock(Exclusive)
+		select {
+		case <-tmout:
+			f.Unlock()
+			return nil
+		default:
+		}
+		return err
+	})
+}
+
 func timespecToTime(ts syscall.Timespec) time.Time {
 	return time.Unix(int64(ts.Sec), int64(ts.Nsec))
 }

go.mod

@@ -3,8 +3,8 @@ module b612.me/staros
 go 1.16
 
 require (
-	b612.me/stario v0.0.5
-	b612.me/win32api v0.0.1
-	b612.me/wincmd v0.0.1
-	golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5
+	b612.me/stario v0.0.9
+	b612.me/win32api v0.0.2
+	b612.me/wincmd v0.0.3
+	golang.org/x/sys v0.18.0
 )

go.sum

@@ -1,18 +1,51 @@
-b612.me/stario v0.0.5 h1:Q1OGF+8eOoK49zMzkyh80GWaMuknhey6+PWJJL9ZuNo=
-b612.me/stario v0.0.5/go.mod h1:or4ssWcxQSjMeu+hRKEgtp0X517b3zdlEOAms8Qscvw=
-b612.me/win32api v0.0.1 h1:vLFB1xhO6pd9+zB2EyaapKB459Urv3v+C1YwgwOFEWo=
-b612.me/win32api v0.0.1/go.mod h1:MHu0JBQjzxQ2yxpZPUBbn5un45o67eF5iWKa4Q9e0yE=
-b612.me/wincmd v0.0.1 h1:4+RCFKHuD/JqAYsdtO6sTNKJs1nQVMQo87h6KhTJjkM=
-b612.me/wincmd v0.0.1/go.mod h1:32xTM7qWAI7jx6qwTrig05rxejSYbSp7CX5WD7qsMxY=
-golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000 h1:SL+8VVnkqyshUSz5iNnXtrBQzvFF2SkROm6t5RczFAE=
-golang.org/x/crypto v0.0.0-20220313003712-b769efc7c000/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+b612.me/stario v0.0.9 h1:bFDlejUJMwZ12a09snZJspQsOlkqpDAl9qKPEYOGWCk=
+b612.me/stario v0.0.9/go.mod h1:x4D/x8zA5SC0pj/uJAi4FyG5p4j5UZoMEZfvuRR6VNw=
+b612.me/win32api v0.0.2 h1:5PwvPR5fYs3a/v+LjYdtRif+5Q04zRGLTVxmCYNjCpA=
+b612.me/win32api v0.0.2/go.mod h1:sj66sFJDKElEjOR+0YhdSW6b4kq4jsXu4T5/Hnpyot0=
+b612.me/wincmd v0.0.3 h1:GYrkYnNun39yfNcA2+u0h4VW/BYbTrJK39QW4W1LCYA=
+b612.me/wincmd v0.0.3/go.mod h1:nWdNREHO6F+2PngEUcyYN3Eo7DzYEVa/fO6czd9d/fo=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng=
-golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8=
+golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

hosts/hosts_test.go

@@ -6,7 +6,149 @@ import (
 )
 
 func Test_Hosts(t *testing.T) {
-	//RemoveHostbyIp("192.168.222.33")
-	Parse()
-	fmt.Println(GetAllListbyIp())
+	var h = NewHosts()
+	err := h.Parse("./test_hosts.txt")
+	if err != nil {
+		t.Error(err)
+	}
+	next := h.firstUid
+	for next != 0 {
+		node, _ := h.GetNode(next)
+		fmt.Printf("Last %d, Next: %d, IP: %s, Hosts: %s, Comment: %s\n", node.LastUID(), node.NextUID(), node.IP(), node.Hosts(), node.Comment())
+		next = node.NextUID()
+	}
+	data := h.ListHostsByIP("11.22.33.44")
+	if len(data) != 2 {
+		t.Error("Expected 2, got ", len(data))
+	} else {
+		t.Log(data)
+	}
+
+	data = h.ListIPsByHost("dns.b612.me")
+	if len(data) < 1 || data[0] != "4.5.6.7" {
+		t.Error("Expected 4.5.6.7, got ", data)
+	} else {
+		t.Log(data)
+	}
+
+	err = h.RemoveHosts("dns.b612.me")
+	if err != nil {
+		t.Error(err)
+	}
+	data = h.ListIPsByHost("dns.b612.me")
+	if len(data) > 0 {
+		t.Error("Expected 0, got ", len(data))
+	} else {
+		t.Log(data)
+	}
+
+	err = h.RemoveHosts("test.dns.set.b612.me")
+	if err != nil {
+		t.Error(err)
+	}
+
+	data = h.ListIPsByHost("remove.b612.me")
+	if len(data) < 1 || data[0] != "11.22.33.44" {
+		t.Error("Expected 11.22.33.44, got ", data)
+	} else {
+		t.Log(data)
+	}
+
+	nodes := h.ListByIP("11.22.33.44")
+	if nodes == nil {
+		t.Error("Expected not nil, got ", nodes)
+	} else {
+		t.Log(nodes)
+	}
+
+	nodes[0].AddHosts("hello.b612.me")
+	err = h.UpdateNode(nodes[0])
+	if err != nil {
+		t.Error(err)
+	}
+	data = h.ListIPsByHost("hello.b612.me")
+	if len(data) < 1 || data[0] != "11.22.33.44" {
+		t.Error("Not Expected Data", data)
+	} else {
+		t.Log(data)
+	}
+	insertNode := new(HostNode)
+	insertNode.SetIP("11.11.11.11")
+	insertNode.SetHosts("insert.b612.me")
+	insertNode.SetComment("Insert Node")
+	insertNode.SetNextUID(nodes[0].UID())
+	insertNode.SetLastUID(nodes[0].LastUID())
+	err = h.InsertNode(insertNode)
+	if err != nil {
+		t.Error(err)
+	}
+	data = h.ListIPsByHost("insert.b612.me")
+	if len(data) < 1 || data[0] != "11.11.11.11" {
+		t.Error("Expected 11.11.11.11 got ", data)
+	} else {
+		t.Log(data)
+	}
+
+	err = h.SaveAs("./test_hosts_01.txt")
+	if err != nil {
+		t.Error(err)
+	}
+
+	err = h.DeleteNode(insertNode)
+	if err != nil {
+		t.Error(err)
+	}
+	data = h.ListIPsByHost("insert.b612.me")
+	if len(data) > 0 {
+		t.Error("Expected 0 got ", data)
+	} else {
+		t.Log(data)
+	}
+
+	for i := 0; i < 100; i++ {
+		err = h.RemoveHosts("release-ftpd")
+		if err != nil {
+			t.Error(err)
+		}
+		err = h.AddHosts("2.3.4.9", "release-ftpd")
+		if err != nil {
+			t.Error(err)
+		}
+	}
+
+	err = h.SetHostIPs("ssh.b612.me", "9.9.9.9")
+	if err != nil {
+		t.Error(err)
+	}
+
+	data = h.ListIPsByHost("ssh.b612.me")
+	if len(data) == 0 {
+		t.Error("Expected 1 got ", data)
+	} else {
+		t.Log(data)
+	}
+
+	err = h.SetIPHosts("10.10.10.10", "ssh.b612.me", "ssr.b612.me")
+	if len(data) == 0 {
+		t.Error("Expected 1 got ", data)
+	}
+
+	err = h.SaveAs("./test_hosts_02.txt")
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+func BenchmarkAddHosts(b *testing.B) {
+	var h = NewHosts()
+	err := h.Parse("./test_hosts.txt")
+	if err != nil {
+		b.Error(err)
+	}
+	for i := 0; i < b.N; i++ {
+		err = h.AddHosts("1.3.4.5", "test.b612.me")
+		if err != nil {
+			b.Error(err)
+		}
+	}
 }

hosts/test_hosts.txt

@@ -0,0 +1,23 @@
+#hosts         This file describes a number of hostname-to-address
+#mappings for the TCP/IP subsystem.  It is mostly
+#used at boot time, when no name servers are running.
+#On small systems, this file can be used instead of a
+#"named" name server.
+#Syntax:
+#IP-Address  Full-Qualifie
+#special IPv6 addre
+127.0.0.1 localhost
+127.0.0.1 b612
+8.8.8.8     ssh.b612.me
+#special IPv6 addresses
+::1 localhost ipv6-localhost ipv6-loopback
+fe00::0 ipv6-localnet
+ff00::0 ipv6-mcastprefix
+ff02::1 ipv6-allnodes
+ff02::2 ipv6-allrouters
+ff02::3 ipv6-allhosts
+1.2.3.4 ssh.b612.me
+4.5.6.7 dns.b612.me
+8.9.10.11 release-ftpd
+11.22.33.44 test.dns.set.b612.me  remove.b612.me
+4.5.6.7 game.b612.me

network_unix.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package staros
@@ -67,7 +68,13 @@ func NetSpeeds(duration time.Duration) ([]NetSpeed, error) {
 	for k, v := range list1 {
 		recv := float64(list2[k].RecvBytes-v.RecvBytes) / duration.Seconds()
 		send := float64(list2[k].SendBytes-v.SendBytes) / duration.Seconds()
-		res = append(res, NetSpeed{v.Name, recv, send})
+		res = append(res, NetSpeed{
+			Name:       v.Name,
+			RecvSpeeds: recv,
+			SendSpeeds: send,
+			RecvBytes:  list2[k].RecvBytes,
+			SendBytes:  list2[k].SendBytes,
+		})
 	}
 	return res, nil
 }
@@ -87,12 +94,12 @@ func NetSpeedsByName(duration time.Duration, name string) (NetSpeed, error) {
 
 // NetConnections return all TCP/UDP/UNIX DOMAIN SOCKET Connections
 // if your uid != 0 ,and analysePid==true ,you should have CAP_SYS_PRTACE and CAP_DAC_OVERRIDE/CAP_DAC_READ_SEARCH Caps
-func NetConnections(analysePid bool,types string) ([]NetConn, error) {
+func NetConnections(analysePid bool, types string) ([]NetConn, error) {
 	var result []NetConn
 	var inodeMap map[string]int64
 	var err error
 	var fileList []string
-	if types=="" || strings.Contains(strings.ToLower(types),"all") {
+	if types == "" || strings.Contains(strings.ToLower(types), "all") {
 		fileList = []string{
 			"/proc/net/tcp",
 			"/proc/net/tcp6",
@@ -101,14 +108,14 @@ func NetConnections(analysePid bool,types string) ([]NetConn, error) {
 			"/proc/net/unix",
 		}
 	}
-	if strings.Contains(strings.ToLower(types),"tcp") {
-		fileList =append(fileList,"/proc/net/tcp","/proc/net/tcp6")
+	if strings.Contains(strings.ToLower(types), "tcp") {
+		fileList = append(fileList, "/proc/net/tcp", "/proc/net/tcp6")
 	}
-	if strings.Contains(strings.ToLower(types),"udp") {
-		fileList =append(fileList,"/proc/net/udp","/proc/net/udp6")
+	if strings.Contains(strings.ToLower(types), "udp") {
+		fileList = append(fileList, "/proc/net/udp", "/proc/net/udp6")
 	}
-	if strings.Contains(strings.ToLower(types),"unix") {
-		fileList =append(fileList,"/proc/net/unix")
+	if strings.Contains(strings.ToLower(types), "unix") {
+		fileList = append(fileList, "/proc/net/unix")
 	}
 	if analysePid {
 		inodeMap, err = GetInodeMap()

sysconf/sysconf.go

@@ -476,7 +476,7 @@ func SliceIn(slice interface{}, data interface{}) bool {
 
 // Unmarshal 输出结果到结构体中
 func (cfg *SysConf) Unmarshal(ins interface{}) error {
-	var structSet func(t reflect.Type, v reflect.Value,oriSeg string) error
+	var structSet func(t reflect.Type, v reflect.Value, oriSeg string) error
 	t := reflect.TypeOf(ins)
 	v := reflect.ValueOf(ins).Elem()
 	if v.Kind() != reflect.Struct {
@@ -486,7 +486,7 @@ func (cfg *SysConf) Unmarshal(ins interface{}) error {
 		return errors.New("Cannot Write!")
 	}
 	t = t.Elem()
-	structSet = func(t reflect.Type, v reflect.Value,oriSeg string) error {
+	structSet = func(t reflect.Type, v reflect.Value, oriSeg string) error {
 		for i := 0; i < t.NumField(); i++ {
 			tp := t.Field(i)
 			vl := v.Field(i)
@@ -494,13 +494,16 @@ func (cfg *SysConf) Unmarshal(ins interface{}) error {
 				continue
 			}
 			if vl.Type().Kind() == reflect.Struct {
-				structSet(vl.Type(), vl,tp.Tag.Get("seg"))
+				structSet(vl.Type(), vl, tp.Tag.Get("seg"))
 				continue
 			}
 			seg := tp.Tag.Get("seg")
 			key := tp.Tag.Get("key")
-			if oriSeg!="" {
-				seg=oriSeg
+			if key != "" && seg == "" && cfg.HaveSegMent {
+				seg = "unnamed"
+			}
+			if oriSeg != "" {
+				seg = oriSeg
 			}
 			if seg == "" || key == "" {
 				continue
@@ -529,12 +532,12 @@ func (cfg *SysConf) Unmarshal(ins interface{}) error {
 		}
 		return nil
 	}
-	return structSet(t, v,"")
+	return structSet(t, v, "")
 }
 
 // Marshal 输出结果到结构体中
 func (cfg *SysConf) Marshal(ins interface{}) ([]byte, error) {
-	var structSet func(t reflect.Type, v reflect.Value,oriSeg string)
+	var structSet func(t reflect.Type, v reflect.Value, oriSeg string)
 	t := reflect.TypeOf(ins)
 	v := reflect.ValueOf(ins)
 	if v.Kind() != reflect.Struct {
@@ -544,20 +547,20 @@ func (cfg *SysConf) Marshal(ins interface{}) ([]byte, error) {
 		t = t.Elem()
 		v = v.Elem()
 	}
-	structSet = func(t reflect.Type, v reflect.Value,oriSeg string) {
+	structSet = func(t reflect.Type, v reflect.Value, oriSeg string) {
 		for i := 0; i < t.NumField(); i++ {
 			var seg, key, comment string = "", "", ""
 			tp := t.Field(i)
 			vl := v.Field(i)
 			if vl.Type().Kind() == reflect.Struct {
-				structSet(vl.Type(), vl,tp.Tag.Get("seg"))
+				structSet(vl.Type(), vl, tp.Tag.Get("seg"))
 				continue
 			}
 			seg = tp.Tag.Get("seg")
 			key = tp.Tag.Get("key")
 			comment = tp.Tag.Get("comment")
 			if oriSeg != "" {
-				seg=oriSeg
+				seg = oriSeg
 			}
 			if seg == "" || key == "" {
 				continue
@@ -569,7 +572,7 @@ func (cfg *SysConf) Marshal(ins interface{}) ([]byte, error) {
 		}
 
 	}
-	structSet(t, v,"")
+	structSet(t, v, "")
 	return cfg.Build(), nil
 }
 

sysconf/sysconf_test.go

@@ -33,11 +33,10 @@ func Test_Parse(t *testing.T) {
 	fmt.Println(cfg.Parse([]byte(data)))
 	cfg.Reverse()
 	cfg.Data[0].Delete(`pp.com`)
-	//fmt.Println(cfg.Data[0].Comment)
+	//fmt.Println(cfg.Data[0].comment)
 	fmt.Println(string(cfg.Build()))
 }
 
-
 type slicetest struct {
 	A string `seg:"s" key:"a"`
 	B string `seg:"a" key:"b"`
@@ -50,7 +49,7 @@ type testme struct {
 
 func Test_Marshal(t *testing.T) {
 
-	var info string =`
+	var info string = `
 [love]
 a=abc
 b=123
@@ -59,10 +58,10 @@ a=456
 b=789
 `
 	var tmp testme
-	ini:=NewIni()
+	ini := NewIni()
 	ini.Parse([]byte(info))
 	ini.Unmarshal(&tmp)
-	fmt.Printf("%+v\n",tmp)
-	b,_:=ini.Marshal(tmp)
+	fmt.Printf("%+v\n", tmp)
+	b, _ := ini.Marshal(tmp)
 	fmt.Println(string(b))
-}
+}

typed.go

@@ -35,9 +35,11 @@ type NetAdapter struct {
 }
 
 type NetSpeed struct {
-	Name      string
-	RecvBytes float64
-	SendBytes float64
+	Name       string
+	RecvSpeeds float64
+	SendSpeeds float64
+	RecvBytes  uint64
+	SendBytes  uint64
 }
 
 // Process 定义一个进程的信息