#include <openssl/err.h>
#include <openssl/evp.h>
-#include "avl_tree.h"
+#include "splay_tree.h"
#include "connection.h"
#include "logger.h"
#include "meta.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;
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)"),
} 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)
-{
- avl_node_t *node;
+void broadcast_meta(connection_t *from, const char *buffer, int length) {
+ splay_node_t *node;
connection_t *c;
cp();
}
}
-bool receive_meta(connection_t *c)
-{
+bool receive_meta(connection_t *c) {
int oldlen, i, result;
- int lenin, lenout, reqlen;
+ int inlen, outlen, reqlen;
bool decrypted = false;
char inbuf[MAXBUFSIZE];
- If not, keep stuff in buffer and exit.
*/
- lenin = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0);
+ inlen = recv(c->socket, c->buffer + c->buflen, MAXBUFSIZE - c->buflen, 0);
- if(lenin <= 0) {
- if(!lenin || !errno) {
+ if(inlen <= 0) {
+ if(!inlen || !errno) {
ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Connection closed by %s (%s)"),
c->name, c->hostname);
} else if(errno == EINTR)
}
oldlen = c->buflen;
- c->buflen += lenin;
+ c->buflen += inlen;
- while(lenin > 0) {
+ while(inlen > 0) {
/* Decrypt */
if(c->status.decryptin && !decrypted) {
- result = EVP_DecryptUpdate(c->inctx, (unsigned char *)inbuf, &lenout, (unsigned char *)c->buffer + oldlen, lenin);
- if(!result || lenout != lenin) {
+ result = EVP_DecryptUpdate(c->inctx, (unsigned char *)inbuf, &outlen, (unsigned char *)c->buffer + oldlen, inlen);
+ if(!result || outlen != inlen) {
logger(LOG_ERR, _("Error while decrypting metadata from %s (%s): %s"),
c->name, c->hostname, ERR_error_string(ERR_get_error(), NULL));
return false;
}
- memcpy(c->buffer + oldlen, inbuf, lenin);
+ memcpy(c->buffer + oldlen, inbuf, inlen);
decrypted = true;
}
receive_tcppacket(c, c->buffer, c->tcplen);
c->buflen -= c->tcplen;
- lenin -= c->tcplen - oldlen;
+ inlen -= c->tcplen - oldlen;
memmove(c->buffer, c->buffer + c->tcplen, c->buflen);
oldlen = 0;
c->tcplen = 0;
return false;
c->buflen -= reqlen;
- lenin -= reqlen - oldlen;
+ inlen -= reqlen - oldlen;
memmove(c->buffer, c->buffer + reqlen, c->buflen);
oldlen = 0;
continue;
return false;
}
- c->last_ping_time = now;
+ c->last_ping_time = time(NULL);
return true;
}