projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
K&R style braces
[tinc]
/
src
/
meta.c
diff --git
a/src/meta.c
b/src/meta.c
index
3e75045
..
4ed1384
100644
(file)
--- a/
src/meta.c
+++ b/
src/meta.c
@@
-34,8
+34,7
@@
#include "utils.h"
#include "xalloc.h"
#include "utils.h"
#include "xalloc.h"
-bool send_meta(connection_t *c, const char *buffer, int length)
-{
+bool send_meta(connection_t *c, const char *buffer, int length) {
int outlen;
int result;
int outlen;
int result;
@@
-45,7
+44,6
@@
bool send_meta(connection_t *c, const char *buffer, int length)
c->name, c->hostname);
if(!c->outbuflen) {
c->name, c->hostname);
if(!c->outbuflen) {
- c->last_flushed_time = now;
if(event_add(&c->outev, NULL) < 0) {
logger(LOG_EMERG, _("event_add failed: %s"), strerror(errno));
abort();
if(event_add(&c->outev, NULL) < 0) {
logger(LOG_EMERG, _("event_add failed: %s"), strerror(errno));
abort();
@@
-84,8
+82,7
@@
bool send_meta(connection_t *c, const char *buffer, int length)
return true;
}
return true;
}
-void flush_meta(int fd, short events, void *data)
-{
+void flush_meta(int fd, short events, void *data) {
connection_t *c = data;
int result;
connection_t *c = data;
int result;
@@
-124,8
+121,7
@@
void flush_meta(int fd, short events, void *data)
c->outbufstart = 0; /* avoid unnecessary memmoves */
}
c->outbufstart = 0; /* avoid unnecessary memmoves */
}
-void broadcast_meta(connection_t *from, const char *buffer, int length)
-{
+void broadcast_meta(connection_t *from, const char *buffer, int length) {
avl_node_t *node;
connection_t *c;
avl_node_t *node;
connection_t *c;
@@
-139,8
+135,7
@@
void broadcast_meta(connection_t *from, const char *buffer, int length)
}
}
}
}
-bool receive_meta(connection_t *c)
-{
+bool receive_meta(connection_t *c) {
int oldlen, i, result;
int lenin, lenout, reqlen;
bool decrypted = false;
int oldlen, i, result;
int lenin, lenout, reqlen;
bool decrypted = false;
@@
-239,7
+234,7
@@
bool receive_meta(connection_t *c)
return false;
}
return false;
}
- c->last_ping_time =
now
;
+ c->last_ping_time =
time(NULL)
;
return true;
}
return true;
}