chore: adjust code

This commit is contained in:
gVisor bot 2022-04-11 13:23:59 +08:00
parent d7d6ed5c70
commit c9a9c49a16
2 changed files with 6 additions and 5 deletions

View file

@ -15,6 +15,9 @@ func LoaderName() string {
} }
func SetLoader(newLoader string) { func SetLoader(newLoader string) {
if newLoader == "memc" {
newLoader = "memconservative"
}
geoLoaderName = newLoader geoLoaderName = newLoader
} }

View file

@ -34,7 +34,6 @@ func (sd *SnifferDispatcher) Tcp(conn net.Conn, metadata *C.Metadata) {
if metadata.Host != "" { if metadata.Host != "" {
return return
} }
sd.cover(bufConn, metadata) sd.cover(bufConn, metadata)
} }
} }
@ -54,24 +53,23 @@ func (sd *SnifferDispatcher) cover(conn *CN.BufferedConn, metadata *C.Metadata)
bufferedLen := conn.Buffered() bufferedLen := conn.Buffered()
bytes, err := conn.Peek(bufferedLen) bytes, err := conn.Peek(bufferedLen)
if err != nil { if err != nil {
log.Warnln("the data lenght not enough") log.Debugln("[Sniffer] the data lenght not enough")
continue continue
} }
host, err := sniffer.SniffTCP(bytes) host, err := sniffer.SniffTCP(bytes)
if err != nil { if err != nil {
log.Warnln("Sniff data failed on Sniffer[%s]", sniffer.Protocol()) log.Debugln("[Sniffer][%s] Sniff data failed", sniffer.Protocol())
continue continue
} }
metadata.Host = host metadata.Host = host
metadata.AddrType = C.AtypDomainName metadata.AddrType = C.AtypDomainName
log.Debugln("[Sniffer][%s] %s --> %s", sniffer.Protocol(), metadata.DstIP, metadata.Host)
if resolver.FakeIPEnabled() { if resolver.FakeIPEnabled() {
metadata.DNSMode = C.DNSFakeIP metadata.DNSMode = C.DNSFakeIP
} else { } else {
metadata.DNSMode = C.DNSMapping metadata.DNSMode = C.DNSMapping
} }
resolver.InsertHostByIP(metadata.DstIP, host) resolver.InsertHostByIP(metadata.DstIP, host)
metadata.DstIP = nil metadata.DstIP = nil