projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only send key_changed if it was previously requested.
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
fa32b89
..
ecf875c
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.1
4 2001/01/07 17:08:57
guus Exp $
+ $Id: meta.c,v 1.1.2.1
6 2001/03/12 23:58:19
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-94,6
+94,7
@@
int receive_meta(connection_t *cl)
int lenin = 0;
char inbuf[MAXBUFSIZE];
char *bufp;
int lenin = 0;
char inbuf[MAXBUFSIZE];
char *bufp;
+ int decrypted = 0;
cp
if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
{
cp
if(getsockopt(cl->meta_socket, SOL_SOCKET, SO_ERROR, &x, &l) < 0)
{
@@
-108,39
+109,38
@@
cp
return -1;
}
return -1;
}
- if(cl->status.decryptin)
- bufp = inbuf;
- else
- bufp = cl->buffer + cl->buflen;
-
- lenin = read(cl->meta_socket, bufp, MAXBUFSIZE - cl->buflen);
+ lenin = read(cl->meta_socket, cl->buffer + cl->buflen, MAXBUFSIZE - cl->buflen);
if(lenin<=0)
{
if(lenin<=0)
{
- if(errno==EINTR)
- return 0;
- if(errno==0)
+ if(lenin==0)
{
if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
cl->name, cl->hostname);
}
else
{
if(debug_lvl >= DEBUG_CONNECTIONS)
syslog(LOG_NOTICE, _("Connection closed by %s (%s)"),
cl->name, cl->hostname);
}
else
- syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
- cl->name, cl->hostname);
- return -1;
- }
+ if(errno==EINTR)
+ return 0;
+ else
+ syslog(LOG_ERR, _("Metadata socket read error for %s (%s): %m"),
+ cl->name, cl->hostname);
- if(cl->status.decryptin)
- {
- EVP_DecryptUpdate(cl->cipher_inctx, cl->buffer + cl->buflen, &lenin, inbuf, lenin);
+ return -1;
}
oldlen = cl->buflen;
cl->buflen += lenin;
}
oldlen = cl->buflen;
cl->buflen += lenin;
-
for(;;
)
+
while(lenin
)
{
{
+ if(cl->status.decryptin && !decrypted)
+ {
+ EVP_DecryptUpdate(cl->cipher_inctx, inbuf, &lenin, cl->buffer + oldlen, lenin);
+ memcpy(cl->buffer + oldlen, inbuf, lenin);
+ decrypted = 1;
+ }
+
cl->reqlen = 0;
for(i = oldlen; i < cl->buflen; i++)
cl->reqlen = 0;
for(i = oldlen; i < cl->buflen; i++)
@@
-163,6
+163,7
@@
cp
return -1;
cl->buflen -= cl->reqlen;
return -1;
cl->buflen -= cl->reqlen;
+ lenin -= cl->reqlen;
memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen);
oldlen = 0;
}
memmove(cl->buffer, cl->buffer + cl->reqlen, cl->buflen);
oldlen = 0;
}