Max/tladesignz_dnstt
1
0
Fork 0
mirror of https://github.com/tladesignz/dnstt.git synced 2026-10-12 09:08:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Be uniform about not ending log calls with "\n".

Browse Source
This commit is contained in:
David Fifield
2021-04-20 15:14:10 -06:00
parent bd8a0e870f
commit 064c53e3d1
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dnstt-client/main.go
+4 -4
View File
@@ -96,7 +96,7 @@ func handle(local *net.TCPConn, sess *smux.Session, conv uint32) error {
err = nil
}
if err != nil {
log.Printf("stream %08x:%d copy stream←local: %v\n", conv, stream.ID(), err)
log.Printf("stream %08x:%d copy stream←local: %v", conv, stream.ID(), err)
}
local.CloseRead()
stream.Close()
@@ -109,7 +109,7 @@ func handle(local *net.TCPConn, sess *smux.Session, conv uint32) error {
err = nil
}
if err != nil && err != io.ErrClosedPipe {
log.Printf("stream %08x:%d copy local←stream: %v\n", conv, stream.ID(), err)
log.Printf("stream %08x:%d copy local←stream: %v", conv, stream.ID(), err)
}
local.CloseWrite()
}()
@@ -131,7 +131,7 @@ func run(pubkey []byte, domain dns.Name, localAddr *net.TCPAddr, remoteAddr net.
if mtu < 80 {
return fmt.Errorf("domain %s leaves only %d bytes for payload", domain, mtu)
}
log.Printf("effective MTU %d\n", mtu)
log.Printf("effective MTU %d", mtu)
// Open a KCP conn on the PacketConn.
conn, err := kcp.NewConn2(remoteAddr, nil, 0, 0, pconn)
@@ -185,7 +185,7 @@ func run(pubkey []byte, domain dns.Name, localAddr *net.TCPAddr, remoteAddr net.
defer local.Close()
err := handle(local.(*net.TCPConn), sess, conn.GetConv())
if err != nil {
log.Printf("handle: %v\n", err)
log.Printf("handle: %v", err)
}
}()
}
dnstt-server/main.go
+6 -6
View File
@@ -198,7 +198,7 @@ func handleStream(stream *smux.Stream, upstream *net.TCPAddr, conv uint32) error
err = nil
}
if err != nil {
log.Printf("stream %08x:%d copy stream←upstream: %v\n", conv, stream.ID(), err)
log.Printf("stream %08x:%d copy stream←upstream: %v", conv, stream.ID(), err)
}
conn.CloseRead()
stream.Close()
@@ -211,7 +211,7 @@ func handleStream(stream *smux.Stream, upstream *net.TCPAddr, conv uint32) error
err = nil
}
if err != nil && err != io.ErrClosedPipe {
log.Printf("stream %08x:%d copy upstream←stream: %v\n", conv, stream.ID(), err)
log.Printf("stream %08x:%d copy upstream←stream: %v", conv, stream.ID(), err)
}
conn.CloseWrite()
}()
@@ -255,7 +255,7 @@ func acceptStreams(conn *kcp.UDPSession, privkey, pubkey []byte, upstream *net.T
}()
err := handleStream(stream, upstream, conn.GetConv())
if err != nil {
log.Printf("stream %08x:%d handleStream: %v\n", conn.GetConv(), stream.ID(), err)
log.Printf("stream %08x:%d handleStream: %v", conn.GetConv(), stream.ID(), err)
}
}()
}
@@ -293,7 +293,7 @@ func acceptSessions(ln *kcp.Listener, privkey, pubkey []byte, mtu int, upstream
}()
err := acceptStreams(conn, privkey, pubkey, upstream)
if err != nil {
log.Printf("session %08x acceptStreams: %v\n", conn.GetConv(), err)
log.Printf("session %08x acceptStreams: %v", conn.GetConv(), err)
}
}()
}
@@ -760,7 +760,7 @@ func run(privkey, pubkey []byte, domain dns.Name, upstream net.Addr, dnsConn net
}
return fmt.Errorf("maximum UDP payload size of %d leaves only %d bytes for payload", maxUDPPayload, mtu)
}
log.Printf("effective MTU %d\n", mtu)
log.Printf("effective MTU %d", mtu)
// Start up the virtual PacketConn for turbotunnel.
ttConn := turbotunnel.NewQueuePacketConn(turbotunnel.DummyAddr{}, idleTimeout*2)
@@ -772,7 +772,7 @@ func run(privkey, pubkey []byte, domain dns.Name, upstream net.Addr, dnsConn net
go func() {
err := acceptSessions(ln, privkey, pubkey, mtu, upstream.(*net.TCPAddr))
if err != nil {
log.Printf("acceptSessions: %v\n", err)
log.Printf("acceptSessions: %v", err)
}
}()