projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix saving of debug level for startup level 0
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
fa475df
..
0025dd8
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.
29 2002/09/09 21:24:34
guus Exp $
+ $Id: meta.c,v 1.1.2.
31 2002/09/10 09:40:25
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-39,7
+39,7
@@
#include "system.h"
#include "protocol.h"
#include "system.h"
#include "protocol.h"
-int send_meta(connection_t *
c, char *buffer, int length)
+int send_meta(connection_t *c, char *buffer, int length)
{
char *bufp;
int outlen;
{
char *bufp;
int outlen;
@@
-67,7
+67,7
@@
int send_meta(connection_t * c, char *buffer, int length)
return 0;
}
return 0;
}
-void broadcast_meta(connection_t *
from, char *buffer, int length)
+void broadcast_meta(connection_t *from, char *buffer, int length)
{
avl_node_t *node;
connection_t *c;
{
avl_node_t *node;
connection_t *c;
@@
-82,9
+82,10
@@
void broadcast_meta(connection_t * from, char *buffer, int length)
}
}
}
}
-int receive_meta(connection_t *
c)
+int receive_meta(connection_t *c)
{
{
- int x, l = sizeof(x);
+ int x;
+ socklen_t l = sizeof(x);
int oldlen, i;
int lenin, reqlen;
int decrypted = 0;
int oldlen, i;
int lenin, reqlen;
int decrypted = 0;
@@
-136,8
+137,7
@@
int receive_meta(connection_t * c)
/* Decrypt */
if(c->status.decryptin && !decrypted) {
/* Decrypt */
if(c->status.decryptin && !decrypted) {
- EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen,
- lenin);
+ EVP_DecryptUpdate(c->inctx, inbuf, &lenin, c->buffer + oldlen, lenin);
memcpy(c->buffer + oldlen, inbuf, lenin);
decrypted = 1;
}
memcpy(c->buffer + oldlen, inbuf, lenin);
decrypted = 1;
}