X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=conn.go;h=c1acd516c75afdb0f782c17019fd262965f817ca;hb=HEAD;hp=7a6ac4227f90b8ad8ab2882ebb3736489fecab61;hpb=16b21a11cabc2846be21d3214664c6deda174ea2;p=ucspi.git

diff --git a/conn.go b/conn.go
index 7a6ac42..c1acd51 100644
--- a/conn.go
+++ b/conn.go
@@ -1,31 +1,27 @@
-/*
-ucspi -- UCSPI-related utilities
-Copyright (C) 2021 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
-the Free Software Foundation, version 3 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// ucspi -- UCSPI-related utilities
+// Copyright (C) 2021-2024 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
+// the Free Software Foundation, version 3 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package ucspi
 
 import (
-	"io"
+	"errors"
 	"net"
 	"os"
 	"time"
 )
 
-var aLongTimeAgo = time.Unix(1, 0)
-
 type Addr struct {
 	ip   string
 	port string
@@ -36,37 +32,33 @@ func (addr *Addr) Network() string { return "tcp" }
 func (addr *Addr) String() string { return addr.ip + ":" + addr.port }
 
 type Conn struct {
-	R   *os.File
-	W   *os.File
-	eof chan struct{}
+	R *os.File
+	W *os.File
 }
 
-type ReadResult struct {
-	n   int
-	err error
+func NewConn(r, w *os.File) (*Conn, error) {
+	if r == nil {
+		return nil, errors.New("no R file descriptor")
+	}
+	if w == nil {
+		return nil, errors.New("no W file descriptor")
+	}
+	return &Conn{R: r, W: w}, nil
 }
 
 func (conn *Conn) Read(b []byte) (int, error) {
-	c := make(chan ReadResult)
-	go func() {
-		n, err := conn.R.Read(b)
-		c <- ReadResult{n, err}
-	}()
-	select {
-	case res := <-c:
-		return res.n, res.err
-	case <-conn.eof:
-		return 0, io.EOF
-	}
+	return conn.R.Read(b)
 }
 
 func (conn *Conn) Write(b []byte) (int, error) { return conn.W.Write(b) }
 
 func (conn *Conn) Close() error {
-	if err := conn.R.Close(); err != nil {
-		return err
+	errR := conn.R.Close()
+	errW := conn.W.Close()
+	if errR != nil {
+		return errR
 	}
-	return os.Stdin.Close()
+	return errW
 }
 
 func (conn *Conn) LocalAddr() net.Addr {
@@ -85,12 +77,6 @@ func (conn *Conn) SetDeadline(t time.Time) error {
 }
 
 func (conn *Conn) SetReadDeadline(t time.Time) error {
-	// An ugly hack to forcefully terminate pending read.
-	// net/http calls SetReadDeadline(aLongTimeAgo), but file
-	// descriptors are not capable to exit immediately that way.
-	if t.Equal(aLongTimeAgo) {
-		conn.eof <- struct{}{}
-	}
 	return conn.R.SetReadDeadline(t)
 }