X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fnncp%2Fcmd%2Fnncp-daemon%2Fmain.go;h=e6ec2d385648ae1c84c8e959cc381addbc3d8e92;hb=b4c6e5230f3bec679ceb9ca4207da08f7e9c53aa;hp=01edc27a7424213cbd0167e650ce1edc7f0d1527;hpb=bd830b6acfec05a10f3d2137c86e0567969101e1;p=nncp.git

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-daemon/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-daemon/main.go
index 01edc27..e6ec2d3 100644
--- a/src/cypherpunks.ru/nncp/cmd/nncp-daemon/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-daemon/main.go
@@ -1,5 +1,5 @@
 /*
-NNCP -- Node-to-Node CoPy
+NNCP -- Node to Node copy, utilities for store-and-forward data exchange
 Copyright (C) 2016-2017 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
@@ -35,7 +35,7 @@ import (
 func usage() {
 	fmt.Fprintf(os.Stderr, nncp.UsageHeader())
 	fmt.Fprintln(os.Stderr, "nncp-daemon -- TCP daemon\n")
-	fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:", os.Args[0])
+	fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:\n", os.Args[0])
 	flag.PrintDefaults()
 }
 
@@ -43,9 +43,10 @@ func main() {
 	var (
 		cfgPath  = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
 		niceRaw  = flag.Int("nice", 255, "Minimal required niceness")
-		bind     = flag.String("bind", ":5400", "Address to bind to")
+		bind     = flag.String("bind", "[::]:5400", "Address to bind to")
 		maxConn  = flag.Int("maxconn", 128, "Maximal number of simultaneous connections")
-		debug    = flag.Bool("debug", false, "Enable debugging information")
+		quiet    = flag.Bool("quiet", false, "Print only errors")
+		debug    = flag.Bool("debug", false, "Print debug messages")
 		version  = flag.Bool("version", false, "Print version information")
 		warranty = flag.Bool("warranty", false, "Print warranty information")
 	)
@@ -64,7 +65,7 @@ func main() {
 	}
 	nice := uint8(*niceRaw)
 
-	cfgRaw, err := ioutil.ReadFile(*cfgPath)
+	cfgRaw, err := ioutil.ReadFile(nncp.CfgPathFromEnv(cfgPath))
 	if err != nil {
 		log.Fatalln("Can not read config:", err)
 	}
@@ -72,6 +73,10 @@ func main() {
 	if err != nil {
 		log.Fatalln("Can not parse config:", err)
 	}
+	if ctx.Self == nil {
+		log.Fatalln("Config lacks private keys")
+	}
+	ctx.Quiet = *quiet
 	ctx.Debug = *debug
 
 	ln, err := net.Listen("tcp", *bind)
@@ -79,7 +84,6 @@ func main() {
 		log.Fatalln("Can not listen:", err)
 	}
 	ln = netutil.LimitListener(ln, *maxConn)
-	ctx.LogI("daemon", nncp.SDS{"bind": *bind}, "listening")
 	for {
 		conn, err := ln.Accept()
 		if err != nil {
@@ -87,12 +91,12 @@ func main() {
 		}
 		ctx.LogD("daemon", nncp.SDS{"addr": conn.RemoteAddr()}, "accepted")
 		go func(conn net.Conn) {
-			state, err := ctx.StartR(conn, nice, nil)
+			state, err := ctx.StartR(conn, nice, "")
 			if err == nil {
-				ctx.LogI("call-start", nncp.SDS{"node": state.NodeId}, "connected")
+				ctx.LogI("call-start", nncp.SDS{"node": state.Node.Id}, "connected")
 				state.Wait()
 				ctx.LogI("call-finish", nncp.SDS{
-					"node":     state.NodeId,
+					"node":     state.Node.Id,
 					"duration": strconv.FormatInt(int64(state.Duration.Seconds()), 10),
 					"rxbytes":  strconv.FormatInt(state.RxBytes, 10),
 					"txbytes":  strconv.FormatInt(state.TxBytes, 10),
@@ -100,7 +104,11 @@ func main() {
 					"txspeed":  strconv.FormatInt(state.TxSpeed, 10),
 				}, "")
 			} else {
-				ctx.LogE("call-start", nncp.SDS{"node": state.NodeId, "err": err}, "")
+				nodeId := "unknown"
+				if state != nil && state.Node != nil {
+					nodeId = state.Node.Id.String()
+				}
+				ctx.LogE("call-start", nncp.SDS{"node": nodeId, "err": err}, "")
 			}
 			conn.Close()
 		}(conn)