From 0b1fe53943a3a2c6d90187f3aeecf9dde4a7517f Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Tue, 14 May 2013 17:10:51 -0700
Subject: [PATCH] Use generic message routine for sim_accept_conn and
 sim_read_sock and don't emit a message if a read fails due to ECONNRESET
 (this is expected).

---
 sim_sock.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sim_sock.c b/sim_sock.c
index 5f3b78ce..416cfe63 100644
--- a/sim_sock.c
+++ b/sim_sock.c
@@ -869,7 +869,7 @@ newsock = accept (master, (struct sockaddr *) &clientname, &size);
 if (newsock == INVALID_SOCKET) {                        /* error? */
     err = WSAGetLastError ();
     if (err != WSAEWOULDBLOCK)
-        printf ("Sockets: accept error %d\n", err);
+        sim_err_sock(newsock, "accept", 0);
     return INVALID_SOCKET;
     }
 if (connectaddr != NULL) {
@@ -945,8 +945,9 @@ if (rbytes == SOCKET_ERROR) {
 #endif
     if ((err != WSAETIMEDOUT) &&                        /* expected errors after a connect failure */
         (err != WSAEHOSTUNREACH) &&
-        (err != WSAECONNREFUSED))
-        printf ("Sockets: read error %d\n", err);
+        (err != WSAECONNREFUSED) &&
+        (err != WSAECONNRESET))
+        sim_err_sock (INVALID_SOCKET, "read", 0);
     return -1;
     }
 return rbytes;