From 180899b1027dccbc3a9a03dcca0e0eb59df511c0 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 22 Jan 2013 01:51:02 -0800
Subject: [PATCH] monitor: Decode LE filter policy for all cases

---
 monitor/packet.c | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/monitor/packet.c b/monitor/packet.c
index 58a5a97ca..5203a8ead 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -444,6 +444,25 @@ static void print_addr_type(const char *label, uint8_t addr_type)
 	print_field("%s: %s (0x%2.2x)", label, str, addr_type);
 }
 
+static void print_filter_policy(uint8_t filter_policy)
+{
+	const char *str;
+
+	switch (filter_policy) {
+	case 0x00:
+		str = "Accept all advertisement";
+		break;
+	case 0x01:
+		str = "Ignore not in white list";
+		break;
+	default:
+		str = "Reserved";
+		break;
+	}
+
+	print_field("Filter policy: %s (0x%2.2x)", str, filter_policy);
+}
+
 static void print_handle(uint16_t handle)
 {
 	print_field("Handle: %d", btohs(handle));
@@ -3433,20 +3452,7 @@ static void le_set_scan_parameters_cmd(const void *data, uint8_t size)
 	print_interval(cmd->interval);
 	print_window(cmd->window);
 	print_addr_type("Own address type", cmd->own_addr_type);
-
-	switch (cmd->filter_policy) {
-	case 0x00:
-		str = "Accept all advertisement";
-		break;
-	case 0x01:
-		str = "Ignore not in white list";
-		break;
-	default:
-		str = "Reserved";
-		break;
-	}
-
-	print_field("Filter policy: %s (0x%2.2x)", str, cmd->filter_policy);
+	print_filter_policy(cmd->filter_policy);
 }
 
 static void le_set_scan_enable_cmd(const void *data, uint8_t size)
@@ -3489,7 +3495,7 @@ static void le_create_conn_cmd(const void *data, uint8_t size)
 
 	print_slot_625("Scan interval", cmd->scan_interval);
 	print_slot_625("Scan window", cmd->scan_window);
-	print_field("Filter policy: 0x%2.2x", cmd->filter_policy);
+	print_filter_policy(cmd->filter_policy);
 	print_addr_type("Peer address type", cmd->peer_addr_type);
 	print_addr(cmd->peer_addr, cmd->peer_addr_type);
 	print_addr_type("Own address type", cmd->own_addr_type);
-- 
2.47.3