Forbid any later GNU GPL versions autousage

[nncp.git] / src / cypherpunks.ru / nncp / check.go

diff --git a/src/cypherpunks.ru/nncp/check.go b/src/cypherpunks.ru/nncp/check.go
index bedd1327f0243a8af50f7971d914a03d37f6dafe..fdd6436f9049806ebe46d054a609f6b0839ccf33 100644 (file)
--- a/src/cypherpunks.ru/nncp/check.go
+++ b/src/cypherpunks.ru/nncp/check.go
@@ -1,11 +1,10 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2017 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2019 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
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+the Free Software Foundation, version 3 of the License.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -41,16 +40,21 @@ func Check(src io.Reader, checksum []byte) (bool, error) {
 func (ctx *Ctx) checkXx(nodeId *NodeId, xx TRxTx) bool {
        isBad := false
        for job := range ctx.Jobs(nodeId, xx) {
-               sds := SDS{"xx": string(xx), "node": nodeId, "pkt": job.Fd.Name()}
+               sds := SDS{
+                       "xx":   string(xx),
+                       "node": nodeId,
+                       "pkt":  ToBase32(job.HshValue[:]),
+               }
+               ctx.LogP("check", sds, "")
                gut, err := Check(job.Fd, job.HshValue[:])
                job.Fd.Close()
                if err != nil {
-                       ctx.LogE("toss-check", SdsAdd(sds, SDS{"err": err}), "")
+                       ctx.LogE("check", SdsAdd(sds, SDS{"err": err}), "")
                        return false
                }
                if !gut {
                        isBad = true
-                       ctx.LogE("toss-check", sds, "bad")
+                       ctx.LogE("check", sds, "bad")
                }
        }
        return isBad