From 837fe1cea17281586268fea1916e9585ce39b4cc Mon Sep 17 00:00:00 2001
From: David Herrmann <dh.herrmann@gmail.com>
Date: Mon, 10 Feb 2014 18:27:21 +0100
Subject: [PATCH] miracled: split peer allocation and linking

If we don't split peer linking off, the peer might get advertised before
the sub-device related data is set. With dbus, this might trigger
callbacks to not return attributes as the peer-type is unknown. Therefore,
properly initialize the peer before linking/advertising it.

This fixes a bug where the initial InterfacesAdded signal for new peers
does not include all properties of a peer.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
---
 src/miracled-peer.c | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/miracled-peer.c b/src/miracled-peer.c
index 7cfc142..1acf45f 100644
--- a/src/miracled-peer.c
+++ b/src/miracled-peer.c
@@ -53,7 +53,6 @@ int peer_make_name(unsigned int id, char **out)
 static int peer_new(struct link *l, struct peer **out)
 {
 	unsigned int id;
-	size_t hash = 0;
 	char *name;
 	struct peer *p;
 	int r;
@@ -66,7 +65,7 @@ static int peer_new(struct link *l, struct peer **out)
 	if (r < 0)
 		return r;
 
-	if (shl_htable_lookup_str(&l->m->peers, name, &hash, NULL)) {
+	if (shl_htable_lookup_str(&l->m->peers, name, NULL, NULL)) {
 		free(name);
 		return -EALREADY;
 	}
@@ -83,25 +82,26 @@ static int peer_new(struct link *l, struct peer **out)
 	p->id = id;
 	p->name = name;
 
-	r = shl_htable_insert_str(&l->m->peers, &p->name, &hash);
-	if (r < 0) {
-		log_vERR(r);
-		goto error;
-	}
-
-	++l->m->peer_cnt;
-	shl_dlist_link(&l->peers, &p->list);
-	peer_dbus_added(p);
-	log_info("new peer: %s@%s", p->name, l->name);
-
 	if (out)
 		*out = p;
 
 	return 0;
+}
 
-error:
-	peer_free(p);
-	return r;
+static int peer_link(struct peer *p)
+{
+	int r;
+
+	r = shl_htable_insert_str(&p->l->m->peers, &p->name, NULL);
+	if (r < 0)
+		return log_ERR(r);
+
+	++p->l->m->peer_cnt;
+	shl_dlist_link(&p->l->peers, &p->list);
+	peer_dbus_added(p);
+	log_info("new peer: %s@%s", p->name, p->l->name);
+
+	return 0;
 }
 
 int peer_new_wifi(struct link *l, struct wifi_dev *d, struct peer **out)
@@ -116,10 +116,18 @@ int peer_new_wifi(struct link *l, struct wifi_dev *d, struct peer **out)
 	p->d = d;
 	wifi_dev_set_data(p->d, p);
 
+	r = peer_link(p);
+	if (r < 0)
+		goto error;
+
 	if (out)
 		*out = p;
 
 	return 0;
+
+error:
+	peer_free(p);
+	return r;
 }
 
 void peer_free(struct peer *p)