Print node names in nncp-pkt

diff --git a/src/cmd/nncp-pkt/main.go b/src/cmd/nncp-pkt/main.go
index 49c23a246df01248921dc321b824e14e9ecfa77c..f696184cdcaf681f1206ea3655c595f3aaf9e135 100644 (file)
--- 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")
        }