/*
-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
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()
}
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")
)
}
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)
}
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)
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 {
}
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),
"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)