X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-pkt%2Fmain.go;h=54844dc4daecacbd5d60b761349698f0f8da8fa6;hb=0367cce2741e1ce6a89a49fd5c4e9df6005c9744;hp=fbfc6dafac0b7bd5e3a34eca16a23970f0da7047;hpb=2dce56705f399b46ccf3b9de9b6610c067da428b;p=nncp.git

diff --git a/src/cmd/nncp-pkt/main.go b/src/cmd/nncp-pkt/main.go
index fbfc6da..54844dc 100644
--- a/src/cmd/nncp-pkt/main.go
+++ b/src/cmd/nncp-pkt/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2021 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2022 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
@@ -29,7 +29,7 @@ import (
 
 	xdr "github.com/davecgh/go-xdr/xdr2"
 	"github.com/klauspost/compress/zstd"
-	"go.cypherpunks.ru/nncp/v7"
+	"go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
@@ -40,7 +40,7 @@ func usage() {
 	fmt.Fprintln(os.Stderr, "Packet is read from stdin.")
 }
 
-func doPlain(pkt nncp.Pkt, dump, decompress bool) {
+func doPlain(ctx *nncp.Ctx, pkt nncp.Pkt, dump, decompress bool) {
 	if dump {
 		bufW := bufio.NewWriter(os.Stdout)
 		var r io.Reader
@@ -68,10 +68,12 @@ func doPlain(pkt nncp.Pkt, dump, decompress bool) {
 		payloadType = "file request"
 	case nncp.PktTypeExec:
 		payloadType = "exec compressed"
-	case nncp.PktTypeExecFat:
-		payloadType = "exec uncompressed"
 	case nncp.PktTypeTrns:
 		payloadType = "transitional"
+	case nncp.PktTypeExecFat:
+		payloadType = "exec uncompressed"
+	case nncp.PktTypeArea:
+		payloadType = "area"
 	}
 	var path string
 	switch pkt.Type {
@@ -81,6 +83,15 @@ func doPlain(pkt nncp.Pkt, dump, decompress bool) {
 		))
 	case nncp.PktTypeTrns:
 		path = nncp.Base32Codec.EncodeToString(pkt.Path[:pkt.PathLen])
+		node, err := ctx.FindNode(path)
+		if err == nil {
+			path = fmt.Sprintf("%s (%s)", path, node.Name)
+		}
+	case nncp.PktTypeArea:
+		path = nncp.Base32Codec.EncodeToString(pkt.Path[:pkt.PathLen])
+		if areaId, err := nncp.AreaIdFromString(path); err == nil {
+			path = fmt.Sprintf("%s (%s)", path, ctx.AreaName(areaId))
+		}
 	default:
 		path = string(pkt.Path[:pkt.PathLen])
 	}
@@ -91,25 +102,39 @@ func doPlain(pkt nncp.Pkt, dump, decompress bool) {
 	return
 }
 
-func doEncrypted(pktEnc nncp.PktEnc, dump bool, cfgPath string, beginning []byte) {
-	ctx, err := nncp.CtxFromCmdline(cfgPath, "", "", false, false, false, false)
-	if err != nil {
-		log.Fatalln("Error during initialization:", err)
+func doEncrypted(
+	ctx *nncp.Ctx,
+	pktEnc nncp.PktEnc,
+	dump bool,
+	beginning []byte,
+) {
+	senderName := "unknown"
+	senderNode := ctx.Neigh[*pktEnc.Sender]
+	if senderNode != nil {
+		senderName = senderNode.Name
 	}
-	if !dump {
-		senderS := "unknown"
-		recipientS := "unknown"
-		if n, ok := ctx.Neigh[*pktEnc.Sender]; ok {
-			senderS = n.Name
-		}
-		if n, ok := ctx.Neigh[*pktEnc.Recipient]; ok {
-			recipientS = n.Name
+
+	recipientName := "unknown"
+	var area *nncp.Area
+	recipientNode := ctx.Neigh[*pktEnc.Recipient]
+	if recipientNode == nil {
+		area = ctx.AreaId2Area[nncp.AreaId(*pktEnc.Recipient)]
+		if area != nil {
+			recipientName = "area " + area.Name
 		}
-		fmt.Printf(
-			"Packet type: encrypted\nNiceness: %s (%d)\nSender: %s (%s)\nRecipient: %s (%s)\n",
+	} else {
+		recipientName = recipientNode.Name
+	}
+
+	if !dump {
+		fmt.Printf(`Packet type: encrypted
+Niceness: %s (%d)
+Sender: %s (%s)
+Recipient: %s (%s)
+`,
 			nncp.NicenessFmt(pktEnc.Nice), pktEnc.Nice,
-			pktEnc.Sender, senderS,
-			pktEnc.Recipient, recipientS,
+			pktEnc.Sender, senderName,
+			pktEnc.Recipient, recipientName,
 		)
 		return
 	}
@@ -117,15 +142,24 @@ func doEncrypted(pktEnc nncp.PktEnc, dump bool, cfgPath string, beginning []byte
 		log.Fatalln("Config lacks private keys")
 	}
 	bufW := bufio.NewWriter(os.Stdout)
-	if _, _, err = nncp.PktEncRead(
-		ctx.Self,
-		ctx.Neigh,
-		io.MultiReader(
-			bytes.NewReader(beginning),
-			bufio.NewReader(os.Stdin),
-		),
-		bufW,
-	); err != nil {
+	var err error
+	if area == nil {
+		_, _, _, err = nncp.PktEncRead(
+			ctx.Self, ctx.Neigh,
+			io.MultiReader(bytes.NewReader(beginning), bufio.NewReader(os.Stdin)),
+			bufW, senderNode != nil, nil,
+		)
+	} else {
+		areaNode := nncp.NodeOur{Id: new(nncp.NodeId), ExchPrv: new([32]byte)}
+		copy(areaNode.Id[:], area.Id[:])
+		copy(areaNode.ExchPrv[:], area.Prv[:])
+		_, _, _, err = nncp.PktEncRead(
+			&areaNode, ctx.Neigh,
+			io.MultiReader(bytes.NewReader(beginning), bufio.NewReader(os.Stdin)),
+			bufW, senderNode != nil, nil,
+		)
+	}
+	if err != nil {
 		log.Fatalln(err)
 	}
 	if err = bufW.Flush(); err != nil {
@@ -154,6 +188,11 @@ func main() {
 		return
 	}
 
+	ctx, err := nncp.CtxFromCmdline(*cfgPath, "", "", false, false, false, false)
+	if err != nil {
+		log.Fatalln("Error during initialization:", err)
+	}
+
 	if *overheads {
 		fmt.Printf(
 			"Plain: %d\nEncrypted: %d\nSize: %d\n",
@@ -180,7 +219,9 @@ func main() {
 		case nncp.MagicNNCPEv4.B:
 			log.Fatalln(nncp.MagicNNCPEv4.TooOld())
 		case nncp.MagicNNCPEv5.B:
-			doEncrypted(pktEnc, *dump, *cfgPath, beginning[:nncp.PktEncOverhead])
+			log.Fatalln(nncp.MagicNNCPEv5.TooOld())
+		case nncp.MagicNNCPEv6.B:
+			doEncrypted(ctx, pktEnc, *dump, beginning[:nncp.PktEncOverhead])
 			return
 		}
 	}
@@ -196,7 +237,7 @@ func main() {
 		case nncp.MagicNNCPPv2.B:
 			log.Fatalln(nncp.MagicNNCPPv2.TooOld())
 		case nncp.MagicNNCPPv3.B:
-			doPlain(pkt, *dump, *decompress)
+			doPlain(ctx, pkt, *dump, *decompress)
 			return
 		}
 	}