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

fix icmp

Browse Source
This commit is contained in:
Alex Tsai 2021-04-20 17:51:20 +08:00
parent 84f8859f0f
commit ae636fa84e
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
server/server.go
View File

@ -45,7 +45,12 @@ func Start(config config.Config) {
continue continue
} }
iface.Write(b) iface.Write(b)
key := srcAddr(b) + "-" + dstAddr(b) srcAddr := srcAddr(b)
dstAddr := dstAddr(b)
if srcAddr == "" || dstAddr == "" {
continue
}
key := srcAddr + "-" + dstAddr
forwarder.connCache.Set(key, cliAddr, cache.DefaultExpiration) forwarder.connCache.Set(key, cliAddr, cache.DefaultExpiration)
} }
} }
@ -66,7 +71,12 @@ func (f *Forwarder) forward(iface *water.Interface, conn *net.UDPConn) {
if !waterutil.IsIPv4(b) { if !waterutil.IsIPv4(b) {
continue continue
} }
key := dstAddr(b) + "-" + srcAddr(b) dstAddr := dstAddr(b)
srcAddr := srcAddr(b)
if dstAddr == "" || srcAddr == "" {
continue
}
key := dstAddr + "-" + srcAddr
v, ok := f.connCache.Get(key) v, ok := f.connCache.Get(key)
if ok { if ok {
// encrypt data // encrypt data
@ -77,15 +87,27 @@ func (f *Forwarder) forward(iface *water.Interface, conn *net.UDPConn) {
} }
func srcAddr(b []byte) string { func srcAddr(b []byte) string {
if waterutil.IPv4Protocol(b) == waterutil.UDP || waterutil.IPv4Protocol(b) == waterutil.TCP {
ip := waterutil.IPv4Source(b) ip := waterutil.IPv4Source(b)
port := waterutil.IPv4SourcePort(b) port := waterutil.IPv4SourcePort(b)
addr := fmt.Sprintf("%s:%d", ip.To4().String(), port) addr := fmt.Sprintf("%s:%d", ip.To4().String(), port)
return addr return addr
} else if waterutil.IPv4Protocol(b) == waterutil.ICMP {
ip := waterutil.IPv4Source(b)
return ip.To4().String()
}
return ""
} }
func dstAddr(b []byte) string { func dstAddr(b []byte) string {
if waterutil.IPv4Protocol(b) == waterutil.UDP || waterutil.IPv4Protocol(b) == waterutil.TCP {
ip := waterutil.IPv4Destination(b) ip := waterutil.IPv4Destination(b)
port := waterutil.IPv4DestinationPort(b) port := waterutil.IPv4DestinationPort(b)
addr := fmt.Sprintf("%s:%d", ip.To4().String(), port) addr := fmt.Sprintf("%s:%d", ip.To4().String(), port)
return addr return addr
} else if waterutil.IPv4Protocol(b) == waterutil.ICMP {
ip := waterutil.IPv4Destination(b)
return ip.To4().String()
}
return ""
} }