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

bug fixes

Browse Source
This commit is contained in:
netbyte 2022-05-21 23:17:58 +08:00
parent 8ca0660098
commit 3724f67db0
7 changed files with 52 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
grpc/grpcclient.go
View File

@ -3,12 +3,12 @@ package grpc
import (
"context"
"crypto/tls"
"log"
"time"
"github.com/net-byte/vtun/grpc/proto"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"io"
"log"
"time"
"github.com/net-byte/vtun/common/cache"
"github.com/net-byte/vtun/common/cipher"
@ -19,6 +19,8 @@ import (
func StartClient(config config.Config) {
log.Printf("vtun grpc client started on %v", config.LocalAddr)
iface := tun.CreateTun(config)
go tunToGrpc(config, iface)
tlsconfig := &tls.Config{
InsecureSkipVerify: config.TLSInsecureSkipVerify,
}
@ -26,22 +28,22 @@ func StartClient(config config.Config) {
tlsconfig.ServerName = config.TLSSni
}
creds := credentials.NewTLS(tlsconfig)
iface := tun.CreateTun(config)
conn, err := grpc.Dial(config.ServerAddr, grpc.WithBlock(), grpc.WithTransportCredentials(creds))
if err != nil {
log.Panic(err)
}
defer conn.Close()
streamClient := proto.NewGrpcServeClient(conn)
stream, err := streamClient.Tunnel(context.Background())
if err != nil {
log.Panic(err)
}
go tunToGrpc(config, iface)
for {
conn, err := grpc.Dial(config.ServerAddr, grpc.WithBlock(), grpc.WithTransportCredentials(creds))
if err != nil {
time.Sleep(3 * time.Second)
continue
}
streamClient := proto.NewGrpcServeClient(conn)
stream, err := streamClient.Tunnel(context.Background())
if err != nil {
conn.Close()
continue
}
cache.GetCache().Set("grpcconn", stream, 24*time.Hour)
grpcToTun(config, stream, iface)
cache.GetCache().Delete("grpcconn")
conn.Close()
}
}
@ -55,7 +57,7 @@ func tunToGrpc(config config.Config, iface *water.Interface) {
if v, ok := cache.GetCache().Get("grpcconn"); ok {
b := packet[:n]
if config.Obfs {
packet = cipher.XOR(packet)
b = cipher.XOR(b)
}
grpcconn := v.(proto.GrpcServe_TunnelClient)
err = grpcconn.Send(&proto.PacketData{Data: b})
@ -69,7 +71,7 @@ func tunToGrpc(config config.Config, iface *water.Interface) {
func grpcToTun(config config.Config, stream proto.GrpcServe_TunnelClient, iface *water.Interface) {
for {
packet, err := stream.Recv()
if err != nil || err == io.EOF {
if err != nil {
break
}
b := packet.Data[:]

12
grpc/grpcserver.go
View File

@ -1,14 +1,14 @@
package grpc
import (
"github.com/net-byte/vtun/grpc/proto"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"io"
"log"
"net"
"time"
"github.com/net-byte/vtun/grpc/proto"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"github.com/net-byte/vtun/common/cache"
"github.com/net-byte/vtun/common/cipher"
"github.com/net-byte/vtun/common/config"
@ -53,7 +53,7 @@ func toClient(config config.Config, iface *water.Interface) {
packet := make([]byte, config.MTU)
for {
n, err := iface.Read(packet)
if err != nil || err == io.EOF || n == 0 {
if err != nil || n == 0 {
continue
}
b := packet[:n]
@ -71,7 +71,7 @@ func toClient(config config.Config, iface *water.Interface) {
func toServer(srv proto.GrpcServe_TunnelServer, config config.Config, iface *water.Interface) {
for {
packet, err := srv.Recv()
if err != nil || err == io.EOF {
if err != nil {
break
}
b := packet.Data[:]

7
quic/quicclient.go
View File

@ -3,7 +3,6 @@ package quic
import (
"context"
"crypto/tls"
"io"
"log"
"time"
@ -43,11 +42,13 @@ func StartClient(config config.Config) {
stream, err := session.OpenStreamSync(context.Background())
if err != nil {
log.Println(err)
session.CloseWithError(0, "bye")
continue
}
cache.GetCache().Set("quicconn", stream, 24*time.Hour)
quicToTun(config, stream, iface)
cache.GetCache().Delete("quicconn")
session.CloseWithError(0, "bye")
}
}
@ -61,7 +62,7 @@ func tunToQuic(config config.Config, iface *water.Interface) {
if v, ok := cache.GetCache().Get("quicconn"); ok {
b := packet[:n]
if config.Obfs {
packet = cipher.XOR(packet)
b = cipher.XOR(b)
}
stream := v.(quic.Stream)
stream.SetWriteDeadline(time.Now().Add(time.Duration(config.Timeout) * time.Second))
@ -79,7 +80,7 @@ func quicToTun(config config.Config, stream quic.Stream, iface *water.Interface)
for {
stream.SetReadDeadline(time.Now().Add(time.Duration(config.Timeout) * time.Second))
n, err := stream.Read(packet)
if err != nil || err == io.EOF {
if err != nil {
break
}
b := packet[:n]

23
quic/quicserver.go
View File

@ -41,12 +41,8 @@ func StartServer(config config.Config) {
log.Println(err)
continue
}
stream, err := session.AcceptStream(context.Background())
if err != nil {
log.Println(err)
continue
}
go toServer(config, stream, iface)
go toServer(config, session, iface)
}
}
@ -63,14 +59,22 @@ func toClient(config config.Config, iface *water.Interface) {
if config.Obfs {
b = cipher.XOR(b)
}
v.(quic.Stream).Write(b)
_, err := v.(quic.Stream).Write(b)
if err != nil {
cache.GetCache().Delete(key)
}
}
}
}
}
func toServer(config config.Config, stream quic.Stream, iface *water.Interface) {
defer stream.Close()
func toServer(config config.Config, session quic.Session, iface *water.Interface) {
stream, err := session.AcceptStream(context.Background())
if err != nil {
log.Println(err)
return
}
defer session.CloseWithError(0, "bye")
packet := make([]byte, config.MTU)
for {
stream.SetReadDeadline(time.Now().Add(time.Duration(config.Timeout) * time.Second))
@ -87,4 +91,5 @@ func toServer(config config.Config, stream quic.Stream, iface *water.Interface)
iface.Write(b)
}
}
stream.Close()
}

2
tcp/tcpclient.go
View File

@ -41,7 +41,7 @@ func tunToTcp(config config.Config, iface *water.Interface) {
if v, ok := cache.GetCache().Get("tcpconn"); ok {
b := packet[:n]
if config.Obfs {
packet = cipher.XOR(packet)
b = cipher.XOR(b)
}
tcpconn := v.(net.Conn)
tcpconn.SetWriteDeadline(time.Now().Add(time.Duration(config.Timeout) * time.Second))

14
tls/tlsclient.go
View File

@ -19,13 +19,13 @@ func StartClient(config config.Config) {
log.Printf("vtun tls client started on %v", config.LocalAddr)
iface := tun.CreateTun(config)
go tunToTLS(config, iface)
tlsconfig := &tls.Config{
InsecureSkipVerify: config.TLSInsecureSkipVerify,
}
if config.TLSSni != "" {
tlsconfig.ServerName = config.TLSSni
}
for {
tlsconfig := &tls.Config{
InsecureSkipVerify: config.TLSInsecureSkipVerify,
}
if config.TLSSni != "" {
tlsconfig.ServerName = config.TLSSni
}
conn, err := tls.Dial("tcp", config.ServerAddr, tlsconfig)
if err != nil {
time.Sleep(3 * time.Second)
@ -47,7 +47,7 @@ func tunToTLS(config config.Config, iface *water.Interface) {
if v, ok := cache.GetCache().Get("tlsconn"); ok {
b := packet[:n]
if config.Obfs {
packet = cipher.XOR(packet)
b = cipher.XOR(b)
}
tlsconn := v.(net.Conn)
tlsconn.SetWriteDeadline(time.Now().Add(time.Duration(config.Timeout) * time.Second))

2
ws/wsclient.go
View File

@ -59,7 +59,7 @@ func tunToWs(config config.Config, iface *water.Interface) {
if v, ok := cache.GetCache().Get("wsconn"); ok {
b := packet[:n]
if config.Obfs {
packet = cipher.XOR(packet)
b = cipher.XOR(b)
}
wsconn := v.(net.Conn)
wsconn.SetWriteDeadline(time.Now().Add(time.Duration(config.Timeout) * time.Second))