X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fmeta.c;h=18315ad1c842f3e569ee9ccdaf5eb350e37a45a3;hp=e818b0b4b6b3a48e247e8899c040bff3e2ad504f;hb=deba3ed900eb4453d27412606cecfaf89b5a5643;hpb=eefa28059ab989c915a7d95fb4ae728abd7ce713;ds=sidebyside

diff --git a/src/meta.c b/src/meta.c
index e818b0b4..18315ad1 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.37 2003/07/22 20:55:19 guus Exp $
+    $Id: meta.c,v 1.1.2.39 2003/08/08 14:24:09 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,13 +118,13 @@ 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)
+		else if(errno == EINTR)
 			return true;
 		else
 			logger(LOG_ERR, _("Metadata socket read error for %s (%s): %s"),