X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fctx.go;h=58dba44df6156381216ee90e5043587d9b538039;hb=2b331a082bb710d1e5a529ed32dcbba0a2e843cb;hp=ebd31024db7765b0c248300d317dd8afd2ad6a4e;hpb=ff2139ccf41d72a3c1c4b56c2106effd1ef2e841;p=nncp.git

diff --git a/src/ctx.go b/src/ctx.go
index ebd3102..58dba44 100644
--- a/src/ctx.go
+++ b/src/ctx.go
@@ -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) {
@@ -64,22 +71,23 @@ func (ctx *Ctx) FindNode(id string) (*Node, error) {
 
 func (ctx *Ctx) ensureRxDir(nodeId *NodeId) error {
 	dirPath := filepath.Join(ctx.Spool, nodeId.String(), string(TRx))
+	logMsg := func(les LEs) string {
+		return fmt.Sprintf("Ensuring directory %s existence", dirPath)
+	}
 	if err := os.MkdirAll(dirPath, os.FileMode(0777)); err != nil {
-		ctx.LogE("dir-ensure", LEs{{"Dir", dirPath}}, err, "")
+		ctx.LogE("dir-ensure-mkdir", LEs{{"Dir", dirPath}}, err, logMsg)
 		return err
 	}
 	fd, err := os.Open(dirPath)
 	if err != nil {
-		ctx.LogE("dir-ensure", LEs{{"Dir", dirPath}}, err, "")
+		ctx.LogE("dir-ensure-open", LEs{{"Dir", dirPath}}, err, logMsg)
 		return err
 	}
 	return fd.Close()
 }
 
 func CtxFromCmdline(
-	cfgPath,
-	spoolPath,
-	logPath string,
+	cfgPath, spoolPath, logPath string,
 	quiet, showPrgrs, omitPrgrs, debug bool,
 ) (*Ctx, error) {
 	env := os.Getenv(CfgPathEnv)
@@ -89,11 +97,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 +137,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 +160,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)