From f39fd5071c00c828b140c01add173e33e30b8a37 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Thu, 1 Jul 2021 12:12:12 +0300 Subject: [PATCH] Print node names in nncp-pkt --- src/cmd/nncp-pkt/main.go | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/cmd/nncp-pkt/main.go b/src/cmd/nncp-pkt/main.go index 49c23a2..f696184 100644 --- a/src/cmd/nncp-pkt/main.go +++ b/src/cmd/nncp-pkt/main.go @@ -95,17 +95,27 @@ func doPlain(pkt nncp.Pkt, dump, decompress bool) { } 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) + } 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 + } fmt.Printf( - "Packet type: encrypted\nNiceness: %s (%d)\nSender: %s\nRecipient: %s\n", - nncp.NicenessFmt(pktEnc.Nice), pktEnc.Nice, pktEnc.Sender, pktEnc.Recipient, + "Packet type: encrypted\nNiceness: %s (%d)\nSender: %s (%s)\nRecipient: %s (%s)\n", + nncp.NicenessFmt(pktEnc.Nice), pktEnc.Nice, + pktEnc.Sender, senderS, + pktEnc.Recipient, recipientS, ) return } - ctx, err := nncp.CtxFromCmdline(cfgPath, "", "", false, false, false, false) - if err != nil { - log.Fatalln("Error during initialization:", err) - } if ctx.Self == nil { log.Fatalln("Config lacks private keys") } -- 2.44.0