X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fconnection.c;fp=src%2Fconnection.c;h=4a2ba4c09110394e8654f4ecc3728484878ddf3f;hp=230ec4ede6b48ca3ae3560ba3ae0844c5407f647;hb=075e6828a7533e7daa790225f17aa6bb39703278;hpb=9b129c07e273ae113f3c67a9feeee82e8146f3a1

diff --git a/src/connection.c b/src/connection.c
index 230ec4ed..4a2ba4c0 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -37,7 +37,7 @@ splay_tree_t *connection_tree;	/* Meta connections */
 connection_t *broadcast;
 
 static int connection_compare(const connection_t *a, const connection_t *b) {
-	return (void *)a - (void *)b;
+	return a < b ? -1 : a == b ? 0 : 1;
 }
 
 void init_connections(void) {
@@ -115,7 +115,7 @@ int dump_connections(struct evbuffer *out) {
 		if(evbuffer_add_printf(out,
 				   _(" %s at %s options %lx socket %d status %04x\n"),
 				   c->name, c->hostname, c->options, c->socket,
-				   c->status.value) == -1)
+				   bitfield_to_int(&c->status, sizeof c->status)) == -1)
 			return errno;
 	}
 
@@ -128,7 +128,7 @@ bool read_connection_config(connection_t *c) {
 
 	cp();
 
-	asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
 	x = read_config_file(c->config_tree, fname);
 	free(fname);