MCD uses regexp instead of exact interface name

[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 4e9231d942671bd15418f28b69207ae91344fe81..5fd6f6d0353f5cc0e7e5e5212234e9bd4def05ea 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
@@ -24,12 +24,14 @@ import (
        "log"
        "net"
        "os"
+       "regexp"
        "strconv"
        "strings"
        "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"
 )
 
@@ -104,6 +106,31 @@ func performSP(
        close(nodeIdC)
 }
 
+func startMCDTx(ctx *nncp.Ctx, port int, zeroInterval bool) error {
+       ifis, err := net.Interfaces()
+       if err != nil {
+               return err
+       }
+       for ifiReString, secs := range ctx.MCDTxIfis {
+               ifiRe, err := regexp.CompilePOSIX(ifiReString)
+               if err != nil {
+                       return err
+               }
+               var interval time.Duration
+               if !zeroInterval {
+                       interval = time.Duration(secs) * time.Second
+               }
+               for _, ifi := range ifis {
+                       if ifiRe.MatchString(ifi.Name) {
+                               if err = ctx.MCDTx(ifi.Name, port, interval); err != nil {
+                                       return err
+                               }
+                       }
+               }
+       }
+       return nil
+}
+
 func main() {
        var (
                cfgPath   = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
@@ -111,6 +138,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")
@@ -200,38 +228,58 @@ func main() {
                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 {
+               if *mcdOnce {
+                       if err = startMCDTx(ctx, port, true); 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)
-       }
-
-       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, err := net.Listen("tcp", *bind)
+               if err != nil {
+                       log.Fatalln("Can not listen:", err)
                }
+               if err = startMCDTx(ctx, port, false); err != nil {
+                       log.Fatalln("Can not do 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()}},
@@ -264,5 +312,6 @@ func main() {
                        }
                        conn.Close()
                }(conn)
+
        }
 }