j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Correct error message when remote host closed connection.

Browse source
This commit is contained in:
Guus Sliepen 2003-08-08 14:24:09 +00:00
parent 0c2256670f
commit deba3ed900
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/meta.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: meta.c,v 1.1.2.38 2003/07/29 22:59:00 guus Exp $ $Id: meta.c,v 1.1.2.39 2003/08/08 14:24:09 guus Exp $
*/ */
#include "system.h" #include "system.h"
@ -54,10 +54,14 @@ bool send_meta(connection_t *c, char *buffer, int length)
while(length) { while(length) {
result = send(c->socket, bufp, length, 0); result = send(c->socket, bufp, length, 0);
if(result <= 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; continue;
logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name, else
c->hostname, strerror(errno)); logger(LOG_ERR, _("Sending meta data to %s (%s) failed: %s"), c->name,
c->hostname, strerror(errno));
return false; return false;
} }
bufp += result; bufp += result;
@ -117,10 +121,10 @@ bool receive_meta(connection_t *c)
lenin = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0); lenin = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0);
if(lenin <= 0) { if(lenin <= 0) {
if(lenin == 0) { if(!lenin || !errno)
ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"), ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
c->name, c->hostname); c->name, c->hostname);
} else if(errno == EINTR) else if(errno == EINTR)
return true; return true;
else else
logger(LOG_ERR, _("Metadata socket read error for %s (%s): %s"), logger(LOG_ERR, _("Metadata socket read error for %s (%s): %s"),