From 4fd773f4218da5398430bc6b50c47fa8a5ee668e Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sun, 30 Apr 2017 11:29:54 +0300 Subject: [PATCH] -minsize option is in KiBs for convenience --- doc/cfg.texi | 2 +- doc/cmds.texi | 6 +++--- doc/news.ru.texi | 1 + doc/news.texi | 2 ++ src/cypherpunks.ru/nncp/cfg.go | 2 +- src/cypherpunks.ru/nncp/cmd/nncp-file/main.go | 4 ++-- src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go | 4 ++-- src/cypherpunks.ru/nncp/cmd/nncp-mail/main.go | 4 ++-- 8 files changed, 14 insertions(+), 11 deletions(-) diff --git a/doc/cfg.texi b/doc/cfg.texi index ea104f5..1a37f10 100644 --- a/doc/cfg.texi +++ b/doc/cfg.texi @@ -50,7 +50,7 @@ neigh: sendmail: [/usr/sbin/sendmail] freq: /home/bob/pub freqchunked: 1024 - freqminsize: 2097152 + freqminsize: 2048 via: [alice] @end verbatim diff --git a/doc/cmds.texi b/doc/cmds.texi index 9ec6650..58a906d 100644 --- a/doc/cmds.texi +++ b/doc/cmds.texi @@ -11,9 +11,9 @@ Nearly all commands have the following common options: Print debug messages. Normally this option should not be used. @item -minsize @anchor{OptMinSize} - Minimal required resulting packet size, in bytes. For example if you - send 2 KiB file and set @option{-minsize 4096}, then resulting - packet will be 4 KiB (containing file itself and some junk). + Minimal required resulting packet size, in KiBs. For example if you + send 2 KiB file and set @option{-minsize 4}, then resulting packet + will be 4 KiB (containing file itself and some junk). @item -nice Set desired outgoing packet @ref{Niceness, niceness level}. 1-255 values are allowed. diff --git a/doc/news.ru.texi b/doc/news.ru.texi index a8aa772..cd12531 100644 --- a/doc/news.ru.texi +++ b/doc/news.ru.texi @@ -14,6 +14,7 @@ @option{-minsize}. @item Опция @option{-force} команды @command{nncp-xfer} переименована в @option{-mkdir} для ясности. +@item Опция @option{-minsize} задётся в KiB, а не байтах, для удобства. @item Обновлены зависимые криптографические библиотеки. @end itemize diff --git a/doc/news.texi b/doc/news.texi index 4c6a22f..3ab0727 100644 --- a/doc/news.texi +++ b/doc/news.texi @@ -15,6 +15,8 @@ entry. Useful for transferring big files over small storage devices. @option{-minsize} one. @item @command{nncp-xfer}'s @option{-force} option is renamed to @option{-mkdir} for clarity. +@item @option{-minsize} option is specified in KiBs, not bytes, for +convenience. @item Cryptographic libraries (dependecies) are updated. @end itemize diff --git a/src/cypherpunks.ru/nncp/cfg.go b/src/cypherpunks.ru/nncp/cfg.go index 2b459b3..9419886 100644 --- a/src/cypherpunks.ru/nncp/cfg.go +++ b/src/cypherpunks.ru/nncp/cfg.go @@ -155,7 +155,7 @@ func NewNode(name string, yml NodeYAML) (*Node, error) { } var freqMinSize int64 if yml.FreqMinSize != nil { - freqMinSize = int64(*yml.FreqMinSize) + freqMinSize = int64(*yml.FreqMinSize) * 1024 } defOnlineDeadline := uint(DefaultDeadline) diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-file/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-file/main.go index 0b61aba..f3406fd 100644 --- a/src/cypherpunks.ru/nncp/cmd/nncp-file/main.go +++ b/src/cypherpunks.ru/nncp/cmd/nncp-file/main.go @@ -44,7 +44,7 @@ func main() { var ( cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file") niceRaw = flag.Int("nice", nncp.DefaultNiceFile, "Outbound packet niceness") - minSize = flag.Uint64("minsize", 0, "Minimal required resulting packet size") + minSize = flag.Uint64("minsize", 0, "Minimal required resulting packet size, in KiB") chunkSize = flag.Uint64("chunked", 0, "Split file on specified size chunks, in KiB") quiet = flag.Bool("quiet", false, "Print only errors") debug = flag.Bool("debug", false, "Print debug messages") @@ -102,7 +102,7 @@ func main() { nice, flag.Arg(0), splitted[1], - int64(*minSize), + int64(*minSize)*1024, int64(*chunkSize)*1024, ) } diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go index d570bdf..a5e96e6 100644 --- a/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go +++ b/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go @@ -41,7 +41,7 @@ func main() { var ( cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file") niceRaw = flag.Int("nice", nncp.DefaultNiceFreq, "Outbound packet niceness") - minSize = flag.Uint64("minsize", 0, "Minimal required resulting packet size") + minSize = flag.Uint64("minsize", 0, "Minimal required resulting packet size, in KiB") quiet = flag.Bool("quiet", false, "Print only errors") debug = flag.Bool("debug", false, "Print debug messages") version = flag.Bool("version", false, "Print version information") @@ -90,7 +90,7 @@ func main() { log.Fatalln("Invalid NODE specified:", err) } - if err = ctx.TxFreq(node, nice, splitted[1], flag.Arg(1), int64(*minSize)); err != nil { + if err = ctx.TxFreq(node, nice, splitted[1], flag.Arg(1), int64(*minSize)*1024); err != nil { log.Fatalln(err) } } diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-mail/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-mail/main.go index c09fbe2..d14c3d6 100644 --- a/src/cypherpunks.ru/nncp/cmd/nncp-mail/main.go +++ b/src/cypherpunks.ru/nncp/cmd/nncp-mail/main.go @@ -42,7 +42,7 @@ func main() { var ( cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file") niceRaw = flag.Int("nice", nncp.DefaultNiceMail, "Outbound packet niceness") - minSize = flag.Uint64("minsize", 0, "Minimal required resulting packet size") + minSize = flag.Uint64("minsize", 0, "Minimal required resulting packet size, in KiB") quiet = flag.Bool("quiet", false, "Print only errors") debug = flag.Bool("debug", false, "Print debug messages") version = flag.Bool("version", false, "Print version information") @@ -91,7 +91,7 @@ func main() { log.Fatalln("Can not read mail body from stdin:", err) } - if err = ctx.TxMail(node, nice, strings.Join(flag.Args()[1:], " "), body, int64(*minSize)); err != nil { + if err = ctx.TxMail(node, nice, strings.Join(flag.Args()[1:], " "), body, int64(*minSize)*1024); err != nil { log.Fatalln(err) } } -- 2.44.0