read all data from connection after EOF

blackhat-go · Dec 13, 2021 · 4d0a1fd · 4d0a1fd
1 parent c27347f
commit 4d0a1fd
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/ch-2/echo-server/main.go b/ch-2/echo-server/main.go
@@ -15,14 +15,16 @@ func echo(conn net.Conn) {
  for {
  // Receive data via conn.Read into a buffer.
  size, err := conn.Read(b[0:])
- if err == io.EOF {
- log.Println("Client disconnected")
+ if err != nil && err != io.EOF {
+ log.Println("Unexpected error")
  break
  }
- if err != nil {
- log.Println("Unexpected error")
+
+ if err == io.EOF && size == 0 {
+ log.Println("Client disconnected")
  break
  }
+
  log.Printf("Received %d bytes: %s", size, string(b))
 
  // Send data via conn.Write.