X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fnncp%2Fcmd%2Fnncp-file%2Fmain.go;h=d922882fec7a3a301e9c793cddfc378ee122de61;hb=f01c589d9d9d26a38ddc8c8d7a28f8c899cf44ca;hp=46728ea26c1d4a60bb0d5ac968971b9206e182a7;hpb=4a4c1be88baf3fa5426bc1c9c96e104643155fca;p=nncp.git

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-file/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-file/main.go
index 46728ea..d922882 100644
--- a/src/cypherpunks.ru/nncp/cmd/nncp-file/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-file/main.go
@@ -35,16 +35,21 @@ func usage() {
 	fmt.Fprintln(os.Stderr, "nncp-file -- send file\n")
 	fmt.Fprintf(os.Stderr, "Usage: %s [options] SRC NODE:[DST]\nOptions:\n", os.Args[0])
 	flag.PrintDefaults()
+	fmt.Fprint(os.Stderr, `
+If SRC equals to -, then read data from stdin to temporary file.
+`)
 }
 
 func main() {
 	var (
-		cfgPath  = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
-		niceRaw  = flag.Int("nice", nncp.DefaultNiceMail, "Outbound packet niceness")
-		quiet    = flag.Bool("quiet", false, "Print only errors")
-		debug    = flag.Bool("debug", false, "Print debug messages")
-		version  = flag.Bool("version", false, "Print version information")
-		warranty = flag.Bool("warranty", false, "Print warranty information")
+		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, 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")
+		version   = flag.Bool("version", false, "Print version information")
+		warranty  = flag.Bool("warranty", false, "Print warranty information")
 	)
 	flag.Usage = usage
 	flag.Parse()
@@ -65,7 +70,7 @@ func main() {
 	}
 	nice := uint8(*niceRaw)
 
-	cfgRaw, err := ioutil.ReadFile(*cfgPath)
+	cfgRaw, err := ioutil.ReadFile(nncp.CfgPathFromEnv(cfgPath))
 	if err != nil {
 		log.Fatalln("Can not read config:", err)
 	}
@@ -73,6 +78,9 @@ func main() {
 	if err != nil {
 		log.Fatalln("Can not parse config:", err)
 	}
+	if ctx.Self == nil {
+		log.Fatalln("Config lacks private keys")
+	}
 	ctx.Quiet = *quiet
 	ctx.Debug = *debug
 
@@ -86,7 +94,25 @@ func main() {
 		log.Fatalln("Invalid NODE specified:", err)
 	}
 
-	if err = ctx.TxFile(node, nice, flag.Arg(0), splitted[1]); err != nil {
+	if *chunkSize == 0 {
+		err = ctx.TxFile(
+			node,
+			nice,
+			flag.Arg(0),
+			splitted[1],
+			int64(*minSize)*1024,
+		)
+	} else {
+		err = ctx.TxFileChunked(
+			node,
+			nice,
+			flag.Arg(0),
+			splitted[1],
+			int64(*minSize)*1024,
+			int64(*chunkSize)*1024,
+		)
+	}
+	if err != nil {
 		log.Fatalln(err)
 	}
 }