diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-11-21 13:54:20 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-11-21 13:54:20 -0800 |
| commit | 02890c182dd4e16d738bf20303d107439e07051c (patch) | |
| tree | 96c3e2be1393ecc38f7dbb5342d8748e0963a80e | |
| parent | 3cbb07431a5911d920b3fcea9438b9939443fdfe (diff) | |
| parent | cbb67277e4a8baf2b08b94585810c952014c8b98 (diff) | |
| download | android_external_wpa_supplicant_8-02890c182dd4e16d738bf20303d107439e07051c.tar.gz android_external_wpa_supplicant_8-02890c182dd4e16d738bf20303d107439e07051c.tar.bz2 android_external_wpa_supplicant_8-02890c182dd4e16d738bf20303d107439e07051c.zip | |
Merge "Interworking: Report STATUS:sp_type even if domain is not configured"
| -rw-r--r-- | wpa_supplicant/ctrl_iface.c | 4 | ||||
| -rw-r--r-- | wpa_supplicant/interworking.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index 89e53f38..ce5eb4fd 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -1567,10 +1567,8 @@ static int wpa_supplicant_ctrl_iface_status(struct wpa_supplicant *wpa_s, if (wpa_s->current_ssid->parent_cred != cred) continue; - if (!cred->domain) - continue; - for (i = 0; i < cred->num_domain; i++) { + for (i = 0; cred->domain && i < cred->num_domain; i++) { ret = os_snprintf(pos, end - pos, "home_sp=%s\n", cred->domain[i]); diff --git a/wpa_supplicant/interworking.c b/wpa_supplicant/interworking.c index 096d4940..06b08931 100644 --- a/wpa_supplicant/interworking.c +++ b/wpa_supplicant/interworking.c @@ -1625,6 +1625,7 @@ int interworking_home_sp_cred(struct wpa_supplicant *wpa_s, struct wpabuf *domain_names) { size_t i; + int ret = -1; #ifdef INTERWORKING_3GPP char nai[100], *realm; @@ -1649,11 +1650,13 @@ int interworking_home_sp_cred(struct wpa_supplicant *wpa_s, if (realm && domain_name_list_contains(domain_names, realm)) return 1; + if (realm) + ret = 0; } #endif /* INTERWORKING_3GPP */ if (domain_names == NULL || cred->domain == NULL) - return 0; + return ret; for (i = 0; i < cred->num_domain; i++) { wpa_printf(MSG_DEBUG, "Interworking: Search for match with " |