From 443a4c02d07ba683082cec1f5405cc2874380fec Mon Sep 17 00:00:00 2001
From: z3APA3A <3APA3A@3proxy.ru>
Date: Wed, 11 Jun 2014 01:54:25 +0400
Subject: [PATCH] better EINTR handling

---
 src/sockgetchar.c |  2 +-
 src/sockmap.c     | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/sockgetchar.c b/src/sockgetchar.c
index f7d74c5..7f4bb6e 100644
--- a/src/sockgetchar.c
+++ b/src/sockgetchar.c
@@ -47,7 +47,7 @@ int socksendto(SOCKET sock, struct sockaddr_in * sin, unsigned char * buf, int b
 	if(res < 1) break;
 	res = so._sendto(sock, buf + sent, bufsize - sent, 0,  (struct sockaddr *)sin, sizeof(struct sockaddr_in));
 	if(res < 0) {
-		if(errno !=  EAGAIN) break;
+		if(errno !=  EAGAIN && errno != EINTR) break;
 		continue;
 	}
 	sent += res;
diff --git a/src/sockmap.c b/src/sockmap.c
index 3b3dfcc..de9a6fe 100644
--- a/src/sockmap.c
+++ b/src/sockmap.c
@@ -130,7 +130,8 @@ int sockmap(struct clientparam * param, int timeo){
 		}
 		res = so._sendto(param->clisock, param->srvbuf + param->srvoffset,(!param->waitserver || ((unsigned)param->waitserver - received) > (param->srvinbuf - param->srvoffset))? param->srvinbuf - param->srvoffset : param->waitserver - received, 0, (struct sockaddr*)&param->sinc, sasize);
 		if(res < 0) {
-			if(errno != EAGAIN) return 96;
+			if(errno != EAGAIN && errno != EINTR) return 96;
+			if(errno == EINTR) usleep(SLEEPTIME);
 			continue;
 		}
 		param->srvoffset += res;
@@ -155,7 +156,8 @@ int sockmap(struct clientparam * param, int timeo){
 		}
 		res = so._sendto(param->remsock, param->clibuf + param->clioffset, (!param->waitclient || ((unsigned)param->waitclient - sent) > (param->cliinbuf - param->clioffset))? param->cliinbuf - param->clioffset : param->waitclient - sent, 0, (struct sockaddr*)&param->sins, sasize);
 		if(res < 0) {
-			if(errno != EAGAIN) return 97;
+			if(errno != EAGAIN && errno != EINTR) return 97;
+			if(errno == EINTR) usleep(SLEEPTIME);
 			continue;
 		}
 		param->clioffset += res;
@@ -180,7 +182,8 @@ int sockmap(struct clientparam * param, int timeo){
 		}
 		else {
 			if (res < 0){
-				if( errno != EAGAIN) return (94);
+				if(errno != EAGAIN && errno != EINTR) return 94;
+				if(errno == EINTR) usleep(SLEEPTIME);
 				continue;
 			}
 			param->cliinbuf += res;
@@ -210,7 +213,8 @@ int sockmap(struct clientparam * param, int timeo){
 		}
 		else {
 			if (res < 0){
-				if( errno != EAGAIN) return (93);
+				if(errno != EAGAIN && errno != EINTR) return 93;
+				if(errno == EINTR) usleep(SLEEPTIME);
 				continue;
 			}
 			param->srvinbuf += res;