projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Porting to FreeBSD:
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
5774bb9
..
a4cfc83
100644
(file)
--- 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.
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.
7 2000/10/29 00:02:18
guus Exp $
+ $Id: meta.c,v 1.1.2.
11 2000/11/15 13:33:25
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-26,10
+26,16
@@
#include <errno.h>
#include <syslog.h>
#include <sys/signal.h>
#include <errno.h>
#include <syslog.h>
#include <sys/signal.h>
-#include <sys/socket.h>
-#include <openssl/evp.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
#include <string.h>
+/* This line must be below the rest for FreeBSD */
+#include <sys/socket.h>
+
+#ifdef HAVE_OPENSSL_EVP_H
+# include <openssl/evp.h>
+#else
+# include <evp.h>
+#endif
#include "net.h"
#include "system.h"
#include "net.h"
#include "system.h"
@@
-46,15
+52,15
@@
cp
cl->name, cl->hostname, buffer);
buffer[length-1]='\n';
cl->name, cl->hostname, buffer);
buffer[length-1]='\n';
-/*
+
if(cl->status.encryptout)
{
EVP_EncryptUpdate(cl->cipher_outctx, outbuf, &outlen, buffer, length);
bufp = outbuf;
if(cl->status.encryptout)
{
EVP_EncryptUpdate(cl->cipher_outctx, outbuf, &outlen, buffer, length);
bufp = outbuf;
+ length = outlen;
}
else
}
else
-*/
- bufp = buffer;
+ bufp = buffer;
if(write(cl->meta_socket, bufp, length) < 0)
{
if(write(cl->meta_socket, bufp, length) < 0)
{
@@
-96,11
+102,10
@@
cp
cl->name, cl->hostname, strerror(x));
return -1;
}
cl->name, cl->hostname, strerror(x));
return -1;
}
-/*
+
if(cl->status.decryptin)
bufp = inbuf;
else
if(cl->status.decryptin)
bufp = inbuf;
else
-*/
bufp = cl->buffer + cl->buflen;
lenin = read(cl->meta_socket, bufp, MAXBUFSIZE - cl->buflen);
bufp = cl->buffer + cl->buflen;
lenin = read(cl->meta_socket, bufp, MAXBUFSIZE - cl->buflen);
@@
-120,12
+125,12
@@
cp
cl->name, cl->hostname);
return -1;
}
cl->name, cl->hostname);
return -1;
}
-/*
+
if(cl->status.decryptin)
{
if(cl->status.decryptin)
{
- EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen,
NULL
, inbuf, lenin);
+ EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen,
&lenin
, inbuf, lenin);
}
}
-*/
+
oldlen = cl->buflen;
cl->buflen += lenin;
oldlen = cl->buflen;
cl->buflen += lenin;
@@
-170,7
+175,6
@@
cp
}
cl->last_ping_time = time(NULL);
}
cl->last_ping_time = time(NULL);
- cl->want_ping = 0;
cp
return 0;
}
cp
return 0;
}