STRLCPY/dnstt

Be uniform about not ending log calls with "\n".
David Fifield committed 3 years ago

064c53e3

1 parent bd8a0e87

■ ■ ■ ■ ■ ■

dnstt-client/main.go

		skipped 95 lines
96	96		err = nil
97	97		}
98	98		if err != nil {
99		-	log.Printf("stream %08x:%d copy stream←local: %v\n", conv, stream.ID(), err)
	99	+	log.Printf("stream %08x:%d copy stream←local: %v", conv, stream.ID(), err)
100	100		}
101	101		local.CloseRead()
102	102		stream.Close()
		skipped 6 lines
109	109		err = nil
110	110		}
111	111		if err != nil && err != io.ErrClosedPipe {
112		-	log.Printf("stream %08x:%d copy local←stream: %v\n", conv, stream.ID(), err)
	112	+	log.Printf("stream %08x:%d copy local←stream: %v", conv, stream.ID(), err)
113	113		}
114	114		local.CloseWrite()
115	115		}()
		skipped 15 lines
131	131		if mtu < 80 {
132	132		return fmt.Errorf("domain %s leaves only %d bytes for payload", domain, mtu)
133	133		}
134		-	log.Printf("effective MTU %d\n", mtu)
	134	+	log.Printf("effective MTU %d", mtu)
135	135
136	136		// Open a KCP conn on the PacketConn.
137	137		conn, err := kcp.NewConn2(remoteAddr, nil, 0, 0, pconn)
		skipped 47 lines
185	185		defer local.Close()
186	186		err := handle(local.(*net.TCPConn), sess, conn.GetConv())
187	187		if err != nil {
188		-	log.Printf("handle: %v\n", err)
	188	+	log.Printf("handle: %v", err)
189	189		}
190	190		}()
191	191		}
		skipped 124 lines

■ ■ ■ ■ ■ ■

dnstt-server/main.go

		skipped 197 lines
198	198		err = nil
199	199		}
200	200		if err != nil {
201		-	log.Printf("stream %08x:%d copy stream←upstream: %v\n", conv, stream.ID(), err)
	201	+	log.Printf("stream %08x:%d copy stream←upstream: %v", conv, stream.ID(), err)
202	202		}
203	203		conn.CloseRead()
204	204		stream.Close()
		skipped 6 lines
211	211		err = nil
212	212		}
213	213		if err != nil && err != io.ErrClosedPipe {
214		-	log.Printf("stream %08x:%d copy upstream←stream: %v\n", conv, stream.ID(), err)
	214	+	log.Printf("stream %08x:%d copy upstream←stream: %v", conv, stream.ID(), err)
215	215		}
216	216		conn.CloseWrite()
217	217		}()
		skipped 37 lines
255	255		}()
256	256		err := handleStream(stream, upstream, conn.GetConv())
257	257		if err != nil {
258		-	log.Printf("stream %08x:%d handleStream: %v\n", conn.GetConv(), stream.ID(), err)
	258	+	log.Printf("stream %08x:%d handleStream: %v", conn.GetConv(), stream.ID(), err)
259	259		}
260	260		}()
261	261		}
		skipped 31 lines
293	293		}()
294	294		err := acceptStreams(conn, privkey, pubkey, upstream)
295	295		if err != nil {
296		-	log.Printf("session %08x acceptStreams: %v\n", conn.GetConv(), err)
	296	+	log.Printf("session %08x acceptStreams: %v", conn.GetConv(), err)
297	297		}
298	298		}()
299	299		}
		skipped 460 lines
760	760		}
761	761		return fmt.Errorf("maximum UDP payload size of %d leaves only %d bytes for payload", maxUDPPayload, mtu)
762	762		}
763		-	log.Printf("effective MTU %d\n", mtu)
	763	+	log.Printf("effective MTU %d", mtu)
764	764
765	765		// Start up the virtual PacketConn for turbotunnel.
766	766		ttConn := turbotunnel.NewQueuePacketConn(turbotunnel.DummyAddr{}, idleTimeout*2)
		skipped 5 lines
772	772		go func() {
773	773		err := acceptSessions(ln, privkey, pubkey, mtu, upstream.(*net.TCPAddr))
774	774		if err != nil {
775		-	log.Printf("acceptSessions: %v\n", err)
	775	+	log.Printf("acceptSessions: %v", err)
776	776		}
777	777		}()
778	778
		skipped 125 lines

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