Multicast areas

[nncp.git] / src / cmd / nncp-file / main.go

diff --git a/src/cmd/nncp-file/main.go b/src/cmd/nncp-file/main.go
index 3257f2b71a39cb9ac38754896989b071910b5e77..6870aec808c818b7c1dfb9aedcf94a2a3fc81e67 100644 (file)
--- a/src/cmd/nncp-file/main.go
+++ b/src/cmd/nncp-file/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2019 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2021 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
@@ -25,13 +25,15 @@ import (
        "os"
        "strings"
 
-       "go.cypherpunks.ru/nncp/v5"
+       "go.cypherpunks.ru/nncp/v7"
 )
 
 func usage() {
        fmt.Fprintf(os.Stderr, nncp.UsageHeader())
        fmt.Fprintf(os.Stderr, "nncp-file -- send file\n\n")
-       fmt.Fprintf(os.Stderr, "Usage: %s [options] SRC NODE:[DST]\nOptions:\n", os.Args[0])
+       fmt.Fprintf(os.Stderr, "Usage: %s [options] SRC NODE:[DST]\n", os.Args[0])
+       fmt.Fprintf(os.Stderr, "       %s [options] SRC %s:AREA:[DST]\nOptions:\n",
+               os.Args[0], nncp.AreaDir)
        flag.PrintDefaults()
        fmt.Fprint(os.Stderr, `
 If SRC equals to -, then read data from stdin to temporary file.
@@ -51,10 +53,13 @@ func main() {
                spoolPath    = flag.String("spool", "", "Override path to spool")
                logPath      = flag.String("log", "", "Override path to logfile")
                quiet        = flag.Bool("quiet", false, "Print only errors")
+               showPrgrs    = flag.Bool("progress", false, "Force progress showing")
+               omitPrgrs    = flag.Bool("noprogress", false, "Omit progress showing")
                debug        = flag.Bool("debug", false, "Print debug messages")
                version      = flag.Bool("version", false, "Print version information")
                warranty     = flag.Bool("warranty", false, "Print warranty information")
        )
+       log.SetFlags(log.Lshortfile)
        flag.Usage = usage
        flag.Parse()
        if *warranty {
@@ -74,7 +79,15 @@ func main() {
                log.Fatalln(err)
        }
 
-       ctx, err := nncp.CtxFromCmdline(*cfgPath, *spoolPath, *logPath, *quiet, *debug)
+       ctx, err := nncp.CtxFromCmdline(
+               *cfgPath,
+               *spoolPath,
+               *logPath,
+               *quiet,
+               *showPrgrs,
+               *omitPrgrs,
+               *debug,
+       )
        if err != nil {
                log.Fatalln("Error during initialization:", err)
        }
@@ -82,14 +95,30 @@ func main() {
                log.Fatalln("Config lacks private keys")
        }
 
-       splitted := strings.SplitN(flag.Arg(1), ":", 2)
-       if len(splitted) != 2 {
+       splitted := strings.Split(flag.Arg(1), ":")
+       if len(splitted) < 2 {
                usage()
                os.Exit(1)
        }
-       node, err := ctx.FindNode(splitted[0])
-       if err != nil {
-               log.Fatalln("Invalid NODE specified:", err)
+       var areaId *nncp.AreaId
+       var node *nncp.Node
+       if splitted[0] == nncp.AreaDir {
+               if len(splitted) < 3 {
+                       usage()
+                       os.Exit(1)
+               }
+               areaId = ctx.AreaName2Id[splitted[1]]
+               if areaId == nil {
+                       log.Fatalln("Unknown area specified")
+               }
+               node = ctx.Neigh[*ctx.SelfId]
+               splitted = splitted[2:]
+       } else {
+               node, err = ctx.FindNode(splitted[0])
+               if err != nil {
+                       log.Fatalln("Invalid NODE specified:", err)
+               }
+               splitted = splitted[1:]
        }
 
        nncp.ViaOverride(*viaOverride, ctx, node)
@@ -116,10 +145,11 @@ func main() {
                node,
                nice,
                flag.Arg(0),
-               splitted[1],
+               strings.Join(splitted, ":"),
                chunkSize,
                minSize,
                nncp.MaxFileSize,
+               areaId,
        ); err != nil {
                log.Fatalln(err)
        }