Simplify channel operations

This commit is contained in:
V2Ray committed 2015-09-13 20:01:50 +02:00
1 parent ef950770fe
commit d12737b3b8
11 files changed
+63 -176

No files matched your search

+1 -1
View File
@@ -1,4 +1,4 @@
package core
package net
import (
"net"
+5 -23
View File
@@ -1,7 +1,6 @@
package freedom
import (
"io"
"net"
"github.com/v2ray/v2ray-core"
@@ -36,31 +35,14 @@ func (vconn *FreedomConnection) Start(ray core.OutboundRay) error {
}
func (vconn *FreedomConnection) DumpInput(conn net.Conn, input <-chan []byte, finish chan<- bool) {
for {
data, open := <-input
if !open {
finish <- true
log.Debug("Freedom finishing input.")
break
}
nBytes, err := conn.Write(data)
log.Debug("Freedom wrote %d bytes with error %v", nBytes, err)
}
v2net.ChanToWriter(conn, input)
finish <- true
}
func (vconn *FreedomConnection) DumpOutput(conn net.Conn, output chan<- []byte, finish chan<- bool) {
for {
buffer := make([]byte, 512)
nBytes, err := conn.Read(buffer)
log.Debug("Freedom reading %d bytes with error %v", nBytes, err)
if err == io.EOF {
close(output)
finish <- true
log.Debug("Freedom finishing output.")
break
}
output <- buffer[:nBytes]
}
v2net.ReaderToChan(output, conn)
close(output)
finish <- true
}
func (vconn *FreedomConnection) CloseConn(conn net.Conn, finish <-chan bool) {
+6 -23
View File
@@ -2,13 +2,13 @@ package socks
import (
"errors"
"io"
"net"
"strconv"
"github.com/v2ray/v2ray-core"
socksio "github.com/v2ray/v2ray-core/io/socks"
"github.com/v2ray/v2ray-core/log"
v2net "github.com/v2ray/v2ray-core/net"
)
var (
@@ -127,31 +127,14 @@ func (server *SocksServer) HandleConnection(connection net.Conn) error {
}
func (server *SocksServer) dumpInput(conn net.Conn, input chan<- []byte, finish chan<- bool) {
for {
buffer := make([]byte, 512)
nBytes, err := conn.Read(buffer)
log.Debug("Reading %d bytes, with error %v", nBytes, err)
if err == io.EOF {
close(input)
finish <- true
log.Debug("Socks finishing input.")
break
}
input <- buffer[:nBytes]
}
v2net.ReaderToChan(input, conn)
close(input)
finish <- true
}
func (server *SocksServer) dumpOutput(conn net.Conn, output <-chan []byte, finish chan<- bool) {
for {
buffer, open := <-output
if !open {
finish <- true
log.Debug("Socks finishing output")
break
}
nBytes, err := conn.Write(buffer)
log.Debug("Writing %d bytes with error %v", nBytes, err)
}
v2net.ChanToWriter(conn, output)
finish <- true
}
func (server *SocksServer) waitForFinish(finish <-chan bool) {
+34
View File
@@ -0,0 +1,34 @@
package net
import (
"io"
"github.com/v2ray/v2ray-core/log"
)
const (
bufferSize = 8192
)
func ReaderToChan(stream chan<- []byte, reader io.Reader) error {
for {
buffer := make([]byte, bufferSize)
nBytes, err := reader.Read(buffer)
if err != nil {
return err
}
stream <- buffer[:nBytes]
}
return nil
}
func ChanToWriter(writer io.Writer, stream <-chan []byte) error {
for buffer := range stream {
nBytes, err := writer.Write(buffer)
log.Debug("Writing %d bytes with error %v", nBytes, err)
if err != nil {
return err
}
}
return nil
}
-5
View File
@@ -1,5 +0,0 @@
package vmess
const (
BufferSize = 512
)
+6 -22
View File
@@ -10,6 +10,7 @@ import (
v2io "github.com/v2ray/v2ray-core/io"
vmessio "github.com/v2ray/v2ray-core/io/vmess"
"github.com/v2ray/v2ray-core/log"
v2net "github.com/v2ray/v2ray-core/net"
)
type VMessInboundHandler struct {
@@ -92,31 +93,14 @@ func (handler *VMessInboundHandler) HandleConnection(connection net.Conn) error
}
func (handler *VMessInboundHandler) dumpInput(reader io.Reader, input chan<- []byte, finish chan<- bool) {
for {
buffer := make([]byte, BufferSize)
nBytes, err := reader.Read(buffer)
log.Debug("VMessInbound: Reading %d bytes with error %v", nBytes, err)
if err == io.EOF {
close(input)
log.Debug("VMessInbound finishing input.")
finish <- true
break
}
input <- buffer[:nBytes]
}
v2net.ReaderToChan(input, reader)
close(input)
finish <- true
}
func (handler *VMessInboundHandler) dumpOutput(writer io.Writer, output <-chan []byte, finish chan<- bool) {
for {
buffer, open := <-output
if !open {
finish <- true
log.Debug("VMessInbound finishing output.")
break
}
nBytes, err := writer.Write(buffer)
log.Debug("VmessInbound: Wrote %d bytes with error %v", nBytes, err)
}
v2net.ChanToWriter(writer, output)
finish <- true
}
func (handler *VMessInboundHandler) waitForFinish(finish <-chan bool) {
+5 -22
View File
@@ -118,31 +118,14 @@ func (handler *VMessOutboundHandler) startCommunicate(request *vmessio.VMessRequ
}
func (handler *VMessOutboundHandler) dumpOutput(reader io.Reader, output chan<- []byte, finish chan<- bool) {
for {
buffer := make([]byte, BufferSize)
nBytes, err := reader.Read(buffer)
log.Debug("VMessOutbound: Reading %d bytes, with error %v", nBytes, err)
if err == io.EOF {
close(output)
finish <- true
log.Debug("VMessOutbound finishing output.")
break
}
output <- buffer[:nBytes]
}
v2net.ReaderToChan(output, reader)
close(output)
finish <- true
}
func (handler *VMessOutboundHandler) dumpInput(writer io.Writer, input <-chan []byte, finish chan<- bool) {
for {
buffer, open := <-input
if !open {
finish <- true
log.Debug("VMessOutbound finishing input.")
break
}
nBytes, err := writer.Write(buffer)
log.Debug("VMessOutbound: Wrote %d bytes with error %v", nBytes, err)
}
v2net.ChanToWriter(writer, input)
finish <- true
}
func (handler *VMessOutboundHandler) waitForFinish(finish <-chan bool) {