Merge pull request #59 from xvzc/timeout

set default timeout to 2000ms
This commit is contained in:
xvzc 2024-07-21 14:37:49 +09:00 committed by GitHub
commit d84dff0674
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 10 deletions

View File

@ -176,11 +176,9 @@ func (from *Conn) Serve(to *Conn, proto string, fd string, td string, timeout in
proto += " " proto += " "
for { for {
if timeout > 0 {
from.SetReadDeadline( from.SetReadDeadline(
time.Now().Add(time.Millisecond * time.Duration(timeout)), time.Now().Add(time.Millisecond * time.Duration(timeout)),
) )
}
buf, err := from.ReadBytes() buf, err := from.ReadBytes()
if err != nil { if err != nil {

View File

@ -39,9 +39,7 @@ func (p *Proxy) Start() {
os.Exit(1) os.Exit(1)
} }
if p.timeout > 0 {
log.Println(fmt.Sprintf("Connection timeout is set to %dms", p.timeout)) log.Println(fmt.Sprintf("Connection timeout is set to %dms", p.timeout))
}
log.Println("Created a listener on port", p.Port()) log.Println("Created a listener on port", p.Port())

View File

@ -56,7 +56,7 @@ func ParseArgs() {
config.Dns = flag.String("dns", "8.8.8.8", "DNS server") config.Dns = flag.String("dns", "8.8.8.8", "DNS server")
config.Debug = flag.Bool("debug", false, "true | false") config.Debug = flag.Bool("debug", false, "true | false")
config.NoBanner = flag.Bool("no-banner", false, "true | false") config.NoBanner = flag.Bool("no-banner", false, "true | false")
config.Timeout = flag.Int("timeout", 0, "timeout in milliseconds") config.Timeout = flag.Int("timeout", 2000, "timeout in milliseconds")
flag.Var(&allowedHosts, "url", "Bypass DPI only on this url, can be passed multiple times") flag.Var(&allowedHosts, "url", "Bypass DPI only on this url, can be passed multiple times")
allowedPattern = flag.String( allowedPattern = flag.String(