X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-stat%2Fmain.go;h=2f7cdc4436877c0e54aefdb3c7e67a80e3019a56;hb=0fad171c0d79ad583c0faf5427e22d1d62a0a52d;hp=04aaed24c0d5eef77a0ea0bfb5665a28c2b48898;hpb=adea2dc4bf9951998a4eb52af00817d29d5665ca;p=nncp.git

diff --git a/src/cmd/nncp-stat/main.go b/src/cmd/nncp-stat/main.go
index 04aaed2..2f7cdc4 100644
--- a/src/cmd/nncp-stat/main.go
+++ b/src/cmd/nncp-stat/main.go
@@ -26,7 +26,7 @@ import (
 	"sort"
 
 	"github.com/dustin/go-humanize"
-	"go.cypherpunks.ru/nncp/v5"
+	"go.cypherpunks.ru/nncp/v7"
 )
 
 func usage() {
@@ -56,6 +56,7 @@ func main() {
 		version   = flag.Bool("version", false, "Print version information")
 		warranty  = flag.Bool("warranty", false, "Print warranty information")
 	)
+	log.SetFlags(log.Lshortfile)
 	flag.Usage = usage
 	flag.Parse()
 	if *warranty {
@@ -98,18 +99,25 @@ func main() {
 		fmt.Println(node.Name)
 		rxNums := make(map[uint8]int)
 		rxBytes := make(map[uint8]int64)
+		noCKNums := make(map[uint8]int)
+		noCKBytes := make(map[uint8]int64)
 		for job := range ctx.Jobs(node.Id, nncp.TRx) {
-			job.Fd.Close() // #nosec G104
 			if *showPkt {
 				jobPrint(nncp.TRx, job)
 			}
 			rxNums[job.PktEnc.Nice] = rxNums[job.PktEnc.Nice] + 1
 			rxBytes[job.PktEnc.Nice] = rxBytes[job.PktEnc.Nice] + job.Size
 		}
+		for job := range ctx.JobsNoCK(node.Id) {
+			if *showPkt {
+				jobPrint(nncp.TRx, job)
+			}
+			noCKNums[job.PktEnc.Nice] = noCKNums[job.PktEnc.Nice] + 1
+			noCKBytes[job.PktEnc.Nice] = noCKBytes[job.PktEnc.Nice] + job.Size
+		}
 		txNums := make(map[uint8]int)
 		txBytes := make(map[uint8]int64)
 		for job := range ctx.Jobs(node.Id, nncp.TTx) {
-			job.Fd.Close() // #nosec G104
 			if *showPkt {
 				jobPrint(nncp.TTx, job)
 			}
@@ -120,17 +128,26 @@ func main() {
 		for nice = 1; nice > 0; nice++ {
 			rxNum, rxExists := rxNums[nice]
 			txNum, txExists := txNums[nice]
-			if !(rxExists || txExists) {
+			noCKNum, noCKExists := noCKNums[nice]
+			if !(rxExists || txExists || noCKExists) {
 				continue
 			}
 			fmt.Printf(
-				"\tnice:% 4s | Rx: % 10s, % 3d pkts | Tx: % 10s, % 3d pkts\n",
+				"\tnice:% 4s | Rx: % 10s, % 3d pkts | Tx: % 10s, % 3d pkts",
 				nncp.NicenessFmt(nice),
 				humanize.IBytes(uint64(rxBytes[nice])),
 				rxNum,
 				humanize.IBytes(uint64(txBytes[nice])),
 				txNum,
 			)
+			if noCKExists {
+				fmt.Printf(
+					" | NoCK: % 10s, % 3d pkts",
+					humanize.IBytes(uint64(noCKBytes[nice])),
+					noCKNum,
+				)
+			}
+			fmt.Printf("\n")
 		}
 	}
 }