X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol.c;h=31d22064541658082f986741097036a056640744;hp=a145c98e15f66363cde4b0b67224e78ed840df91;hb=54881faf6fdbf04fb5ee56b7809439fbc50c65cb;hpb=11f3e9d138daf6b726631cc124b14d66dfa4d1f7

diff --git a/src/protocol.c b/src/protocol.c
index a145c98e..31d22064 100644
--- a/src/protocol.c
+++ b/src/protocol.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: protocol.c,v 1.28.4.76 2001/01/08 20:35:30 guus Exp $
+    $Id: protocol.c,v 1.28.4.80 2001/02/25 16:34:19 guus Exp $
 */
 
 #include "config.h"
@@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <errno.h>
 
 #include <utils.h>
 #include <xalloc.h>
@@ -612,7 +613,7 @@ cp
   cl->status.active = 1;
   cl->status.decryptin = 1;
   cl->nexthop = cl;
-  cl->cipher_pkttype = EVP_bf_cfb();
+  cl->cipher_pkttype = EVP_bf_cbc();
   cl->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
 
   if(debug_lvl >= DEBUG_CONNECTIONS)
@@ -928,7 +929,7 @@ cp
 
   new->nexthop = cl;
   new->status.active = 1;
-  new->cipher_pkttype = EVP_bf_cfb();
+  new->cipher_pkttype = EVP_bf_cbc();
   new->cipher_pktkeylength = cl->cipher_pkttype->key_len + cl->cipher_pkttype->iv_len;
 cp
   return 0;
@@ -1043,20 +1044,20 @@ cp
   return 0;
 }
 
-int send_error(connection_t *cl, int errno, char *errstring)
+int send_error(connection_t *cl, int err, char *errstring)
 {
 cp
   if(!errstring)
-    errstring = strerror(errno);
-  return send_request(cl, "%d %d %s", ERROR, errno, errstring);
+    errstring = strerror(err);
+  return send_request(cl, "%d %d %s", ERROR, err, errstring);
 }
 
 int error_h(connection_t *cl)
 {
-  int errno;
+  int err;
   char errorstring[MAX_STRING_SIZE];
 cp
-  if(sscanf(cl->buffer, "%*d %d "MAX_STRING, &errno, errorstring) != 2)
+  if(sscanf(cl->buffer, "%*d %d "MAX_STRING, &err, errorstring) != 2)
     {
        syslog(LOG_ERR, _("Got bad ERROR from %s (%s)"),
               cl->name, cl->hostname);
@@ -1066,7 +1067,7 @@ cp
   if(debug_lvl >= DEBUG_ERROR)
     {
       syslog(LOG_NOTICE, _("Error message from %s (%s): %s: %s"),
-             cl->name, cl->hostname, strerror(errno), errorstring);
+             cl->name, cl->hostname, strerror(err), errorstring);
     }
 
   terminate_connection(cl);
@@ -1324,9 +1325,17 @@ int tcppacket_h(connection_t *cl)
   while(todo)
     {
       x = read(cl->meta_socket, p, todo);
-      if(x<0)
+
+      if(x<=0)
         {
-          syslog(LOG_ERR, _("Error during reception of PACKET from %s (%s): %m"), cl->name, cl->hostname);
+          if(x==0)
+            syslog(LOG_NOTICE, _("Connection closed by %s (%s)"), cl->name, cl->hostname);
+          else
+            if(errno==EINTR)
+              continue;
+            else
+              syslog(LOG_ERR, _("Error during reception of PACKET from %s (%s): %m"), cl->name, cl->hostname);
+
           return -1;
         }