[PATCH 09/12] hs20-client: Add more logging.

greearb at candelatech.com greearb at candelatech.com
Thu Mar 26 17:39:55 EDT 2015


From: Ben Greear <greearb at candelatech.com>

Add some more verbose logging, and make sure logging
messages are unique for easier debugging.

Signed-off-by: Ben Greear <greearb at candelatech.com>
---
 hs20/client/osu_client.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/hs20/client/osu_client.c b/hs20/client/osu_client.c
index d8a8287..f9b1069 100644
--- a/hs20/client/osu_client.c
+++ b/hs20/client/osu_client.c
@@ -2825,17 +2825,19 @@ static int osu_cert_cb(void *_ctx, struct http_cert *cert)
 		char *name = ctx->icon_filename[j];
 		size_t name_len = os_strlen(name);
 
-		wpa_printf(MSG_INFO, "Looking for icon file name '%s' match",
-			   name);
+		wpa_printf(MSG_INFO, "[%i] Looking for icon file name '%s' match",
+			   j, name);
 		for (i = 0; i < cert->num_logo; i++) {
 			struct http_logo *logo = &cert->logo[i];
 			size_t uri_len = os_strlen(logo->uri);
 			char *pos;
 
-			wpa_printf(MSG_INFO, "Comparing to '%s' uri_len=%d name_len=%d",
-				   logo->uri, (int) uri_len, (int) name_len);
-			if (uri_len < 1 + name_len)
+			wpa_printf(MSG_INFO, "[%i] Comparing to '%s' uri_len=%d name_len=%d",
+				   i, logo->uri, (int) uri_len, (int) name_len);
+			if (uri_len < 1 + name_len) {
+				wpa_printf(MSG_INFO, "URI Length is too short");
 				continue;
+			}
 			pos = &logo->uri[uri_len - name_len - 1];
 			if (*pos != '/')
 				continue;
@@ -2862,17 +2864,25 @@ static int osu_cert_cb(void *_ctx, struct http_cert *cert)
 		for (i = 0; i < cert->num_logo; i++) {
 			struct http_logo *logo = &cert->logo[i];
 
-			if (logo->hash_len != 32)
+			if (logo->hash_len != 32) {
+				wpa_printf(MSG_INFO, "[%i][%i] Icon hash length invalid (should be 32): %d",
+					   j, i, (int)(logo->hash_len));
 				continue;
+			}
 			if (os_memcmp(logo->hash, ctx->icon_hash[j], 32) == 0) {
 				found = 1;
 				break;
 			}
+			else {
+				wpa_printf(MSG_INFO, "[%i][%i] Icon hash did not match\n", j, i);
+				wpa_hexdump_ascii(MSG_INFO, "logo->hash", logo->hash, 32);
+				wpa_hexdump_ascii(MSG_INFO, "ctx->icon_hash[j]", ctx->icon_hash[j], 32);
+			}
 		}
 
 		if (!found) {
-			wpa_printf(MSG_INFO, "No icon hash match found");
-			write_result(ctx, "No icon hash match found");
+			wpa_printf(MSG_INFO, "No icon hash match (by hash) found");
+			write_result(ctx, "No icon hash match (by hash) found");
 			return -1;
 		}
 	}
-- 
1.9.3



More information about the HostAP mailing list