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

1.只留下BlockingQueueCache

Browse Source 
2.为了避免循环引用，重新整理package结构
This commit is contained in:
dmy@lab
2016-01-11 21:29:48 +08:00
parent b284b401dc
commit 8599c87f0c
7 changed files with 57 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
protocol/constant.go
View File

@@ -1,8 +0,0 @@
package protocol
type Direction int
const (
RECEIVE Direction = 0
SEND Direction = 1
)

10
protocol/tcp.go
View File

@@ -3,7 +3,9 @@ package protocol
import (
"errors"
"fmt"
"github.com/TransX/constant"
"github.com/TransX/log"
"github.com/TransX/model"
"github.com/TransX/stat"
"github.com/TransX/utils"
"net"
@@ -77,11 +79,11 @@ func (this *TransTCP) Start(listenPort, destIP, destPort string, clientOrServer
//tunnel model : [ -->>server ---- client -->> ](this is a tunnel)
if clientOrServer == "client" {
sendID := utils.TunnelID()
ntSend := NewTunnel(sendID, listenerConn, destConn, SEND)
ntSend := model.NewTunnel(sendID, listenerConn, destConn, constant.SEND)
ntSend.SetRegChan(tunMng.GetRegChan())
ntSend.SetUnRegChan(tunMng.GetUnregChan())
receiveID := utils.TunnelID()
ntRev := NewTunnel(receiveID, destConn, listenerConn, RECEIVE)
ntRev := model.NewTunnel(receiveID, destConn, listenerConn, constant.RECEIVE)
ntRev.SetRegChan(tunMng.GetRegChan())
ntRev.SetUnRegChan(tunMng.GetUnregChan())
printModelDetail(sendID, receiveID)
@@ -90,11 +92,11 @@ func (this *TransTCP) Start(listenPort, destIP, destPort string, clientOrServer
}
if clientOrServer == "server" {
receiveID := utils.TunnelID()
ntRev := NewTunnel(receiveID, listenerConn, destConn, RECEIVE)
ntRev := model.NewTunnel(receiveID, listenerConn, destConn, constant.RECEIVE)
ntRev.SetRegChan(tunMng.GetRegChan())
ntRev.SetUnRegChan(tunMng.GetUnregChan())
sendID := utils.TunnelID()
ntSend := NewTunnel(sendID, destConn, listenerConn, SEND)
ntSend := model.NewTunnel(sendID, destConn, listenerConn, constant.SEND)
ntSend.SetRegChan(tunMng.GetRegChan())
ntSend.SetUnRegChan(tunMng.GetUnregChan())
printModelDetail(sendID, receiveID)

134
protocol/tunnel.go
View File

@@ -1,134 +0,0 @@
package protocol
import (
// "fmt"
"github.com/TransX/cache"
"github.com/TransX/log"
"github.com/TransX/tscipher"
"net"
"time"
)
type Tunnel struct {
id string
src net.Conn
dest net.Conn
cipherDirection Direction
regChan chan interface{}
unregChan chan interface{}
}
func NewTunnel(id string, src, dest net.Conn, cipherDirection Direction) *Tunnel {
return &Tunnel{
id: id,
src: src,
dest: dest,
cipherDirection: cipherDirection,
}
}
func (this *Tunnel) GetID(id string) string {
return this.id
}
func (this *Tunnel) SetID(id string) { //rarely used
this.id = id
}
func (this *Tunnel) SetRegChan(c chan interface{}) {
this.regChan = c
}
func (this *Tunnel) SetUnRegChan(c chan interface{}) {
this.unregChan = c
}
//tunnel model : [ -->>server ---- client -->> ](this is a tunnel)
func (this *Tunnel) Run() { //单向的，从src发送到dest
//进行注册
this.regChan <- this
src := this.src
dest := this.dest
// cipherDirection := this.cipherDirection
id := this.id
// cache := make([]byte, 1024*4) //4kB
//构建Carrier
queCache := cache.NewUnblockingQueueCache(1)
for i := 0; i < 1; i++ {
queCache.Put(make([]byte, 1024*4), 0)
}
msg := cache.NewBlockingQueueCache(1)
revCarrier := tscipher.NewCarrier(src, tscipher.NewCipher("XOR"), queCache, msg, id)
sendCarrier := tscipher.NewCarrier(dest, tscipher.NewCipher("XOR"), queCache, msg, id)
go this.receive(revCarrier)
go this.send(sendCarrier)
}
func (this *Tunnel) receive(revCarrier *tscipher.Carrier) {
src := this.src
dest := this.dest
cipherDirection := this.cipherDirection
id := this.id
defer func() {
// log.Debug("tunnel id %s ends", id)
//注销
// this.unregChan <- this
if r := recover(); r != nil {
if src != nil {
src.Close()
}
if dest != nil {
dest.Close()
}
}
}()
var n int
var err error
for {
rTimer := time.Now() //receive timer
if cipherDirection != RECEIVE {
revCarrier.Cipher = nil
n, err = tscipher.RowReceiveData(revCarrier)
} else {
n, err = tscipher.ReceiveData(revCarrier)
}
log.Info("id %s time to receive %d", id, time.Since(rTimer)/1000)
if err != nil {
log.Panic("Read panic. Tunnel id: %s. Remote Add: %s Local: %s. Err:%s", id, src.RemoteAddr().String(), src.LocalAddr().String(), err.Error())
}
log.Debug("Reived %d bytes (local add %s) from %s. Tunnel: id %s", n, src.LocalAddr().String(), src.RemoteAddr().String(), id)
}
}
func (this *Tunnel) send(sendCarrier *tscipher.Carrier) {
src := this.src
dest := this.dest
cipherDirection := this.cipherDirection
id := this.id
defer func() {
//注销
this.unregChan <- this
if r := recover(); r != nil {
if src != nil {
src.Close()
}
if dest != nil {
dest.Close()
}
}
}()
if cipherDirection != SEND {
sendCarrier.Cipher = nil
}
for {
sTimer := time.Now() //send timer
n, err := tscipher.SendData(sendCarrier)
log.Info("id %s time to send %d", id, time.Since(sTimer)/1000)
if err != nil {
log.Panic("Write panic. ID: %s, Err: %s, Remote Add: %s", id, err, dest.RemoteAddr().String())
}
log.Info("id %s Send %d bytes (local add %s),to %s", id, n, dest.LocalAddr().String(), dest.RemoteAddr().String())
}
}