projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle timeouts during connecting the same way as other errors.
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
bc0cda6
..
93bc48b
100644
(file)
--- a/
src/meta.c
+++ b/
src/meta.c
@@
-1,7
+1,7
@@
/*
meta.c -- handle the meta communication
/*
meta.c -- handle the meta communication
- Copyright (C) 2000-200
3 Guus Sliepen <guus@sliepen.eu
.org>,
- 2000-200
3 Ivo Timmermans <ivo@o2w.nl
>
+ Copyright (C) 2000-200
4 Guus Sliepen <guus@tinc-vpn
.org>,
+ 2000-200
4 Ivo Timmermans <ivo@tinc-vpn.org
>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-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.46 2003/10/11 12:16:12 guus Exp
$
+ $Id$
*/
#include "system.h"
*/
#include "system.h"
@@
-150,7
+150,7
@@
bool receive_meta(connection_t *c)
receive_tcppacket(c, c->buffer, c->tcplen);
c->buflen -= c->tcplen;
receive_tcppacket(c, c->buffer, c->tcplen);
c->buflen -= c->tcplen;
- lenin -= c->tcplen;
+ lenin -= c->tcplen
- oldlen
;
memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
oldlen = 0;
c->tcplen = 0;
memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
oldlen = 0;
c->tcplen = 0;
@@
-178,7
+178,7
@@
bool receive_meta(connection_t *c)
return false;
c->buflen -= reqlen;
return false;
c->buflen -= reqlen;
- lenin -= reqlen;
+ lenin -= reqlen
- oldlen
;
memmove(c->buffer, c->buffer + reqlen, c->buflen);
oldlen = 0;
continue;
memmove(c->buffer, c->buffer + reqlen, c->buflen);
oldlen = 0;
continue;