From 748082223084801201ac36e2c5d4efe6641dff23 Mon Sep 17 00:00:00 2001
From: Lucas Clemente <lucas@clemente.io>
Date: Sat, 16 Apr 2016 22:17:36 +0200
Subject: [PATCH] reduce debug messages

---
 server.go  |  4 +---
 session.go | 11 +----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/server.go b/server.go
index ac283864f..039a4fc3a 100644
--- a/server.go
+++ b/server.go
@@ -60,15 +60,13 @@ func (s *Server) ListenAndServe(address string) error {
 		data = data[:n]
 		r := bytes.NewReader(data)
 
-		fmt.Printf("Received %d bytes from %v\n", n, remoteAddr)
-
 		publicHeader, err := ParsePublicHeader(r)
 		if err != nil {
 			fmt.Printf("Could not parse public header")
 			continue
 		}
 
-		fmt.Printf("Got packet # %d\n", publicHeader.PacketNumber)
+		fmt.Printf("<- Got packet %d (%d bytes) from %v\n", publicHeader.PacketNumber, n, remoteAddr)
 
 		// Send Version Negotiation Packet if the client is speaking a different protocol version
 		if publicHeader.VersionFlag && !protocol.IsSupportedVersion(publicHeader.VersionNumber) {
diff --git a/session.go b/session.go
index bd58f4896..52941119a 100644
--- a/session.go
+++ b/session.go
@@ -84,16 +84,11 @@ func (s *Session) HandlePacket(addr *net.UDPAddr, publicHeaderBinary []byte, pub
 		Entropy:         s.Entropy.Get(),
 	}})
 
-	frameCounter := 0
-
 	// read all frames in the packet
 	for r.Len() > 0 {
 		typeByte, _ := r.ReadByte()
 		r.UnreadByte()
 
-		frameCounter++
-		fmt.Printf("Reading frame %d\n", frameCounter)
-
 		err = nil
 		if typeByte&0x80 == 0x80 {
 			err = s.handleStreamFrame(r)
@@ -132,7 +127,6 @@ func (s *Session) HandlePacket(addr *net.UDPAddr, publicHeaderBinary []byte, pub
 }
 
 func (s *Session) handleStreamFrame(r *bytes.Reader) error {
-	fmt.Println("Detected STREAM")
 	frame, err := frames.ParseStreamFrame(r)
 	if err != nil {
 		return err
@@ -179,7 +173,6 @@ func (s *Session) handleStreamFrame(r *bytes.Reader) error {
 }
 
 func (s *Session) handleAckFrame(r *bytes.Reader) error {
-	fmt.Println("Detected ACK")
 	_, err := frames.ParseAckFrame(r)
 	if err != nil {
 		return err
@@ -198,7 +191,6 @@ func (s *Session) handleConnectionCloseFrame(r *bytes.Reader) error {
 }
 
 func (s *Session) handleStopWaitingFrame(r *bytes.Reader, publicHeader *PublicHeader) error {
-	fmt.Println("Detected STOP_WAITING")
 	_, err := frames.ParseStopWaitingFrame(r, publicHeader.PacketNumberLen)
 	if err != nil {
 		return err
@@ -220,14 +212,13 @@ func (s *Session) SendFrames(frames []frames.Frame) error {
 
 	var fullReply bytes.Buffer
 	responsePublicHeader := PublicHeader{ConnectionID: s.ConnectionID, PacketNumber: s.lastSentPacketNumber}
-	fmt.Printf("Sending packet # %d\n", responsePublicHeader.PacketNumber)
 	if err := responsePublicHeader.WritePublicHeader(&fullReply); err != nil {
 		return err
 	}
 
 	s.cryptoSetup.Seal(s.lastSentPacketNumber, &fullReply, fullReply.Bytes(), framesData.Bytes())
 
-	fmt.Printf("Sending %d bytes to %v\n", len(fullReply.Bytes()), s.CurrentRemoteAddr)
+	fmt.Printf("-> Sending packet %d (%d bytes) to %v\n", responsePublicHeader.PacketNumber, len(fullReply.Bytes()), s.CurrentRemoteAddr)
 	_, err := s.Connection.WriteToUDP(fullReply.Bytes(), s.CurrentRemoteAddr)
 	return err
 }