Corrected check for errors after read() calls.

[tinc] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index 14a3c1d..f9b18ca 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -1,7 +1,7 @@
 /*
     meta.c -- handle the meta communication
 /*
     meta.c -- handle the meta communication

-    Copyright (C) 2000 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
+                  2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>

 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by


@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     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.13 2001/01/05 23:53:49 guus Exp $
+    $Id: meta.c,v 1.1.2.15 2001/02/25 11:09:29 guus Exp $

 */
 
 #include "config.h"
 */
 
 #include "config.h"


@@ -117,17 +117,19 @@ cp
 
   if(lenin<=0)
     {
 
   if(lenin<=0)
     {

-      if(errno==EINTR)
-        return 0;      
-      if(errno==0)
+      if(lenin==0)

         {
           if(debug_lvl >= DEBUG_CONNECTIONS)
             syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
                 cl->name, cl->hostname);
         }
       else
         {
           if(debug_lvl >= DEBUG_CONNECTIONS)
             syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
                 cl->name, cl->hostname);
         }
       else

-        syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
-               cl->name, cl->hostname);
+        if(errno==EINTR)
+          return 0;      
+        else
+          syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
+                 cl->name, cl->hostname);
+

       return -1;
     }
 
       return -1;
     }