external/miraclecast
1
0
Fork 0
mirror of https://github.com/albfan/miraclecast.git synced 2025-03-09 23:38:56 +00:00
Code Issues Releases Wiki Activity

ctl: publish objects after parsing properties

Browse source 
Delay object-broadcasts so we first parse properties and then advertise
the objects. Otherwise, the caller will get almost empty objects which are
rather useless.

Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
This commit is contained in:
David Herrmann 2014-04-23 12:30:20 +02:00
parent d0a85ac46c
commit 78cf818484
1 changed files with 40 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/ctl/ctl-wifi.c
View file

@ -52,6 +52,13 @@ static void ctl_peer_free(struct ctl_peer *p)
free(p); free(p);
} }
static void ctl_peer_free_p(struct ctl_peer **p)
{
ctl_peer_free(*p);
}
#define _ctl_peer_free_ _shl_cleanup_(ctl_peer_free_p)
static int ctl_peer_new(struct ctl_peer **out, static int ctl_peer_new(struct ctl_peer **out,
struct ctl_link *l, struct ctl_link *l,
const char *label) const char *label)
@ -74,8 +81,6 @@ static int ctl_peer_new(struct ctl_peer **out,
goto error; goto error;
} }
shl_dlist_link_tail(&l->peers, &p->list);
ctl_fn_peer_new(p);
if (out) if (out)
*out = p; *out = p;
@ -86,6 +91,15 @@ error:
return r; return r;
} }
static void ctl_peer_link(struct ctl_peer *p)
{
if (!p || shl_dlist_linked(&p->list))
return;
shl_dlist_link_tail(&p->l->peers, &p->list);
ctl_fn_peer_new(p);
}
static int ctl_peer_parse_properties(struct ctl_peer *p, static int ctl_peer_parse_properties(struct ctl_peer *p,
sd_bus_message *m) sd_bus_message *m)
{ {
@ -343,6 +357,13 @@ static void ctl_link_free(struct ctl_link *l)
free(l); free(l);
} }
static void ctl_link_free_p(struct ctl_link **l)
{
ctl_link_free(*l);
}
#define _ctl_link_free_ _shl_cleanup_(ctl_link_free_p)
static int ctl_link_new(struct ctl_link **out, static int ctl_link_new(struct ctl_link **out,
struct ctl_wifi *w, struct ctl_wifi *w,
const char *label) const char *label)
@ -366,8 +387,6 @@ static int ctl_link_new(struct ctl_link **out,
goto error; goto error;
} }
shl_dlist_link_tail(&w->links, &l->list);
ctl_fn_link_new(l);
if (out) if (out)
*out = l; *out = l;
@ -378,6 +397,15 @@ error:
return r; return r;
} }
static void ctl_link_link(struct ctl_link *l)
{
if (!l || shl_dlist_linked(&l->list))
return;
shl_dlist_link_tail(&l->w->links, &l->list);
ctl_fn_link_new(l);
}
static int ctl_link_parse_properties(struct ctl_link *l, static int ctl_link_parse_properties(struct ctl_link *l,
sd_bus_message *m) sd_bus_message *m)
{ {
@ -666,8 +694,8 @@ static int ctl_wifi_parse_link(struct ctl_wifi *w,
const char *label, const char *label,
sd_bus_message *m) sd_bus_message *m)
{ {
_ctl_link_free_ struct ctl_link *l = NULL;
const char *t; const char *t;
struct ctl_link *l;
int r; int r;
r = ctl_link_new(&l, w, label); r = ctl_link_new(&l, w, label);
@ -710,6 +738,9 @@ static int ctl_wifi_parse_link(struct ctl_wifi *w,
if (r < 0) if (r < 0)
return cli_log_parser(r); return cli_log_parser(r);
ctl_link_link(l);
l = NULL;
return 0; return 0;
} }
@ -717,9 +748,9 @@ static int ctl_wifi_parse_peer(struct ctl_wifi *w,
const char *label, const char *label,
sd_bus_message *m) sd_bus_message *m)
{ {
_ctl_peer_free_ struct ctl_peer *p = NULL;
const char *t; const char *t;
struct ctl_link *l; struct ctl_link *l;
struct ctl_peer *p;
int r; int r;
l = ctl_wifi_find_link_by_peer(w, label); l = ctl_wifi_find_link_by_peer(w, label);
@ -766,6 +797,9 @@ static int ctl_wifi_parse_peer(struct ctl_wifi *w,
if (r < 0) if (r < 0)
return cli_log_parser(r); return cli_log_parser(r);
ctl_peer_link(p);
p = NULL;
return 0; return 0;
} }