GuanM/hysteria-dev
1
0
Fork 0
mirror of https://github.com/cmz0228/hysteria-dev.git synced 2025-08-30 05:01:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(tun): switch to xjasonlyu/tun2socks

Browse Source 
fix: #306, #394, #185, #161

break changes:

we won't create or maintain the interface now, so it is user's duty to
create the tun interface, for example, with command like
  ip tuntap add dev hytun mode tun
(or maybe we can use songgao/water to keep this behavior unchanged).

correspondingly, the "address", "gateway", "mask", "dns", "persist"
options in the "tun" config have been removed.

in addition, please note xjasonlyu/tun2socks is licensed under GPLv3 and
hysteria is licensed under MIT, I don't ensure is it legal to use it as
a go mod, but there are too many requests related on it so whatever...
This commit is contained in:
Haruue Icymoon
2022-08-10 02:19:03 +08:00
parent a2ab9e0425
commit f3f604b59a
8 changed files with 404 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
pkg/tun/tcp.go
View File

@@ -1,45 +1,44 @@
//go:build cgo
// +build cgo
package tun
import (
tun2socks "github.com/eycorsican/go-tun2socks/core"
"github.com/tobyxdd/hysteria/pkg/utils"
"github.com/xjasonlyu/tun2socks/v2/core/adapter"
"net"
)
func (s *Server) Handle(conn net.Conn, target *net.TCPAddr) error {
if s.RequestFunc != nil {
s.RequestFunc(conn.LocalAddr(), target.String())
}
var closeErr error
defer func() {
if s.ErrorFunc != nil && closeErr != nil {
s.ErrorFunc(conn.LocalAddr(), target.String(), closeErr)
}
}()
rc, err := s.HyClient.DialTCP(target.String())
if err != nil {
closeErr = err
return err
}
go s.relayTCP(conn, rc)
return nil
func (s *Server) HandleTCP(localConn adapter.TCPConn) {
go s.handleTCPConn(localConn)
}
func (s *Server) relayTCP(clientConn, relayConn net.Conn) {
closeErr := utils.PipePairWithTimeout(relayConn, clientConn, s.Timeout)
if s.ErrorFunc != nil {
s.ErrorFunc(clientConn.LocalAddr(), relayConn.RemoteAddr().String(), closeErr)
func (s *Server) handleTCPConn(localConn adapter.TCPConn) {
defer localConn.Close()
id := localConn.ID()
remoteAddr := net.TCPAddr{
IP: net.IP(id.LocalAddress),
Port: int(id.LocalPort),
}
relayConn.Close()
clientConn.Close()
if closeErr != nil {
if err, ok := closeErr.(net.Error); ok && err.Timeout() {
if clientConn, ok := clientConn.(tun2socks.TCPConn); ok {
clientConn.Abort()
}
localAddr := net.TCPAddr{
IP: net.IP(id.RemoteAddress),
Port: int(id.RemotePort),
}
if s.RequestFunc != nil {
s.RequestFunc(&localAddr, remoteAddr.String())
}
var err error
defer func() {
if s.ErrorFunc != nil && err != nil {
s.ErrorFunc(&localAddr, remoteAddr.String(), err)
}
}()
rc, err := s.HyClient.DialTCP(remoteAddr.String())
if err != nil {
return
}
defer rc.Close()
err = utils.PipePairWithTimeout(localConn, rc, s.Timeout)
}