src/cfg.go | 2 +- src/cfgdir.go | 2 +- src/cmd/nncp/cfgnew.go | 2 +- src/df.go | 1 - src/df_netbsd.go | 1 - src/df_openbsd.go | 1 - src/dirwatch.go | 1 - src/dirwatch_dummy.go | 1 - src/log.go | 2 +- src/pkt.go | 7 ++----- src/sp.go | 2 +- src/toss_test.go | 6 +++--- src/yggdrasil/tcpip.go | 1 - src/yggdrasil/yggdrasil.go | 5 ++--- src/yggdrasil/yggdrasil_dummy.go | 1 - diff --git a/src/cfg.go b/src/cfg.go index d5b5df3d8a538a6703e67bc8fd1a44703bbeeb16826c28fd82e182bec305822b..35de88562b9e02014d5f149151afb807340bc6077310fb587ff0ed72da717ece 100644 --- a/src/cfg.go +++ b/src/cfg.go @@ -508,7 +508,7 @@ log.Fatalln(MagicNNCPBv2.TooOld()) } else if bytes.Equal(data[:8], MagicNNCPBv1.B[:]) { log.Fatalln(MagicNNCPBv1.TooOld()) } - var cfgGeneral map[string]interface{} + var cfgGeneral map[string]any if err = hjson.Unmarshal(data, &cfgGeneral); err != nil { return nil, err } diff --git a/src/cfgdir.go b/src/cfgdir.go index a98016e31591a5a308715fc8ac7252fc02282730faf9d5354d5a2530229c1023..ccdb2096410d2a3692e9ea317e0b3245639863355c85aaccb2b505625b5b5714 100644 --- a/src/cfgdir.go +++ b/src/cfgdir.go @@ -30,7 +30,7 @@ func cfgDirMkdir(dst ...string) error { return os.MkdirAll(filepath.Join(dst...), os.FileMode(0777)) } -func cfgDirSave(v interface{}, dst ...string) error { +func cfgDirSave(v any, dst ...string) error { var r string switch v := v.(type) { case *string: diff --git a/src/cmd/nncp/cfgnew.go b/src/cmd/nncp/cfgnew.go index b5518f7db4ef6aea30ce1c675a60481855117985a5be0affa7f74ef898967cf7..b5ef6675810d99a21624c797e32c05b95493f959285d46e6b6e9ae751e35d8e4 100644 --- a/src/cmd/nncp/cfgnew.go +++ b/src/cmd/nncp/cfgnew.go @@ -119,7 +119,7 @@ *areaName, nncp.DefaultSendmailPath, ) } - var cfgGeneral map[string]interface{} + var cfgGeneral map[string]any if err = hjson.Unmarshal([]byte(cfgRaw), &cfgGeneral); err != nil { panic(err) } diff --git a/src/df.go b/src/df.go index 93fe1e89b61d0a25ed74b3ca3989e8a258f5dad00b29ba5718bbfc64aaa41703..f774e74ee6a41cad2c61a1ef0fbdca647fcf5eb89d36cf1fd36008674e5cb056 100644 --- a/src/df.go +++ b/src/df.go @@ -1,5 +1,4 @@ //go:build !netbsd && !openbsd -// +build !netbsd,!openbsd package nncp diff --git a/src/df_netbsd.go b/src/df_netbsd.go index 4202b7e918ecc14809db484fbb645718005004bbd1dfd449f1f6b9a3d367a677..6310c9048e55f6fd9487be7bbec36b9a13cbfd01e7e66d9ecb30cd668a84a520 100644 --- a/src/df_netbsd.go +++ b/src/df_netbsd.go @@ -1,5 +1,4 @@ //go:build netbsd -// +build netbsd package nncp diff --git a/src/df_openbsd.go b/src/df_openbsd.go index 4be7405e8da2cba1facf54d8f3c885da87f2c8bebe1be0cd811f31383cb96e91..ab520720abcd918a78a72f752f04eb840aa4f453afd407a5ea826685a32dfea8 100644 --- a/src/df_openbsd.go +++ b/src/df_openbsd.go @@ -1,5 +1,4 @@ //go:build openbsd -// +build openbsd package nncp diff --git a/src/dirwatch.go b/src/dirwatch.go index 246f268eec25758c75e2abf4b3763c2bc95e1ec010f16dc86e30bc5d65dd3a35..bb1f199376e2373999a7b0def389ca780008bf7d23745c74f15f1e3b9235db2f 100644 --- a/src/dirwatch.go +++ b/src/dirwatch.go @@ -1,5 +1,4 @@ //go:build !nofsnotify -// +build !nofsnotify // NNCP -- Node to Node copy, utilities for store-and-forward data exchange // Copyright (C) 2016-2026 Sergey Matveev diff --git a/src/dirwatch_dummy.go b/src/dirwatch_dummy.go index d952a10c5cea7d14b7e3ff9f44b8e5ff8915b7b49b3dccdbcdc5505c125469c6..314e571a111a409844d638b32f324656ac0d9a579027c16b0525934f529a6bdb 100644 --- a/src/dirwatch_dummy.go +++ b/src/dirwatch_dummy.go @@ -1,5 +1,4 @@ //go:build nofsnotify -// +build nofsnotify // NNCP -- Node to Node copy, utilities for store-and-forward data exchange // Copyright (C) 2016-2026 Sergey Matveev diff --git a/src/log.go b/src/log.go index 3d6909ee7b3a062cb5d7315fab6b90de47f2f62bf5e5b210c92cc4716e975d97..dcaf1a04dc831862a863a50a15a41452edb592ad60a79ebb1b14eff4c7304d79 100644 --- a/src/log.go +++ b/src/log.go @@ -33,7 +33,7 @@ ) type LE struct { K string - V interface{} + V any } type LEs []LE diff --git a/src/pkt.go b/src/pkt.go index 961bb621ebe2ba8ec598acdfe701da8c4e8e6f432c3941ab03d86989c7337b22..50da0cf26674c55dfcf9f998a54357c562e0b992d79da90f5027fbf972bd4cdd 100644 --- a/src/pkt.go +++ b/src/pkt.go @@ -182,13 +182,10 @@ } func sizePadCalc(sizePayload, minSize int64, wrappers int) (sizePad int64) { expectedSize := sizePayload - PktOverhead - for i := 0; i < wrappers; i++ { + for range wrappers { expectedSize = PktEncOverhead + sizeWithTags(PktOverhead+expectedSize) } - sizePad = minSize - expectedSize - if sizePad < 0 { - sizePad = 0 - } + sizePad = max(minSize-expectedSize, 0) return } diff --git a/src/sp.go b/src/sp.go index 769c837f21e136aa398f2780084749bde89ed848b9e20f1435dc2d49eb8d67f3..bc3ec0aa521c29631f5bbe980a0d7169fcacf8e557db72b5f9b747e8877dda89 100644 --- a/src/sp.go +++ b/src/sp.go @@ -179,7 +179,7 @@ SPFileOverhead = buf.Len() spCheckerTasks = make(chan SPCheckerTask) } -func MarshalSP(typ SPType, sp interface{}) []byte { +func MarshalSP(typ SPType, sp any) []byte { var buf bytes.Buffer if _, err := xdr.Marshal(&buf, SPHead{typ}); err != nil { panic(err) diff --git a/src/toss_test.go b/src/toss_test.go index be3b6d7f76216dac5be41635c2d043c9a1cdcc436edfb390ef5aeb36c6c14584..eb8aef501bf71b81dccdcdd4b1ce64484e91e673d9a1a1b356ea5d3e8976fa91 100644 --- a/src/toss_test.go +++ b/src/toss_test.go @@ -137,10 +137,10 @@ if err != nil { return false } expected := make([]byte, 0, 16) - for i := 0; i < 16; i++ { + for range 16 { expected = append( expected, - []byte(fmt.Sprintf("%d arg0 arg1\n", replyNice))..., + fmt.Appendf(nil, "%d arg0 arg1\n", replyNice)..., ) expected = append(expected, []byte("BODY\n")...) } @@ -276,7 +276,7 @@ t.Error(err) return false } incomingPath := filepath.Join(spool, "incoming") - for i := 0; i < files; i++ { + for range files { if err := ctx.TxFile( ctx.Neigh[*nodeOur.Id], DefaultNiceFile, diff --git a/src/yggdrasil/tcpip.go b/src/yggdrasil/tcpip.go index 1a08383d240c26022b09f0721bf01cfb1e5d3036fea7ff0125512647f09758e2..4cd471104b23b90f906eb613807ee4548a8c46ec3962547425ee558108cbfb4e 100644 --- a/src/yggdrasil/tcpip.go +++ b/src/yggdrasil/tcpip.go @@ -1,5 +1,4 @@ //go:build !noyggdrasil -// +build !noyggdrasil // NNCP -- Node to Node copy, utilities for store-and-forward data exchange // Copyright (C) 2016-2026 Sergey Matveev diff --git a/src/yggdrasil/yggdrasil.go b/src/yggdrasil/yggdrasil.go index 5a82aa2b718cad75adcf29229ee757174e981010a6a15f85f915fd559c3a8c34..de9c004217f7b843a208b1a359c4bd2c91efcc2ab3988f028ae60c264b6de702 100644 --- a/src/yggdrasil/yggdrasil.go +++ b/src/yggdrasil/yggdrasil.go @@ -1,5 +1,4 @@ //go:build !noyggdrasil -// +build !noyggdrasil // NNCP -- Node to Node copy, utilities for store-and-forward data exchange // Copyright (C) 2016-2026 Sergey Matveev @@ -207,7 +206,7 @@ } cfg := ycfg.NodeConfig{ PrivateKey: prvRaw, Peers: peers, - NodeInfo: map[string]interface{}{"name": "NNCP"}, + NodeInfo: map[string]any{"name": "NNCP"}, NodeInfoPrivacy: true, } core, err := ycoreStart(&cfg, port, mcasts) @@ -299,7 +298,7 @@ PrivateKey: ycfg.KeyBytes(prvRaw), Listen: binds, AllowedPublicKeys: pubs, Peers: peers, - NodeInfo: map[string]interface{}{"name": "NNCP"}, + NodeInfo: map[string]any{"name": "NNCP"}, NodeInfoPrivacy: true, } core, err := ycoreStart(&cfg, port, mcasts) diff --git a/src/yggdrasil/yggdrasil_dummy.go b/src/yggdrasil/yggdrasil_dummy.go index d0517d8ba3eed9071ff43340aa15e89334a427dd6941d622419f2ded4b9cfb88..570bf614708f1a95b809b3475f0ef12bd9ee7011763d34d70c4d31b3c2597716 100644 --- a/src/yggdrasil/yggdrasil_dummy.go +++ b/src/yggdrasil/yggdrasil_dummy.go @@ -1,5 +1,4 @@ //go:build noyggdrasil -// +build noyggdrasil // NNCP -- Node to Node copy, utilities for store-and-forward data exchange // Copyright (C) 2016-2026 Sergey Matveev