Robot
/
croc
mirror of https://github.com/schollz/croc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use writers in relay

This commit is contained in:
Zack Scholl 2018-09-26 07:41:07 -07:00
parent 085dd4e4c3
commit ab70b53998
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tcp/tcp.go
View File

@ -1,6 +1,7 @@
package tcp package tcp
import ( import (
"bufio"
"net" "net"
"sync" "sync"
"time" "time"
@ -124,12 +125,13 @@ func clientCommuncation(port string, c *comm.Comm) (err error) {
// Read()s from the socket to the channel. // Read()s from the socket to the channel.
func chanFromConn(conn net.Conn) chan []byte { func chanFromConn(conn net.Conn) chan []byte {
c := make(chan []byte) c := make(chan []byte)
reader := bufio.NewReader(conn)
go func() { go func() {
b := make([]byte, models.TCP_BUFFER_SIZE) b := make([]byte, models.TCP_BUFFER_SIZE)
for { for {
n, err := conn.Read(b) n, err := reader.Read(b)
if n > 0 { if n > 0 {
res := make([]byte, n) res := make([]byte, n)
// Copy the buffer so it doesn't get changed while read by the recipient. // Copy the buffer so it doesn't get changed while read by the recipient.
@ -151,6 +153,8 @@ func chanFromConn(conn net.Conn) chan []byte {
func pipe(conn1 net.Conn, conn2 net.Conn) { func pipe(conn1 net.Conn, conn2 net.Conn) {
chan1 := chanFromConn(conn1) chan1 := chanFromConn(conn1)
chan2 := chanFromConn(conn2) chan2 := chanFromConn(conn2)
writer1 := bufio.NewWriter(conn1)
writer2 := bufio.NewWriter(conn2)
for { for {
select { select {
@ -158,13 +162,13 @@ func pipe(conn1 net.Conn, conn2 net.Conn) {
if b1 == nil { if b1 == nil {
return return
} }
conn2.Write(b1) writer2.Write(b1)
case b2 := <-chan2: case b2 := <-chan2:
if b2 == nil { if b2 == nil {
return return
} }
conn1.Write(b2) writer1.Write(b2)
} }
} }
} }