Use the HAVE_OPENSSL_xxx_H defined from m4/openssl.m4 during

[oweals/tinc.git] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index 21cbe964661e5c6abdc96b859f283ed8417a16ca..eb005fdf4dc8b0e6bb5b1b8f3486fc3564867ecf 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -17,31 +17,49 @@
     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.1 2000/09/26 14:06:03 guus Exp $
+    $Id: meta.c,v 1.1.2.10 2000/11/15 01:06:10 zarq Exp $
 */
 
 #include "config.h"
-
-int send_meta(conn_list_t *cl, const char *buffer, int length)
+#include <utils.h>
+
+#include <errno.h>
+#include <syslog.h>
+#include <sys/signal.h>
+#include <sys/socket.h>
+#include <unistd.h>
+#include <string.h>
+
+#ifdef HAVE_OPENSSL_EVP_H
+# include <openssl/evp.h>
+#else
+# include <evp.h>
+#endif
+
+#include "net.h"
+#include "system.h"
+#include "protocol.h"
+
+int send_meta(conn_list_t *cl, char *buffer, int length)
 {
   char outbuf[MAXBUFSIZE];
   char *bufp;
+  int outlen;
 cp
   if(debug_lvl >= DEBUG_META)
-    syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s): %s"), int length,
+    syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s): %s"), length,
            cl->name, cl->hostname, buffer);
 
+  buffer[length-1]='\n';
+
   if(cl->status.encryptout)
     {
-      if(EVP_EncryptUpdate(cl->cipher_outctx, cl->buffer + cl->buflen, NULL, inbuf, length) != 1)
-        {
-          syslog(LOG_ERR, _("Error during encryption of outgoing metadata to %s (%s)"), cl->name, cl->hostname);
-          return -1;
-        }
+      EVP_EncryptUpdate(cl->cipher_outctx, outbuf, &outlen, buffer, length);
       bufp = outbuf;
+      length = outlen;
     }
   else
-    bufp = buffer;
+      bufp = buffer;
 
   if(write(cl->meta_socket, bufp, length) < 0)
     {
@@ -52,7 +70,7 @@ cp
   return 0;
 }
 
-int broadcast_meta(conn_list_t *cl, const char *buffer, int length)
+int broadcast_meta(conn_list_t *cl, char *buffer, int length)
 {
   conn_list_t *p;
 cp
@@ -84,7 +102,7 @@ cp
       return -1;
     }
 
-  if(cl->status.encryptin)
+  if(cl->status.decryptin)
     bufp = inbuf;
   else
     bufp = cl->buffer + cl->buflen;
@@ -97,7 +115,7 @@ cp
         return 0;      
       if(errno==0)
         {
-          if(debug_lvl>DEBUG_CONNECTIONS)
+          if(debug_lvl >= DEBUG_CONNECTIONS)
             syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
                 cl->name, cl->hostname);
         }
@@ -109,13 +127,9 @@ cp
 
   if(cl->status.decryptin)
     {
-      if(EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen, NULL, inbuf, lenin) != 1)
-        {
-          syslog(LOG_ERR, _("Error during decryption of incoming metadata from %s (%s)"), cl->name, cl->hostname);
-          return -1;
-        }
+      EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen, &lenin, inbuf, lenin);
     }
-    
+
   oldlen = cl->buflen;
   cl->buflen += lenin;
 
@@ -135,7 +149,7 @@ cp
 
       if(cl->reqlen)
         {
-          if(debug_lvl > DEBUG_META)
+          if(debug_lvl >= DEBUG_META)
             syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
                   cl->name, cl->hostname, cl->buffer);
 
@@ -160,7 +174,6 @@ cp
     }
 
   cl->last_ping_time = time(NULL);
-  cl->want_ping = 0;
 cp  
   return 0;
 }