github-starred/go-http-tunnel
2
0
Fork 0
mirror of https://github.com/mmatczuk/go-http-tunnel.git synced 2026-05-21 06:45:30 -06:00
Code Issues 61 Projects Packages Wiki Activity Actions

keepalive: server listen keepalive fix plus log message fixes

Browse source
This commit is contained in:
Michał Matczuk 2017-11-28 22:04:47 +01:00
parent d8b914378c
commit 14342d7cde
2 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

29
server.go
View file

@ -149,7 +149,7 @@ func (s *Server) Start() {
s.logger.Log(
"level", 0,
"msg", "accept control connection failed",
"msg", "accept of control connection failed",
"addr", addr,
"err", err,
)
@ -158,8 +158,8 @@ func (s *Server) Start() {
if err := keepAlive(conn); err != nil {
s.logger.Log(
"level", 1,
"msg", "could not enable TCP keepalive for control connection",
"level", 0,
"msg", "TCP keepalive for control connection failed",
"addr", addr,
"err", err,
)
@ -440,19 +440,9 @@ func (s *Server) listen(l net.Listener, identifier id.ID) {
return
}
if err = keepAlive(conn); err != nil {
s.logger.Log(
"level", 1,
"msg", "could not enable TCP keepalive for tunnel connection",
"identifier", identifier,
"addr", addr,
"err", err,
)
}
s.logger.Log(
"level", 0,
"msg", "accept connection failed",
"msg", "accept of connection failed",
"identifier", identifier,
"addr", addr,
"err", err,
@ -465,6 +455,17 @@ func (s *Server) listen(l net.Listener, identifier id.ID) {
ForwardedHost: l.Addr().String(),
ForwardedProto: l.Addr().Network(),
}
if err := keepAlive(conn); err != nil {
s.logger.Log(
"level", 1,
"msg", "TCP keepalive for tunneled connection failed",
"identifier", identifier,
"ctrlMsg", msg,
"err", err,
)
}
go func() {
if err := s.proxyConn(identifier, conn, msg); err != nil {
s.logger.Log(

6
tcpproxy.go
View file

@ -91,10 +91,10 @@ func (p *TCPProxy) Proxy(w io.Writer, r io.ReadCloser, msg *proto.ControlMessage
}
defer local.Close()
if err = keepAlive(local); err != nil {
if err := keepAlive(local); err != nil {
p.logger.Log(
"level", 0,
"msg", "could not enable TCP keepalive for local tunnel connection",
"level", 1,
"msg", "TCP keepalive for tunneled connection failed",
"target", target,
"ctrlMsg", msg,
"err", err,