Various Yggdrasil related refactoring and tcpip network stack

[nncp.git] / src / cmd / nncp-daemon / main.go

diff --git a/src/cmd/nncp-daemon/main.go b/src/cmd/nncp-daemon/main.go
index 485199ceb629e93480409bef7ee11e0244c116ec..88f7e20fec9dfa1c5692dfb04235ccf1171f3ba4 100644 (file)
--- 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 <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
@@ -29,7 +29,8 @@ import (
        "time"
 
        "github.com/dustin/go-humanize"
-       "go.cypherpunks.ru/nncp/v7"
+       "go.cypherpunks.ru/nncp/v8"
+       nncpYggdrasil "go.cypherpunks.ru/nncp/v8/yggdrasil"
        "golang.org/x/net/netutil"
 )
 
@@ -111,6 +112,7 @@ func main() {
                bind      = flag.String("bind", "[::]:5400", "Address to bind to")
                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")
@@ -124,7 +126,7 @@ 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")
@@ -168,7 +170,7 @@ func main() {
        ctx.Umask()
 
        if *ucspi {
-               os.Stderr.Close() // #nosec G104
+               os.Stderr.Close()
                conn := &nncp.UCSPIConn{R: os.Stdin, W: os.Stdout}
                nodeIdC := make(chan *nncp.NodeId)
                addr := nncp.UCSPITCPRemoteAddr()
@@ -196,42 +198,68 @@ func main() {
                        close(autoTossFinish)
                        <-autoTossBadCode
                }
-               conn.Close() // #nosec G104
+               conn.Close()
                return
        }
 
-       cols := strings.Split(*bind, ":")
-       port, err := strconv.Atoi(cols[len(cols)-1])
-       if err != nil {
-               log.Fatalln("Can not parse port:", 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)
+               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
                }
-               return
-       }
 
-       ln, err := net.Listen("tcp", *bind)
-       if err != nil {
-               log.Fatalln("Can not listen:", err)
-       }
+               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)
+               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()}},
@@ -262,7 +290,8 @@ func main() {
                                close(autoTossFinish)
                                <-autoTossBadCode
                        }
-                       conn.Close() // #nosec G104
+                       conn.Close()
                }(conn)
+
        }
 }