README | 4 ++-- README.RU | 4 ++-- doc/admin.texi | 10 +++++----- doc/building.texi | 7 +++++-- doc/cmd/nncp-bundle.texi | 6 +++--- doc/cmd/nncp-cfgdir.texi | 2 +- doc/cmd/nncp-cfgenc.texi | 4 ++-- doc/cmd/nncp-cfgmin.texi | 2 +- doc/cmd/nncp-cfgnew.texi | 2 +- doc/cmd/nncp-exec.texi | 2 +- doc/cmd/nncp-pkt.texi | 4 ++-- doc/contacts.texi | 2 +- doc/default.plantuml.txt.do | 2 +- doc/download.texi | 8 +++++++- doc/index.texi | 2 +- doc/install.texi | 4 ++-- doc/integration/freqindex.texi | 4 ++-- doc/integrity.texi | 2 +- doc/mirrors.texi | 4 ++-- doc/news.ru.texi | 18 +++++++++++++++++- doc/news.texi | 18 +++++++++++++++++- doc/sendmail.sh | 4 ++-- doc/sources.texi | 8 ++++---- makedist | 33 +++++++++++++++------------------ ports/nncp/files/pkg-message.in | 2 +- src/area.go | 30 ++++++++++++++---------------- src/call.go | 32 +++++++++++++++----------------- src/cfg.go | 30 ++++++++++++++---------------- src/cfgdir.go | 30 ++++++++++++++---------------- src/check.go | 30 ++++++++++++++---------------- src/chunked.go | 30 ++++++++++++++---------------- src/cmd/nncp-ack/main.go | 32 +++++++++++++++----------------- src/cmd/nncp-bundle/main.go | 38 ++++++++++++++++++-------------------- src/cmd/nncp-call/main.go | 32 +++++++++++++++----------------- src/cmd/nncp-caller/main.go | 32 +++++++++++++++----------------- src/cmd/nncp-cfgdir/main.go | 34 ++++++++++++++++------------------ src/cmd/nncp-cfgenc/main.go | 36 +++++++++++++++++------------------- src/cmd/nncp-cfgmin/main.go | 32 +++++++++++++++----------------- src/cmd/nncp-cfgnew/main.go | 32 +++++++++++++++----------------- src/cmd/nncp-check/main.go | 32 +++++++++++++++----------------- src/cmd/nncp-cronexpr/main.go | 32 +++++++++++++++----------------- src/cmd/nncp-daemon/main.go | 34 ++++++++++++++++------------------ src/cmd/nncp-exec/main.go | 32 +++++++++++++++----------------- src/cmd/nncp-file/main.go | 32 +++++++++++++++----------------- src/cmd/nncp-freq/main.go | 32 +++++++++++++++----------------- src/cmd/nncp-hash/main.go | 32 +++++++++++++++----------------- src/cmd/nncp-log/main.go | 34 ++++++++++++++++------------------ src/cmd/nncp-pkt/main.go | 32 +++++++++++++++----------------- src/cmd/nncp-reass/main.go | 32 +++++++++++++++----------------- src/cmd/nncp-rm/main.go | 34 ++++++++++++++++------------------ src/cmd/nncp-stat/main.go | 32 +++++++++++++++----------------- src/cmd/nncp-toss/main.go | 32 +++++++++++++++----------------- src/cmd/nncp-trns/main.go | 32 +++++++++++++++----------------- src/cmd/nncp-xfer/main.go | 32 +++++++++++++++----------------- src/ctx.go | 30 ++++++++++++++---------------- src/dirwatch.go | 30 ++++++++++++++---------------- src/dirwatch_dummy.go | 30 ++++++++++++++---------------- src/eblob.go | 30 ++++++++++++++---------------- src/go.mod | 53 +++++++++++++++++++++++++++-------------------------- src/go.sum | 124 +++++++++++++++++++++++++++++------------------------ src/humanizer.go | 32 +++++++++++++++----------------- src/jobs.go | 30 ++++++++++++++---------------- src/lockdir.go | 30 ++++++++++++++---------------- src/log.go | 32 +++++++++++++++----------------- src/magic.go | 30 ++++++++++++++---------------- src/mcd.go | 30 ++++++++++++++---------------- src/mth.go | 30 ++++++++++++++---------------- src/mth_test.go | 30 ++++++++++++++---------------- src/nice.go | 15 +++++++++++++++ src/nncp.go | 34 ++++++++++++++++------------------ src/node.go | 30 ++++++++++++++---------------- src/pipe.go | 30 ++++++++++++++---------------- src/pkt.go | 30 ++++++++++++++---------------- src/pkt_test.go | 30 ++++++++++++++---------------- src/progress.go | 32 +++++++++++++++----------------- src/sp.go | 30 ++++++++++++++---------------- src/tmp.go | 30 ++++++++++++++---------------- src/toss.go | 30 ++++++++++++++---------------- src/toss_test.go | 32 +++++++++++++++----------------- src/tx.go | 30 ++++++++++++++---------------- src/tx_test.go | 30 ++++++++++++++---------------- src/ucspi.go | 30 ++++++++++++++---------------- src/via.go | 30 ++++++++++++++---------------- src/yggdrasil/tcpip.go | 57 +++++++++++++++++++++++++++++------------------------ src/yggdrasil/yggdrasil.go | 30 ++++++++++++++---------------- src/yggdrasil/yggdrasil_dummy.go | 32 +++++++++++++++----------------- t/nncp-rm.t | 8 ++++---- version | 2 +- diff --git a/README b/README index 1ae01347a944d8f8419899c93055bbb331d8cfb3828c47064408219bf2c18217..85a3db2babc07c394fe16c5ec58ea977ab84a2c3aba3eca99f08b1a42fbd42a3 100644 --- a/README +++ b/README @@ -22,9 +22,9 @@ Home page: http://www.nncpgo.org/ Please send questions regarding the use of NNCP, bug reports and patches to nncp-devel mailing list: -http://lists.cypherpunks.ru/nncp_002ddevel.html +http://lists.cypherpunks.su/nncp_002ddevel.html Development Git source code repository currently is located here: -http://www.git.cypherpunks.ru/?p=nncp.git;a=summary +http://www.git.cypherpunks.su/?p=nncp.git;a=summary For further information please read either doc/nncp.info or doc/nncp.texi. diff --git a/README.RU b/README.RU index 8c2487bf980bbf680494aac71eb49519589e756819b11dd588750c9907925bce..bc9f6d52ab47eea3d9db832be082d99a537242b8d1be92112d8f455ed6143428 100644 --- a/README.RU +++ b/README.RU @@ -27,10 +27,10 @@ Домашняя страница: http://www.nncpgo.org/ Пожалуйста все вопросы касающиеся использования NNCP, отчёты об ошибках и патчи отправляйте в nncp-devel почтовую рассылку: -http://lists.cypherpunks.ru/nncp_002ddevel.html +http://lists.cypherpunks.su/nncp_002ddevel.html Исходный код для разработчика находится в Git репозитории: -http://www.git.cypherpunks.ru/?p=nncp.git;a=summary +http://www.git.cypherpunks.su/?p=nncp.git;a=summary Для дополнительной информации пожалуйста читайте или doc/nncp.info или doc/nncp.texi. diff --git a/doc/admin.texi b/doc/admin.texi index fa73fa241105e4cbe90d3dbd9bc8687f3f0db7626f7252730c577f08beb24890..1e40f8fac33c265abe270ae0ad89e5193efd40f706967d233825febce84b5c9b 100644 --- a/doc/admin.texi +++ b/doc/admin.texi @@ -44,7 +44,7 @@ @example $ chgrp nncp /usr/local/etc/nncp.hjson /var/spool/nncp $ chmod g+r /usr/local/etc/nncp.hjson $ chmod g+rwxs /var/spool/nncp -$ echo 'umask: "007"' >> /usr/local/etc/nncp.hjson +$ echo 'umask: "007"' >>/usr/local/etc/nncp.hjson @end example @item @@ -84,13 +84,13 @@ @example # mkdir -p /var/service/.nncp-toss/log # cd /var/service/.nncp-toss -# cat > run <run <&1 exec setuidgid uucp /usr/local/bin/nncp-toss -cycle 10 EOF -# cat > log/run <log/run < run <run <&1 EOF -# cat > log/run <log/run < @dots{} -$ nncp-bundle [options] -rx -delete [-dryrun] [NODE @dots{}] < @dots{} -$ nncp-bundle [options] -rx [-check] [-dryrun] [NODE @dots{}] < @dots{} +$ nncp-bundle [options] -tx [-delete] NODE [NODE @dots{}] >@dots{} +$ nncp-bundle [options] -rx -delete [-dryrun] [NODE @dots{}] <@dots{} +$ nncp-bundle [options] -rx [-check] [-dryrun] [NODE @dots{}] <@dots{} @end example With @option{-tx} option, this command creates @ref{Bundles, bundle} of diff --git a/doc/cmd/nncp-cfgdir.texi b/doc/cmd/nncp-cfgdir.texi index 2778912596711cc5baba7e4c03cd2d0c4fd8d5db4bef626e85d9ecb9cbbf8bd4..b12723897be5b26277f185f73c56677d20ef0172966134c0af052749f21ecca7 100644 --- a/doc/cmd/nncp-cfgdir.texi +++ b/doc/cmd/nncp-cfgdir.texi @@ -4,7 +4,7 @@ @section nncp-cfgdir @example $ nncp-cfgdir [options] [-cfg @dots{}] -dump /path/to/dir -$ nncp-cfgdir [options] -load /path/to/dir > cfg.hjson +$ nncp-cfgdir [options] -load /path/to/dir >cfg.hjson @end example @option{-dump} option dumps current configuration file to the diff --git a/doc/cmd/nncp-cfgenc.texi b/doc/cmd/nncp-cfgenc.texi index be3e66f7eb316c5c3589178f77315dbb8f2460def3233dcb803842701dc17f3e..be8b5619ab2603ac402ace284be7f4de649fe5697bb5493332fc2f07f1d931fc 100644 --- a/doc/cmd/nncp-cfgenc.texi +++ b/doc/cmd/nncp-cfgenc.texi @@ -3,8 +3,8 @@ @pindex nncp-cfgenc @section nncp-cfgenc @example -$ nncp-cfgenc [options] [-s INT] [-t INT] [-p INT] cfg.hjson > cfg.hjson.eblob -$ nncp-cfgenc [options] -d cfg.hjson.eblob > cfg.hjson +$ nncp-cfgenc [options] [-s INT] [-t INT] [-p INT] cfg.hjson >cfg.hjson.eblob +$ nncp-cfgenc [options] -d cfg.hjson.eblob >cfg.hjson @end example This command allows you to encrypt provided @file{cfg.hjson} file with diff --git a/doc/cmd/nncp-cfgmin.texi b/doc/cmd/nncp-cfgmin.texi index 9b69ed9733d7166ed4bed19c7faaf063426c0bd3ce418f1439a74390bb77fae2..3e260463032e9602deb4bccacdb58db0429ba4b9ea9ea4cb998660573784209f 100644 --- a/doc/cmd/nncp-cfgmin.texi +++ b/doc/cmd/nncp-cfgmin.texi @@ -5,7 +5,7 @@ @pindex nncp-cfgmin @section nncp-cfgmin @example -$ nncp-cfgmin [options] > stripped.hjson +$ nncp-cfgmin [options] >stripped.hjson @end example Print out stripped configuration version: only path to @ref{Spool, diff --git a/doc/cmd/nncp-cfgnew.texi b/doc/cmd/nncp-cfgnew.texi index 34ce65d11b3d66165e3c0a8eb6a6b244505308c004a104bfe27165ee89c9ad04..827fd9fac56133cd54e6f693c8b399d6172726f1c3957c79f0aac2dd5eff91dd 100644 --- a/doc/cmd/nncp-cfgnew.texi +++ b/doc/cmd/nncp-cfgnew.texi @@ -3,7 +3,7 @@ @pindex nncp-cfgnew @section nncp-cfgnew @example -$ nncp-cfgnew [options] [-area NAME] [-yggdrasil] [-nocomments] > new.hjson +$ nncp-cfgnew [options] [-area NAME] [-yggdrasil] [-nocomments] >new.hjson @end example Generate new node configuration: private keys, example configuration diff --git a/doc/cmd/nncp-exec.texi b/doc/cmd/nncp-exec.texi index f1938e2e672882388b289bcf92a0c3e668388cad2646500afeec96dc0384c1a5..99d992c30b7238b5ef2ec05c03703f58804072c0be377d01fea30d6c083130d5 100644 --- a/doc/cmd/nncp-exec.texi +++ b/doc/cmd/nncp-exec.texi @@ -19,7 +19,7 @@ @verbatim exec: { sendmail: [/usr/sbin/sendmail, "-t"] - appender: ["/bin/sh", "-c", "cat >> /append"] + appender: ["/bin/sh", "-c", "cat >>/append"] } @end verbatim diff --git a/doc/cmd/nncp-pkt.texi b/doc/cmd/nncp-pkt.texi index 49bc83295da8167dcd2cf5f111450dd596827643093107e33a916559c7a14fc2..7f724c793b7d8c34c30673c9fb9b27d981789c82a70697ee39a1a0dc880b5663 100644 --- a/doc/cmd/nncp-pkt.texi +++ b/doc/cmd/nncp-pkt.texi @@ -3,8 +3,8 @@ @pindex nncp-pkt @section nncp-pkt @example -$ nncp-pkt [options] < pkt -$ nncp-pkt [options] [-decompress] -dump < pkt > payload +$ nncp-pkt [options] payload $ nncp-pkt -overheads @end example diff --git a/doc/contacts.texi b/doc/contacts.texi index 3dc1a060e0066a30beeb5c4192f352ce660db176bc7c1e781ec14975833529b3..1347e7bb1219591335130ffce57d62d65df133326dd23731dd2b1931a2a16a7d 100644 --- a/doc/contacts.texi +++ b/doc/contacts.texi @@ -6,7 +6,7 @@ @cindex Matrix @unnumbered Contacts Please send questions regarding the use of NNCP, bug reports and patches to -@url{http://lists.cypherpunks.ru/nncp_002ddevel.html, nncp-devel} +@url{http://lists.cypherpunks.su/nncp_002ddevel.html, nncp-devel} mailing list. Announcements also go to this mailing list. There are also community-supported @code{#nncp:matrix.org} Matrix diff --git a/doc/default.plantuml.txt.do b/doc/default.plantuml.txt.do index 50da2a96717745d0e8030abe8bc448f74181f97df6cdfe2aeb155eb1de2ea825..79a58ef3c71561f863c8d86d51f4604860ab830920c5ca47a2a238d3bccdbc35 100644 --- a/doc/default.plantuml.txt.do +++ b/doc/default.plantuml.txt.do @@ -1,4 +1,4 @@ src=${1%.txt} redo-ifchange $src ../config . ../config -$PLANTUML -tutxt -pipe < $src +$PLANTUML -tutxt -pipe <$src diff --git a/doc/download.texi b/doc/download.texi index 09c88bd31cd7f930edd13e48fa96b4613ac6f9793dca2c3f3336846539e116d9..43fb41e94c7cfa8382a80a7da1690d5c1a64b5cc42ef3b9227c53630258a6fde 100644 --- a/doc/download.texi +++ b/doc/download.texi @@ -24,7 +24,7 @@ @item @code{github.com/klauspost/compress} @tab BSD 3-Clause @item @code{github.com/klauspost/cpuid} @tab BSD 3-Clause @item @code{github.com/quic-go/quic-go} @tab Expat @item @code{go.cypherpunks.ru/balloon} @tab GNU LGPLv3 -@item @code{go.cypherpunks.ru/recfile} @tab GNU GPLv3 +@item @code{go.cypherpunks.su/recfile/v2} @tab GNU GPLv3 @item @code{golang.org/x/crypto} @tab BSD 3-Clause @item @code{golang.org/x/net} @tab BSD 3-Clause @item @code{golang.org/x/sys} @tab BSD 3-Clause @@ -49,6 +49,12 @@ @end multitable @multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {meta4 tar pgp ssh} @headitem Version @tab Date @tab Size @tab Tarball + +@item @ref{Release 8_10_0, 8.10.0} @tab 2023-10-31 @tab 2672 KiB @tab +@url{download/nncp-8.10.0.tar.xz.meta4, meta4} +@url{download/nncp-8.10.0.tar.xz, tar} +@url{download/nncp-8.10.0.tar.xz.asc, pgp} +@url{download/nncp-8.10.0.tar.xz.sig, ssh} @item @ref{Release 8_9_0, 8.9.0} @tab 2023-08-13 @tab 1780 KiB @tab @url{download/nncp-8.9.0.tar.xz.meta4, meta4} diff --git a/doc/index.texi b/doc/index.texi index 33338175f251bd87f62510c41f4f2f8eed5027718b6da123b7433e0900bb92d1..5cb06e67618109652aafd868b6658fe625da1b65b5c984d5740bb2dc750e19aa 100644 --- a/doc/index.texi +++ b/doc/index.texi @@ -5,7 +5,7 @@ @copying This manual is for NNCP (Node to Node copy) -- collection of utilities simplifying secure store-and-forward files and mail exchanging. -Copyright @copyright{} 2016-2023 @email{stargrave@@stargrave.org, Sergey Matveev} +Copyright @copyright{} 2016-2024 @email{stargrave@@stargrave.org, Sergey Matveev} @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/install.texi b/doc/install.texi index 8a238bc956e59232e4b2e7f129a7161e31dc6812c0e3b85d24133f14d9e44fab..8bced785f3190f6eca7f79ac59c13a6317323e72798274c0d3db5d552e148601 100644 --- a/doc/install.texi +++ b/doc/install.texi @@ -34,7 +34,7 @@ @cindex NetBSD @item @url{https://pkgsrc.se/wip/nncp, NetBSD package} @cindex NixOS -@item @url{https://github.com/NixOS/nixpkgs/tree/master/pkgs/tools/misc/nncp, NixOS packages} +@item @url{https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/nn/nncp, NixOS packages} @cindex Ubuntu @item @url{https://packages.ubuntu.com/search?keywords=nncp, Ubuntu} @@ -50,7 +50,7 @@ @pindex go @pindex texinfo NNCP is written on @url{https://go.dev/, Go} programming language -and you have to install Go compiler 1.20+ version. +and you have to install Go compiler 1.22+ version. @url{http://cr.yp.to/redo.html, redo} build system is recommended for convenience. @url{https://www.gnu.org/software/texinfo/, Texinfo} is used for building documentation (although tarballs already include it). diff --git a/doc/integration/freqindex.texi b/doc/integration/freqindex.texi index 952cf36ca23072b6a1876296c07e1167db268c08f8ac6dd4f232d66fb4bc0f38..97f9bdb254950b15817e74834ce605053c947b585716d7939766fc22b4cc666a 100644 --- a/doc/integration/freqindex.texi +++ b/doc/integration/freqindex.texi @@ -10,7 +10,7 @@ @example 0 4 * * * cd /storage ; tmp=`mktemp` ; \ tree -f -h -N --du --timefmt \%Y-\%m-\%d | - zstdmt -19 > $tmp && chmod 644 $tmp && mv $tmp TREE.txt.zst ; \ + zstdmt -19 >$tmp && chmod 644 $tmp && mv $tmp TREE.txt.zst ; \ tree -J -f --timefmt \%Y-\%m-\%d | - zstdmt -19 > $tmp && chmod 644 $tmp && mv $tmp TREE.json.zst + zstdmt -19 >$tmp && chmod 644 $tmp && mv $tmp TREE.json.zst @end example diff --git a/doc/integrity.texi b/doc/integrity.texi index ec862fb1b09cb9bc10c1a5cfc910e246fb52187da5456d9b3fc208dcaa404453..af14a32d69a01cc843a56044ada539faba1451934c0e9e65eb960b027d28230c 100644 --- a/doc/integrity.texi +++ b/doc/integrity.texi @@ -38,7 +38,7 @@ Its fingerprint: @code{SHA256:FRiWawVNBkyS3jFn8uZ/JlT+PWKSFbhWe5XSixp1+SY}. @example $ ssh-keygen -Y verify -f PUBKEY-SSH.pub -I releases@@nncpgo.org -n file \ - -s nncp-@value{VERSION}.tar.zst.sig < nncp-@value{VERSION}.tar.zst + -s nncp-@value{VERSION}.tar.zst.sig $tmp -sendmail -f "`reformail -x Return-Path: < $tmp`" $@ < $tmp +cat >$tmp +sendmail -f "`reformail -x Return-Path: <$tmp`" $@ <$tmp diff --git a/doc/sources.texi b/doc/sources.texi index 6dce0c4110a615c564efd2380669303070a506d7a3546cd80b32bd243def3eb9..abd0dad80a766cc21a01c7a8ddaa264d7bad096bb2e9d8b0657e9c329b2d5109 100644 --- a/doc/sources.texi +++ b/doc/sources.texi @@ -10,10 +10,10 @@ libraries source code. Because of that, it is recommended for porters to use @ref{Tarballs, tarballs} instead. @example -$ git clone --branch develop git://git.cypherpunks.ru/nncp.git nncp +$ git clone --branch develop git://git.cypherpunks.su/nncp.git nncp @end example You can also use -@url{https://git.cypherpunks.ru/nncp.git}, -@url{http://git.cypherpunks.ru/nncp.git}, -@url{http://y.git.cypherpunks.ru/nncp.git} URLs instead. +@url{https://git.cypherpunks.su/nncp.git}, +@url{http://git.cypherpunks.su/nncp.git}, +@url{http://y.git.cypherpunks.su/nncp.git} URLs instead. diff --git a/makedist b/makedist index 6f73935b56989988f551bc4edb6c052359cf9ec6c2ade9024fa3fb42b2c0fdb4..328ba4f546f05c630a90b0154bda85722bb4d7d172de8144e09a1f1f44522449 100755 --- a/makedist +++ b/makedist @@ -9,7 +9,7 @@ git clone . $tmp/nncp-$release cd $tmp/nncp-$release git checkout v$release -./version > VERSION +./version >VERSION cd src go mod vendor modvendor -v -copy="**/*_test.go **/words.go **/README.md **/main.go" @@ -36,7 +36,7 @@ -name .travis.yml -o \ -name .goreleaser.yml -o \ -name .gitattributes \) -delete -cat > doc/download.texi <doc/download.texi < $texi <$texi < $texi <$texi < $texi <$texi < $texi <$texi <nncp-"$release".tar.xz tarball=nncp-"$release".tar.xz ssh-keygen -Y sign -f ~/.ssh/sign/releases@nncpgo.org -n file $tarball gpg --armor --detach-sign --sign --local-user releases@nncpgo.org "$tarball" -meta4-create -fn "$tarball" -mtime "$tarball" \ +meta4ra-create -fn "$tarball" -mtime "$tarball" \ -sig-pgp "$tarball".asc -sig-ssh "$tarball".sig \ http://www.nncpgo.org/download/"$tarball" \ http://y.www.nncpgo.org/download/"$tarball" \ - https://nncp.mirrors.quux.org/download/"$tarball" < "$tarball" > "$tarball".meta4 + https://nncp.mirrors.quux.org/download/"$tarball" <"$tarball" >"$tarball".meta4 size=$(( $(stat -f %z $tarball) / 1024 )) release_date=$(date "+%Y-%m-%d") @@ -187,10 +184,10 @@ There are mirrors where you can also get the source code tarballs: http://www.nncpgo.org/Mirrors.html Please send questions regarding the use of NNCP, bug reports and patches -to mailing list: http://lists.cypherpunks.ru/nncp_002ddevel.html +to mailing list: http://lists.cypherpunks.su/nncp_002ddevel.html EOF echo mutt -s \"[EN] NNCP $release release announcement\" \ - nncp-devel@lists.cypherpunks.ru \ + nncp-devel@lists.cypherpunks.su \ -a $cur/doc/download/"$tarball".meta4 cat < %%PREFIX%%/etc/nncp.hjson + # nncp-cfgnew >%%PREFIX%%/etc/nncp.hjson EOM } ] diff --git a/src/area.go b/src/area.go index 25f33c7622ba850d3ea1ec654d3c1e0d183326060904214cd41c5400231077dc..3611309409dcce64f6907b7e1c443fe1cc6405ea6522b2958507a098aef22bf3 100644 --- a/src/area.go +++ b/src/area.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/call.go b/src/call.go index ccbbe42ce4bc3fe12000ddde862bfce93cbba0f5459cd99d40552a27d33d4862..751a5986a85207043fc23425e4bbe9d90142e5e1650103263f88912b0c3f608c 100644 --- a/src/call.go +++ b/src/call.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp @@ -27,7 +25,7 @@ "time" "github.com/dustin/go-humanize" "github.com/gorhill/cronexpr" - nncpYggdrasil "go.cypherpunks.ru/nncp/v8/yggdrasil" + nncpYggdrasil "go.cypherpunks.su/nncp/v8/yggdrasil" ) type Call struct { diff --git a/src/cfg.go b/src/cfg.go index 019b8ba8da8fb590bcbe26454d4ac3c1752eba55952b0150e2ec16e2b030a93d..111b81f5e9348c2a6986b19580804ba20be74f584487bbf07b76d6f5a29cb1f5 100644 --- a/src/cfg.go +++ b/src/cfg.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/cfgdir.go b/src/cfgdir.go index f46902d2f06cddfeb36645005dd6a1286f6ce0c9f0e9409691477ad88a876dca..a7028b86e275819aa1a97b2192ab8149b5065ac02ba513620bee26e0c9dc1687 100644 --- a/src/cfgdir.go +++ b/src/cfgdir.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/check.go b/src/check.go index f9a54cff836e8f72c37f7ca94ab61d2bfa76f5054ca5c9f5303c05a038580373..0b05af25262150f17957de315fe2ed3814adbed755cc33a959f4438d537c53ba 100644 --- a/src/check.go +++ b/src/check.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/chunked.go b/src/chunked.go index 8a2575b994c224762dd0c24d35f9e48ee1b7dc7cdaa9f1226dd156875034f914..cf672b376c4813599227d9668b236e6558aa338ad4297c6b52c30e486d03ce63 100644 --- a/src/chunked.go +++ b/src/chunked.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/cmd/nncp-ack/main.go b/src/cmd/nncp-ack/main.go index 31a4ba301d0d2ba9b463fe400cb0df81a4c946ecc174124561526f5f809453ad..9937461534f6fca69fc663624c6218d808c8fe8bc553a4db8e57136cb00b0808 100644 --- a/src/cmd/nncp-ack/main.go +++ b/src/cmd/nncp-ack/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Send packet receipt acknowledgement via NNCP. package main @@ -30,7 +28,7 @@ "path/filepath" "strings" xdr "github.com/davecgh/go-xdr/xdr2" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/cmd/nncp-bundle/main.go b/src/cmd/nncp-bundle/main.go index d36a2ef8e76fa3f77e81bcf62b662c431255fa5e0d0ce67f32dcc9f7c08d5aa7..25525176cb61bf6326b7eacfb91aafeef262109e46713bca18568ebfead7c918 100644 --- a/src/cmd/nncp-bundle/main.go +++ b/src/cmd/nncp-bundle/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Create/digest stream of NNCP encrypted packets. package main @@ -34,14 +32,14 @@ "strings" xdr "github.com/davecgh/go-xdr/xdr2" "github.com/dustin/go-humanize" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { fmt.Fprint(os.Stderr, "nncp-bundle -- Create/digest stream of NNCP encrypted packets\n\n") - fmt.Fprintf(os.Stderr, "Usage: %s [options] -tx [-delete] NODE [NODE ...] > ...\n", os.Args[0]) - fmt.Fprintf(os.Stderr, " %s [options] -rx -delete [-dryrun] [NODE ...] < ...\n", os.Args[0]) - fmt.Fprintf(os.Stderr, " %s [options] -rx [-check] [-dryrun] [NODE ...] < ...\n", os.Args[0]) + fmt.Fprintf(os.Stderr, "Usage: %s [options] -tx [-delete] NODE [NODE ...] >...\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] -rx -delete [-dryrun] [NODE ...] <...\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] -rx [-check] [-dryrun] [NODE ...] <...\n", os.Args[0]) fmt.Fprintln(os.Stderr, "Options:") flag.PrintDefaults() } diff --git a/src/cmd/nncp-call/main.go b/src/cmd/nncp-call/main.go index 90d5b5c0a24d3c9dcb16981426203470acafb443b5af6572a40c040d861d78f5..f9e864b18862af075f25024358db8242e3185239f5a1869c3404a0b68c6002dc 100644 --- a/src/cmd/nncp-call/main.go +++ b/src/cmd/nncp-call/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Call NNCP TCP daemon. package main @@ -28,7 +26,7 @@ "regexp" "strings" "time" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/cmd/nncp-caller/main.go b/src/cmd/nncp-caller/main.go index 68b2e1efe6da3c9f7e8c97bf7067da52c49dd76dd70fd53c105d895c777183f3..eb4795f1e6f2eae2771b6c24ca9a1ca30be3e1cc8776a2d45dff4b6ad9fa254f 100644 --- a/src/cmd/nncp-caller/main.go +++ b/src/cmd/nncp-caller/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Croned NNCP TCP daemon caller. package main @@ -29,7 +27,7 @@ "regexp" "sync" "time" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/cmd/nncp-cfgdir/main.go b/src/cmd/nncp-cfgdir/main.go index 09c140a700be4924681a530d2ea5b737238d63f724471a043c3731c33a1e842f..eabbca86885cc9c043bda2e3c9456852894fbc51f3c3cb345bd594cc4cc2aaae 100644 --- a/src/cmd/nncp-cfgdir/main.go +++ b/src/cmd/nncp-cfgdir/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Convert NNCP Hjson configuration file to the directory layout. package main @@ -25,13 +23,13 @@ "log" "os" "github.com/hjson/hjson-go/v4" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { fmt.Fprint(os.Stderr, "nncp-cfgdir -- Convert configuration file to the directory layout.\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] [-cfg ...] -dump /path/to/dir\n", os.Args[0]) - fmt.Fprintf(os.Stderr, " %s [options] -load /path/to/dir > cfg.hjson\nOptions:\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] -load /path/to/dir >cfg.hjson\nOptions:\n", os.Args[0]) flag.PrintDefaults() } diff --git a/src/cmd/nncp-cfgenc/main.go b/src/cmd/nncp-cfgenc/main.go index d8af83ddfe90a9692e4adb73876f28570f7f8fa07ea0f465607cb9232851ea36..3c6b797a96d009ad55b3c944784559d4674c53b2112babd7ce6a6750d60cb02a 100644 --- a/src/cmd/nncp-cfgenc/main.go +++ b/src/cmd/nncp-cfgenc/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // NNCP configuration file encrypter/decrypter. package main @@ -27,15 +25,15 @@ "log" "os" xdr "github.com/davecgh/go-xdr/xdr2" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" "golang.org/x/crypto/blake2b" "golang.org/x/term" ) func usage() { fmt.Fprint(os.Stderr, "nncp-cfgenc -- encrypt/decrypt configuration file\n\n") - fmt.Fprintf(os.Stderr, "Usage: %s [options] cfg.hjson > cfg.hjson.eblob\n", os.Args[0]) - fmt.Fprintf(os.Stderr, " %s [options] -d cfg.hjson.eblob > cfg.hjson\n", os.Args[0]) + fmt.Fprintf(os.Stderr, "Usage: %s [options] cfg.hjson >cfg.hjson.eblob\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] -d cfg.hjson.eblob >cfg.hjson\n", os.Args[0]) fmt.Fprintf(os.Stderr, " %s [options] -dump cfg.hjson.eblob\n", os.Args[0]) fmt.Fprintln(os.Stderr, "Options:") flag.PrintDefaults() diff --git a/src/cmd/nncp-cfgmin/main.go b/src/cmd/nncp-cfgmin/main.go index 7e03364c4b173c034f47db45f22ee363328e4e7102965d9634a08e303d9883a4..9df5516b669db1ec7d9640da449f8865024825883127e522e59d64f43c703f96 100644 --- a/src/cmd/nncp-cfgmin/main.go +++ b/src/cmd/nncp-cfgmin/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Stripped NNCP configuration file. package main @@ -25,7 +23,7 @@ "log" "os" "github.com/hjson/hjson-go/v4" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/cmd/nncp-cfgnew/main.go b/src/cmd/nncp-cfgnew/main.go index 8d86069724d61b0844169fc3e0f0c9b5e1877555417ae29e8abf0571a248b42f..387a7209796eb541557e03c80b60caa7f95c2caa659378f4571999c9c949657c 100644 --- a/src/cmd/nncp-cfgnew/main.go +++ b/src/cmd/nncp-cfgnew/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Generate new NNCP node keys and configuration file package main @@ -32,7 +30,7 @@ "github.com/hjson/hjson-go/v4" "golang.org/x/crypto/blake2b" "golang.org/x/crypto/nacl/box" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/cmd/nncp-check/main.go b/src/cmd/nncp-check/main.go index fde623730e76d1bce74b46e15772f42748642f01ceff3fffd70f12060d6ccbc7..28663c519520ed080ba256d628511e653be8da86907aa8d3e775957ba3209862 100644 --- a/src/cmd/nncp-check/main.go +++ b/src/cmd/nncp-check/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Verify NNCP Rx/Tx packets checksum. package main @@ -26,7 +24,7 @@ "os" "path/filepath" "time" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/cmd/nncp-cronexpr/main.go b/src/cmd/nncp-cronexpr/main.go index 7d8f6c3a13fc7981197d1de2fc09a9fe8cfaa2426046d8e0540c9e71b5a4913d..a1a386cf28d994b07f40b3cac6a803d4a6d7c4b57232b7bd56182b6f5e582403 100644 --- a/src/cmd/nncp-cronexpr/main.go +++ b/src/cmd/nncp-cronexpr/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // NNCP cron expression checker. package main @@ -27,7 +25,7 @@ "strings" "time" "github.com/gorhill/cronexpr" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/cmd/nncp-daemon/main.go b/src/cmd/nncp-daemon/main.go index 7c037077652221d92cf6af195a32a8ec472d3e831ac017e4459c0c0359aef203..0276edd732bf8ac5ec53d913625dd62ef8c891463cc3c8d90216703cb117d652 100644 --- a/src/cmd/nncp-daemon/main.go +++ b/src/cmd/nncp-daemon/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // NNCP TCP daemon. package main @@ -30,8 +28,8 @@ "strings" "time" "github.com/dustin/go-humanize" - "go.cypherpunks.ru/nncp/v8" - nncpYggdrasil "go.cypherpunks.ru/nncp/v8/yggdrasil" + "go.cypherpunks.su/nncp/v8" + nncpYggdrasil "go.cypherpunks.su/nncp/v8/yggdrasil" "golang.org/x/net/netutil" ) diff --git a/src/cmd/nncp-exec/main.go b/src/cmd/nncp-exec/main.go index 41f5d0deec5da83c53931e447016f4fb259bbe311aba0204bb932cafaf767e36..effa7e2bbdda6d3e9c3ca50afbdc30238029cabc93e4473ac29ff73bb0a87f1d 100644 --- a/src/cmd/nncp-exec/main.go +++ b/src/cmd/nncp-exec/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Send execution command via NNCP. package main @@ -26,7 +24,7 @@ "log" "os" "strings" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/cmd/nncp-file/main.go b/src/cmd/nncp-file/main.go index 4422588ac3d60c09ad53fb962d5d5e9bac0d29ef84fe6019aab444bbbdbdd1d3..f84403ca4f7acccb1972ce34249421bbfa73ee7b4651a46c98e842c923315526 100644 --- a/src/cmd/nncp-file/main.go +++ b/src/cmd/nncp-file/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Send file via NNCP. package main @@ -25,7 +23,7 @@ "log" "os" "strings" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/cmd/nncp-freq/main.go b/src/cmd/nncp-freq/main.go index 82dee7ca17c67482d7a7260c59e03be120ee4361e6ca2f6e41596ca9dbb1386e..f08d30578beb8631106ec6b1b484018046653f4a1033273cdd2d62ebf7e027e8 100644 --- a/src/cmd/nncp-freq/main.go +++ b/src/cmd/nncp-freq/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Send file request via NNCP. package main @@ -26,7 +24,7 @@ "os" "path/filepath" "strings" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/cmd/nncp-hash/main.go b/src/cmd/nncp-hash/main.go index 4649f12c45c4052a96142408f6f80f084871af98a137c17796a3875c7a8f9add..29a87d7b165ab5e57c3ca7d3a60e87bf657194b1184d188ba0903e781d439efa 100644 --- a/src/cmd/nncp-hash/main.go +++ b/src/cmd/nncp-hash/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Calculate MTH hash of the file package main @@ -28,7 +26,7 @@ "log" "os" "sync" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/cmd/nncp-log/main.go b/src/cmd/nncp-log/main.go index 6a380ec356e1c449556746604e92459cf0ddaf960e87b04ca93da0c7ba28d93f..347ba535c02c2dacaf1249c813d84e3953e846e69a8db540fd2265281001f58b 100644 --- a/src/cmd/nncp-log/main.go +++ b/src/cmd/nncp-log/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Read NNCP logs. package main @@ -25,8 +23,8 @@ "io" "log" "os" - "go.cypherpunks.ru/nncp/v8" - "go.cypherpunks.ru/recfile" + "go.cypherpunks.su/nncp/v8" + "go.cypherpunks.su/recfile/v2" ) func usage() { diff --git a/src/cmd/nncp-pkt/main.go b/src/cmd/nncp-pkt/main.go index cc9f436a33a23bd50ad8159bf9d9b2fb6b82050fd0c296587c3f79910f39f751..728eedcce62692715f9c096f2490f05fe922674cc6423f0ff28c7b2478b4ad2c 100644 --- a/src/cmd/nncp-pkt/main.go +++ b/src/cmd/nncp-pkt/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Parse raw NNCP packet. package main @@ -29,7 +27,7 @@ "os" xdr "github.com/davecgh/go-xdr/xdr2" "github.com/klauspost/compress/zstd" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/cmd/nncp-reass/main.go b/src/cmd/nncp-reass/main.go index 06bc805e8181ebc37d64bc33e6456eb018d2a072e817642e6bd2975b62985b4d..8b5d18fedfad3cd53b1cad5c17e90589e32f126e327e45f27ea99bcfda9b2fb1 100644 --- a/src/cmd/nncp-reass/main.go +++ b/src/cmd/nncp-reass/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Reassembly chunked file. package main @@ -36,7 +34,7 @@ "strings" xdr "github.com/davecgh/go-xdr/xdr2" "github.com/dustin/go-humanize" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/cmd/nncp-rm/main.go b/src/cmd/nncp-rm/main.go index ba2c976c98be9b014f837b483dd52bc10b5ac84706229383ac0a37abcad98706..a1b49a18d339537efd88b17d699158b416e17999d0310f7c726c1d9d94d970d5 100644 --- a/src/cmd/nncp-rm/main.go +++ b/src/cmd/nncp-rm/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Remove packet from the queue. package main @@ -32,7 +30,7 @@ "strconv" "strings" "time" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { @@ -44,7 +42,7 @@ fmt.Fprintf(os.Stderr, " %s [options] [-older X] {-all|-node NODE} -seen\n", os.Args[0]) fmt.Fprintf(os.Stderr, " %s [options] [-older X] {-all|-node NODE} -nock\n", os.Args[0]) fmt.Fprintf(os.Stderr, " %s [options] [-older X] {-all|-node NODE} -area\n", os.Args[0]) fmt.Fprintf(os.Stderr, " %s [options] [-older X] {-all|-node NODE} {-rx|-tx} [-hdr]\n", os.Args[0]) - fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -pkt < ...\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -pkt <...\n", os.Args[0]) fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -ack\n", os.Args[0]) fmt.Fprintln(os.Stderr, "-older option's time units are: (s)econds, (m)inutes, (h)ours, (d)ays") fmt.Fprintln(os.Stderr, "Options:") diff --git a/src/cmd/nncp-stat/main.go b/src/cmd/nncp-stat/main.go index df892ced62f49c1c18eaa3697a34e68c90c8a3bdedf32f84eb4bbb249ede361b..abb9503a1e451afe33b7a9d8f5f843eb54632f1cb4ece8d3da36f17250af0e68 100644 --- a/src/cmd/nncp-stat/main.go +++ b/src/cmd/nncp-stat/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Show queued NNCP Rx/Tx stats. package main @@ -26,7 +24,7 @@ "os" "sort" "github.com/dustin/go-humanize" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/cmd/nncp-toss/main.go b/src/cmd/nncp-toss/main.go index 0ce9d1ff005dc3af3efd73a1a1d9b64f8de096c6c69283b71aff1ed3c387cfb2..728dd91263908bb0ddabf4d1ba40d1f5a99ed0a3ee57971636a0c44a3af1d0e5 100644 --- a/src/cmd/nncp-toss/main.go +++ b/src/cmd/nncp-toss/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Process inbound NNCP packets. package main @@ -26,7 +24,7 @@ "os" "path/filepath" "time" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/cmd/nncp-trns/main.go b/src/cmd/nncp-trns/main.go index 215892f3f2cb0ddac5ca824fddf16121f357d77cfc411fecfaf152cdeda895f1..4a9f20cd094aa6ebc25ea004a4bd498854e66e93bfb2579b4ec406963aa48ed2 100644 --- a/src/cmd/nncp-trns/main.go +++ b/src/cmd/nncp-trns/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Wrap existing encrypted packet to transition ones. package main @@ -27,7 +25,7 @@ "os" "path/filepath" "strings" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/cmd/nncp-xfer/main.go b/src/cmd/nncp-xfer/main.go index 246a5dbaaf0201d5d7e4db58f4ef46fbdd5d8fffc63417fc9313e147be1cb2a9..0b6d3a8d3acaa55071a64512e0259fe62c08e38fc074f006abba674be2308adf 100644 --- a/src/cmd/nncp-xfer/main.go +++ b/src/cmd/nncp-xfer/main.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // Exchange NNCP inbound and outbounds packets with external directory. package main @@ -30,7 +28,7 @@ "os" "path/filepath" "github.com/dustin/go-humanize" - "go.cypherpunks.ru/nncp/v8" + "go.cypherpunks.su/nncp/v8" ) func usage() { diff --git a/src/ctx.go b/src/ctx.go index f85a8f23031b677a0b1dd738854f30b11cbf7a54cd3cfccbe63ab52f2e5b23f2..c9c3cc3c494e94f5a3f8c39d8f3aba039f960a1286f2829a3b9bdb0bc54adabd 100644 --- a/src/ctx.go +++ b/src/ctx.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/dirwatch.go b/src/dirwatch.go index e5a944cbec4ea14a02146519befb5791aa5ffa5b0d690e935553f15dc948ed71..18f4f65d8ad20d1a845536e6986c5397103aecae235ffa73f9ce7502a9ab3bd1 100644 --- a/src/dirwatch.go +++ b/src/dirwatch.go @@ -1,22 +1,20 @@ //go:build !nofsnotify // +build !nofsnotify -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/dirwatch_dummy.go b/src/dirwatch_dummy.go index b74eadaa5f423f288ba3258c9ff4fd8f2657588c07086e1f08e2b5f31addadb2..caac3118841f9fbab11a25cb429878a334cb9defdb86a541ec540fa235f83b00 100644 --- a/src/dirwatch_dummy.go +++ b/src/dirwatch_dummy.go @@ -1,22 +1,20 @@ //go:build nofsnotify // +build nofsnotify -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/eblob.go b/src/eblob.go index 95d9fb3a637b773fc6f149e02a8e0bb02640ac9a7e7d5b6c49225704889d7119..8549b9b9ea1fe60815fc2ff1c1b1adcd56ace0a00f4cf9cec8ebae50ceada57d 100644 --- a/src/eblob.go +++ b/src/eblob.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/go.mod b/src/go.mod index 4416e21d81d71be318f8f2b4dc374154a42d81140026b2effb685db13f0ac4fb..db9b11f8fbe7612fcb8146d9b0fda2d2106f3cfdb695874b34125c80fd237248 100644 --- a/src/go.mod +++ b/src/go.mod @@ -1,43 +1,44 @@ -module go.cypherpunks.ru/nncp/v8 +module go.cypherpunks.su/nncp/v8 require ( - github.com/Arceliar/ironwood v0.0.0-20231028101932-ceac99571f43 + github.com/Arceliar/ironwood v0.0.0-20240529054413-b8e59574e2b2 github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892 github.com/dustin/go-humanize v1.0.1 - github.com/flynn/noise v1.0.0 + github.com/flynn/noise v1.1.0 github.com/fsnotify/fsnotify v1.7.0 github.com/gologme/log v1.3.0 github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75 - github.com/hjson/hjson-go/v4 v4.3.1 - github.com/klauspost/compress v1.17.2 - github.com/yggdrasil-network/yggdrasil-go v0.5.1 + github.com/hjson/hjson-go/v4 v4.4.0 + github.com/klauspost/compress v1.17.9 + github.com/yggdrasil-network/yggdrasil-go v0.5.6 go.cypherpunks.ru/balloon v1.1.1 - go.cypherpunks.ru/recfile v0.7.0 - golang.org/x/crypto v0.14.0 - golang.org/x/net v0.17.0 - golang.org/x/sys v0.13.0 - golang.org/x/term v0.13.0 - gvisor.dev/gvisor v0.0.0-20230428223346-f33f75cda699 - lukechampine.com/blake3 v1.2.1 + go.cypherpunks.su/recfile/v2 v2.0.0 + golang.org/x/crypto v0.25.0 + golang.org/x/net v0.27.0 + golang.org/x/sys v0.22.0 + golang.org/x/term v0.22.0 + gvisor.dev/gvisor v0.0.0-20240723001103-634ce95eed8d + lukechampine.com/blake3 v1.3.0 ) require ( github.com/Arceliar/phony v0.0.0-20220903101357-530938a4b13d // indirect - github.com/bits-and-blooms/bitset v1.5.0 // indirect - github.com/bits-and-blooms/bloom/v3 v3.3.1 // indirect + github.com/bits-and-blooms/bitset v1.13.0 // indirect + github.com/bits-and-blooms/bloom/v3 v3.7.0 // indirect github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect - github.com/google/btree v1.0.1 // indirect + github.com/google/btree v1.1.2 // indirect github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect - github.com/klauspost/cpuid/v2 v2.2.5 // indirect + github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/onsi/ginkgo/v2 v2.9.5 // indirect - github.com/quic-go/qtls-go1-20 v0.3.4 // indirect - github.com/quic-go/quic-go v0.39.3 // indirect - go.uber.org/mock v0.3.0 // indirect - golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect - golang.org/x/mod v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect - golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect - golang.org/x/tools v0.14.0 // indirect + github.com/quic-go/quic-go v0.44.0 // indirect + go.uber.org/mock v0.4.0 // indirect + golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect + golang.org/x/mod v0.17.0 // indirect + golang.org/x/text v0.16.0 // indirect + golang.org/x/time v0.5.0 // indirect + golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect ) -go 1.20 +go 1.22.0 + +toolchain go1.22.5 diff --git a/src/go.sum b/src/go.sum index 9ca8a5fbcce65c688fc6780a8f4918ad6ddcbffe457e4438959d67cd67080f24..8c02c0e408de58b607431525fa12735e3feaf0669f304c4ce495c873894a5f6c 100644 --- a/src/go.sum +++ b/src/go.sum @@ -1,12 +1,12 @@ -github.com/Arceliar/ironwood v0.0.0-20231028101932-ceac99571f43 h1:M4NczBPk7Fy0Uy2YvNoXwSkk3dGoGTOYtUjyqpOC5ko= -github.com/Arceliar/ironwood v0.0.0-20231028101932-ceac99571f43/go.mod h1:5x7fWW0mshe9WQ1lvSMmmHBYC3BeHH9gpwW5tz7cbfw= +github.com/Arceliar/ironwood v0.0.0-20240529054413-b8e59574e2b2 h1:SBdYBKeXYUUFef5wi2CMhYmXFVGiYaRpTvbki0Bu+JQ= +github.com/Arceliar/ironwood v0.0.0-20240529054413-b8e59574e2b2/go.mod h1:6WP4799FX0OuWdENGQAh+0RXp9FLh0y7NZ7tM9cJyXk= github.com/Arceliar/phony v0.0.0-20220903101357-530938a4b13d h1:UK9fsWbWqwIQkMCz1CP+v5pGbsGoWAw6g4AyvMpm1EM= github.com/Arceliar/phony v0.0.0-20220903101357-530938a4b13d/go.mod h1:BCnxhRf47C/dy/e/D2pmB8NkB3dQVIrkD98b220rx5Q= -github.com/bits-and-blooms/bitset v1.3.1/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bits-and-blooms/bitset v1.5.0 h1:NpE8frKRLGHIcEzkR+gZhiioW1+WbYV6fKwD6ZIpQT8= -github.com/bits-and-blooms/bitset v1.5.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bits-and-blooms/bloom/v3 v3.3.1 h1:K2+A19bXT8gJR5mU7y+1yW6hsKfNCjcP2uNfLFKncjQ= -github.com/bits-and-blooms/bloom/v3 v3.3.1/go.mod h1:bhUUknWd5khVbTe4UgMCSiOOVJzr3tMoijSK3WwvW90= +github.com/bits-and-blooms/bitset v1.10.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= +github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE= +github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= +github.com/bits-and-blooms/bloom/v3 v3.7.0 h1:VfknkqV4xI+PsaDIsoHueyxVDZrfvMn56jeWUzvzdls= +github.com/bits-and-blooms/bloom/v3 v3.7.0/go.mod h1:VKlUSvp0lFIYqxJjzdnSsZEw4iHb1kOL2tfHTgyJBHg= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -17,30 +17,33 @@ github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892 h1:qg9VbHo1TlL0KDM0vYvBG9EY0X0Yku5WYIPoFWt8f6o= github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod h1:CTDl0pzVzE5DEzZhPfvhY/9sPFMQIxaJ9VAMs9AagrE= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ= -github.com/flynn/noise v1.0.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= +github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg= +github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= +github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/gologme/log v1.3.0 h1:l781G4dE+pbigClDSDzSaaYKtiueHCILUa/qSDsmHAo= github.com/gologme/log v1.3.0/go.mod h1:yKT+DvIPdDdDoPtqFrFxheooyVmoqi0BAsw+erN3wA4= -github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/btree v1.1.2 h1:xf4v41cLI2Z6FxbKm+8Bu+m8ifhj15JuZ9sa0jZCMUU= +github.com/google/btree v1.1.2/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75 h1:f0n1xnMSmBLzVfsMMvriDyA75NB/oBgILX2GcHXIQzY= github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod h1:g2644b03hfBX9Ov0ZBDgXXens4rxSxmqFBbhvKv2yVA= -github.com/hjson/hjson-go/v4 v4.3.1 h1:wfmDwHGxjzmYKXRFL0Qr9nonY/Xxe5y7IalwjlY7ekA= -github.com/hjson/hjson-go/v4 v4.3.1/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= +github.com/hjson/hjson-go/v4 v4.4.0 h1:D/NPvqOCH6/eisTb5/ztuIS8GUvmpHaLOcNk1Bjr298= +github.com/hjson/hjson-go/v4 v4.4.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= -github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= -github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= +github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -49,48 +52,51 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q= github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k= github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE= +github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/quic-go/qtls-go1-20 v0.3.4 h1:MfFAPULvst4yoMgY9QmtpYmfij/em7O8UUi+bNVm7Cg= -github.com/quic-go/qtls-go1-20 v0.3.4/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= -github.com/quic-go/quic-go v0.39.3 h1:o3YB6t2SR+HU/pgwF29kJ6g4jJIJEwEZ8CKia1h1TKg= -github.com/quic-go/quic-go v0.39.3/go.mod h1:T09QsDQWjLiQ74ZmacDfqZmhY/NLnw5BC40MANNNZ1Q= +github.com/quic-go/quic-go v0.44.0 h1:So5wOr7jyO4vzL2sd8/pD9Kesciv91zSk8BoFngItQ0= +github.com/quic-go/quic-go v0.44.0/go.mod h1:z4cx/9Ny9UtGITIPzmPTXh1ULfOyWh4qGQlpnPcWmek= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/twmb/murmur3 v1.1.6 h1:mqrRot1BRxm+Yct+vavLMou2/iJt0tNVTTC0QoIjaZg= github.com/twmb/murmur3 v1.1.6/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ= -github.com/yggdrasil-network/yggdrasil-go v0.5.1 h1:xH1j90WCgSgDT57HN8VfPqz2CmjgWo9nAvStwu8oWc0= -github.com/yggdrasil-network/yggdrasil-go v0.5.1/go.mod h1:NXqj9rpVBdAIOvofnHjE4luG1tx4bqKblcS0nWM4nvQ= +github.com/yggdrasil-network/yggdrasil-go v0.5.6 h1:thh5YQYXQgkhkSO6v2D9Ya9fLHXfY38VfsCTZTIbIeI= +github.com/yggdrasil-network/yggdrasil-go v0.5.6/go.mod h1:WAqMZ4e1QSf/EKbzfD77XXTSAIRO/0nWKCVpHsKLg40= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.cypherpunks.ru/balloon v1.1.1 h1:ypHM1DRf/XuCrp9pDkTHg00CqZX/Np/APb//iHvDJTA= go.cypherpunks.ru/balloon v1.1.1/go.mod h1:k4s4ozrIrhpBjj78Z7LX8ZHxMQ+XE7DZUWl8gP2ojCo= -go.cypherpunks.ru/recfile v0.7.0 h1:0R1UnDGKccp7JnC66msslJMlSY02jHx/XkW+ISl0GuY= -go.cypherpunks.ru/recfile v0.7.0/go.mod h1:sR+KajB+vzofL3SFVFwKt3Fke0FaCcN1g3YPNAhU3qI= -go.uber.org/mock v0.3.0 h1:3mUxI1No2/60yUYax92Pt8eNOEecx2D3lcXZh2NEZJo= -go.uber.org/mock v0.3.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= +go.cypherpunks.su/recfile/v2 v2.0.0 h1:Q2o+OzM1H2O1WnshU88r+waBqylkqZj8plBdBWZitcU= +go.cypherpunks.su/recfile/v2 v2.0.0/go.mod h1:36EnyBwx6VpsSM5MMcYGTDiKrVEP49S09p33EFuhQYU= +go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU= +go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= -golang.org/x/exp v0.0.0-20221205204356-47842c84f3db h1:D/cFflL63o2KSLJIwjlcIt8PR064j/xsmdEJL/YvY/o= -golang.org/x/exp v0.0.0-20221205204356-47842c84f3db/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= +golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= 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/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= -golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= +golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= 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.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +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/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= 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/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -98,38 +104,46 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.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.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= 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.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= -golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +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.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= +golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= 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.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= 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/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= -golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v1.28.2-0.20230118093459-a9481185b34d h1:qp0AnQCvRCMlu9jBjtdbTaaEmThIgZOrbVyDEOcmKhQ= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gvisor.dev/gvisor v0.0.0-20230428223346-f33f75cda699 h1:Ns93L6u6C3xgQY2eodedE2ZgIW8JaQYExfHdACX1BJc= -gvisor.dev/gvisor v0.0.0-20230428223346-f33f75cda699/go.mod h1:pzr6sy8gDLfVmDAg8OYrlKvGEHw5C3PGTiBXBTCx76Q= -lukechampine.com/blake3 v1.2.1 h1:YuqqRuaqsGV71BV/nm9xlI0MKUv4QC54jQnBChWbGnI= -lukechampine.com/blake3 v1.2.1/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gvisor.dev/gvisor v0.0.0-20240723001103-634ce95eed8d h1:cotv1311nrTN4xLRbN9lSEFcZwJ8GLNI+tB1pGd7mQ4= +gvisor.dev/gvisor v0.0.0-20240723001103-634ce95eed8d/go.mod h1:sxc3Uvk/vHcd3tj7/DHVBoR5wvWT/MmRq2pj7HRJnwU= +lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE= +lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k= diff --git a/src/humanizer.go b/src/humanizer.go index f41d2f1c2c6e72af5567923fb287456300f683be8cd635e0f4c744f5228c68ec..59cebed0a21fa244be513d760478e0acac6f9fcb47f33a4520d8f83e06553a1e 100644 --- a/src/humanizer.go +++ b/src/humanizer.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp @@ -22,7 +20,7 @@ "fmt" "strings" "time" - "go.cypherpunks.ru/recfile" + "go.cypherpunks.su/recfile/v2" ) func (ctx *Ctx) HumanizeRec(rec string) string { diff --git a/src/jobs.go b/src/jobs.go index 00bde95fe3f6533736613a28dd755660bcc02655307ea6270bb47ac0e822f43a..b194e41b2770513595b1cfee4dfba7ff04448681ff985001bd581724054773f5 100644 --- a/src/jobs.go +++ b/src/jobs.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/lockdir.go b/src/lockdir.go index c79e1575be431185e805b6e426e47910c0ebd638f6be2a5a8af41f780b1ff337..d1931c82a67488a69a53877530aeeae9e32c4f30eaf089b46ce6f2de643cdabc 100644 --- a/src/lockdir.go +++ b/src/lockdir.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/log.go b/src/log.go index 4e089bccfbf1205a41f9053c5d1aa96ad610a8c654767301af4590e9bb571055..16b1f92b6af4242a670302e0f39f90129b0bfff6900c8e2a65068a201f159abe 100644 --- a/src/log.go +++ b/src/log.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp @@ -24,7 +22,7 @@ "os" "sync" "time" - "go.cypherpunks.ru/recfile" + "go.cypherpunks.su/recfile/v2" "golang.org/x/sys/unix" ) diff --git a/src/magic.go b/src/magic.go index 7690dad17ef22d58eb9932adada51d0f2c3a51c0249edabc44e40c8c7117531c..b12b7e21bf4f24fc09ee81dc2b734496803b0d949085cfa97342d377d3436725 100644 --- a/src/magic.go +++ b/src/magic.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/mcd.go b/src/mcd.go index 4c4024b4ad305108ad68bd0352f2be0a5b4876041a10d6776423c3e3e646092e..2fe839ef8bc5e9e66631e2d272208e922f8ae58dd3c48f9856900a5d94833f48 100644 --- a/src/mcd.go +++ b/src/mcd.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/mth.go b/src/mth.go index 292ddd7b805d87a8f8f679751d9070d731cab1bbff7b6003d38ad08686af19fb..ded679c50cec52427331bc61416e3b602e670ef303ef3bf4fdf55b317ddb08e7 100644 --- a/src/mth.go +++ b/src/mth.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/mth_test.go b/src/mth_test.go index 690f8f734181e8b1dd277812e4569f9e57a134c0784d76f4f0517595b2f2d719..8c794eec6e887ca98da3699df80c5a981a644ac57b7bab7a500379e09a9d72dc 100644 --- a/src/mth_test.go +++ b/src/mth_test.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/nice.go b/src/nice.go index 3ec19fabaa9957f9901015e61d186be6a839b7061cef2537a1462eb72f062f7c..a7868af316f58d1bab071c75e7b9f1414e5c4e5821d88c6d560512c2ddbcb4a3 100644 --- a/src/nice.go +++ b/src/nice.go @@ -1,3 +1,18 @@ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . + package nncp import ( diff --git a/src/nncp.go b/src/nncp.go index 528cf742a4518cfafc4f9f76a96a64bc8bf30e16f944926d6f28a7dfddb322f7..d597a690baeca96e4bf26016055deb523599f539c25394235429d3bedafb305e 100644 --- a/src/nncp.go +++ b/src/nncp.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . // NNCP -- Node to Node copy package nncp @@ -24,7 +22,7 @@ "runtime" ) const ( - Warranty = `Copyright (C) 2016-2023 Sergey Matveev + Warranty = `Copyright (C) 2016-2024 Sergey Matveev This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,7 +39,7 @@ Base32Encoded32Len = 52 ) var ( - Version string = "8.10.0" + Version string = "8.11.0" Base32Codec *base32.Encoding = base32.StdEncoding.WithPadding(base32.NoPadding) ) diff --git a/src/node.go b/src/node.go index 8f54e33e8844d1479bd8ae24150594c300dcd7ed588e6951b7a0f89702e80906..9097f47c0d85a73a05211c4c3d82ab2b2fa7152ea2b904116a32fa8c235c972c 100644 --- a/src/node.go +++ b/src/node.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/pipe.go b/src/pipe.go index b09bb5023867f4ff155e6fde22f41bb5e7cdb450bf4eeebc2b7b29e9b491945b..442756df024c49978f4171fb85254c03c89d12c15de6f1223534212a8de66209 100644 --- a/src/pipe.go +++ b/src/pipe.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/pkt.go b/src/pkt.go index f05129fd7b56c84e9b16c444848218e5cb785b0c49a1cceab10eb5d3175ff4cc..8d321dd6568a096aebea85d74906860f59f93151699ac5480d6cca01638c68bd 100644 --- a/src/pkt.go +++ b/src/pkt.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/pkt_test.go b/src/pkt_test.go index 82f4ae9e06aef10e6fed3714336bd89598f86ec65ff406c49a9df67485edef50..9f35ca6cd1cf1bc2775ba4cbca9d2c1cb4a4ad698e309ae2c830786dbdfc1e27 100644 --- a/src/pkt_test.go +++ b/src/pkt_test.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/progress.go b/src/progress.go index 1a0a13b6a3116f58880bf48b3af57b7f1cd9c470d3fb84f54eb3b59dad3a041d..07c5d9a25b9363ce7bb5b129c852aab1a624c2d90f322802d96404c1cb59ef79 100644 --- a/src/progress.go +++ b/src/progress.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp @@ -25,7 +23,7 @@ "sync" "time" "github.com/dustin/go-humanize" - "go.cypherpunks.ru/nncp/v8/uilive" + "go.cypherpunks.su/nncp/v8/uilive" ) func init() { diff --git a/src/sp.go b/src/sp.go index 888eba7fad19009a5b80c64347e16d9839cbeecd942c584d19826f322fc4bdad..f834530850a1cf16ad7ad7e9849ed4939a20a064f57689af092c8e3b9f95b9f4 100644 --- a/src/sp.go +++ b/src/sp.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/tmp.go b/src/tmp.go index e4eba5fdfc9f2998fd3499f07af21fd93330a10f65f655db6c46dae8c8ea9858..bbefee43c5f5000ac940a8c9a2a32e169a0cd26dd46a4bf0e89e183c1b22488a 100644 --- a/src/tmp.go +++ b/src/tmp.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/toss.go b/src/toss.go index 9525ca84ecf2c53c51f9f381cf82b0927005e2fc383ae135dec28e9d79843951..b29e2fe958cf72d7bc5e435f634d4df5d91ba4173ffb32dc8280920074ca8b15 100644 --- a/src/toss.go +++ b/src/toss.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/toss_test.go b/src/toss_test.go index 9c61fb2ad97b884e982735dfd0b9cf72f4574346481c88a062d599bdbef3f654..799eb0241ba273b6dfbfe987f2a8a6770280e0fda33289b68a4004748ef54daf 100644 --- a/src/toss_test.go +++ b/src/toss_test.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp @@ -124,7 +122,7 @@ } ctx.Neigh[*nodeOur.Id].Exec[handle] = []string{ "/bin/sh", "-c", fmt.Sprintf( - "echo $NNCP_NICE $0 $1 >> %s ; cat >> %s", + "echo $NNCP_NICE $0 $1 >>%s ; cat >>%s", filepath.Join(spool, "mbox"), filepath.Join(spool, "mbox"), ), diff --git a/src/tx.go b/src/tx.go index bafeb7a03ad8fce3a51c8f317ea2b132cbdc4aa3d5cc373f4d5ce109c4e99677..637693e13f06c2c950eaddcdd84ad275df843704c84c4aa42ebfc82e0ad49be5 100644 --- a/src/tx.go +++ b/src/tx.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/tx_test.go b/src/tx_test.go index 404fb2e8a4f3d37c6cf1b52b4c20003c963c8e4e0a44479aa7fe76c27388da79..1ac9ab13408fb18198442a34c9c8017ffefa9d3b91dccce4616338fe05f6d8f5 100644 --- a/src/tx_test.go +++ b/src/tx_test.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/ucspi.go b/src/ucspi.go index e9f1f56a7cac019c5f0a85016e32bfff671e2171bf670d0ba932a4b69da1b9a1..7cbc28e4bd03a1b9b3b3f133fd6fac0aa4e01a9d5ab535023da0a12d00e1bc1c 100644 --- a/src/ucspi.go +++ b/src/ucspi.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/via.go b/src/via.go index 6aad944fc506fafb50afdbceb661a902bc6adde733546f8ffd62ec7a804ec1a5..5a5f52a063cf2ff8645f9638b4a0b0b732da601c1d793adb5ba6972df2fc9922 100644 --- a/src/via.go +++ b/src/via.go @@ -1,19 +1,17 @@ -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package nncp diff --git a/src/yggdrasil/tcpip.go b/src/yggdrasil/tcpip.go index 7b9283933b705d22d496dc0e9c35fdacb2bab3a2eb45e14ad580179c242f243e..72035bbe4c13da17f2ffbc00e00881910b51dbd991776ebbc5b235077d9bec69 100644 --- a/src/yggdrasil/tcpip.go +++ b/src/yggdrasil/tcpip.go @@ -1,25 +1,23 @@ //go:build !noyggdrasil // +build !noyggdrasil -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . - -Code below is heavily based on Wireguard's MIT licenced -golang.zx2c4.com/wireguard/tun/netstack. -*/ +// Code below is heavily based on Wireguard's MIT licenced +// golang.zx2c4.com/wireguard/tun/netstack. package yggdrasil @@ -31,7 +29,7 @@ iwt "github.com/Arceliar/ironwood/types" yaddr "github.com/yggdrasil-network/yggdrasil-go/src/address" "golang.org/x/crypto/ed25519" - "gvisor.dev/gvisor/pkg/bufferv2" + "gvisor.dev/gvisor/pkg/buffer" "gvisor.dev/gvisor/pkg/tcpip" "gvisor.dev/gvisor/pkg/tcpip/adapters/gonet" "gvisor.dev/gvisor/pkg/tcpip/header" @@ -60,6 +58,8 @@ func (e *TCPIPEndpoint) IsAttached() bool { return e.d != nil } func (e *TCPIPEndpoint) MTU() uint32 { return e.mtu } +func (e *TCPIPEndpoint) SetMTU(mtu uint32) { e.mtu = mtu } + func (*TCPIPEndpoint) Capabilities() stack.LinkEndpointCapabilities { return stack.CapabilityNone } func (*TCPIPEndpoint) MaxHeaderLength() uint16 { return 0 } @@ -68,7 +68,13 @@ func (*TCPIPEndpoint) LinkAddress() tcpip.LinkAddress { return "" } func (*TCPIPEndpoint) Wait() {} -func (e *TCPIPEndpoint) WritePacket(pkt stack.PacketBufferPtr) tcpip.Error { +func (*TCPIPEndpoint) ParseHeader(*stack.PacketBuffer) bool { return false } + +func (*TCPIPEndpoint) SetLinkAddress(addr tcpip.LinkAddress) {} + +func (*TCPIPEndpoint) SetOnCloseAction(func()) {} + +func (e *TCPIPEndpoint) WritePacket(pkt *stack.PacketBuffer) tcpip.Error { v := pkt.ToView() n, err := v.Read(e.writeBuf) if err != nil { @@ -101,12 +107,12 @@ } func (*TCPIPEndpoint) ARPHardwareType() header.ARPHardwareType { return header.ARPHardwareNone } -func (e *TCPIPEndpoint) AddHeader(stack.PacketBufferPtr) {} +func (e *TCPIPEndpoint) AddHeader(*stack.PacketBuffer) {} func convertToFullAddr(ip net.IP, port int) (tcpip.FullAddress, tcpip.NetworkProtocolNumber) { return tcpip.FullAddress{ NIC: 1, - Addr: tcpip.Address(ip), + Addr: tcpip.AddrFrom16Slice(ip.To16()[:]), Port: uint16(port), }, ipv6.ProtocolNumber } @@ -127,9 +133,8 @@ fa, pn := convertToFullAddr(addr.IP, addr.Port) return gonet.ListenTCP(e.s, fa, pn) } -func (e *TCPIPEndpoint) Close() error { +func (e *TCPIPEndpoint) Close() { e.s.RemoveNIC(1) - return nil } func NewTCPIPEndpoint( @@ -156,7 +161,7 @@ return nil, fmt.Errorf("%+v", err) } protoAddr := tcpip.ProtocolAddress{ Protocol: ipv6.ProtocolNumber, - AddressWithPrefix: tcpip.Address(ipOur).WithPrefix(), + AddressWithPrefix: tcpip.AddrFrom16Slice(ipOur.To16()[:]).WithPrefix(), } if err := s.AddProtocolAddress(1, protoAddr, stack.AddressProperties{}); err != nil { return nil, fmt.Errorf("%+v", err) @@ -181,7 +186,7 @@ e.pubToIP[pub] = ip e.ipToAddr[ip] = from } pkb := stack.NewPacketBuffer(stack.PacketBufferOptions{ - Payload: bufferv2.MakeWithData(e.readBuf[:n]), + Payload: buffer.MakeWithData(e.readBuf[:n]), }) e.d.DeliverNetworkPacket(ipv6.ProtocolNumber, pkb) } diff --git a/src/yggdrasil/yggdrasil.go b/src/yggdrasil/yggdrasil.go index b7fa843b01458e46615c3267c446557e6ca039e35ea37edc9aacac7e38e506bc..20f52acfa30288ca975139e971b8e35d432e6190c98e13d0ee662268ae88db5a 100644 --- a/src/yggdrasil/yggdrasil.go +++ b/src/yggdrasil/yggdrasil.go @@ -1,22 +1,20 @@ //go:build !noyggdrasil // +build !noyggdrasil -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package yggdrasil diff --git a/src/yggdrasil/yggdrasil_dummy.go b/src/yggdrasil/yggdrasil_dummy.go index a42e5deba5bfd4d40b7b42786db8e91eb6e1d139f9b931c9067c71c03980c17a..1e785a16524d01a82f7341ede324c23501493455903ac8cb0cdc7ea7310a9d0d 100644 --- a/src/yggdrasil/yggdrasil_dummy.go +++ b/src/yggdrasil/yggdrasil_dummy.go @@ -1,22 +1,20 @@ //go:build noyggdrasil // +build noyggdrasil -/* -NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2023 Sergey Matveev - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, version 3 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ +// NNCP -- Node to Node copy, utilities for store-and-forward data exchange +// Copyright (C) 2016-2024 Sergey Matveev +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, version 3 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . package yggdrasil @@ -27,7 +25,7 @@ ) var NoYggdrasil = errors.New("no Yggdrasil support is compiled in") -func NewConn(aliases map[string]string, in string) (ConnDeadlined, error) { +func NewConn(aliases map[string]string, in string) (net.Conn, error) { return nil, NoYggdrasil } diff --git a/t/nncp-rm.t b/t/nncp-rm.t index 8a3bc2ee556f5624051b3bac1cb2c808470375c7018939273b36bcbdfc00d2e8..7e8c69f66c2461716fb1bf622129e87b56d47016b23cf318fc33aa44166bb00b 100755 --- a/t/nncp-rm.t +++ b/t/nncp-rm.t @@ -46,13 +46,13 @@ PKTS="$pkts" } now=`date +%s` -nncp-cfgnew > cfg +nncp-cfgnew >cfg nncp-cfgdir -cfg cfg -dump cfgdir -echo "$PWD/spool" > cfgdir/spool -echo "$PWD/log" > cfgdir/log +echo "$PWD/spool" >cfgdir/spool +echo "$PWD/log" >cfgdir/log neigh=`rand32` mkdir -p cfgdir/neigh/neigh -for w in id exchpub signpub ; do echo $neigh > cfgdir/neigh/neigh/$w ; done +for w in id exchpub signpub ; do echo $neigh >cfgdir/neigh/neigh/$w ; done mkdir -p spool/tmp spool/$neigh/rx/hdr spool/$neigh/rx/seen spool/$neigh/tx/hdr date_old=$(date -j -f %s +%FT%T $(( $now - (3600 * 24 * 7) ))) diff --git a/version b/version index d6ac5abcc749ea82acca879d0beb7734b0a0b2a21fda76ce2a63de22e41d7814..b1c71ebdf82ebc5165dfd6ce15a35fc2eff322daf433f34c062f8dc1e2ca8a24 100755 --- a/version +++ b/version @@ -1,3 +1,3 @@ #!/bin/sh -e -exec perl -ne 'print "$1\n" if /Version.* = "(.*)"$/' < "$(realpath -- $(dirname "$0"))"/src/nncp.go +exec perl -ne 'print "$1\n" if /Version.* = "(.*)"$/' <"$(realpath -- $(dirname "$0"))"/src/nncp.go