From 29583db582a6b7654f551bed4c0bbc67cf905d2f Mon Sep 17 00:00:00 2001 From: Derek Dai Date: Thu, 4 May 2017 10:37:15 +0800 Subject: [PATCH] miracle-dispd: ignore peers which has no valid wfd_supplicant Change-Id: Ifd7225a944fb0312eb3fe0c575b82a9c95c6ab14 --- src/disp/dispd.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/disp/dispd.c b/src/disp/dispd.c index ec78b83..3f8a526 100644 --- a/src/disp/dispd.c +++ b/src/disp/dispd.c @@ -346,7 +346,6 @@ void ctl_fn_peer_new(struct ctl_peer *p) { struct wfd_sink *s; union wfd_sube sube; - const char *sube_str; int r; log_debug("new peer %s (%s) shows up, wfd_subelems: '%s'", @@ -354,20 +353,15 @@ void ctl_fn_peer_new(struct ctl_peer *p) p->label, p->wfd_subelements); - if(p->wfd_subelements && *p->wfd_subelements) { - sube_str = p->wfd_subelements; - } - else { - sube_str = "000600111c4400c8"; - log_info("peer %s has no wfd_subelems, assume %s", - p->label, - sube_str); + if(!p->wfd_subelements || !*p->wfd_subelements) { + log_info("peer %s has no wfd_subelems, ignore it", p->label); + return; } - r = wfd_sube_parse(sube_str, &sube); + r = wfd_sube_parse(p->wfd_subelements, &sube); if(0 > r) { - log_debug("peer %s has invalid subelement", p->label); - return log_vERR(r); + log_debug("peer %s has no valid subelement, ignore it", p->label); + return; } if(wfd_sube_device_is_sink(&sube)) {