"golang.org/x/crypto/blake2b"
)
+const (
+ SeenSuffix = ".seen"
+)
+
func newNotification(fromTo *FromToYAML, subject string) io.Reader {
return strings.NewReader(fmt.Sprintf(
"From: %s\nTo: %s\nSubject: %s\n",
))
}
-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())
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
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")
}
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
}
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
}
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
}
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