Multicast areas

[nncp.git] / src / call.go

diff --git a/src/call.go b/src/call.go
index ab254b2dd5b6e8e9affb7e6280373111038c6117..1e20aa23f340a40549660de2878dfb1b97986c78 100644 (file)
--- a/src/call.go
+++ b/src/call.go
@@ -37,6 +37,7 @@ type Call struct {
        MaxOnlineTime  time.Duration
        WhenTxExists   bool
        NoCK           bool
+       MCDIgnore      bool
 
        AutoToss       bool
        AutoTossDoSeen bool
@@ -44,6 +45,7 @@ type Call struct {
        AutoTossNoFreq bool
        AutoTossNoExec bool
        AutoTossNoTrns bool
+       AutoTossNoArea bool
 }
 
 func (ctx *Ctx) CallNode(
@@ -55,7 +57,7 @@ func (ctx *Ctx) CallNode(
        onlineDeadline, maxOnlineTime time.Duration,
        listOnly bool,
        noCK bool,
-       onlyPkts map[[32]byte]bool,
+       onlyPkts map[[MTHSize]byte]bool,
 ) (isGood bool) {
        for _, addr := range addrs {
                les := LEs{{"Node", node.Id}, {"Addr", addr}}
@@ -109,7 +111,7 @@ func (ctx *Ctx) CallNode(
                                        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)),