X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fctx.go;h=655c3e9bce07052a6469e5dfa82e1fc4a42134be;hb=0367cce2741e1ce6a89a49fd5c4e9df6005c9744;hp=91969302a2ab101edb045390fbac20e0ee93da5a;hpb=3a710c60770ddbc553ea0de627aef6153e7088c7;p=nncp.git

diff --git a/src/ctx.go b/src/ctx.go
index 9196930..655c3e9 100644
--- a/src/ctx.go
+++ b/src/ctx.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2020 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
@@ -19,14 +19,14 @@ package nncp
 
 import (
 	"errors"
+	"fmt"
 	"io/ioutil"
-	"log"
 	"os"
 	"path/filepath"
+	"strconv"
+	"strings"
 
 	"syscall"
-
-	"golang.org/x/sys/unix"
 )
 
 type Ctx struct {
@@ -35,15 +35,22 @@ type Ctx struct {
 	Neigh  map[NodeId]*Node
 	Alias  map[string]*NodeId
 
+	AreaId2Area map[AreaId]*Area
+	AreaName2Id map[string]*AreaId
+
 	Spool      string
 	LogPath    string
 	UmaskForce *int
 	Quiet      bool
 	ShowPrgrs  bool
+	HdrUsage   bool
 	Debug      bool
 	NotifyFile *FromToJSON
 	NotifyFreq *FromToJSON
 	NotifyExec map[string]*FromToJSON
+
+	MCDRxIfis []string
+	MCDTxIfis map[string]int
 }
 
 func (ctx *Ctx) FindNode(id string) (*Node, error) {
@@ -62,24 +69,34 @@ func (ctx *Ctx) FindNode(id string) (*Node, error) {
 	return node, nil
 }
 
-func (ctx *Ctx) ensureRxDir(nodeId *NodeId) error {
-	dirPath := filepath.Join(ctx.Spool, nodeId.String(), string(TRx))
-	if err := os.MkdirAll(dirPath, os.FileMode(0777)); err != nil {
-		ctx.LogE("dir-ensure", SDS{"dir": dirPath}, err, "")
+func ensureDir(dirs ...string) error {
+	p := filepath.Join(dirs...)
+	fi, err := os.Stat(p)
+	if err == nil {
+		if fi.IsDir() {
+			return nil
+		}
+		return fmt.Errorf("%s: is not a directory", p)
+	}
+	if !os.IsNotExist(err) {
 		return err
 	}
-	fd, err := os.Open(dirPath)
+	return os.MkdirAll(p, os.FileMode(0777))
+}
+
+func (ctx *Ctx) ensureRxDir(nodeId *NodeId) error {
+	dirPath := filepath.Join(ctx.Spool, nodeId.String(), string(TRx))
+	err := ensureDir(dirPath)
 	if err != nil {
-		ctx.LogE("dir-ensure", SDS{"dir": dirPath}, err, "")
-		return err
+		ctx.LogE("dir-ensure-mkdir", LEs{{"Dir", dirPath}}, err, func(les LEs) string {
+			return fmt.Sprintf("Ensuring directory %s existence", dirPath)
+		})
 	}
-	return fd.Close()
+	return err
 }
 
 func CtxFromCmdline(
-	cfgPath,
-	spoolPath,
-	logPath string,
+	cfgPath, spoolPath, logPath string,
 	quiet, showPrgrs, omitPrgrs, debug bool,
 ) (*Ctx, error) {
 	env := os.Getenv(CfgPathEnv)
@@ -89,11 +106,27 @@ func CtxFromCmdline(
 	if showPrgrs && omitPrgrs {
 		return nil, errors.New("simultaneous -progress and -noprogress")
 	}
-	cfgRaw, err := ioutil.ReadFile(cfgPath)
+	fi, err := os.Stat(cfgPath)
 	if err != nil {
 		return nil, err
 	}
-	ctx, err := CfgParse(cfgRaw)
+	var cfg *CfgJSON
+	if fi.IsDir() {
+		cfg, err = DirToCfg(cfgPath)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		cfgRaw, err := ioutil.ReadFile(cfgPath)
+		if err != nil {
+			return nil, err
+		}
+		cfg, err = CfgParse(cfgRaw)
+		if err != nil {
+			return nil, err
+		}
+	}
+	ctx, err := Cfg2Ctx(cfg)
 	if err != nil {
 		return nil, err
 	}
@@ -113,6 +146,18 @@ func CtxFromCmdline(
 	} else {
 		ctx.LogPath = logPath
 	}
+	if strings.HasPrefix(ctx.LogPath, LogFdPrefix) {
+		ptr, err := strconv.ParseUint(
+			strings.TrimPrefix(ctx.LogPath, LogFdPrefix), 10, 64,
+		)
+		if err != nil {
+			return nil, err
+		}
+		LogFd = os.NewFile(uintptr(ptr), CfgLogEnv)
+		if LogFd == nil {
+			return nil, errors.New("can not open:" + ctx.LogPath)
+		}
+	}
 	if showPrgrs {
 		ctx.ShowPrgrs = true
 	}
@@ -124,14 +169,6 @@ func CtxFromCmdline(
 	return ctx, nil
 }
 
-func (ctx *Ctx) IsEnoughSpace(want int64) bool {
-	var s unix.Statfs_t
-	if err := unix.Statfs(ctx.Spool, &s); err != nil {
-		log.Fatalln(err)
-	}
-	return int64(s.Bavail)*int64(s.Bsize) > want
-}
-
 func (ctx *Ctx) Umask() {
 	if ctx.UmaskForce != nil {
 		syscall.Umask(*ctx.UmaskForce)