go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netns: fix network namespaces for listeners

Browse Source
This commit is contained in:
ginuerzh
2024-07-08 10:59:32 +08:00
parent 949c98adc0
commit 96f4d7bf5c
9 changed files with 246 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
listener/http3/listener.go
View File

@ -46,11 +46,16 @@ func (l *http3Listener) Init(md md.Metadata) (err error) {
return
}
addr := l.options.Addr
if addr == "" {
addr = ":https"
}
network := "udp"
if xnet.IsIPv4(l.options.Addr) {
if xnet.IsIPv4(addr) {
network = "udp4"
}
l.addr, err = net.ResolveUDPAddr(network, l.options.Addr)
l.addr, err = net.ResolveUDPAddr(network, addr)
if err != nil {
return
}
@ -66,15 +71,21 @@ func (l *http3Listener) Init(md md.Metadata) (err error) {
quic.Version1,
},
MaxIncomingStreams: int64(l.md.maxStreams),
Allow0RTT: true,
},
Handler: http.HandlerFunc(l.handleFunc),
}
ln, err := quic.ListenAddrEarly(addr, http3.ConfigureTLSConfig(l.server.TLSConfig), l.server.QUICConfig.Clone())
if err != nil {
return
}
l.cqueue = make(chan net.Conn, l.md.backlog)
l.errChan = make(chan error, 1)
go func() {
if err := l.server.ListenAndServe(); err != nil {
if err := l.server.ServeListener(ln); err != nil {
l.logger.Error(err)
}
}()

49
listener/http3/wt/listener.go
View File

@ -50,11 +50,22 @@ func (l *wtListener) Init(md md.Metadata) (err error) {
return
}
addr := l.options.Addr
if addr == "" {
addr = ":https"
}
network := "udp"
if xnet.IsIPv4(l.options.Addr) {
if xnet.IsIPv4(addr) {
network = "udp4"
}
l.addr, err = net.ResolveUDPAddr(network, l.options.Addr)
laddr, err := net.ResolveUDPAddr(network, addr)
if err != nil {
return
}
l.addr = laddr
pc, err := net.ListenUDP(network, laddr)
if err != nil {
return
}
@ -62,23 +73,25 @@ func (l *wtListener) Init(md md.Metadata) (err error) {
mux := http.NewServeMux()
mux.Handle(l.md.path, http.HandlerFunc(l.upgrade))
quicCfg := &quic.Config{
KeepAlivePeriod: l.md.keepAlivePeriod,
HandshakeIdleTimeout: l.md.handshakeTimeout,
MaxIdleTimeout: l.md.maxIdleTimeout,
/*
Versions: []quic.VersionNumber{
quic.Version1,
quic.Version2,
},
*/
MaxIncomingStreams: int64(l.md.maxStreams),
Allow0RTT: true,
}
l.srv = &wt.Server{
H3: http3.Server{
Addr: l.options.Addr,
TLSConfig: l.options.TLSConfig,
QUICConfig: &quic.Config{
KeepAlivePeriod: l.md.keepAlivePeriod,
HandshakeIdleTimeout: l.md.handshakeTimeout,
MaxIdleTimeout: l.md.maxIdleTimeout,
/*
Versions: []quic.VersionNumber{
quic.Version1,
quic.Version2,
},
*/
MaxIncomingStreams: int64(l.md.maxStreams),
},
Handler: mux,
Addr: l.options.Addr,
TLSConfig: l.options.TLSConfig,
QUICConfig: quicCfg,
Handler: mux,
},
CheckOrigin: func(r *http.Request) bool { return true },
}
@ -87,7 +100,7 @@ func (l *wtListener) Init(md md.Metadata) (err error) {
l.errChan = make(chan error, 1)
go func() {
if err := l.srv.ListenAndServe(); err != nil {
if err := l.srv.Serve(pc); err != nil {
l.logger.Error(err)
}
}()