X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Ftx.go;h=80357e74ae3fcee8fa59b64fb84d5fb0105d2de3;hb=3a710c60770ddbc553ea0de627aef6153e7088c7;hp=831cb6fde721eac9eb982ab83c80a074d7ee79d7;hpb=0679d5b7cce7e041fb518babb222e4510eff776e;p=nncp.git

diff --git a/src/tx.go b/src/tx.go
index 831cb6f..80357e7 100644
--- a/src/tx.go
+++ b/src/tx.go
@@ -86,7 +86,7 @@ func (ctx *Ctx) Tx(
 			"size": size,
 		}, "wrote")
 		errs <- PktEncWrite(ctx.Self, hops[0], pkt, nice, size, padSize, src, dst)
-		dst.Close()
+		dst.Close() // #nosec G104
 	}(curSize, src, pipeW)
 	curSize = PktEncOverhead + PktSizeOverhead + sizeWithTags(PktOverhead+curSize) + padSize
 
@@ -102,7 +102,7 @@ func (ctx *Ctx) Tx(
 				"size": size,
 			}, "trns wrote")
 			errs <- PktEncWrite(ctx.Self, node, pkt, nice, size, 0, src, dst)
-			dst.Close()
+			dst.Close() // #nosec G104
 		}(hops[i], pktTrns, curSize, pipeRPrev, pipeW)
 		curSize = PktEncOverhead + PktSizeOverhead + sizeWithTags(PktOverhead+curSize)
 	}
@@ -117,13 +117,13 @@ func (ctx *Ctx) Tx(
 	for i := 0; i <= len(hops); i++ {
 		err = <-errs
 		if err != nil {
-			tmp.Fd.Close()
+			tmp.Fd.Close() // #nosec G104
 			return nil, err
 		}
 	}
 	nodePath := filepath.Join(ctx.Spool, lastNode.Id.String())
 	err = tmp.Commit(filepath.Join(nodePath, string(TTx)))
-	os.Symlink(nodePath, filepath.Join(ctx.Spool, lastNode.Name))
+	os.Symlink(nodePath, filepath.Join(ctx.Spool, lastNode.Name)) // #nosec G104
 	return lastNode, err
 }
 
@@ -140,7 +140,7 @@ func prepareTxFile(srcPath string) (reader io.Reader, closer io.Closer, fileSize
 			rerr = err
 			return
 		}
-		os.Remove(src.Name())
+		os.Remove(src.Name()) // #nosec G104
 		tmpW := bufio.NewWriter(src)
 		tmpKey := make([]byte, chacha20poly1305.KeySize)
 		if _, rerr = rand.Read(tmpKey[:]); rerr != nil {
@@ -165,7 +165,7 @@ func prepareTxFile(srcPath string) (reader io.Reader, closer io.Closer, fileSize
 		r, w := io.Pipe()
 		go func() {
 			if _, err := aeadProcess(aead, nonce, false, bufio.NewReader(src), w); err != nil {
-				w.CloseWithError(err)
+				w.CloseWithError(err) // #nosec G104
 			}
 		}()
 		reader = r
@@ -244,7 +244,7 @@ func prepareTxFile(srcPath string) (reader io.Reader, closer io.Closer, fileSize
 	closer = DummyCloser{}
 	fileSize += 2 * TarBlockSize // termination block
 
-	go func() {
+	go func() error {
 		tarWr := tar.NewWriter(w)
 		hdr := tar.Header{
 			Typeflag: tar.TypeDir,
@@ -258,7 +258,7 @@ func prepareTxFile(srcPath string) (reader io.Reader, closer io.Closer, fileSize
 			hdr.Name = basePath + e.path[len(rootPath):]
 			hdr.ModTime = e.modTime
 			if err = tarWr.WriteHeader(&hdr); err != nil {
-				w.CloseWithError(err)
+				return w.CloseWithError(err)
 			}
 		}
 		hdr.Typeflag = tar.TypeReg
@@ -268,7 +268,7 @@ func prepareTxFile(srcPath string) (reader io.Reader, closer io.Closer, fileSize
 			hdr.ModTime = e.modTime
 			hdr.Size = e.size
 			if err = tarWr.WriteHeader(&hdr); err != nil {
-				w.CloseWithError(err)
+				return w.CloseWithError(err)
 			}
 			fd, err := os.Open(e.path)
 			if err != nil {
@@ -546,6 +546,6 @@ func (ctx *Ctx) TxTrns(node *Node, nice uint8, size int64, src io.Reader) error
 	} else {
 		ctx.LogI("tx", SdsAdd(sds, SDS{"err": err}), "sent")
 	}
-	os.Symlink(nodePath, filepath.Join(ctx.Spool, node.Name))
+	os.Symlink(nodePath, filepath.Join(ctx.Spool, node.Name)) // #nosec G104
 	return err
 }