aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rtls.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-rtls.c')
-rw-r--r--epan/dissectors/packet-rtls.c156
1 files changed, 78 insertions, 78 deletions
diff --git a/epan/dissectors/packet-rtls.c b/epan/dissectors/packet-rtls.c
index b385028477..8a6c32cb66 100644
--- a/epan/dissectors/packet-rtls.c
+++ b/epan/dissectors/packet-rtls.c
@@ -21,70 +21,72 @@
void proto_reg_handoff_rtls(void);
void proto_register_rtls(void);
-static int proto_rtls = -1;
-static int hf_rtls_message_type = -1;
-static int hf_rtls_message_id = -1;
-static int hf_rtls_version_major = -1;
-static int hf_rtls_version_minor = -1;
-static int hf_rtls_data_length = -1;
-static int hf_rtls_ap_mac = -1;
-static int hf_rtls_padding = -1;
-static int hf_rtls_reserved = -1;
-static int hf_rtls_signature = -1;
-
-static int hf_rtls_as_tag_addr = -1;
-static int hf_rtls_sr_mac_address = -1;
-static int hf_rtls_nack_flags = -1;
-static int hf_rtls_nack_flags_internal_error = -1;
-static int hf_rtls_nack_flags_station_not_found = -1;
-static int hf_rtls_nack_flags_reserved = -1;
-static int hf_rtls_tr_bssid = -1;
-static int hf_rtls_tr_rssi = -1;
-static int hf_rtls_tr_rssi_calculated = -1;
-static int hf_rtls_tr_noise_floor = -1;
-static int hf_rtls_tr_timestamp = -1;
-static int hf_rtls_tr_tag_mac = -1;
-static int hf_rtls_tr_frame_control = -1;
-static int hf_rtls_tr_sequence = -1;
-static int hf_rtls_tr_data_rate = -1;
-static int hf_rtls_tr_tx_power = -1;
-static int hf_rtls_tr_channel = -1;
-static int hf_rtls_tr_battery = -1;
-static int hf_rtls_sr_mac = -1;
-static int hf_rtls_sr_noise_floor = -1;
-static int hf_rtls_sr_data_rate = -1;
-static int hf_rtls_sr_channel = -1;
-static int hf_rtls_sr_rssi = -1;
-static int hf_rtls_sr_rssi_calculated = -1;
-static int hf_rtls_sr_type = -1;
-static int hf_rtls_sr_associated = -1;
-static int hf_rtls_sr_radio_bssid = -1;
-static int hf_rtls_sr_mon_bssid = -1;
-static int hf_rtls_sr_age = -1;
-static int hf_rtls_ser_mac = -1;
-static int hf_rtls_ser_bssid = -1;
-static int hf_rtls_ser_essid = -1;
-static int hf_rtls_ser_channel = -1;
-static int hf_rtls_ser_phy_type = -1;
-static int hf_rtls_ser_rssi = -1;
-static int hf_rtls_ser_rssi_calculated = -1;
-static int hf_rtls_ser_duration = -1;
-static int hf_rtls_ser_num_packets = -1;
-static int hf_rtls_ser_noise_floor = -1;
-static int hf_rtls_ser_classification = -1;
-static int hf_rtls_aer_bssid = -1;
-static int hf_rtls_aer_essid = -1;
-static int hf_rtls_aer_channel = -1;
-static int hf_rtls_aer_phy_type = -1;
-static int hf_rtls_aer_rssi = -1;
-static int hf_rtls_aer_rssi_calculated = -1;
-static int hf_rtls_aer_duration = -1;
-static int hf_rtls_aer_num_packets = -1;
-static int hf_rtls_aer_noise_floor = -1;
-static int hf_rtls_aer_classification = -1;
-static int hf_rtls_aer_match_type = -1;
-static int hf_rtls_aer_match_method = -1;
-static int hf_rtls_cmr_messages = -1;
+static dissector_handle_t rtls_handle;
+
+static int proto_rtls;
+static int hf_rtls_message_type;
+static int hf_rtls_message_id;
+static int hf_rtls_version_major;
+static int hf_rtls_version_minor;
+static int hf_rtls_data_length;
+static int hf_rtls_ap_mac;
+static int hf_rtls_padding;
+static int hf_rtls_reserved;
+static int hf_rtls_signature;
+
+static int hf_rtls_as_tag_addr;
+static int hf_rtls_sr_mac_address;
+static int hf_rtls_nack_flags;
+static int hf_rtls_nack_flags_internal_error;
+static int hf_rtls_nack_flags_station_not_found;
+static int hf_rtls_nack_flags_reserved;
+static int hf_rtls_tr_bssid;
+static int hf_rtls_tr_rssi;
+static int hf_rtls_tr_rssi_calculated;
+static int hf_rtls_tr_noise_floor;
+static int hf_rtls_tr_timestamp;
+static int hf_rtls_tr_tag_mac;
+static int hf_rtls_tr_frame_control;
+static int hf_rtls_tr_sequence;
+static int hf_rtls_tr_data_rate;
+static int hf_rtls_tr_tx_power;
+static int hf_rtls_tr_channel;
+static int hf_rtls_tr_battery;
+static int hf_rtls_sr_mac;
+static int hf_rtls_sr_noise_floor;
+static int hf_rtls_sr_data_rate;
+static int hf_rtls_sr_channel;
+static int hf_rtls_sr_rssi;
+static int hf_rtls_sr_rssi_calculated;
+static int hf_rtls_sr_type;
+static int hf_rtls_sr_associated;
+static int hf_rtls_sr_radio_bssid;
+static int hf_rtls_sr_mon_bssid;
+static int hf_rtls_sr_age;
+static int hf_rtls_ser_mac;
+static int hf_rtls_ser_bssid;
+static int hf_rtls_ser_essid;
+static int hf_rtls_ser_channel;
+static int hf_rtls_ser_phy_type;
+static int hf_rtls_ser_rssi;
+static int hf_rtls_ser_rssi_calculated;
+static int hf_rtls_ser_duration;
+static int hf_rtls_ser_num_packets;
+static int hf_rtls_ser_noise_floor;
+static int hf_rtls_ser_classification;
+static int hf_rtls_aer_bssid;
+static int hf_rtls_aer_essid;
+static int hf_rtls_aer_channel;
+static int hf_rtls_aer_phy_type;
+static int hf_rtls_aer_rssi;
+static int hf_rtls_aer_rssi_calculated;
+static int hf_rtls_aer_duration;
+static int hf_rtls_aer_num_packets;
+static int hf_rtls_aer_noise_floor;
+static int hf_rtls_aer_classification;
+static int hf_rtls_aer_match_type;
+static int hf_rtls_aer_match_method;
+static int hf_rtls_cmr_messages;
static int * const rtls_nack_flags[] = {
&hf_rtls_nack_flags_internal_error,
@@ -93,10 +95,10 @@ static int * const rtls_nack_flags[] = {
NULL
};
-static expert_field ei_rtls_undecoded = EI_INIT;
-static gint ett_rtls = -1;
-static gint ett_rtls_message = -1;
-static gint ett_rtls_nack_flags = -1;
+static expert_field ei_rtls_undecoded;
+static gint ett_rtls;
+static gint ett_rtls_message;
+static gint ett_rtls_nack_flags;
#define RTLS_MIN_LENGTH 16
@@ -174,7 +176,7 @@ static void
rssi_base_custom(gchar *result, guint32 rssi)
{
/* Convert Hex to decimal and subtract 256 to get the signal value */
- g_snprintf(result, ITEM_LABEL_LENGTH, "%d", rssi - 256);
+ snprintf(result, ITEM_LABEL_LENGTH, "%d", rssi - 256);
}
@@ -295,7 +297,7 @@ hf_rtls_nack_flags, ett_rtls_nack_flags, rtls_nack_flags, ENC_BIG_ENDIAN, BMT_NO
offset += 6;
proto_tree_add_item(rtls_tree, hf_rtls_ser_bssid, tvb, offset, 6, ENC_NA);
offset += 6;
- proto_tree_add_item(rtls_tree, hf_rtls_ser_essid, tvb, offset, 33, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(rtls_tree, hf_rtls_ser_essid, tvb, offset, 33, ENC_ASCII);
offset += 33;
proto_tree_add_item(rtls_tree, hf_rtls_ser_channel, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
@@ -319,7 +321,7 @@ hf_rtls_nack_flags, ett_rtls_nack_flags, rtls_nack_flags, ENC_BIG_ENDIAN, BMT_NO
case AR_AP_EX_REPORT:
proto_tree_add_item(rtls_tree, hf_rtls_aer_bssid, tvb, offset, 6, ENC_NA );
offset += 6;
- proto_tree_add_item(rtls_tree, hf_rtls_aer_essid, tvb, offset, 33, ENC_ASCII|ENC_NA);
+ proto_tree_add_item(rtls_tree, hf_rtls_aer_essid, tvb, offset, 33, ENC_ASCII);
offset += 33;
proto_tree_add_item(rtls_tree, hf_rtls_aer_channel, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
@@ -355,7 +357,7 @@ hf_rtls_nack_flags, ett_rtls_nack_flags, rtls_nack_flags, ENC_BIG_ENDIAN, BMT_NO
while(cmr_messages){
guint32 data_length;
type = tvb_get_ntohs(tvb, offset);
- sub_tree = proto_tree_add_subtree_format(rtls_tree, tvb, offset, -1, ett_rtls_message, NULL, "%s", val_to_str_const(type, rtls_message_type_vals, "(unknown %d)"));
+ sub_tree = proto_tree_add_subtree_format(rtls_tree, tvb, offset, -1, ett_rtls_message, NULL, "%s", val_to_str(type, rtls_message_type_vals, "(unknown %d)"));
offset = dissect_rtls_header(tvb, pinfo, sub_tree, offset, &data_length);
@@ -399,7 +401,7 @@ dissect_rtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_
/* RTLS Header */
type = tvb_get_ntohs(tvb, offset);
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(type, rtls_message_type_vals, "(unknown %d)"));
+ col_add_str(pinfo->cinfo, COL_INFO, val_to_str(type, rtls_message_type_vals, "(unknown %d)"));
offset = dissect_rtls_header(tvb, pinfo, rtls_tree, offset, NULL);
@@ -436,7 +438,7 @@ proto_register_rtls(void)
NULL, HFILL }
},
{ &hf_rtls_version_minor,
- { "Version Major", "rtls.version_minor",
+ { "Version Minor", "rtls.version_minor",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
@@ -496,7 +498,7 @@ proto_register_rtls(void)
},
{ &hf_rtls_nack_flags_reserved,
{ "Reserved", "rtls.nack.flags.reserved",
- FT_UINT16, BASE_HEX, NULL, 0x0D,
+ FT_UINT16, BASE_HEX, NULL, 0xFC,
NULL, HFILL }
},
@@ -759,6 +761,7 @@ proto_register_rtls(void)
proto_rtls = proto_register_protocol("Real Time Location System", "RTLS", "rtls");
+ rtls_handle = register_dissector("rtls", dissect_rtls, proto_rtls);
proto_register_field_array(proto_rtls, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
@@ -771,9 +774,6 @@ proto_register_rtls(void)
void
proto_reg_handoff_rtls(void)
{
- dissector_handle_t rtls_handle;
-
- rtls_handle = create_dissector_handle(dissect_rtls, proto_rtls);
dissector_add_for_decode_as_with_preference("udp.port", rtls_handle);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 00:43:09 +0000