github/vtun
5
0
Fork 0
mirror of https://github.com/net-byte/vtun synced 2024-03-14 10:50:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Alex Tsai 2021-05-24 11:25:22 +08:00
parent 2110fa6c1e
commit 912792b4ad
6 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/udpclient.go
View File

@ -12,7 +12,6 @@ import (
// StartUDPClient start udp client
func StartUDPClient(config config.Config) {
config.Init()
iface := tun.CreateTun(config.CIDR)
serverAddr, err := net.ResolveUDPAddr("udp", config.ServerAddr)
if err != nil {
@ -36,8 +35,7 @@ func StartUDPClient(config config.Config) {
if err != nil || n == 0 {
continue
}
// decrypt data
b := cipher.Decrypt(buf[:n])
b := cipher.XOR(buf[:n])
if !waterutil.IsIPv4(b) {
continue
}
@ -54,8 +52,7 @@ func StartUDPClient(config config.Config) {
if !waterutil.IsIPv4(packet) {
continue
}
// encrypt data
b := cipher.Encrypt(packet[:n])
b := cipher.XOR(packet[:n])
conn.WriteToUDP(b, serverAddr)
}
}

5
client/wsclient.go
View File

@ -18,7 +18,6 @@ import (
// StartWSClient start ws client
func StartWSClient(config config.Config) {
config.Init()
iface := tun.CreateTun(config.CIDR)
c := cache.New(30*time.Minute, 10*time.Minute)
log.Printf("vtun ws client started,CIDR is %v", config.CIDR)
@ -50,7 +49,7 @@ func StartWSClient(config config.Config) {
c.Set(key, conn, cache.DefaultExpiration)
go wsToTun(c, key, conn, iface)
}
b = cipher.Encrypt(b)
b = cipher.XOR(b)
conn.WriteMessage(websocket.BinaryMessage, b)
}
}
@ -63,7 +62,7 @@ func wsToTun(c *cache.Cache, key string, wsConn *websocket.Conn, iface *water.In
if err != nil || err == io.EOF {
break
}
b = cipher.Decrypt(b)
b = cipher.XOR(b)
if !waterutil.IsIPv4(b) {
continue
}

16
common/cipher/cipher.go
View File

@ -11,22 +11,12 @@ func GenerateKey(key string) {
_key = []byte(key)
}
func Encrypt(data []byte) []byte {
func XOR(src []byte) []byte {
c, err := rc4.NewCipher(_key)
if err != nil {
log.Fatalln(err)
}
dst := make([]byte, len(data))
c.XORKeyStream(dst, data)
return dst
}
func Decrypt(data []byte) []byte {
c, err := rc4.NewCipher(_key)
if err != nil {
log.Fatalln(err)
}
dst := make([]byte, len(data))
c.XORKeyStream(dst, data)
dst := make([]byte, len(src))
c.XORKeyStream(dst, src)
return dst
}

2
main.go
View File

@ -18,7 +18,7 @@ func main() {
flag.BoolVar(&config.ServerMode, "S", false, "server mode")
flag.BoolVar(&config.TLS, "t", false, "enable tls")
flag.Parse()
config.Init()
switch config.Protocol {
case "udp":
if config.ServerMode {

7
server/udpserver.go
View File

@ -17,7 +17,6 @@ import (
// StartUDPServer start udp server
func StartUDPServer(config config.Config) {
config.Init()
iface := tun.CreateTun(config.CIDR)
localAddr, err := net.ResolveUDPAddr("udp", config.LocalAddr)
if err != nil {
@ -39,8 +38,7 @@ func StartUDPServer(config config.Config) {
if err != nil || n == 0 {
continue
}
// decrypt data
b := cipher.Decrypt(buf[:n])
b := cipher.XOR(buf[:n])
if !waterutil.IsIPv4(b) {
continue
}
@ -77,8 +75,7 @@ func (f *Forwarder) forward(iface *water.Interface, conn *net.UDPConn) {
key := fmt.Sprintf("%v->%v", dstAddr, srcAddr)
v, ok := f.connCache.Get(key)
if ok {
// encrypt data
b = cipher.Encrypt(b)
b = cipher.XOR(b)
f.localConn.WriteToUDP(b, v.(*net.UDPAddr))
}
}

5
server/wsserver.go
View File

@ -30,7 +30,6 @@ var upgrader = websocket.Upgrader{
// StartWSServer start ws server
func StartWSServer(config config.Config) {
config.Init()
iface := tun.CreateTun(config.CIDR)
c := cache.New(30*time.Minute, 10*time.Minute)
go tunToWs(iface, c)
@ -128,7 +127,7 @@ func tunToWs(iface *water.Interface, c *cache.Cache) {
key := fmt.Sprintf("%v->%v", dstAddr, srcAddr)
v, ok := c.Get(key)
if ok {
b = cipher.Encrypt(b)
b = cipher.XOR(b)
v.(*websocket.Conn).WriteMessage(websocket.BinaryMessage, b)
}
}
@ -142,7 +141,7 @@ func wsToTun(wsConn *websocket.Conn, iface *water.Interface, c *cache.Cache) {
if err != nil || err == io.EOF {
break
}
b = cipher.Decrypt(b)
b = cipher.XOR(b)
if !waterutil.IsIPv4(b) {
continue
}