X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-ack%2Fmain.go;h=098218aa356c45583167a5f032305d28e53bcd89;hb=c2b17fd0fc439e420710f53602604e8823c2fb1d;hp=370026f377fe95ff3fcad179e2525be9af483b74;hpb=ba16c17a029e3a1b2c836915b2473edcee259277;p=nncp.git diff --git a/src/cmd/nncp-ack/main.go b/src/cmd/nncp-ack/main.go index 370026f..098218a 100644 --- a/src/cmd/nncp-ack/main.go +++ b/src/cmd/nncp-ack/main.go @@ -119,15 +119,22 @@ func main() { os.Exit(1) } + acksCreated := os.NewFile(uintptr(4), "ACKsCreated") + if acksCreated == nil { + log.Fatalln("can not open FD:4") + } + if *pktRaw != "" { if len(nodes) != 1 { usage() os.Exit(1) } nncp.ViaOverride(*viaOverride, ctx, nodes[0]) - if err = ctx.TxACK(nodes[0], nice, *pktRaw, minSize); err != nil { + pktName, err := ctx.TxACK(nodes[0], nice, *pktRaw, minSize) + if err != nil { log.Fatalln(err) } + acksCreated.WriteString(nodes[0].Id.String() + "/" + pktName + "\n") return } @@ -199,7 +206,12 @@ func main() { continue } pipeR, pipeW := io.Pipe() - go nncp.PktEncRead(ctx.Self, ctx.Neigh, bufio.NewReader(fd), pipeW, true, nil) + go nncp.PktEncRead( + ctx.Self, + ctx.Neigh, + bufio.NewReaderSize(fd, nncp.MTHBlockSize), + pipeW, true, nil, + ) var pkt nncp.Pkt _, err = xdr.Unmarshal(pipeR, &pkt) fd.Close() @@ -217,9 +229,11 @@ func main() { }) continue } - if err = ctx.TxACK(node, nice, pktName, minSize); err != nil { + newPktName, err := ctx.TxACK(node, nice, pktName, minSize) + if err != nil { log.Fatalln(err) } + acksCreated.WriteString(node.Id.String() + "/" + newPktName + "\n") } } if isBad {