X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fnncp%2Fcmd%2Fnncp-freq%2Fmain.go;h=1c8e248cb60ce27a1f2c7e0be57566ad778a3b4d;hb=2a5c56d7ba8cecf8f200255d5e5c61589c43009c;hp=ada8edbba2854725af5f8b226ed7d96b52f62743;hpb=5b401cc06b0a9a29f0201c20ead311fb2bff7446;p=nncp.git

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go
index ada8edb..1c8e248 100644
--- a/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-freq/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2018 Sergey Matveev <stargrave@stargrave.org>
 
 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
@@ -22,9 +22,9 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
+	"path/filepath"
 	"strings"
 
 	"cypherpunks.ru/nncp"
@@ -32,20 +32,24 @@ import (
 
 func usage() {
 	fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-	fmt.Fprintln(os.Stderr, "nncp-freq -- send file request\n")
-	fmt.Fprintf(os.Stderr, "Usage: %s [options] NODE:SRC DST\nOptions:\n", os.Args[0])
+	fmt.Fprintf(os.Stderr, "nncp-freq -- send file request\n\n")
+	fmt.Fprintf(os.Stderr, "Usage: %s [options] NODE:SRC [DST]\nOptions:\n", os.Args[0])
 	flag.PrintDefaults()
 }
 
 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")
-		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.DefaultNiceFreq, "Outbound packet niceness")
+		replyNiceRaw = flag.Int("replynice", nncp.DefaultNiceFile, "Reply file packet niceness")
+		minSize      = flag.Uint64("minsize", 0, "Minimal required resulting packet size, in KiB")
+		viaOverride  = flag.String("via", "", "Override Via path to destination node")
+		spoolPath    = flag.String("spool", "", "Override path to spool")
+		logPath      = flag.String("log", "", "Override path to logfile")
+		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()
@@ -57,7 +61,7 @@ func main() {
 		fmt.Println(nncp.VersionGet())
 		return
 	}
-	if flag.NArg() != 2 {
+	if flag.NArg() == 0 {
 		usage()
 		os.Exit(1)
 	}
@@ -65,17 +69,18 @@ func main() {
 		log.Fatalln("-nice must be between 1 and 255")
 	}
 	nice := uint8(*niceRaw)
+	if *replyNiceRaw < 1 || *replyNiceRaw > 255 {
+		log.Fatalln("-replynice must be between 1 and 255")
+	}
+	replyNice := uint8(*replyNiceRaw)
 
-	cfgRaw, err := ioutil.ReadFile(nncp.CfgPathFromEnv(cfgPath))
+	ctx, err := nncp.CtxFromCmdline(*cfgPath, *spoolPath, *logPath, *quiet, *debug)
 	if err != nil {
-		log.Fatalln("Can not read config:", err)
+		log.Fatalln("Error during initialization:", err)
 	}
-	ctx, err := nncp.CfgParse(cfgRaw)
-	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
 
 	splitted := strings.SplitN(flag.Arg(0), ":", 2)
 	if len(splitted) != 2 {
@@ -87,7 +92,23 @@ func main() {
 		log.Fatalln("Invalid NODE specified:", err)
 	}
 
-	if err = ctx.TxFreq(node, nice, splitted[1], flag.Arg(1), int64(*minSize)); err != nil {
+	nncp.ViaOverride(*viaOverride, ctx, node)
+
+	var dst string
+	if flag.NArg() == 2 {
+		dst = flag.Arg(1)
+	} else {
+		dst = filepath.Base(splitted[1])
+	}
+
+	if err = ctx.TxFreq(
+		node,
+		nice,
+		replyNice,
+		splitted[1],
+		dst,
+		int64(*minSize)*1024,
+	); err != nil {
 		log.Fatalln(err)
 	}
 }