#include "splay_tree.h"
#include "cipher.h"
#include "conf.h"
+#include "control_common.h"
#include "list.h"
#include "logger.h"
-#include "net.h" /* Don't ask. */
-#include "netutl.h"
#include "subnet.h"
#include "utils.h"
#include "xalloc.h"
free(c->hostname);
cipher_close(&c->incipher);
+ digest_close(&c->indigest);
cipher_close(&c->outcipher);
+ digest_close(&c->outdigest);
if(c->hischallenge)
free(c->hischallenge);
if(c->config_tree)
exit_configuration(&c->config_tree);
- if(c->buffer)
- bufferevent_free(c->buffer);
+ buffer_clear(&c->inbuf);
+ buffer_clear(&c->outbuf);
if(event_initialized(&c->inevent))
event_del(&c->inevent);
+ if(event_initialized(&c->outevent))
+ event_del(&c->outevent);
+
free(c);
}
splay_delete(connection_tree, c);
}
-int dump_connections(struct evbuffer *out) {
+bool dump_connections(connection_t *cdump) {
splay_node_t *node;
connection_t *c;
for(node = connection_tree->head; node; node = node->next) {
c = node->data;
- if(evbuffer_add_printf(out,
- " %s at %s options %x socket %d status %04x\n",
- c->name, c->hostname, c->options, c->socket,
- bitfield_to_int(&c->status, sizeof c->status)) == -1)
- return errno;
+ send_request(cdump, "%d %d %s at %s options %x socket %d status %04x",
+ CONTROL, REQ_DUMP_CONNECTIONS,
+ c->name, c->hostname, c->options, c->socket,
+ bitfield_to_int(&c->status, sizeof c->status));
}
- return 0;
-}
-
-bool read_connection_config(connection_t *c) {
- char *fname;
- int x;
-
- xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
- x = read_config_file(c->config_tree, fname);
- free(fname);
-
- return x == 0;
+ return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
}