Merge branch 'develop'

[nncp.git] / src / toss.go

diff --git a/src/toss.go b/src/toss.go
index cc49784b335ffb7bfdecf1dd395b17fac68c5ca1..576abb1fa3553346ee88d9705e970c47de116080 100644 (file)
--- a/src/toss.go
+++ b/src/toss.go
@@ -83,23 +83,24 @@ func (ctx *Ctx) Toss(
        }
        defer decompressor.Close()
        for job := range ctx.Jobs(nodeId, TRx) {
-               pktName := filepath.Base(job.Fd.Name())
+               pktName := filepath.Base(job.Path)
                les := LEs{{"Node", job.PktEnc.Sender}, {"Pkt", pktName}}
                if job.PktEnc.Nice > nice {
                        ctx.LogD("rx", append(les, LE{"Nice", int(job.PktEnc.Nice)}), "too nice")
-                       job.Fd.Close() // #nosec G104
                        continue
                }
+               fd, err := os.Open(job.Path)
+               if err != nil {
+                       ctx.LogE("rx", les, err, "open")
+                       isBad = true
+                       continue
+               }
+
                pipeR, pipeW := io.Pipe()
                go func(job Job) error {
                        pipeWB := bufio.NewWriter(pipeW)
-                       _, _, err := PktEncRead(
-                               ctx.Self,
-                               ctx.Neigh,
-                               bufio.NewReader(job.Fd),
-                               pipeWB,
-                       )
-                       job.Fd.Close() // #nosec G104
+                       _, _, err := PktEncRead(ctx.Self, ctx.Neigh, bufio.NewReader(fd), pipeWB)
+                       fd.Close() // #nosec G104
                        if err != nil {
                                return pipeW.CloseWithError(err)
                        }
@@ -109,7 +110,6 @@ func (ctx *Ctx) Toss(
                        return pipeW.Close()
                }(job)
                var pkt Pkt
-               var err error
                var pktSize int64
                var pktSizeBlocks int64
                if _, err = xdr.Unmarshal(pipeR, &pkt); err != nil {
@@ -197,13 +197,15 @@ func (ctx *Ctx) Toss(
                        ctx.LogI("rx", les, "")
                        if !dryRun {
                                if doSeen {
-                                       if fd, err := os.Create(job.Fd.Name() + SeenSuffix); err == nil {
+                                       if fd, err := os.Create(job.Path + SeenSuffix); err == nil {
                                                fd.Close() // #nosec G104
                                        }
                                }
-                               if err = os.Remove(job.Fd.Name()); err != nil {
+                               if err = os.Remove(job.Path); err != nil {
                                        ctx.LogE("rx", les, err, "remove")
                                        isBad = true
+                               } else if ctx.HdrUsage {
+                                       os.Remove(job.Path + HdrSuffix)
                                }
                        }
                case PktTypeFile:
@@ -293,13 +295,15 @@ func (ctx *Ctx) Toss(
                        ctx.LogI("rx", les, "")
                        if !dryRun {
                                if doSeen {
-                                       if fd, err := os.Create(job.Fd.Name() + SeenSuffix); err == nil {
+                                       if fd, err := os.Create(job.Path + SeenSuffix); err == nil {
                                                fd.Close() // #nosec G104
                                        }
                                }
-                               if err = os.Remove(job.Fd.Name()); err != nil {
+                               if err = os.Remove(job.Path); err != nil {
                                        ctx.LogE("rx", les, err, "remove")
                                        isBad = true
+                               } else if ctx.HdrUsage {
+                                       os.Remove(job.Path + HdrSuffix)
                                }
                                if len(sendmail) > 0 && ctx.NotifyFile != nil {
                                        cmd := exec.Command(
@@ -362,13 +366,15 @@ func (ctx *Ctx) Toss(
                        ctx.LogI("rx", les, "")
                        if !dryRun {
                                if doSeen {
-                                       if fd, err := os.Create(job.Fd.Name() + SeenSuffix); err == nil {
+                                       if fd, err := os.Create(job.Path + SeenSuffix); err == nil {
                                                fd.Close() // #nosec G104
                                        }
                                }
-                               if err = os.Remove(job.Fd.Name()); err != nil {
+                               if err = os.Remove(job.Path); err != nil {
                                        ctx.LogE("rx", les, err, "remove")
                                        isBad = true
+                               } else if ctx.HdrUsage {
+                                       os.Remove(job.Path + HdrSuffix)
                                }
                                if len(sendmail) > 0 && ctx.NotifyFreq != nil {
                                        cmd := exec.Command(
@@ -408,13 +414,15 @@ func (ctx *Ctx) Toss(
                        ctx.LogI("rx", les, "")
                        if !dryRun {
                                if doSeen {
-                                       if fd, err := os.Create(job.Fd.Name() + SeenSuffix); err == nil {
+                                       if fd, err := os.Create(job.Path + SeenSuffix); err == nil {
                                                fd.Close() // #nosec G104
                                        }
                                }
-                               if err = os.Remove(job.Fd.Name()); err != nil {
+                               if err = os.Remove(job.Path); err != nil {
                                        ctx.LogE("rx", les, err, "remove")
                                        isBad = true
+                               } else if ctx.HdrUsage {
+                                       os.Remove(job.Path + HdrSuffix)
                                }
                        }
                default: