Simpler checking of permissions on private RSA key and other fixes.

[tinc] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index e818b0b..c2fbd7e 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.37 2003/07/22 20:55:19 guus Exp $
+    $Id: meta.c,v 1.1.2.40 2003/08/08 22:11:54 guus Exp $
 */
 
 #include "system.h"
@@ -52,12 +52,16 @@ bool send_meta(connection_t *c, char *buffer, int length)
                bufp = buffer;
 
        while(length) {
-               result = write(c->socket, bufp, length);
+               result = send(c->socket, bufp, length, 0);
                if(result <= 0) {
-                       if(errno == EINTR)
+                       if(!errno || errno == EPIPE) {
+                               ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
+                                                  c->name, c->hostname);
+                       } else if(errno == EINTR)
                                continue;
-                       logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
-                                  c->hostname, strerror(errno));
+                       else
+                               logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
+                                          c->hostname, strerror(errno));
                        return false;
                }
                bufp += result;
@@ -114,10 +118,10 @@ bool receive_meta(connection_t *c)
           - If not, keep stuff in buffer and exit.
         */
 
-       lenin = read(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen);
+       lenin = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0);
 
        if(lenin <= 0) {
-               if(lenin == 0) {
+               if(!lenin || !errno) {
                        ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
                                           c->name, c->hostname);
                } else if(errno == EINTR)