projects
/
oweals
/
tinc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 3cd2c533d6707e6c002e90e24e0991f67f15e25f..eb005fdf4dc8b0e6bb5b1b8f3486fc3564867ecf 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.
3 2000/10/11 22:00:58 guus
Exp $
+ $Id: meta.c,v 1.1.2.
10 2000/11/15 01:06:10 zarq
Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-27,10
+27,18
@@
#include <syslog.h>
#include <sys/signal.h>
#include <sys/socket.h>
#include <syslog.h>
#include <sys/signal.h>
#include <sys/socket.h>
-#include <openssl/evp.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 "net.h"
#include "system.h"
+#include "protocol.h"
int send_meta(conn_list_t *cl, char *buffer, int length)
{
int send_meta(conn_list_t *cl, char *buffer, int length)
{
@@
-42,13
+50,16
@@
cp
syslog(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s): %s"), length,
cl->name, cl->hostname, buffer);
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)
{
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)
{
@@
-104,7
+115,7
@@
cp
return 0;
if(errno==0)
{
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);
}
syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
cl->name, cl->hostname);
}
@@
-116,9
+127,9
@@
cp
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;
@@
-138,7
+149,7
@@
cp
if(cl->reqlen)
{
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);
syslog(LOG_DEBUG, _("Got request from %s (%s): %s"),
cl->name, cl->hostname, cl->buffer);
@@
-163,7
+174,6
@@
cp
}
cl->last_ping_time = time(NULL);
}
cl->last_ping_time = time(NULL);
- cl->want_ping = 0;
cp
return 0;
}
cp
return 0;
}