os.IsNotExists is deprecated

[nncp.git] / src / toss.go

diff --git a/src/toss.go b/src/toss.go
index ebe20fbf0dd159c626d7b91801e814ddbc34ce0b..b4363f713ea7856a16df74e26ff5a10ae0413ae6 100644 (file)
--- a/src/toss.go
+++ b/src/toss.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2022 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2023 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
@@ -24,7 +24,7 @@ import (
        "errors"
        "fmt"
        "io"
-       "io/ioutil"
+       "io/fs"
        "log"
        "mime"
        "os"
@@ -357,7 +357,7 @@ func jobProcess(
                        dstPathCtr := 0
                        for {
                                if _, err = os.Stat(dstPath); err != nil {
-                                       if os.IsNotExist(err) {
+                                       if errors.Is(err, fs.ErrNotExist) {
                                                break
                                        }
                                        ctx.LogE("rx-stat", les, err, func(les LEs) string {
@@ -475,7 +475,7 @@ func jobProcess(
                        )
                        return err
                }
-               dstRaw, err := ioutil.ReadAll(pipeR)
+               dstRaw, err := io.ReadAll(pipeR)
                if err != nil {
                        ctx.LogE("rx-read", les, err, func(les LEs) string {
                                return fmt.Sprintf(
@@ -621,7 +621,7 @@ func jobProcess(
                                if err != nil {
                                        panic(err)
                                }
-                               if _, _, err = ctx.Tx(
+                               if _, _, _, err = ctx.Tx(
                                        node,
                                        pktTrns,
                                        nice,
@@ -752,7 +752,7 @@ func jobProcess(
                                }
                                if nodeId != sender.Id && nodeId != pktEnc.Sender {
                                        ctx.LogI("rx-area-echo", lesEcho, logMsgNode)
-                                       if _, _, err = ctx.Tx(
+                                       if _, _, _, err = ctx.Tx(
                                                node,
                                                &pkt,
                                                nice,
@@ -926,6 +926,8 @@ func jobProcess(
                                                return logMsg(les) + ": removing packet"
                                        })
                                        return err
+                               } else if ctx.HdrUsage {
+                                       os.Remove(JobPath2Hdr(pktPath))
                                }
                        }
                } else {
@@ -1061,7 +1063,7 @@ func (ctx *Ctx) Toss(
                sharedKey, _, _, err = PktEncRead(
                        ctx.Self,
                        ctx.Neigh,
-                       bufio.NewReader(fd),
+                       bufio.NewReaderSize(fd, MTHBlockSize),
                        pipeWB,
                        sharedKey == nil,
                        sharedKey,