X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-daemon%2Fmain.go;h=88f7e20fec9dfa1c5692dfb04235ccf1171f3ba4;hb=15ff8ac40bbf354f5319a6e753cf8c0963b15a53;hp=c5f8a10cddd2489917061aed9e41db5844a53c63;hpb=fd1ff00305ba34a32a98f5ef0ad24e3dc8dfde1a;p=nncp.git diff --git a/src/cmd/nncp-daemon/main.go b/src/cmd/nncp-daemon/main.go index c5f8a10..88f7e20 100644 --- a/src/cmd/nncp-daemon/main.go +++ b/src/cmd/nncp-daemon/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-2022 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 @@ -24,10 +24,13 @@ import ( "log" "net" "os" + "strconv" + "strings" "time" "github.com/dustin/go-humanize" - "go.cypherpunks.ru/nncp/v6" + "go.cypherpunks.ru/nncp/v8" + nncpYggdrasil "go.cypherpunks.ru/nncp/v8/yggdrasil" "golang.org/x/net/netutil" ) @@ -38,38 +41,10 @@ func usage() { flag.PrintDefaults() } -type InetdConn struct { - r *os.File - w *os.File -} - -func (c InetdConn) Read(p []byte) (n int, err error) { - return c.r.Read(p) -} - -func (c InetdConn) Write(p []byte) (n int, err error) { - return c.w.Write(p) -} - -func (c InetdConn) SetReadDeadline(t time.Time) error { - return c.r.SetReadDeadline(t) -} - -func (c InetdConn) SetWriteDeadline(t time.Time) error { - return c.w.SetWriteDeadline(t) -} - -func (c InetdConn) Close() error { - if err := c.r.Close(); err != nil { - c.w.Close() // #nosec G104 - return err - } - return c.w.Close() -} - func performSP( ctx *nncp.Ctx, conn nncp.ConnDeadlined, + addr string, nice uint8, noCK bool, nodeIdC chan *nncp.NodeId, @@ -83,7 +58,9 @@ func performSP( ctx.LogI( "call-started", nncp.LEs{{K: "Node", V: state.Node.Id}}, - func(les nncp.LEs) string { return "Connection with " + state.Node.Name }, + func(les nncp.LEs) string { + return fmt.Sprintf("Connection with %s (%s)", state.Node.Name, addr) + }, ) nodeIdC <- state.Node.Id state.Wait() @@ -100,7 +77,7 @@ func performSP( state.Node.Name, int(state.Duration.Hours()), int(state.Duration.Minutes()), - int(state.Duration.Seconds()), + int(state.Duration.Seconds())%60, humanize.IBytes(uint64(state.RxBytes)), humanize.IBytes(uint64(state.RxSpeed)), humanize.IBytes(uint64(state.TxBytes)), @@ -133,9 +110,12 @@ func main() { cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file") niceRaw = flag.String("nice", nncp.NicenessFmt(255), "Minimal required niceness") bind = flag.String("bind", "[::]:5400", "Address to bind to") - inetd = flag.Bool("inetd", false, "Is it started as inetd service") + ucspi = flag.Bool("ucspi", false, "Is it started as UCSPI-TCP server") + inetd = flag.Bool("inetd", false, "Obsolete, use -ucspi") + yggdrasil = flag.String("yggdrasil", "", "Start Yggdrasil listener: yggdrasils://PRV[:PORT]?[bind=BIND][&pub=PUB][&peer=PEER][&mcast=REGEX[:PORT]]") maxConn = flag.Int("maxconn", 128, "Maximal number of simultaneous connections") noCK = flag.Bool("nock", false, "Do no checksum checking") + mcdOnce = flag.Bool("mcd-once", false, "Send MCDs once and quit") spoolPath = flag.String("spool", "", "Override path to spool") logPath = flag.String("log", "", "Override path to logfile") quiet = flag.Bool("quiet", false, "Print only errors") @@ -146,11 +126,12 @@ func main() { warranty = flag.Bool("warranty", false, "Print warranty information") autoToss = flag.Bool("autotoss", false, "Toss after call is finished") - autoTossDoSeen = flag.Bool("autotoss-seen", false, "Create .seen files during tossing") + autoTossDoSeen = flag.Bool("autotoss-seen", false, "Create seen/ files during tossing") autoTossNoFile = flag.Bool("autotoss-nofile", false, "Do not process \"file\" packets during tossing") autoTossNoFreq = flag.Bool("autotoss-nofreq", false, "Do not process \"freq\" packets during tossing") autoTossNoExec = flag.Bool("autotoss-noexec", false, "Do not process \"exec\" packets during tossing") autoTossNoTrns = flag.Bool("autotoss-notrns", false, "Do not process \"trns\" packets during tossing") + autoTossNoArea = flag.Bool("autotoss-noarea", false, "Do not process \"area\" packets during tossing") ) log.SetFlags(log.Lshortfile) flag.Usage = usage @@ -167,6 +148,9 @@ func main() { if err != nil { log.Fatalln(err) } + if *inetd { + *ucspi = true + } ctx, err := nncp.CtxFromCmdline( *cfgPath, @@ -185,11 +169,15 @@ func main() { } ctx.Umask() - if *inetd { - os.Stderr.Close() // #nosec G104 - conn := &InetdConn{os.Stdin, os.Stdout} + if *ucspi { + os.Stderr.Close() + conn := &nncp.UCSPIConn{R: os.Stdin, W: os.Stdout} nodeIdC := make(chan *nncp.NodeId) - go performSP(ctx, conn, nice, *noCK, nodeIdC) + addr := nncp.UCSPITCPRemoteAddr() + if addr == "" { + addr = "PIPE" + } + go performSP(ctx, conn, addr, nice, *noCK, nodeIdC) nodeId := <-nodeIdC var autoTossFinish chan struct{} var autoTossBadCode chan bool @@ -202,6 +190,7 @@ func main() { *autoTossNoFreq, *autoTossNoExec, *autoTossNoTrns, + *autoTossNoArea, ) } <-nodeIdC // call completion @@ -209,20 +198,68 @@ func main() { close(autoTossFinish) <-autoTossBadCode } - conn.Close() // #nosec G104 + conn.Close() return } - ln, err := net.Listen("tcp", *bind) - if err != nil { - log.Fatalln("Can not listen:", err) + conns := make(chan net.Conn) + if *bind != "" { + cols := strings.Split(*bind, ":") + port, err := strconv.Atoi(cols[len(cols)-1]) + if err != nil { + log.Fatalln("Can not parse port:", err) + } + + if *mcdOnce { + for ifiName := range ctx.MCDTxIfis { + if err = ctx.MCDTx(ifiName, port, 0); err != nil { + log.Fatalln("Can not do MCD transmission:", err) + } + } + return + } + + ln, err := net.Listen("tcp", *bind) + if err != nil { + log.Fatalln("Can not listen:", err) + } + + for ifiName, secs := range ctx.MCDTxIfis { + if err = ctx.MCDTx(ifiName, port, time.Duration(secs)*time.Second); err != nil { + log.Fatalln("Can not run MCD transmission:", err) + } + } + + ln = netutil.LimitListener(ln, *maxConn) + go func() { + for { + conn, err := ln.Accept() + if err != nil { + log.Fatalln("Can not accept connection on TCP:", err) + } + conns <- conn + } + }() } - ln = netutil.LimitListener(ln, *maxConn) - for { - conn, err := ln.Accept() + + if *yggdrasil != "" { + ln, err := nncpYggdrasil.NewListener(ctx.YggdrasilAliases, *yggdrasil) if err != nil { - log.Fatalln("Can not accept connection:", err) + log.Fatalln("Can not listen:", err) } + ln = netutil.LimitListener(ln, *maxConn) + go func() { + for { + conn, err := ln.Accept() + if err != nil { + log.Fatalln("Can not accept connection on Yggdrasil:", err) + } + conns <- conn + } + }() + } + + for conn := range conns { ctx.LogD( "daemon-accepted", nncp.LEs{{K: "Addr", V: conn.RemoteAddr()}}, @@ -232,7 +269,7 @@ func main() { ) go func(conn net.Conn) { nodeIdC := make(chan *nncp.NodeId) - go performSP(ctx, conn, nice, *noCK, nodeIdC) + go performSP(ctx, conn, conn.RemoteAddr().String(), nice, *noCK, nodeIdC) nodeId := <-nodeIdC var autoTossFinish chan struct{} var autoTossBadCode chan bool @@ -245,6 +282,7 @@ func main() { *autoTossNoFreq, *autoTossNoExec, *autoTossNoTrns, + *autoTossNoArea, ) } <-nodeIdC // call completion @@ -252,7 +290,8 @@ func main() { close(autoTossFinish) <-autoTossBadCode } - conn.Close() // #nosec G104 + conn.Close() }(conn) + } }