nncp-xfer -rx seen/ check

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 28ce8a0f72ac9568de0f03940b8f7025ea683404..cd8659532d8987f769e550236d9e2793823c80f2 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,16 @@
 @node Новости
 @section Новости
 
+@node Релиз 8.7.1
+@subsection Релиз 8.7.1
+@itemize
+
+@item
+@command{nncp-xfer} теперь корректно проверяет наличие @file{seen/}
+файлов для входящих пакетов.
+
+@end itemize
+
 @node Релиз 8.7.0
 @subsection Релиз 8.7.0
 @itemize

diff --git a/doc/news.texi b/doc/news.texi
index e18445adaa0e7deca5a1e2119b5a83d5b79954d3..9b0e59590f9239361682d194e3de049435aa8912 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -4,6 +4,16 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 8_7_1
+@section Release 8.7.1
+@itemize
+
+@item
+@command{nncp-xfer} now correctly checks for @file{seen/} files for
+inbound packets.
+
+@end itemize
+
 @node Release 8_7_0
 @section Release 8.7.0
 @itemize

diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index b959a327403aae08a2adb851089394f402e50723..dbc14e44c0384568b14a6f9db99b1c57c6dfe091 100644 (file)
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=      nncp
-DISTVERSION=   8.7.0
+DISTVERSION=   8.7.1
 CATEGORIES=    net
 MASTER_SITES=  http://www.nncpgo.org/download/
 

diff --git a/src/cmd/nncp-xfer/main.go b/src/cmd/nncp-xfer/main.go
index a1ef5fa5d51c438179b33450f7876352d62d5242..9c29b0284b1975b4da44fcd927a3cb5841901a32 100644 (file)
--- a/src/cmd/nncp-xfer/main.go
+++ b/src/cmd/nncp-xfer/main.go
@@ -209,6 +209,24 @@ func main() {
                                        ctx.NodeName(nodeId), filename,
                                )
                        }
+                       if _, err = os.Stat(filepath.Join(
+                               ctx.Spool,
+                               nodeId.String(),
+                               string(nncp.TRx),
+                               nncp.SeenDir,
+                               fiInt.Name(),
+                       )); err == nil || !os.IsNotExist(err) {
+                               ctx.LogI("xfer-rx-seen", les, func(les nncp.LEs) string {
+                                       return logMsg(les) + ": packet already seen"
+                               })
+                               if !*keep {
+                                       if err = os.Remove(filename); err != nil {
+                                               ctx.LogE("xfer-rx-remove", les, err, logMsg)
+                                               isBad = true
+                                       }
+                               }
+                               continue
+                       }
                        fd, err := os.Open(filename)
                        if err != nil {
                                ctx.LogE("xfer-rx-open", les, err, func(les nncp.LEs) string {
@@ -436,14 +454,6 @@ Tx:
                                })
                                continue
                        }
-                       if _, err = os.Stat(filepath.Join(
-                               dstPath, nncp.SeenDir, pktName,
-                       )); err == nil || !os.IsNotExist(err) {
-                               ctx.LogD("xfer-tx-seen", les, func(les nncp.LEs) string {
-                                       return logMsg(les) + ": already seen"
-                               })
-                               continue
-                       }
                        tmp, err := nncp.TempFile(dstPath, "xfer")
                        if err != nil {
                                ctx.LogE("xfer-tx-mktemp", les, err, func(les nncp.LEs) string {

diff --git a/src/nncp.go b/src/nncp.go
index ff817da745fb9f77c1befa57352f07dd7116c68c..2647e4c891389d775019ccefce4d0a4fa446cc3e 100644 (file)
--- a/src/nncp.go
+++ b/src/nncp.go
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.`
 const Base32Encoded32Len = 52
 
 var (
-       Version string = "8.7.0"
+       Version string = "8.7.1"
 
        Base32Codec *base32.Encoding = base32.StdEncoding.WithPadding(base32.NoPadding)
 )