/*
meta.c -- handle the meta communication
- Copyright (C) 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
- 2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+ Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+ 2000-2005 Ivo Timmermans
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
#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;
ifdebug(META) logger(LOG_DEBUG, _("Sending %d bytes of metadata to %s (%s)"), length,
c->name, c->hostname);
- if(!c->outbuflen)
- c->last_flushed_time = now;
+ if(!c->outbuflen) {
+ if(event_add(&c->outev, NULL) < 0) {
+ logger(LOG_EMERG, _("event_add failed: %s"), strerror(errno));
+ abort();
+ }
+ }
/* Find room in connection's buffer */
if(length + c->outbuflen > c->outbufsize) {
return true;
}
-bool flush_meta(connection_t *c)
-{
+void flush_meta(int fd, short events, void *data) {
+ connection_t *c = data;
int result;
ifdebug(META) logger(LOG_DEBUG, _("Flushing %d bytes to %s (%s)"),
c->name, c->hostname);
} else if(errno == EINTR) {
continue;
+#ifdef EWOULDBLOCK
} else if(errno == EWOULDBLOCK) {
ifdebug(CONNECTIONS) logger(LOG_DEBUG, _("Flushing %d bytes to %s (%s) would block"),
c->outbuflen, c->name, c->hostname);
- return true;
+ return;
+#endif
} else {
logger(LOG_ERR, _("Flushing meta data to %s (%s) failed: %s"), c->name,
c->hostname, strerror(errno));
}
- return false;
+ terminate_connection(c, c->status.active);
+ return;
}
c->outbufstart += result;
c->outbuflen -= result;
}
+ event_del(&c->outev);
+
c->outbufstart = 0; /* avoid unnecessary memmoves */
- return true;
}
-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;
}
}
-bool receive_meta(connection_t *c)
-{
+bool receive_meta(connection_t *c) {
int oldlen, i, result;
int lenin, lenout, reqlen;
bool decrypted = false;
return false;
}
- c->last_ping_time = now;
+ c->last_ping_time = time(NULL);
return true;
}