-minsize option is in KiBs for convenience

diff --git a/doc/cfg.texi b/doc/cfg.texi
index ea104f51da53f2b338cf613b9ba186b4cf5a6867..1a37f10e5678410c3d7523ae311567a62c856e94 100644 (file)
--- 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 9ec665014eb92984d515dd6ddaca4da1f7cbb89b..58a906dd33a82e62b84c044ddbc404fc944704da 100644 (file)
--- 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 a8aa772b0e244197ef3dca1ef23f3267cfbaebb6..cd1253174e654c46e1efb6f5c5c6cb4ed073f35b 100644 (file)
--- 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 4c6a22fe56c2cd1b625e31da65cc9744211b1402..3ab07276723b4f74e0c9dea5a7f51c7a10358dcc 100644 (file)
--- 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 2b459b316e091ac69709d82a4a3aaded4e6a1e11..9419886071a5ac657729825ef3f428cfb1f1a9aa 100644 (file)
--- 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 0b61aba057356d3cfbe1de1bfd7d3b9dedf989d1..f3406fd455aa53cd6cb8ff9300d2b8d125ad0a0f 100644 (file)
--- 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 d570bdfcc232f8fb1314fe4f4b7b1a162bee1658..a5e96e69aed5e05fdf5137ae955579cf023b5d6f 100644 (file)
--- 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 c09fbe228e2aa415bed4bb0009a24718ecc6888b..d14c3d66c077cb205d76f4f956a117e97005cd68 100644 (file)
--- 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)
        }
 }