/*
NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2021 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2022 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
import (
"flag"
"fmt"
+ "io"
"log"
"os"
"path/filepath"
"strings"
"time"
- "go.cypherpunks.ru/nncp/v7"
+ "go.cypherpunks.ru/nncp/v8"
)
func usage() {
fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -hdr\n", os.Args[0])
fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -area\n", os.Args[0])
fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} {-rx|-tx}\n", os.Args[0])
- fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -pkt PKT\n", os.Args[0])
+ fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -pkt < ...\n", os.Args[0])
fmt.Fprintln(os.Stderr, "-older option's time units are: (s)econds, (m)inutes, (h)ours, (d)ays")
fmt.Fprintln(os.Stderr, "Options:")
flag.PrintDefaults()
cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
doAll = flag.Bool("all", false, "Apply remove rules to all nodes")
doTmp = flag.Bool("tmp", false, "Remove all temporary files")
- doHdr = flag.Bool("hdr", false, "Remove all .hdr files")
+ doHdr = flag.Bool("hdr", false, "Remove all hdr/ files")
doLock = flag.Bool("lock", false, "Remove all lock files")
nodeRaw = flag.String("node", "", "Node to remove files in")
doRx = flag.Bool("rx", false, "Process received packets")
doTx = flag.Bool("tx", false, "Process transfered packets")
doPart = flag.Bool("part", false, "Remove only .part files")
- doSeen = flag.Bool("seen", false, "Remove only .seen files")
+ doSeen = flag.Bool("seen", false, "Remove only seen/ files")
doNoCK = flag.Bool("nock", false, "Remove only .nock files")
- doArea = flag.Bool("area", false, "Remove only area/*.seen files")
+ doArea = flag.Bool("area", false, "Remove only area/* seen files")
older = flag.String("older", "", "XXX{smhd}: only older than XXX number of time units")
dryRun = flag.Bool("dryrun", false, "Do not actually remove files")
- pktRaw = flag.String("pkt", "", "Packet to remove")
+ doPkt = flag.Bool("pkt", false, "Packet to remove TODO")
spoolPath = flag.String("spool", "", "Override path to spool")
quiet = flag.Bool("quiet", false, "Print only errors")
debug = flag.Bool("debug", false, "Print debug messages")
}
oldBoundary := time.Second * time.Duration(oldBoundaryRaw)
+ pkts := make(map[string]struct{})
+ if *doPkt {
+ raw, err := io.ReadAll(os.Stdin)
+ if err != nil {
+ log.Fatalln("can not read -pkt from stdin:", err)
+ }
+ for _, line := range strings.Split(string(raw), "\n") {
+ if len(line) == 0 {
+ continue
+ }
+ cols := strings.Split(line, "/")
+ pkts[cols[len(cols)-1]] = struct{}{}
+ }
+ }
+
now := time.Now()
if *doTmp {
err = filepath.Walk(
os.Exit(1)
}
} else {
- nodeId, err = nncp.NodeIdFromString(*nodeRaw)
+ node, err := ctx.FindNode(*nodeRaw)
if err != nil {
log.Fatalln("Invalid -node specified:", err)
}
+ nodeId = node.Id
}
for _, node := range ctx.Neigh {
if nodeId != nil && node.Id != nodeId {
continue
}
remove := func(xx nncp.TRxTx) error {
- return filepath.Walk(
- filepath.Join(ctx.Spool, node.Id.String(), string(xx)),
+ p := filepath.Join(ctx.Spool, node.Id.String(), string(xx))
+ if _, err := os.Stat(p); err != nil && os.IsNotExist(err) {
+ return nil
+ }
+ return filepath.Walk(p,
func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
})
return nil
}
- if (*doSeen && strings.HasSuffix(info.Name(), nncp.SeenSuffix)) ||
- (*doNoCK && strings.HasSuffix(info.Name(), nncp.NoCKSuffix)) ||
- (*doHdr && strings.HasSuffix(info.Name(), nncp.HdrSuffix)) ||
+ if (*doNoCK && strings.HasSuffix(info.Name(), nncp.NoCKSuffix)) ||
(*doPart && strings.HasSuffix(info.Name(), nncp.PartSuffix)) {
ctx.LogI("rm", nncp.LEs{{K: "File", V: path}}, logMsg)
if *dryRun {
}
return os.Remove(path)
}
- if *pktRaw != "" && filepath.Base(info.Name()) == *pktRaw {
- ctx.LogI("rm", nncp.LEs{{K: "File", V: path}}, logMsg)
- if *dryRun {
- return nil
+ if len(pkts) > 0 {
+ if _, exists := pkts[filepath.Base(info.Name())]; exists {
+ ctx.LogI("rm", nncp.LEs{{K: "File", V: path}}, logMsg)
+ if *dryRun {
+ return nil
+ }
+ return os.Remove(path)
}
- return os.Remove(path)
}
if !*doSeen && !*doNoCK && !*doHdr && !*doPart &&
(*doRx || *doTx) &&
return nil
})
}
- if *pktRaw != "" || *doRx || *doSeen || *doNoCK || *doHdr || *doPart {
+ if len(pkts) > 0 || *doRx || *doNoCK || *doPart {
if err = remove(nncp.TRx); err != nil {
log.Fatalln("Can not remove:", err)
}
}
- if *pktRaw != "" || *doTx || *doHdr {
+ if len(pkts) > 0 || *doTx || *doHdr {
if err = remove(nncp.TTx); err != nil {
log.Fatalln("Can not remove:", err)
}
}
+ removeSub := func(p string, everything bool) error {
+ return filepath.Walk(
+ p, func(path string, info os.FileInfo, err error) error {
+ if err != nil {
+ if os.IsNotExist(err) {
+ return nil
+ }
+ return err
+ }
+ if info.IsDir() {
+ return nil
+ }
+ logMsg := func(les nncp.LEs) string {
+ return fmt.Sprintf("File %s: removed", path)
+ }
+ if everything {
+ ctx.LogI("rm", nncp.LEs{{K: "File", V: path}}, logMsg)
+ if *dryRun {
+ return nil
+ }
+ return os.Remove(path)
+ }
+ if now.Sub(info.ModTime()) < oldBoundary {
+ ctx.LogD(
+ "rm-skip", nncp.LEs{{K: "File", V: path}},
+ func(les nncp.LEs) string {
+ return fmt.Sprintf("File %s: too fresh, skipping", path)
+ },
+ )
+ } else if !*dryRun {
+ return os.Remove(path)
+ }
+ return nil
+ },
+ )
+ }
+ if *doRx || *doSeen {
+ if err = removeSub(filepath.Join(
+ ctx.Spool, node.Id.String(), string(nncp.TRx), nncp.SeenDir,
+ ), *doSeen); err != nil {
+ log.Fatalln("Can not remove:", err)
+ }
+ }
+ if *doRx || *doHdr {
+ if err = removeSub(filepath.Join(
+ ctx.Spool, node.Id.String(), string(nncp.TRx), nncp.HdrDir,
+ ), *doHdr); err != nil {
+ log.Fatalln("Can not remove:", err)
+ }
+ }
+ if *doTx || *doHdr {
+ if err = removeSub(filepath.Join(
+ ctx.Spool, node.Id.String(), string(nncp.TTx), nncp.HdrDir,
+ ), *doHdr); err != nil {
+ log.Fatalln("Can not remove:", err)
+ }
+ }
if *doArea {
if err = filepath.Walk(
filepath.Join(ctx.Spool, node.Id.String(), nncp.AreaDir),
return nil
}
if now.Sub(info.ModTime()) < oldBoundary {
- ctx.LogD("rm-skip", nncp.LEs{{K: "File", V: path}}, func(les nncp.LEs) string {
- return fmt.Sprintf("File %s: too fresh, skipping", path)
- })
- return nil
- }
- if strings.HasSuffix(info.Name(), nncp.SeenSuffix) {
- ctx.LogI(
- "rm",
- nncp.LEs{{K: "File", V: path}},
+ ctx.LogD(
+ "rm-skip", nncp.LEs{{K: "File", V: path}},
func(les nncp.LEs) string {
- return fmt.Sprintf("File %s: removed", path)
+ return fmt.Sprintf("File %s: too fresh, skipping", path)
},
)
- if *dryRun {
- return nil
- }
- return os.Remove(path)
+ return nil
}
- return nil
+ ctx.LogI(
+ "rm",
+ nncp.LEs{{K: "File", V: path}},
+ func(les nncp.LEs) string {
+ return fmt.Sprintf("File %s: removed", path)
+ },
+ )
+ if *dryRun {
+ return nil
+ }
+ return os.Remove(path)
}); err != nil {
log.Fatalln("Can not remove:", err)
}