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

[tinc] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index 18315ad..0e4b0d2 100644 (file)
--- 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.39 2003/08/08 14:24:09 guus Exp $
+    $Id: meta.c,v 1.1.2.42 2003/08/16 12:40:00 guus Exp $
 */
 
 #include "system.h"
@@ -27,14 +27,15 @@
 #include "avl_tree.h"
 #include "connection.h"
 #include "logger.h"
+#include "meta.h"
 #include "net.h"
 #include "protocol.h"
 #include "system.h"
 #include "utils.h"
 
-bool send_meta(connection_t *c, char *buffer, int length)
+bool send_meta(connection_t *c, const char *buffer, int length)
 {
-       char *bufp;
+       const char *bufp;
        int outlen;
        char outbuf[MAXBUFSIZE];
        int result;
@@ -54,10 +55,10 @@ bool send_meta(connection_t *c, char *buffer, int length)
        while(length) {
                result = send(c->socket, bufp, length, 0);
                if(result <= 0) {
-                       if(!errno || errno == EPIPE)
+                       if(!errno || errno == EPIPE) {
                                ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
                                                   c->name, c->hostname);
-                       else if(errno == EINTR)
+                       } else if(errno == EINTR)
                                continue;
                        else
                                logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
@@ -71,7 +72,7 @@ bool send_meta(connection_t *c, char *buffer, int length)
        return true;
 }
 
-void broadcast_meta(connection_t *from, char *buffer, int length)
+void broadcast_meta(connection_t *from, const char *buffer, int length)
 {
        avl_node_t *node;
        connection_t *c;
@@ -97,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.
@@ -121,10 +110,10 @@ bool receive_meta(connection_t *c)
        lenin = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0);
 
        if(lenin <= 0) {
-               if(!lenin || !errno)
+               if(!lenin || !errno) {
                        ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
                                           c->name, c->hostname);
-               else if(errno == EINTR)
+               } else if(errno == EINTR)
                        return true;
                else
                        logger(LOG_ERR, _("Metadata socket read error for %s (%s): %s"),