From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 16 Aug 2003 12:40:01 +0000 (+0000)
Subject: Don't getsockopt() SO_ERROR. We get the error from send()/recv() anyway.
X-Git-Tag: release-1.0.2~44
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=f4e80cc5e0d1689bcdd828ac7f158bd634b7dd20;p=tinc

Don't getsockopt() SO_ERROR. We get the error from send()/recv() anyway.
---

diff --git a/src/meta.c b/src/meta.c
index e6e76d37..0e4b0d22 100644
--- a/src/meta.c
+++ b/src/meta.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: meta.c,v 1.1.2.41 2003/08/12 14:48:12 guus Exp $
+    $Id: meta.c,v 1.1.2.42 2003/08/16 12:40:00 guus Exp $
 */
 
 #include "system.h"
@@ -98,18 +98,6 @@ bool receive_meta(connection_t *c)
 
 	cp();
 
-	if(getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0) {
-		logger(LOG_ERR, _("This is a bug: %s:%d: %d:%s %s (%s)"), __FILE__,
-			   __LINE__, c->socket, strerror(errno), c->name, c->hostname);
-		return false;
-	}
-
-	if(x) {
-		logger(LOG_ERR, _("Metadata socket error for %s (%s): %s"),
-			   c->name, c->hostname, strerror(x));
-		return false;
-	}
-
 	/* Strategy:
 	   - Read as much as possible from the TCP socket in one go.
 	   - Decrypt it.
diff --git a/src/net_packet.c b/src/net_packet.c
index aa5bea34..0828525f 100644
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net_packet.c,v 1.1.2.37 2003/08/08 19:42:35 guus Exp $
+    $Id: net_packet.c,v 1.1.2.38 2003/08/16 12:40:01 guus Exp $
 */
 
 #include "system.h"
@@ -400,18 +400,6 @@ void handle_incoming_vpn_data(int sock)
 
 	cp();
 
-	if(getsockopt(sock, SOL_SOCKET, SO_ERROR, &x, &l) < 0) {
-		logger(LOG_ERR, _("This is a bug: %s:%d: %d:%s"),
-			   __FILE__, __LINE__, sock, strerror(errno));
-		cp_trace();
-		exit(1);
-	}
-
-	if(x) {
-		logger(LOG_ERR, _("Incoming data socket error: %s"), strerror(x));
-		return;
-	}
-
 	pkt.len = recvfrom(sock, (char *) &pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen);
 
 	if(pkt.len <= 0) {