facat/transx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

找到bug了。应该没问题了。

Browse Source 
Signed-off-by: dmy@lab <dmy@lab.com>
This commit is contained in:
dmy@lab
2015-10-31 22:51:29 +08:00
parent b48734136d
commit 9fe6abc89a
6 changed files with 94 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client.bat
View File

@@ -1 +1 @@
.\TransX -destip 127.0.0.1 -destport 1082 -listenport 1080 -encrypt client
.\TransX -destip 127.0.0.1 -destport 1082 -listenport 1080 -encrypt client -log client.log

2
main.go
View File

@@ -24,6 +24,6 @@ func tunnel() {
func main() {
flag.Parse()
fmt.Println("Hello World!")
log.LogTo(cli.LogTo, "INFO")
log.LogTo(cli.LogTo, "DEBUG")
tunnel()
}

2
main_test.go
View File

@@ -181,7 +181,7 @@ func clientBin(t *testing.T) {
}
log.Info("Test Client Receive %s", bytes[:n])
fmt.Println("Test Client Receive ", string(bytes[:n]))
time.Sleep(time.Second * 2)
// time.Sleep(time.Second * 2)
conn.Close()
log.Info("Test Client closed")

2
server.bat
View File

@@ -1 +1 @@
.\TransX -destip 127.0.0.1 -destport 1084 -listenport 1082 -encrypt server
.\TransX -destip 127.0.0.1 -destport 1315 -listenport 1082 -encrypt server -log server.log

140
tscipher/cipher.go
View File

@@ -6,7 +6,9 @@ import (
"github.com/TransX/utils"
"io"
"net"
// "time"
"runtime/debug"
"strconv"
"strings"
)
var StartMark = []byte("#2v!") //should be constant
@@ -38,7 +40,27 @@ type Carrier struct {
Cipher Cipher
Cache []byte
AttachedTunnelID string
ReceiveBuff []byte
receiveBuff []byte
}
func NewCarrier(conn net.Conn, cipher Cipher, cache []byte, id string) *Carrier {
t := new(Carrier)
t.Conn = conn
t.Cipher = cipher
t.Cache = cache
t.AttachedTunnelID = id
t.receiveBuff = make([]byte, 0, len(cache)*8)
return t
}
func (this *Carrier) GetReceiveBuff() []byte {
log.Debug("id %d receivebuff Get, len %d", this.AttachedTunnelID, len(this.receiveBuff))
return this.receiveBuff
}
func (this *Carrier) SetReceiveBuff(buff []byte) {
this.receiveBuff = buff
log.Debug("id %d receivebuff set, len %d", this.AttachedTunnelID, len(this.receiveBuff))
}
func NewCipher(cipherName string) (cipher Cipher) {
@@ -97,7 +119,13 @@ func UnwrapPackage(pacakge []byte) (data []byte, rest []byte, err error) {
packageSize = 0
data = nil
rest = nil
err = &NotPackageError{"NotPackageError" + "start:" + string(start) + " end:" + string(end)}
if strings.Contains(string(pacakge), "#2v!") && strings.Contains(string(pacakge), "_=1z") {
a := strings.Index(string(pacakge), "#2v!")
b := strings.Index(string(pacakge), "_=1z")
err = &NotPackageError{"NotPackageError(contains)" + "start:" + string(start) + " end:" + string(end) + "pacakge " + strconv.Itoa(len(pacakge)) + "start" + strconv.Itoa(a) + "end" + strconv.Itoa(b)}
} else {
err = &NotPackageError{"NotPackageError" + "start:" + string(start) + " end:" + string(end)}
}
}
return
@@ -118,19 +146,17 @@ func SendData(carrier *Carrier, nByte int) (n int, err error) {
}
//打包
wraped := WrapPackage(encrypedByte[:nByte])
//检查一下这个包是否正确
// _, _, err = UnwrapPackage(wraped)
// if err != nil {
// log.Error("Package is incorrect")
// }
n, err = carrier.Conn.Write(wraped)
log.Info("Ready to write id %s, 18 byte %s", carrier.AttachedTunnelID, string(wraped[:18]))
copy(carrier.Cache, encrypedByte[:nByte]) // in case of debugging
return
}
func SendData2(carrier *Carrier, nByte int) (n int, err error) {
n, err = carrier.Conn.Write(carrier.Cache[:nByte])
if err != nil {
return
}
return
}
func RowReceiveData(carrier *Carrier) (n int, err error) {
n, err = carrier.Conn.Read(carrier.Cache)
if err != nil {
@@ -143,19 +169,24 @@ func RowReceiveData(carrier *Carrier) (n int, err error) {
func ReceiveData(carrier *Carrier) (n int, err error) {
defer func() {
if r := recover(); r != nil {
debug.PrintStack()
log.Error("ReceiveData err %s", r)
}
}()
// hasHeader := false
wrapedPackage := carrier.ReceiveBuff //make([]byte, 0, cap(carrier.Cache))
log.Info("id %s wrapedPackage := carrier.GetReceiveBuff()", carrier.AttachedTunnelID)
wrapedPackage := carrier.GetReceiveBuff() //make([]byte, 0, cap(carrier.Cache))
// log.Debug("WWW id %s address of wrapedPackage[0] %p cap %d. carrier.ReceiveBuff[0] %p cap(%d)", carrier.AttachedTunnelID, &wrapedPackage[0], cap(wrapedPackage), &(carrier.ReceiveBuff[0]), cap(carrier.ReceiveBuff))
var packageData []byte
var _rest []byte
for {
//首先检查这个是不是完整的包，是就返回好了，免得被阻塞
if data, _, err := UnwrapPackage(wrapedPackage); err == nil {
// log.Debug("id %s address of wrapedPackage[0] %p. carrier.ReceiveBuff[0] %p", carrier.AttachedTunnelID, &wrapedPackage[0], &(carrier.ReceiveBuff[0]))
if data, rest, err := UnwrapPackage(wrapedPackage); err == nil {
_rest = rest
packageData = data
} else {
log.Info("id %s to read wrapedPackage %d", carrier.AttachedTunnelID, len(wrapedPackage))
log.Debug("id %s to read wrapedPackage %d", carrier.AttachedTunnelID, len(wrapedPackage))
// carrier.Conn.SetReadDeadline(time.Now().Add(time.Second * 5))
if len(wrapedPackage) > 0 {
@@ -163,28 +194,18 @@ func ReceiveData(carrier *Carrier) (n int, err error) {
if err != nil {
log.Error("ERROR %s", err)
}
log.Info("id %s to Conn.Read %d", carrier.AttachedTunnelID, n)
log.Debug("id %s to Conn.Read %d", carrier.AttachedTunnelID, n)
} else {
n, err = io.ReadAtLeast(carrier.Conn, carrier.Cache, 18)
log.Info("id %s to ReadAtLeast", carrier.AttachedTunnelID)
log.Debug("id %s to ReadAtLeast", carrier.AttachedTunnelID)
}
if err != nil {
n = 0
return n, err
}
// if len(carrier.ReceiveBuff) > 0 {
// hasHeader = true
// }
//解包
// if !hasHeader {
// copy(wrapedPackage, carrier.Cache[:n])
// } else {
// wrapedPackage = append(carrier.ReceiveBuff, carrier.Cache[:n])
// }
log.Info("length of wrapedPackage %d", len(wrapedPackage))
wrapedPackage = append(wrapedPackage, carrier.Cache[:n]...)
log.Info("first 18 %s from %s", string(wrapedPackage[:18]), carrier.Conn.RemoteAddr().String())
log.Debug("id %s length of conn %d", carrier.AttachedTunnelID, n)
log.Debug("id %s first 18 %s from %s", carrier.AttachedTunnelID, string(wrapedPackage[:18]), carrier.Conn.RemoteAddr().String())
data, rest, err := UnwrapPackage(wrapedPackage)
if err, ok := err.(*NotPackageError); ok {
return 0, err
@@ -193,54 +214,32 @@ func ReceiveData(carrier *Carrier) (n int, err error) {
if _, ok := err.(*LackDataError); ok {
// carrier.ReceiveBuff = append(carrier.ReceiveBuff, wrapedPackage)
// hasHeader = true
log.Info("not enough")
log.Info("id %s not enough", carrier.AttachedTunnelID)
continue
}
packageData = data
log.Debug("id %s length of package %d", carrier.AttachedTunnelID, len(packageData))
_rest = rest
}
//够一个完整的包
carrier.ReceiveBuff = make([]byte, 0, cap(carrier.ReceiveBuff)) //释放
carrier.ReceiveBuff = append(carrier.ReceiveBuff, _rest...)
// carrier.ReceiveBuff = make([]byte, 0, cap(carrier.ReceiveBuff)) //释放
log.Info("id %s capBuff := cap(carrier.GetReceiveBuff())", carrier.AttachedTunnelID)
capBuff := cap(carrier.GetReceiveBuff())
_buff := make([]byte, 0, capBuff) //释放
// carrier.SetReceiveBuff()
_buff = append(_buff, _rest...)
// carrier.ReceiveBuff = append(carrier.ReceiveBuff, _rest...)
// carrier.SetReceiveBuff(append(carrier.GetReceiveBuff(), _rest...))
log.Info("id %s carrier.SetReceiveBuff(_buff)", carrier.AttachedTunnelID)
carrier.SetReceiveBuff(_buff)
// log.Debug("id %s address of carrier.ReceiveBuff[0] %p", carrier.AttachedTunnelID, &carrier.ReceiveBuff[0])
break
}
// realData := make([]byte, 0, packageSize)
// // log.Info("packageSize %d data size %d", packageSize, len(data))
// if err == nil && packageSize == len(data) { //读到的是一个完整的包
// realData = data
// n = len(realData)
// log.Debug("read a complete package")
// } else {
// gotSize := len(data)
// for {
// n, err = carrier.Conn.Read(carrier.Cache)
// if err != nil {
// n = 0
// return
// }
// wrapedPackage = carrier.Cache[:n]
// log.Debug("got partial package size %d from %s ID: %s", n, carrier.Conn.RemoteAddr().String(), carrier.AttachedTunnelID)
// _, data, err = UnwrapPackage(wrapedPackage)
// if err == nil {
// n = 0
// err = errors.New("partial package lost")
// return
// }
// gotSize += len(data)
// realData = append(realData, data...)
// if gotSize == packageSize {
// log.Debug("got enough:. packageSize %d, real size %d. not include header", packageSize, gotSize)
// n = gotSize
// break
// }
// }
// }
if len(carrier.ReceiveBuff) > 0 {
log.Info("trailing %d from %s", len(carrier.ReceiveBuff), carrier.Conn.RemoteAddr().String())
log.Info("18 byte of trailing %s", string(carrier.ReceiveBuff[:18]))
if len(carrier.GetReceiveBuff()) > 0 {
log.Debug("id %s trailing %d from %s", carrier.AttachedTunnelID, len(carrier.GetReceiveBuff()), carrier.Conn.RemoteAddr().String())
log.Debug("id %s 18 byte of trailing %s", carrier.AttachedTunnelID, string(carrier.GetReceiveBuff()[:18]))
}
decrypted, err := carrier.Cipher.Decrypt(packageData)
if err != nil {
@@ -251,12 +250,3 @@ func ReceiveData(carrier *Carrier) (n int, err error) {
copy(carrier.Cache, decrypted)
return
}
func ReceiveData2(carrier *Carrier) (n int, err error) {
n, err = carrier.Conn.Read(carrier.Cache)
if err != nil {
n = 0
return
}
return
}

42
tunnel.go
View File

@@ -59,22 +59,22 @@ func (this *Tunnel) run() { //单向的，从src发送到dest
}
}()
cache := make([]byte, 1024*2) //128kB
cache := make([]byte, 1024*32) //128kB
//构建Carrier
revCarrier := &tscipher.Carrier{
src,
tscipher.NewCipher("XOR"),
cache,
this.id,
make([]byte, 0, cap(cache)*8),
}
sendCarrier := &tscipher.Carrier{
dest,
tscipher.NewCipher("XOR"),
cache, //TODO:危险，cache的容量容易被不小心修改
this.id,
make([]byte, 0, cap(cache)*8),
}
// revCarrier := &tscipher.Carrier{
// src,
// tscipher.NewCipher("XOR"),
// cache,
// this.id,
// }
revCarrier := tscipher.NewCarrier(src, tscipher.NewCipher("XOR"), cache, this.id)
// sendCarrier := &tscipher.Carrier{
// dest,
// tscipher.NewCipher("XOR"),
// cache, //TODO:危险，cache的容量容易被不小心修改
// this.id,
// }
sendCarrier := tscipher.NewCarrier(dest, tscipher.NewCipher("XOR"), cache, this.id)
for {
// log.Info("a loop Tunnel id %s", id)
var nByte int
@@ -88,18 +88,26 @@ func (this *Tunnel) run() { //单向的，从src发送到dest
nByte, err = tscipher.ReceiveData(revCarrier)
}
if err != nil {
log.Panic("Read panic. Tunnel id: %s. Remote Add: %s. Err:%s", id, src.RemoteAddr().String(), err.Error())
log.Panic("Read panic. Tunnel id: %s. Remote Add: %s Local: %s. Err:%s", id, src.RemoteAddr().String(), src.LocalAddr().String(), err.Error())
}
log.Info("Reived %d bytes from %s. Tunnel: id %s", nByte, src.RemoteAddr().String(), id)
if cipherDirection != "send" {
sendCarrier.Cipher = nil
// log.Debug("Write not crypted. Tunnel: %s", id)
}
// for {
n, err := tscipher.SendData(sendCarrier, nByte)
log.Info("Write %d bytes from %s to %s. Tunnel: %s", n, dest.LocalAddr(), dest.RemoteAddr().String(), id)
if err != nil {
log.Panic("Write panic. ID: %s, Err: %s, Remote Add: %s", id, err, dest.RemoteAddr().String())
}
log.Info("Write %d bytes from %s to %s. Tunnel: %s . 18 bytes", n, dest.LocalAddr(), dest.RemoteAddr().String(), id, string(sendCarrier.Cache[:18]))
// if n == 0 {
// log.Info("Retry Write id %s", id)
// continue
// }
// break
// }
}
}