projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Fixed offsets when reading/writing from/to tap device
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
3cd2c53
..
bc9d0b5
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.
6 2000/10/24 15:46:16
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-42,12
+42,15
@@
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;
}
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)
@@
-90,10
+93,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);
@@
-104,7
+108,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);
}
@@
-113,12
+117,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;
@@
-138,7
+142,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);