Multicast areas

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

diff --git a/src/cmd/nncp-exec/main.go b/src/cmd/nncp-exec/main.go
index 640682a4699dcb4c472931f1109dd1d0dda8cde2..11a99073bb441ab06642ae27f1ebb72babe555d6 100644 (file)
--- a/src/cmd/nncp-exec/main.go
+++ b/src/cmd/nncp-exec/main.go
@@ -24,14 +24,17 @@ import (
        "fmt"
        "log"
        "os"
+       "strings"
 
-       "go.cypherpunks.ru/nncp/v6"
+       "go.cypherpunks.ru/nncp/v7"
 )
 
 func usage() {
        fmt.Fprintf(os.Stderr, nncp.UsageHeader())
        fmt.Fprintf(os.Stderr, "nncp-exec -- send execution command\n\n")
-       fmt.Fprintf(os.Stderr, "Usage: %s [options] NODE HANDLE [ARG0 ARG1 ...]\nOptions:\n", os.Args[0])
+       fmt.Fprintf(os.Stderr, "Usage: %s [options] NODE HANDLE [ARG0 ARG1 ...]\n", os.Args[0])
+       fmt.Fprintf(os.Stderr, "       %s [options] %s:AREA HANDLE [ARG0 ARG1 ...]\nOptions:\n",
+               os.Args[0], nncp.AreaDir)
        flag.PrintDefaults()
 }
 
@@ -53,6 +56,7 @@ func main() {
                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 {
@@ -92,9 +96,19 @@ func main() {
                log.Fatalln("Config lacks private keys")
        }
 
-       node, err := ctx.FindNode(flag.Arg(0))
-       if err != nil {
-               log.Fatalln("Invalid NODE specified:", err)
+       var areaId *nncp.AreaId
+       var node *nncp.Node
+       if strings.HasPrefix(flag.Arg(0), nncp.AreaDir+":") {
+               areaId = ctx.AreaName2Id[flag.Arg(0)[len(nncp.AreaDir)+1:]]
+               if areaId == nil {
+                       log.Fatalln("Unknown area specified")
+               }
+               node = ctx.Neigh[*ctx.SelfId]
+       } else {
+               node, err = ctx.FindNode(flag.Arg(0))
+               if err != nil {
+                       log.Fatalln("Invalid NODE specified:", err)
+               }
        }
 
        nncp.ViaOverride(*viaOverride, ctx, node)
@@ -110,6 +124,7 @@ func main() {
                int64(*minSize)*1024,
                *useTmp,
                *noCompress,
+               areaId,
        ); err != nil {
                log.Fatalln(err)
        }