mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2025-08-02 08:10:00 +07:00
Code Issues Packages Projects Releases Wiki Activity

chore(sniffer): move conn logic from streamSniffer to connSniffer

Browse Source
This commit is contained in:
mzz2017
2023-04-10 00:43:50 +08:00
parent 8465229e35
commit 3146a5c7c2
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
component/sniffing/conn_sniffer.go
View File

@ -30,7 +30,15 @@ func NewConnSniffer(conn net.Conn, snifferBufSize int) *ConnSniffer {
func (s *ConnSniffer) SniffTcp() (d string, err error) {
s.Conn.SetReadDeadline(time.Now().Add(100 * time.Millisecond))
defer s.Conn.SetReadDeadline(time.Time{})
return s.sniffer.SniffTcp()
d, err = s.sniffer.SniffTcp()
if err != nil {
var netError net.Error
if errors.As(err, &netError) && netError.Timeout() {
return "", NotApplicableError
}
return "", err
}
return d, nil
}
func (s *ConnSniffer) Read(p []byte) (n int, err error) {

6
component/sniffing/sniffer.go
View File

@ -6,10 +6,8 @@
package sniffing
import (
"errors"
"github.com/mzz2017/softwind/pool"
"io"
"net"
"sync"
)
@ -47,10 +45,6 @@ func (s *Sniffer) SniffTcp() (d string, err error) {
n, err := s.r.Read(s.buf)
s.buf = s.buf[:n]
if err != nil {
var netError net.Error
if errors.As(err, &netError) && netError.Timeout() {
return "", NotApplicableError
}
return "", err
}
}