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

wifi: handle P2P_GROUP_FORMATION_FAILURE

Browse source 
Forward group-formation-failure events via dbus so sinkctl can restart
p2p-scans immediately. Unfortunately, the event itself does not contain
any useful information at all. Therefore, we have to track the connection
attempts ourselves.

Signed-off-by: Andrey Gusakov <adnrey.gusakov@cogentembedded.com>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
This commit is contained in:
Andrey Gusakov 2014-07-24 08:16:04 +04:00 • committed by David Herrmann
parent 2a84a2d868
commit 9196c5c426
8 changed files with 94 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -946,14 +946,9 @@ static int ctl_wifi_peer_fn(sd_bus *bus,
_shl_free_ char *label = NULL;
struct ctl_wifi *w = data;
struct ctl_peer *p;
const char *t, *prov, *pin;
const char *t;
int r;
if (!sd_bus_message_is_signal(m,
"org.freedesktop.miracle.wifi.Peer",
"ProvisionDiscovery"))
return 0;
t = sd_bus_message_get_path(m);
if (!t)
return cli_EINVAL();
@ -963,16 +958,36 @@ static int ctl_wifi_peer_fn(sd_bus *bus,
&label);
if (r < 0) {
return cli_ERR(r);
} else if (r == 0) {
return 0;
} else if (r > 0) {
p = ctl_wifi_find_peer(w, label);
if (!p)
return 0;
}
if (sd_bus_message_is_signal(m,
"org.freedesktop.miracle.wifi.Peer",
"ProvisionDiscovery")) {
/* provision discovery */
const char *prov, *pin;
r = sd_bus_message_read(m, "ss", &prov, &pin);
if (r < 0)
return cli_log_parser(r);
ctl_fn_peer_provision_discovery(p, prov, pin);
} else if (sd_bus_message_is_signal(m,
"org.freedesktop.miracle.wifi.Peer",
"FormationFailure")) {
/* group formation failure */
const char *reason;
r = sd_bus_message_read(m, "s", &reason);
if (r < 0)
return cli_log_parser(r);
ctl_fn_peer_formation_failure(p, reason);
}
return 0;

1
src/ctl/ctl.h
View file

@ -251,6 +251,7 @@ void ctl_fn_peer_free(struct ctl_peer *p);
void ctl_fn_peer_provision_discovery(struct ctl_peer *p,
const char *prov,
const char *pin);
void ctl_fn_peer_formation_failure(struct ctl_peer *p, const char *reason);
void ctl_fn_peer_connected(struct ctl_peer *p);
void ctl_fn_peer_disconnected(struct ctl_peer *p);
void ctl_fn_link_new(struct ctl_link *l);

15
src/ctl/sinkctl.c
View file

@ -464,6 +464,21 @@ void ctl_fn_peer_provision_discovery(struct ctl_peer *p,
}
}
void ctl_fn_peer_formation_failure(struct ctl_peer *p, const char *reason)
{
if (p->l != running_link || shl_isempty(p->wfd_subelements))
return;
if (cli_running())
cli_printf("[" CLI_YELLOW "FAIL" CLI_DEFAULT "] Peer: %s Reason: %s\n",
p->label, reason);
if (!running_peer) {
stop_timeout(&scan_timeout);
ctl_link_set_p2p_scanning(p->l, true);
}
}
void ctl_fn_peer_connected(struct ctl_peer *p)
{
if (p->l != running_link || shl_isempty(p->wfd_subelements))

7
src/ctl/wifictl.c
View file

@ -364,6 +364,13 @@ void ctl_fn_peer_provision_discovery(struct ctl_peer *p,
p->label, prov, pin);
}
void ctl_fn_peer_formation_failure(struct ctl_peer *p, const char *reason)
{
if (cli_running())
cli_printf("[" CLI_YELLOW "FAIL" CLI_DEFAULT "] Peer: %s Reason: %s\n",
p->label, reason);
}
void ctl_fn_peer_connected(struct ctl_peer *p)
{
if (cli_running())