Merge branch 'develop'

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

diff --git a/src/cypherpunks.ru/nncp/toss.go b/src/cypherpunks.ru/nncp/toss.go
index 4ae9711f8d7d6f42fbefb50b1363ef3001ccaef6..7777ecd50e5c2c213ecf0d829758b713a5ba2af0 100644 (file)
--- a/src/cypherpunks.ru/nncp/toss.go
+++ b/src/cypherpunks.ru/nncp/toss.go
@@ -36,7 +36,10 @@ import (
        "github.com/davecgh/go-xdr/xdr2"
        "github.com/dustin/go-humanize"
        "golang.org/x/crypto/blake2b"
-       "golang.org/x/sys/unix"
+)
+
+const (
+       SeenSuffix = ".seen"
 )
 
 func newNotification(fromTo *FromToYAML, subject string) io.Reader {
@@ -48,40 +51,7 @@ func newNotification(fromTo *FromToYAML, subject string) io.Reader {
        ))
 }
 
-func (ctx *Ctx) LockDir(nodeId *NodeId, xx TRxTx) (*os.File, error) {
-       ctx.ensureRxDir(nodeId)
-       lockPath := filepath.Join(ctx.Spool, nodeId.String(), string(xx)) + ".lock"
-       dirLock, err := os.OpenFile(
-               lockPath,
-               os.O_CREATE|os.O_WRONLY,
-               os.FileMode(0600),
-       )
-       if err != nil {
-               ctx.LogE("lockdir", SDS{"path": lockPath, "err": err}, "")
-               return nil, err
-       }
-       err = unix.Flock(int(dirLock.Fd()), unix.LOCK_EX|unix.LOCK_NB)
-       if err != nil {
-               ctx.LogE("lockdir", SDS{"path": lockPath, "err": err}, "")
-               dirLock.Close()
-               return nil, err
-       }
-       return dirLock, nil
-}
-
-func (ctx *Ctx) UnlockDir(fd *os.File) {
-       if fd != nil {
-               unix.Flock(int(fd.Fd()), unix.LOCK_UN)
-               fd.Close()
-       }
-}
-
-func (ctx *Ctx) Toss(nodeId *NodeId, nice uint8, dryRun bool) bool {
-       dirLock, err := ctx.LockDir(nodeId, TRx)
-       if err != nil {
-               return false
-       }
-       defer ctx.UnlockDir(dirLock)
+func (ctx *Ctx) Toss(nodeId *NodeId, nice uint8, dryRun, doSeen bool) bool {
        isBad := false
        for job := range ctx.Jobs(nodeId, TRx) {
                pktName := filepath.Base(job.Fd.Name())
@@ -132,7 +102,8 @@ func (ctx *Ctx) Toss(nodeId *NodeId, nice uint8, dryRun bool) bool {
                        if err != nil {
                                log.Fatalln(err)
                        }
-                       sendmail := ctx.Neigh[*job.PktEnc.Sender].Sendmail
+                       sender := ctx.Neigh[*job.PktEnc.Sender]
+                       sendmail := sender.Sendmail
                        if len(sendmail) == 0 {
                                ctx.LogE("rx", SdsAdd(sds, SDS{"err": "No sendmail configured"}), "")
                                isBad = true
@@ -146,6 +117,7 @@ func (ctx *Ctx) Toss(nodeId *NodeId, nice uint8, dryRun bool) bool {
                                                strings.Split(recipients, " ")...,
                                        )...,
                                )
+                               cmd.Env = append(cmd.Env, "NNCP_SENDER="+sender.Id.String())
                                cmd.Stdin = decompressor
                                if err = cmd.Run(); err != nil {
                                        ctx.LogE("rx", SdsAdd(sds, SDS{"err": err}), "sendmail")
@@ -155,6 +127,11 @@ func (ctx *Ctx) Toss(nodeId *NodeId, nice uint8, dryRun bool) bool {
                        }
                        ctx.LogI("rx", sds, "")
                        if !dryRun {
+                               if doSeen {
+                                       if fd, err := os.Create(job.Fd.Name() + SeenSuffix); err == nil {
+                                               fd.Close()
+                                       }
+                               }
                                if err = os.Remove(job.Fd.Name()); err != nil {
                                        ctx.LogE("rx", SdsAdd(sds, SDS{"err": err}), "remove")
                                        isBad = true
@@ -221,6 +198,11 @@ func (ctx *Ctx) Toss(nodeId *NodeId, nice uint8, dryRun bool) bool {
                        }
                        ctx.LogI("rx", sds, "")
                        if !dryRun {
+                               if doSeen {
+                                       if fd, err := os.Create(job.Fd.Name() + SeenSuffix); err == nil {
+                                               fd.Close()
+                                       }
+                               }
                                if err = os.Remove(job.Fd.Name()); err != nil {
                                        ctx.LogE("rx", SdsAdd(sds, SDS{"err": err}), "remove")
                                        isBad = true
@@ -290,6 +272,11 @@ func (ctx *Ctx) Toss(nodeId *NodeId, nice uint8, dryRun bool) bool {
                        }
                        ctx.LogI("rx", sds, "")
                        if !dryRun {
+                               if doSeen {
+                                       if fd, err := os.Create(job.Fd.Name() + SeenSuffix); err == nil {
+                                               fd.Close()
+                                       }
+                               }
                                if err = os.Remove(job.Fd.Name()); err != nil {
                                        ctx.LogE("rx", SdsAdd(sds, SDS{"err": err}), "remove")
                                        isBad = true
@@ -329,6 +316,11 @@ func (ctx *Ctx) Toss(nodeId *NodeId, nice uint8, dryRun bool) bool {
                        }
                        ctx.LogI("rx", sds, "")
                        if !dryRun {
+                               if doSeen {
+                                       if fd, err := os.Create(job.Fd.Name() + SeenSuffix); err == nil {
+                                               fd.Close()
+                                       }
+                               }
                                if err = os.Remove(job.Fd.Name()); err != nil {
                                        ctx.LogE("rx", SdsAdd(sds, SDS{"err": err}), "remove")
                                        isBad = true