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

18
src/wifi/wifid-dbus.c
View file

@ -408,6 +408,24 @@ void peer_dbus_provision_discovery(struct peer *p,
log_vERR(r);
}
void peer_dbus_formation_failure(struct peer *p, const char *reason)
{
_shl_free_ char *node = NULL;
int r;
node = peer_dbus_get_path(p);
if (!node)
return;
r = sd_bus_emit_signal(p->l->m->bus,
node,
"org.freedesktop.miracle.wifi.Peer",
"FormationFailure",
"s", reason);
if (r < 0)
log_vERR(r);
}
void peer_dbus_added(struct peer *p)
{
_shl_free_ char *node = NULL;

9
src/wifi/wifid-peer.c
View file

@ -200,6 +200,15 @@ void peer_supplicant_provision_discovery(struct peer *p,
peer_dbus_provision_discovery(p, prov, pin);
}
void peer_supplicant_formation_failure(struct peer *p,
const char *reason)
{
if (!p || !p->public)
return;
peer_dbus_formation_failure(p, reason);
}
void peer_supplicant_connected_changed(struct peer *p, bool connected)
{
if (!p || p->connected == connected)

21
src/wifi/wifid-supplicant.c
View file

@ -747,6 +747,8 @@ int supplicant_peer_connect(struct supplicant_peer *sp,
if (r < 0)
return log_ERR(r);
sp->s->pending = sp;
return 0;
}
@ -1220,6 +1222,23 @@ static void supplicant_event_p2p_group_removed(struct supplicant *s,
supplicant_group_free(g);
}
static void supplicant_event_p2p_group_formation_failure(struct supplicant *s,
struct wpas_message *ev)
{
struct peer *p;
/* There is no useful information in this event at all. Why would
* anyone want to know to which group formation (or even peer?) this
* event belongs to? No, we have to track all that ourselves, sigh.. */
if (s->pending) {
log_debug("peer %s connection failed",
s->pending->friendly_name);
p = s->pending->p;
s->pending = NULL;
peer_supplicant_formation_failure(p, "unknown");
}
}
static void supplicant_event_ap_sta_connected(struct supplicant *s,
struct wpas_message *ev)
{
@ -1365,6 +1384,8 @@ static void supplicant_event(struct supplicant *s, struct wpas_message *m)
supplicant_event_p2p_group_started(s, m);
else if (!strcmp(name, "P2P-GROUP-REMOVED"))
supplicant_event_p2p_group_removed(s, m);
else if (!strcmp(name, "P2P-GROUP-FORMATION-FAILURE"))
supplicant_event_p2p_group_formation_failure(s, m);
else if (!strcmp(name, "AP-STA-CONNECTED"))
supplicant_event_ap_sta_connected(s, m);
else if (!strcmp(name, "AP-STA-DISCONNECTED"))

2
src/wifi/wifid.h
View file

@ -101,6 +101,7 @@ void peer_supplicant_wfd_subelements_changed(struct peer *p);
void peer_supplicant_provision_discovery(struct peer *p,
const char *prov,
const char *pin);
void peer_supplicant_formation_failure(struct peer *p, const char *reason);
void peer_supplicant_connected_changed(struct peer *p, bool connected);
_shl_sentinel_
@ -108,6 +109,7 @@ void peer_dbus_properties_changed(struct peer *p, const char *prop, ...);
void peer_dbus_provision_discovery(struct peer *p,
const char *prov,
const char *pin);
void peer_dbus_formation_failure(struct peer *p, const char *reason);
void peer_dbus_added(struct peer *p);
void peer_dbus_removed(struct peer *p);