XiaoMo/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-07-27 07:35:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

start refactoring

Browse Source
This commit is contained in:
fatedier
2017-03-09 02:03:47 +08:00
parent b006540141
commit 88083d21e8
115 changed files with 5515 additions and 3491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/echo_server.go
View File

@@ -1,10 +1,11 @@
package main
import (
"bufio"
"fmt"
"io"
"github.com/fatedier/frp/src/utils/conn"
"github.com/fatedier/frp/utils/net"
)
var (
@@ -12,7 +13,7 @@ var (
)
func main() {
l, err := conn.Listen("0.0.0.0", PORT)
l, err := net.ListenTcp("127.0.0.1", PORT)
if err != nil {
fmt.Printf("echo server listen error: %v\n", err)
return
@@ -29,9 +30,10 @@ func main() {
}
}
func echoWorker(c *conn.Conn) {
func echoWorker(c net.Conn) {
br := bufio.NewReader(c)
for {
buff, err := c.ReadLine()
buf, err := br.ReadString('\n')
if err == io.EOF {
break
}
@@ -40,6 +42,6 @@ func echoWorker(c *conn.Conn) {
return
}
c.WriteString(buff)
c.Write([]byte(buf + "\n"))
}
}

15
test/func_test.go
View File

@@ -1,6 +1,7 @@
package test
import (
"bufio"
"fmt"
"io/ioutil"
"net/http"
@@ -8,7 +9,7 @@ import (
"testing"
"time"
"github.com/fatedier/frp/src/utils/conn"
"github.com/fatedier/frp/utils/net"
)
var (
@@ -19,22 +20,24 @@ var (
)
func TestEchoServer(t *testing.T) {
c, err := conn.ConnectServer(fmt.Sprintf("0.0.0.0:%d", ECHO_PORT))
c, err := net.ConnectTcpServer(fmt.Sprintf("127.0.0.1:%d", ECHO_PORT))
if err != nil {
t.Fatalf("connect to echo server error: %v", err)
}
timer := time.Now().Add(time.Duration(5) * time.Second)
c.SetDeadline(timer)
c.WriteString(ECHO_TEST_STR)
c.Write([]byte(ECHO_TEST_STR))
c.Write('\n')
buff, err := c.ReadLine()
br := bufio.NewReader(c)
buf, err := br.ReadString('\n')
if err != nil {
t.Fatalf("read from echo server error: %v", err)
}
if ECHO_TEST_STR != buff {
t.Fatalf("content error, send [%s], get [%s]", strings.Trim(ECHO_TEST_STR, "\n"), strings.Trim(buff, "\n"))
if ECHO_TEST_STR != buf {
t.Fatalf("content error, send [%s], get [%s]", strings.Trim(ECHO_TEST_STR, "\n"), strings.Trim(buf, "\n"))
}
}