projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better checks for OpenSSL. I think it can now detect almost all conceivable installa...
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
31a387a
..
da09062
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.
5 2000/10/21 11:52:0
6 guus Exp $
+ $Id: meta.c,v 1.1.2.
9 2000/11/04 20:44:2
6 guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-28,9
+28,12
@@
#include <sys/signal.h>
#include <sys/socket.h>
#include <openssl/evp.h>
#include <sys/signal.h>
#include <sys/socket.h>
#include <openssl/evp.h>
+#include <unistd.h>
+#include <string.h>
#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)
{
@@
-43,14
+46,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)
{
@@
-118,9
+122,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;
@@
-140,7
+144,7
@@
cp
if(cl->reqlen)
{
if(cl->reqlen)
{
- if(debug_lvl >= DEBUG_
PROTOCOL
)
+ 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);
@@
-165,7
+169,6
@@
cp
}
cl->last_ping_time = time(NULL);
}
cl->last_ping_time = time(NULL);
- cl->want_ping = 0;
cp
return 0;
}
cp
return 0;
}