X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-daemon%2Fmain.go;h=5fd6f6d0353f5cc0e7e5e5212234e9bd4def05ea;hb=857b50285a0b75f03c2f2bfa5daa39901cfdf320;hp=485199ceb629e93480409bef7ee11e0244c116ec;hpb=bd98bc071da6b50d20ddf1df02af69111df4831c;p=nncp.git

diff --git a/src/cmd/nncp-daemon/main.go b/src/cmd/nncp-daemon/main.go
index 485199c..5fd6f6d 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 <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")
@@ -124,7 +152,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 +196,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 +224,62 @@ 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 {
+		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()}},
@@ -262,7 +310,8 @@ func main() {
 				close(autoTossFinish)
 				<-autoTossBadCode
 			}
-			conn.Close() // #nosec G104
+			conn.Close()
 		}(conn)
+
 	}
 }