X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-rm%2Fmain.go;h=18931ebbcbe3fd3f9ad0196fcbd561e538eb38e1;hb=2e22bda93fdf8f2f84e4d19b3f1d46318b497139;hp=aa642288c69a77f09a659ae7c13cfde808150c67;hpb=ab7c7eca0e53661f0ba904c2a6ba752990bea367;p=nncp.git diff --git a/src/cmd/nncp-rm/main.go b/src/cmd/nncp-rm/main.go index aa64228..18931eb 100644 --- a/src/cmd/nncp-rm/main.go +++ b/src/cmd/nncp-rm/main.go @@ -1,6 +1,6 @@ /* NNCP -- Node to Node copy, utilities for store-and-forward data exchange -Copyright (C) 2016-2021 Sergey Matveev +Copyright (C) 2016-2023 Sergey Matveev 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 @@ -19,8 +19,11 @@ along with this program. If not, see . package main import ( + "errors" "flag" "fmt" + "io" + "io/fs" "log" "os" "path/filepath" @@ -29,21 +32,20 @@ import ( "strings" "time" - "go.cypherpunks.ru/nncp/v7" + "go.cypherpunks.ru/nncp/v8" ) func usage() { - fmt.Fprintf(os.Stderr, nncp.UsageHeader()) - fmt.Fprintf(os.Stderr, "nncp-rm -- remove packet\n\n") - fmt.Fprintf(os.Stderr, "Usage: %s [options] -tmp\n", os.Args[0]) + fmt.Fprint(os.Stderr, "nncp-rm -- remove packet\n\n") + fmt.Fprintf(os.Stderr, "Usage: %s [options] [-older X] -tmp\n", os.Args[0]) fmt.Fprintf(os.Stderr, " %s [options] -lock\n", os.Args[0]) - fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -part\n", os.Args[0]) - fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -seen\n", os.Args[0]) - fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -nock\n", os.Args[0]) - 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] [-older X] {-all|-node NODE} -part\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] [-older X] {-all|-node NODE} -seen\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] [-older X] {-all|-node NODE} -nock\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] [-older X] {-all|-node NODE} -area\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] [-older X] {-all|-node NODE} {-rx|-tx} [-hdr]\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -pkt < ...\n", os.Args[0]) + fmt.Fprintf(os.Stderr, " %s [options] {-all|-node NODE} -ack\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() @@ -52,20 +54,21 @@ func usage() { func main() { var ( 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") + doTmp = flag.Bool("tmp", false, "Remove temporary 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") + doAll = flag.Bool("all", false, "Process all nodes") + nodeRaw = flag.String("node", "", "Process only that node") + doRx = flag.Bool("rx", false, "Process inbound packets") + doTx = flag.Bool("tx", false, "Process outbound 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") + doHdr = flag.Bool("hdr", false, "Remove only hdr/ 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, "Remove only that packets") + doACK = flag.Bool("ack", false, "Remove ACK packets from outbound") spoolPath = flag.String("spool", "", "Override path to spool") quiet = flag.Bool("quiet", false, "Print only errors") debug = flag.Bool("debug", false, "Print debug messages") @@ -114,6 +117,21 @@ func main() { } 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.Fields(string(raw)) { + if len(line) == 0 { + continue + } + cols := strings.Split(line, "/") + pkts[cols[len(cols)-1]] = struct{}{} + } + } + now := time.Now() if *doTmp { err = filepath.Walk( @@ -144,6 +162,7 @@ func main() { } return } + if *doLock { err = filepath.Walk(ctx.Spool, func(path string, info os.FileInfo, err error) error { if err != nil { @@ -168,6 +187,7 @@ func main() { } return } + var nodeId *nncp.NodeId if *nodeRaw == "" { if !*doAll { @@ -175,79 +195,175 @@ func main() { 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)), - func(path string, info os.FileInfo, err error) error { - if err != nil { - return err + p := filepath.Join(ctx.Spool, node.Id.String(), string(xx)) + if _, err := os.Stat(p); err != nil && errors.Is(err, fs.ErrNotExist) { + return nil + } + dir, err := os.Open(p) + if err != nil { + if errors.Is(err, fs.ErrNotExist) { + return nil + } + return err + } + defer dir.Close() + for { + entries, err := dir.ReadDir(1 << 10) + if err != nil { + if err == io.EOF { + break } - if info.IsDir() { - return nil + return err + } + for _, entry := range entries { + if entry.IsDir() { + continue } + pth := filepath.Join(p, entry.Name()) logMsg := func(les nncp.LEs) string { - return fmt.Sprintf("File %s: removed", path) + return fmt.Sprintf("File %s: removed", pth) + } + if len(pkts) > 0 { + if _, exists := pkts[filepath.Base(entry.Name())]; exists { + ctx.LogI("rm", nncp.LEs{{K: "File", V: pth}}, logMsg) + if !*dryRun { + os.Remove(nncp.JobPath2Hdr(pth)) + if err = os.Remove(pth); err != nil { + return err + } + } + } + continue + } + info, err := entry.Info() + if err != nil { + return err } 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 + ctx.LogD("rm-skip", nncp.LEs{{K: "File", V: pth}}, + func(les nncp.LEs) string { + return fmt.Sprintf("File %s: too fresh, skipping", pth) + }, + ) + continue } - if (*doSeen && strings.HasSuffix(info.Name(), nncp.SeenSuffix)) || - (*doNoCK && strings.HasSuffix(info.Name(), nncp.NoCKSuffix)) || - (*doHdr && strings.HasSuffix(info.Name(), nncp.HdrSuffix)) || - (*doPart && strings.HasSuffix(info.Name(), nncp.PartSuffix)) { - ctx.LogI("rm", nncp.LEs{{K: "File", V: path}}, logMsg) + if (*doNoCK && strings.HasSuffix(entry.Name(), nncp.NoCKSuffix)) || + (*doPart && strings.HasSuffix(entry.Name(), nncp.PartSuffix)) { + ctx.LogI("rm", nncp.LEs{{K: "File", V: pth}}, logMsg) if *dryRun { - return nil + continue } - 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 err = os.Remove(pth); err != nil { + return err } - return os.Remove(path) } if !*doSeen && !*doNoCK && !*doHdr && !*doPart && (*doRx || *doTx) && ((*doRx && xx == nncp.TRx) || (*doTx && xx == nncp.TTx)) { - ctx.LogI("rm", nncp.LEs{{K: "File", V: path}}, logMsg) + ctx.LogI("rm", nncp.LEs{{K: "File", V: pth}}, logMsg) if *dryRun { - return nil + continue + } + os.Remove(nncp.JobPath2Hdr(pth)) + if err = os.Remove(pth); err != nil { + return err } - return os.Remove(path) } - return nil - }) + } + } + 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 { if err = remove(nncp.TTx); err != nil { log.Fatalln("Can not remove:", err) } } + removeSub := func(p string) error { + return filepath.Walk(p, func( + path string, info os.FileInfo, err error, + ) error { + if err != nil { + if errors.Is(err, fs.ErrNotExist) { + return nil + } + return err + } + if info.IsDir() { + return nil + } + logMsg := func(les nncp.LEs) string { + return fmt.Sprintf("File %s: removed", path) + } + if len(pkts) > 0 { + if _, exists := pkts[filepath.Base(info.Name())]; !exists { + return nil + } + 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) + }, + ) + return nil + } + ctx.LogI("rm", nncp.LEs{{K: "File", V: path}}, logMsg) + if *dryRun { + return nil + } + return os.Remove(path) + }) + } + if len(pkts) > 0 || *doSeen { + if err = removeSub(filepath.Join( + ctx.Spool, node.Id.String(), string(nncp.TRx), nncp.SeenDir, + )); 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, + )); 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, + )); err != nil { + log.Fatalln("Can not remove:", err) + } + } if *doArea { if err = filepath.Walk( filepath.Join(ctx.Spool, node.Id.String(), nncp.AreaDir), func(path string, info os.FileInfo, err error) error { if err != nil { - if os.IsNotExist(err) { + if errors.Is(err, fs.ErrNotExist) { return nil } return err @@ -256,28 +372,69 @@ func main() { 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) } } + if *doACK { + dirPath := filepath.Join( + ctx.Spool, node.Id.String(), string(nncp.TTx), nncp.ACKDir) + dir, err := os.Open(dirPath) + if err != nil { + continue + } + for { + fis, err := dir.ReadDir(1 << 10) + if err != nil { + if err == io.EOF { + break + } + log.Fatalln("Can not read directory:", err) + } + for _, fi := range fis { + for _, pth := range []string{ + filepath.Join( + ctx.Spool, + node.Id.String(), + string(nncp.TTx), + fi.Name(), + ), + filepath.Join(dirPath, fi.Name()), + } { + if err = os.Remove(pth); err == nil { + ctx.LogI( + "rm", + nncp.LEs{{K: "File", V: pth}}, + func(les nncp.LEs) string { + return fmt.Sprintf("File %s: removed", pth) + }, + ) + } else if !errors.Is(err, fs.ErrNotExist) { + log.Fatalln("Can not remove:", pth, ":", err) + } + } + } + } + dir.Close() + } } }