ieee1905: Correct RSSI fields to RCPI
- The RSSI fields in "(Un)Asssociated STA Link Metrics" and "Steering Policy" TLVs are not defined as RSSI but RCPI in released versions of the Multi-AP/EasyMesh specs. It's defined as an unsigned value in range 0 - 220. - Changed "RCPI reporting threshold" type to UINT8 in "Metric Reporing Policy TLV".
This commit is contained in:
parent
a592c0d84f
commit
d72af75157
|
@ -300,7 +300,7 @@ static int hf_ieee1905_assoc_sta_link_metrics_bssid = -1;
|
|||
static int hf_ieee1905_assoc_sta_link_metrics_time_delta = -1;
|
||||
static int hf_ieee1905_assoc_sta_link_metrics_dwn_rate = -1;
|
||||
static int hf_ieee1905_assoc_sta_link_metrics_up_rate = -1;
|
||||
static int hf_ieee1905_assoc_sta_link_metrics_rssi = -1;
|
||||
static int hf_ieee1905_assoc_sta_link_metrics_rcpi = -1;
|
||||
static int hf_ieee1905_assoc_wf6_sta_mac_addr = -1;
|
||||
static int hf_ieee1905_assoc_wf6_sta_tid_count = -1;
|
||||
static int hf_ieee1905_assoc_wf6_sta_tid = -1;
|
||||
|
@ -335,7 +335,7 @@ static int hf_ieee1905_steering_policy_radio_count = -1;
|
|||
static int hf_ieee1905_steering_policy_radio_id = -1;
|
||||
static int hf_ieee1905_steering_policy_policy = -1;
|
||||
static int hf_ieee1905_steering_policy_util = -1;
|
||||
static int hf_ieee1905_steering_policy_rssi_threshold = -1;
|
||||
static int hf_ieee1905_steering_policy_rcpi_threshold = -1;
|
||||
static int hf_ieee1905_radio_restriction_radio_id = -1;
|
||||
static int hf_ieee1905_radio_restriction_op_class_count = -1;
|
||||
static int hf_ieee1905_radio_restriction_op_class = -1;
|
||||
|
@ -359,7 +359,7 @@ static int hf_ieee1905_unassoc_sta_link_metric_sta_count = -1;
|
|||
static int hf_ieee1905_unassoc_link_metric_mac_addr = -1;
|
||||
static int hf_ieee1905_unassoc_link_metric_channel = -1;
|
||||
static int hf_ieee1905_unassoc_link_metric_delta = -1;
|
||||
static int hf_ieee1905_unassoc_link_metric_uplink_rssi = -1;
|
||||
static int hf_ieee1905_unassoc_link_metric_uplink_rcpi = -1;
|
||||
static int hf_ieee1905_beacon_metrics_query_mac_addr = -1;
|
||||
static int hf_ieee1905_beacon_metrics_query_op_class = -1;
|
||||
static int hf_ieee1905_beacon_metrics_query_channel = -1;
|
||||
|
@ -1537,8 +1537,8 @@ static const value_string ieee1905_channel_select_resp_code_vals[] = {
|
|||
|
||||
static const value_string ieee1905_steering_policy_vals[] = {
|
||||
{ 0x0, "Agent initiated steering disallowed" },
|
||||
{ 0x1, "Agent initiated RSSI-based steering mandated" },
|
||||
{ 0x2, "Agent initiated RSSI-based steering allowed" },
|
||||
{ 0x1, "Agent initiated RCPI-based steering mandated" },
|
||||
{ 0x2, "Agent initiated RCPI-based steering allowed" },
|
||||
{ 0, NULL}
|
||||
};
|
||||
|
||||
|
@ -3420,7 +3420,7 @@ dissect_steering_policy(tvbuff_t *tvb, packet_info *pinfo _U_,
|
|||
offset++;
|
||||
|
||||
proto_tree_add_item(policy_tree,
|
||||
hf_ieee1905_steering_policy_rssi_threshold,
|
||||
hf_ieee1905_steering_policy_rcpi_threshold,
|
||||
tvb, offset, 1, ENC_NA);
|
||||
offset++;
|
||||
|
||||
|
@ -3892,7 +3892,7 @@ dissect_unassociated_sta_link_metric_response(tvbuff_t *tvb, packet_info *pinfo
|
|||
tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
|
||||
proto_tree_add_item(sta_tree, hf_ieee1905_unassoc_link_metric_uplink_rssi,
|
||||
proto_tree_add_item(sta_tree, hf_ieee1905_unassoc_link_metric_uplink_rcpi,
|
||||
tvb, offset, 1, ENC_NA);
|
||||
offset++;
|
||||
|
||||
|
@ -4574,7 +4574,7 @@ dissect_associated_sta_link_metrics(tvbuff_t *tvb, packet_info *pinfo _U_,
|
|||
tvb, offset, 4, ENC_BIG_ENDIAN);
|
||||
offset += 4;
|
||||
|
||||
proto_tree_add_item(bss_tree, hf_ieee1905_assoc_sta_link_metrics_rssi,
|
||||
proto_tree_add_item(bss_tree, hf_ieee1905_assoc_sta_link_metrics_rcpi,
|
||||
tvb, offset, 1, ENC_NA);
|
||||
offset++;
|
||||
|
||||
|
@ -8973,7 +8973,7 @@ proto_register_ieee1905(void)
|
|||
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x40, NULL, HFILL }},
|
||||
|
||||
{ &hf_ieee1905_agent_init_steering,
|
||||
{ "Agent-initiated RSSI-based Steering", "ieee1905.agent_init_steering",
|
||||
{ "Agent-initiated RCPI-based Steering", "ieee1905.agent_init_steering",
|
||||
FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x20, NULL, HFILL }},
|
||||
|
||||
{ &hf_ieee1905_rpt_unsuccessful_assoc_report,
|
||||
|
@ -9481,7 +9481,7 @@ proto_register_ieee1905(void)
|
|||
|
||||
{ &hf_ieee1905_metric_rcpi_threshold,
|
||||
{ "RCPI reporting threshold", "ieee1905.sta_metric_policy.rcpi_threshold",
|
||||
FT_INT8, BASE_CUSTOM, CF_FUNC(rcpi_threshold_custom),
|
||||
FT_UINT8, BASE_CUSTOM, CF_FUNC(rcpi_threshold_custom),
|
||||
0, NULL, HFILL }},
|
||||
|
||||
{ &hf_ieee1905_metric_reporting_rcpi_hysteresis,
|
||||
|
@ -9554,8 +9554,8 @@ proto_register_ieee1905(void)
|
|||
{ "Uplink data rate", "ieee1905.assoc_sta_link_metrics.up_rate",
|
||||
FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
|
||||
|
||||
{ &hf_ieee1905_assoc_sta_link_metrics_rssi,
|
||||
{ "Measured uplink RSSI for STA", "ieee1905.assoc_sta_link_metrics.rssi",
|
||||
{ &hf_ieee1905_assoc_sta_link_metrics_rcpi,
|
||||
{ "Measured uplink RCPI for STA", "ieee1905.assoc_sta_link_metrics.rcpi",
|
||||
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
|
||||
|
||||
{ &hf_ieee1905_assoc_wf6_sta_mac_addr,
|
||||
|
@ -9701,9 +9701,9 @@ proto_register_ieee1905(void)
|
|||
{ "Channel utilization threshold", "ieee1905.steering_policy.utilization_threshold",
|
||||
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
|
||||
|
||||
{ &hf_ieee1905_steering_policy_rssi_threshold,
|
||||
{ "RSSI steering threshold", "ieee1905.steering_policy.rssi_threshold",
|
||||
FT_INT8, BASE_DEC|BASE_UNIT_STRING, &units_dbm, 0, NULL, HFILL }},
|
||||
{ &hf_ieee1905_steering_policy_rcpi_threshold,
|
||||
{ "RCPI steering threshold", "ieee1905.steering_policy.rcpi_threshold",
|
||||
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
|
||||
|
||||
{ &hf_ieee1905_radio_restriction_radio_id,
|
||||
{ "Radio unique ID", "ieee1905.radio_restriction.radio_id",
|
||||
|
@ -9805,9 +9805,9 @@ proto_register_ieee1905(void)
|
|||
{ "Associated STA MAC address", "ieee1905.beacon_metrics.assoc_sta_mac",
|
||||
FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
|
||||
|
||||
{ &hf_ieee1905_unassoc_link_metric_uplink_rssi,
|
||||
{ "Uplink RSSI", "ieee1905.unassoc_sta_link_metrics.rssi",
|
||||
FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
|
||||
{ &hf_ieee1905_unassoc_link_metric_uplink_rcpi,
|
||||
{ "Uplink RCPI", "ieee1905.unassoc_sta_link_metrics.rcpi",
|
||||
FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
|
||||
|
||||
{ &hf_ieee1905_beacon_metrics_query_op_class,
|
||||
{ "Operating class", "ieee1905.beacon_metrics.op_class",
|
||||
|
|
Loading…
Reference in New Issue