projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Enforce correct order of authentication requests
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
0a40d8c
..
5774bb9
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.
4 2000/10/15 00:59:34
guus Exp $
+ $Id: meta.c,v 1.1.2.
7 2000/10/29 00:02:18
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,13
+46,14
@@
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;
}
else
if(cl->status.encryptout)
{
EVP_EncryptUpdate(cl->cipher_outctx, outbuf, &outlen, buffer, length);
bufp = outbuf;
}
else
+*/
bufp = buffer;
if(write(cl->meta_socket, bufp, length) < 0)
bufp = buffer;
if(write(cl->meta_socket, bufp, length) < 0)
@@
-92,10
+96,11
@@
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);
@@
-106,7
+111,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);
}
@@
-115,12
+120,12
@@
cp
cl->name, cl->hostname);
return -1;
}
cl->name, cl->hostname);
return -1;
}
-
+/*
if(cl->status.decryptin)
{
EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen, NULL, inbuf, lenin);
}
if(cl->status.decryptin)
{
EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen, NULL, inbuf, lenin);
}
-
+*/
oldlen = cl->buflen;
cl->buflen += lenin;
oldlen = cl->buflen;
cl->buflen += lenin;
@@
-140,7
+145,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);