zishuo/NetHive
1
0
Fork 0
mirror of https://github.com/wlynxg/NetHive.git synced 2025-09-26 19:11:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: ping failure issue

Browse Source
This commit is contained in:
wlynxg
2024-09-08 18:19:43 +08:00
parent 62f3d1e6b7
commit 2c87388288
2 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/engine/conn.go
View File

@@ -64,7 +64,6 @@ func (e *Engine) addConnByID(id string) (PacketChan, error) {
}
func (e *Engine) addConn(peerChan PacketChan, id string) {
//dev := &devWrapper{w: e.devWriter, r: peerChan}
e.log.Infof("start find peer %s", id)
var (
@@ -102,11 +101,6 @@ func (e *Engine) addConn(peerChan PacketChan, id string) {
mr := msgio.NewVarintReaderSize(stream, network.MessageSizeMax)
mw := msgio.NewVarintWriter(stream)
peerChan, ok := e.routeTable.id.Load(id)
if !ok {
return
}
go func() {
for {
msg, err := mr.ReadMsg()
@@ -132,17 +126,4 @@ func (e *Engine) addConn(peerChan PacketChan, id string) {
}
}
}
//go func() {
// defer stream.Close()
// _, err := io.Copy(stream, dev)
// if err != nil && err != io.EOF {
// e.log.Errorf("Peer [%s] stream write error: %s", id, err)
// }
//}()
//
//_, err = io.Copy(dev, stream)
//if err != nil && err != io.EOF {
// e.log.Errorf("Peer [%s] stream read error: %s", id, err)
//}
}

22
core/engine/routine.go
View File

@@ -2,9 +2,8 @@ package engine
import (
"fmt"
"net/netip"
"github.com/wlynxg/NetHive/core/protocol"
"net/netip"
)
// RoutineTUNReader loop to read packets from TUN
@@ -65,17 +64,16 @@ func (e *Engine) RoutineTUNWriter() {
func (e *Engine) RoutineRouteTableWriter() {
var (
payload Payload
ok bool
conn PacketChan
)
for payload = range e.devReader {
var conn PacketChan
if (payload.Dst.IsLinkLocalMulticast() || payload.Dst.IsMulticast()) && e.cfg.EnableBroadcast {
e.routeTable.m.Range(func(key string, value netip.Prefix) bool {
if c, ok := e.routeTable.id.Load(key); ok {
conn = c
} else {
conn = make(PacketChan, ChanSize)
conn, ok := e.routeTable.id.Load(key)
if !ok {
conn := make(PacketChan, ChanSize)
e.routeTable.id.Store(key, conn)
e.routeTable.addr.Store(value.Addr(), conn)
go func() {
@@ -83,6 +81,7 @@ func (e *Engine) RoutineRouteTableWriter() {
defer e.routeTable.addr.Delete(value.Addr())
e.addConn(conn, key)
}()
}
select {
case conn <- payload:
@@ -94,11 +93,8 @@ func (e *Engine) RoutineRouteTableWriter() {
continue
}
//e.log.Debugf("%s -> %s", payload.Src, payload.Dst)
c, ok := e.routeTable.addr.Load(payload.Dst)
if ok {
conn = c
} else {
conn, ok = e.routeTable.addr.Load(payload.Dst)
if !ok {
c, err := e.addConnByDst(payload.Dst)
if err != nil {
e.log.Warnf("[RoutineRouteTableWriter] drop packet: %s, because %s", payload.Dst, err)