X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-daemon%2Fmain.go;h=b0628fe421a39c8ab37f21e8cb6f733d79b343c8;hb=ab7c7eca0e53661f0ba904c2a6ba752990bea367;hp=a69175a299f417794e465758e8df3176f2eb95a6;hpb=5a9bf58a2638e42f2d42fa4d43c363a664fe8198;p=nncp.git

diff --git a/src/cmd/nncp-daemon/main.go b/src/cmd/nncp-daemon/main.go
index a69175a..b0628fe 100644
--- a/src/cmd/nncp-daemon/main.go
+++ b/src/cmd/nncp-daemon/main.go
@@ -24,10 +24,12 @@ import (
 	"log"
 	"net"
 	"os"
+	"strconv"
+	"strings"
 	"time"
 
 	"github.com/dustin/go-humanize"
-	"go.cypherpunks.ru/nncp/v6"
+	"go.cypherpunks.ru/nncp/v7"
 	"golang.org/x/net/netutil"
 )
 
@@ -70,6 +72,7 @@ func (c InetdConn) Close() error {
 func performSP(
 	ctx *nncp.Ctx,
 	conn nncp.ConnDeadlined,
+	addr string,
 	nice uint8,
 	noCK bool,
 	nodeIdC chan *nncp.NodeId,
@@ -83,7 +86,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 +105,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)),
@@ -108,17 +113,21 @@ func performSP(
 			)
 		})
 	} else {
-		nodeId := "unknown"
+		var nodeId string
+		var nodeName string
 		if state.Node == nil {
+			nodeId = "unknown"
+			nodeName = "unknown"
 			nodeIdC <- nil
 		} else {
-			nodeIdC <- state.Node.Id
 			nodeId = state.Node.Id.String()
+			nodeName = state.Node.Name
+			nodeIdC <- state.Node.Id
 		}
 		ctx.LogI(
 			"call-started",
 			nncp.LEs{{K: "Node", V: nodeId}},
-			func(les nncp.LEs) string { return "Connected to " + state.Node.Name },
+			func(les nncp.LEs) string { return "Connected to " + nodeName },
 		)
 	}
 	close(nodeIdC)
@@ -132,6 +141,7 @@ func main() {
 		inetd     = flag.Bool("inetd", false, "Is it started as inetd service")
 		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")
@@ -147,7 +157,9 @@ func main() {
 		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
 	flag.Parse()
 	if *warranty {
@@ -184,7 +196,7 @@ func main() {
 		os.Stderr.Close() // #nosec G104
 		conn := &InetdConn{os.Stdin, os.Stdout}
 		nodeIdC := make(chan *nncp.NodeId)
-		go performSP(ctx, conn, nice, *noCK, nodeIdC)
+		go performSP(ctx, conn, "PIPE", nice, *noCK, nodeIdC)
 		nodeId := <-nodeIdC
 		var autoTossFinish chan struct{}
 		var autoTossBadCode chan bool
@@ -197,6 +209,7 @@ func main() {
 				*autoTossNoFreq,
 				*autoTossNoExec,
 				*autoTossNoTrns,
+				*autoTossNoArea,
 			)
 		}
 		<-nodeIdC // call completion
@@ -208,10 +221,32 @@ 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)
+	}
+
+	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)
 	for {
 		conn, err := ln.Accept()
@@ -227,7 +262,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
@@ -240,6 +275,7 @@ func main() {
 					*autoTossNoFreq,
 					*autoTossNoExec,
 					*autoTossNoTrns,
+					*autoTossNoArea,
 				)
 			}
 			<-nodeIdC // call completion