diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-03-17 13:51:01 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-03-26 16:56:12 +0000 |
| commit | 6184560d71bc78444128abee5168bfa8f7ac89ea (patch) | |
| tree | be1534be7c0120707ed67c903e0f95ca29d304ed /epan/dissectors/packet-llrp.c | |
| parent | 244b30179cce1b795d4498db49950d391e7fd43e (diff) | |
LLRP: Remove PARAM_TREE_ADD* macros
and make checkhf happy (no need to rewrite some wireshark function...)
Change-Id: I0214e809229ac14d5ecf136f61db232c5dd50cdb
Reviewed-on: https://code.wireshark.org/review/20704
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-llrp.c')
| -rw-r--r-- | epan/dissectors/packet-llrp.c | 881 |
1 files changed, 562 insertions, 319 deletions
diff --git a/epan/dissectors/packet-llrp.c b/epan/dissectors/packet-llrp.c index 4bfb2e81c1..7c7569fed1 100644 --- a/epan/dissectors/packet-llrp.c +++ b/epan/dissectors/packet-llrp.c @@ -1497,14 +1497,6 @@ static guint dissect_llrp_item_array(tvbuff_t * const tvb, packet_info *pinfo, return offset; } -#define PARAM_TREE_ADD_STAY(hfindex, length, flag) \ - proto_tree_add_item(param_tree, hf_llrp_##hfindex, tvb, \ - suboffset, length, flag) - -#define PARAM_TREE_ADD(hfindex, length, flag) \ - PARAM_TREE_ADD_STAY(hfindex, length, flag); \ - suboffset += length - static guint dissect_llrp_impinj_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *param_tree, guint suboffset, const guint param_end) @@ -1527,40 +1519,56 @@ dissect_llrp_impinj_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *par /* Just parameters */ break; case LLRP_IMPINJ_PARAM_REQUESTED_DATA: - PARAM_TREE_ADD(impinj_req_data, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_impinj_req_data, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_IMPINJ_PARAM_SUBREGULATORY_REGION: - PARAM_TREE_ADD(impinj_reg_region, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_impinj_reg_region, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_INVENTORY_SEARCH_MODE: - PARAM_TREE_ADD(impinj_search_mode, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_impinj_search_mode, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_TAG_DIRECTION_REPORTING: - PARAM_TREE_ADD(impinj_en_tag_dir, 2, ENC_NA); - PARAM_TREE_ADD(impinj_antenna_conf, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(rfu, 4, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_impinj_en_tag_dir, tvb, suboffset, 2, ENC_NA); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_impinj_antenna_conf, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_rfu, tvb, suboffset, 4, ENC_NA); + suboffset += 4; break; case LLRP_IMPINJ_PARAM_TAG_DIRECTION: - PARAM_TREE_ADD(decision_time, 8, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(impinj_tag_dir, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(confidence, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_decision_time, tvb, suboffset, 8, ENC_BIG_ENDIAN); + suboffset += 8; + proto_tree_add_item(param_tree, hf_llrp_impinj_tag_dir, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_confidence, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_FIXED_FREQUENCY_LIST: - PARAM_TREE_ADD(impinj_fix_freq_mode, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(rfu, 2, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_impinj_fix_freq_mode, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_rfu, tvb, suboffset, 2, ENC_NA); + suboffset += 2; suboffset = dissect_llrp_item_array(tvb, pinfo, param_tree, hf_llrp_num_channels, hf_llrp_channel, 2, suboffset); break; case LLRP_IMPINJ_PARAM_REDUCED_POWER_FREQUENCY_LIST: - PARAM_TREE_ADD(impinj_reduce_power_mode, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(rfu, 2, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_impinj_reduce_power_mode, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_rfu, tvb, suboffset, 2, ENC_NA); + suboffset += 2; suboffset = dissect_llrp_item_array(tvb, pinfo, param_tree, hf_llrp_num_channels, hf_llrp_channel, 2, suboffset); break; case LLRP_IMPINJ_PARAM_LOW_DUTY_CYCLE: - PARAM_TREE_ADD(impinj_low_duty_mode, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(empty_field_timeout, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(field_ping_interval, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_impinj_low_duty_mode, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_empty_field_timeout, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_field_ping_interval, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_DETAILED_VERSION: suboffset = dissect_llrp_utf8_parameter(tvb, pinfo, param_tree, hf_llrp_model_name, suboffset); @@ -1575,105 +1583,155 @@ dissect_llrp_impinj_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *par hf_llrp_num_freqs, hf_llrp_frequency, 4, suboffset); break; case LLRP_IMPINJ_PARAM_FORKLIFT_HEIGHT_THRESHOLD: - PARAM_TREE_ADD(height_thresh, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_height_thresh, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_FORKLIFT_ZEROMOTION_TIME_THRESHOLD: - PARAM_TREE_ADD(zero_motion_thresh, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_zero_motion_thresh, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_FORKLIFT_COMPANION_BOARD_INFO: suboffset = dissect_llrp_utf8_parameter(tvb, pinfo, param_tree, hf_llrp_board_manufacturer, suboffset); - PARAM_TREE_ADD(fw_ver_hex, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(hw_ver_hex, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_fw_ver_hex, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_hw_ver_hex, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_GPI_DEBOUNCE_CONFIGURATION: - PARAM_TREE_ADD(gpi_port, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(gpi_debounce, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_gpi_port, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_gpi_debounce, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_IMPINJ_PARAM_READER_TEMPERATURE: - PARAM_TREE_ADD(temperature, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_temperature, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_LINK_MONITOR_CONFIGURATION: - PARAM_TREE_ADD(impinj_link_monitor_mode, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(link_down_thresh, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_impinj_link_monitor_mode, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_link_down_thresh, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_REPORT_BUFFER_CONFIGURATION: - PARAM_TREE_ADD(impinj_report_buff_mode, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_impinj_report_buff_mode, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_BLOCK_WRITE_WORD_COUNT: - PARAM_TREE_ADD(word_count, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_word_count, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_BLOCK_PERMALOCK: - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(access_pass, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(mb, 1, ENC_NA); - PARAM_TREE_ADD(block_pointer, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(block_mask, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_access_pass, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_mb, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_block_pointer, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_block_mask, tvb, suboffset, 2, ENC_NA); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_BLOCK_PERMALOCK_OPSPEC_RESULT: - PARAM_TREE_ADD(permalock_result, 1, ENC_NA); - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_permalock_result, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_GET_BLOCK_PERMALOCK_STATUS: - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(access_pass, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(mb, 1, ENC_NA); - PARAM_TREE_ADD(block_pointer, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(block_range, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_access_pass, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_mb, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_block_pointer, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_block_range, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_GET_BLOCK_PERMALOCK_STATUS_OPSPEC_RESULT: - PARAM_TREE_ADD(block_permalock_result, 1, ENC_NA); - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_block_permalock_result, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_SET_QT_CONFIG: - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(access_pass, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(impinj_data_profile, 1, ENC_NA); - PARAM_TREE_ADD(impinj_access_range, 1, ENC_NA); - PARAM_TREE_ADD(impinj_persistence, 1, ENC_NA); - PARAM_TREE_ADD(rfu, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_access_pass, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_impinj_data_profile, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_impinj_access_range, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_impinj_persistence, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_rfu, tvb, suboffset, 4, ENC_NA); + suboffset += 4; break; case LLRP_IMPINJ_PARAM_SET_QT_CONFIG_OPSPEC_RESULT: - PARAM_TREE_ADD(set_qt_config_result, 1, ENC_NA); - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_set_qt_config_result, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_GET_QT_CONFIG: - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(access_pass, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_access_pass, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_IMPINJ_PARAM_GET_QT_CONFIG_OPSPEC_RESULT: - PARAM_TREE_ADD(get_qt_config_result, 1, ENC_NA); - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(impinj_data_profile, 1, ENC_NA); - PARAM_TREE_ADD(impinj_access_range, 1, ENC_NA); - PARAM_TREE_ADD(rfu, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_get_qt_config_result, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_impinj_data_profile, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_impinj_access_range, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_rfu, tvb, suboffset, 4, ENC_NA); + suboffset += 4; break; case LLRP_IMPINJ_PARAM_ENABLE_SERIALIZED_TID: - PARAM_TREE_ADD(impinj_serialized_tid_mode, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_impinj_serialized_tid_mode, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_ENABLE_RF_PHASE_ANGLE: - PARAM_TREE_ADD(impinj_rf_phase_mode, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_impinj_rf_phase_mode, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_ENABLE_PEAK_RSSI: - PARAM_TREE_ADD(impinj_peak_rssi_mode, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_impinj_peak_rssi_mode, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_ENABLE_GPS_COORDINATES: - PARAM_TREE_ADD(impinj_gps_coordinates_mode, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_impinj_gps_coordinates_mode, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_SERIALIZED_TID: - PARAM_TREE_ADD(impinj_tid, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_impinj_tid, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_RF_PHASE_ANGLE: - PARAM_TREE_ADD(phase_angle, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_phase_angle, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_PEAK_RSSI: - PARAM_TREE_ADD(rssi, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_rssi, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_GPS_COORDINATES: - PARAM_TREE_ADD(latitude, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(longitude, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_latitude, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_longitude, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_IMPINJ_PARAM_LOOP_SPEC: - PARAM_TREE_ADD(loop_count, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_loop_count, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_IMPINJ_PARAM_GGA_SENTENCE: suboffset = dissect_llrp_utf8_parameter(tvb, pinfo, param_tree, hf_llrp_gga_sentence, suboffset); @@ -1682,21 +1740,28 @@ dissect_llrp_impinj_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *par suboffset = dissect_llrp_utf8_parameter(tvb, pinfo, param_tree, hf_llrp_rmc_sentence, suboffset); break; case LLRP_IMPINJ_PARAM_OPSPEC_RETRY_COUNT: - PARAM_TREE_ADD(retry_count, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_retry_count, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_ADVANCE_GPO_CONFIG: - PARAM_TREE_ADD(gpo_port, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(impinj_gpo_mode, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(gpo_pulse_dur, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_gpo_port, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_impinj_gpo_mode, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_gpo_pulse_dur, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_IMPINJ_PARAM_ENABLE_OPTIM_READ: - PARAM_TREE_ADD(impinj_optim_read_mode, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_impinj_optim_read_mode, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_ACCESS_SPEC_ORDERING: - PARAM_TREE_ADD(impinj_access_spec_ordering, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_impinj_access_spec_ordering, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_ENABLE_RF_DOPPLER_FREQ: - PARAM_TREE_ADD(impinj_rf_doppler_mode, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_impinj_rf_doppler_mode, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_IMPINJ_PARAM_ARRAY_VERSION: suboffset = dissect_llrp_utf8_parameter(tvb, pinfo, param_tree, hf_llrp_serial_number, suboffset); @@ -1704,9 +1769,12 @@ dissect_llrp_impinj_parameter(tvbuff_t *tvb, packet_info *pinfo, proto_tree *par suboffset = dissect_llrp_utf8_parameter(tvb, pinfo, param_tree, hf_llrp_pcba_ver, suboffset); break; case LLRP_IMPINJ_PARAM_HUB_CONFIGURATION: - PARAM_TREE_ADD(impinj_hub_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(impinj_hub_connected_type, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(impinj_hub_fault_type, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_impinj_hub_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_impinj_hub_connected_type, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_impinj_hub_fault_type, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; default: return suboffset; @@ -1782,93 +1850,117 @@ dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, break; case LLRP_TLV_UTC_TIMESTAMP: case LLRP_TLV_UPTIME: - PARAM_TREE_ADD(microseconds, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_microseconds, tvb, suboffset, 8, ENC_BIG_ENDIAN); + suboffset += 8; break; case LLRP_TLV_GENERAL_DEVICE_CAP: - PARAM_TREE_ADD_STAY(max_supported_antenna, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(can_set_antenna_prop, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(has_utc_clock, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(device_manufacturer, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(model, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_max_supported_antenna, tvb, suboffset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_can_set_antenna_prop, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_has_utc_clock, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_device_manufacturer, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_model, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; suboffset = dissect_llrp_utf8_parameter(tvb, pinfo, param_tree, hf_llrp_firmware_version, suboffset); suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_MAX_RECEIVE_SENSE: - PARAM_TREE_ADD(max_receive_sense, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_max_receive_sense, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_RECEIVE_SENSE_ENTRY: - PARAM_TREE_ADD(index, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(receive_sense, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_index, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_receive_sense, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_ANTENNA_RCV_SENSE_RANGE: - PARAM_TREE_ADD(antenna_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(receive_sense_index_min, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(receive_sense_index_max, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_antenna_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_receive_sense_index_min, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_receive_sense_index_max, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_ANTENNA_AIR_PROTO: - PARAM_TREE_ADD(antenna_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_antenna_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; suboffset = dissect_llrp_item_array(tvb, pinfo, param_tree, hf_llrp_num_protocols, hf_llrp_protocol_id, 1, suboffset); break; case LLRP_TLV_GPIO_CAPABILITIES: - PARAM_TREE_ADD(num_gpi, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(num_gpo, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_num_gpi, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_num_gpo, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_LLRP_CAPABILITIES: - PARAM_TREE_ADD_STAY(can_do_survey, 1, ENC_NA); - PARAM_TREE_ADD_STAY(can_report_buffer_warning, 1, ENC_NA); - PARAM_TREE_ADD_STAY(support_client_opspec, 1, ENC_NA); - PARAM_TREE_ADD_STAY(can_stateaware, 1, ENC_NA); - PARAM_TREE_ADD(support_holding, 1, ENC_NA); - PARAM_TREE_ADD(max_priority_supported, 1, ENC_NA); - PARAM_TREE_ADD(client_opspec_timeout, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_can_do_survey, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_can_report_buffer_warning, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_support_client_opspec, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_can_stateaware, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_support_holding, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_max_priority_supported, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_client_opspec_timeout, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; num = tvb_get_ntohl(tvb, suboffset); if(num == LLRP_NO_LIMIT) proto_tree_add_uint_format_value(param_tree, hf_llrp_max_num_rospec, tvb, suboffset, 4, num, "No limit (%u)", num); else - PARAM_TREE_ADD_STAY(max_num_rospec, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_max_num_rospec, tvb, suboffset, 4, ENC_BIG_ENDIAN); suboffset += 4; num = tvb_get_ntohl(tvb, suboffset); if(num == LLRP_NO_LIMIT) proto_tree_add_uint_format_value(param_tree, hf_llrp_max_num_spec_per_rospec, tvb, suboffset, 4, num, "No limit (%u)", num); else - PARAM_TREE_ADD_STAY(max_num_spec_per_rospec, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_max_num_spec_per_rospec, tvb, suboffset, 4, ENC_BIG_ENDIAN); suboffset += 4; num = tvb_get_ntohl(tvb, suboffset); if(num == LLRP_NO_LIMIT) proto_tree_add_uint_format_value(param_tree, hf_llrp_max_num_inventory_per_aispec, tvb, suboffset, 4, num, "No limit (%u)", num); else - PARAM_TREE_ADD_STAY(max_num_inventory_per_aispec, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_max_num_inventory_per_aispec, tvb, suboffset, 4, ENC_BIG_ENDIAN); suboffset += 4; num = tvb_get_ntohl(tvb, suboffset); if(num == LLRP_NO_LIMIT) proto_tree_add_uint_format_value(param_tree, hf_llrp_max_num_accessspec, tvb, suboffset, 4, num, "No limit (%u)", num); else - PARAM_TREE_ADD_STAY(max_num_accessspec, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_max_num_accessspec, tvb, suboffset, 4, ENC_BIG_ENDIAN); suboffset += 4; num = tvb_get_ntohl(tvb, suboffset); if(num == LLRP_NO_LIMIT) proto_tree_add_uint_format_value(param_tree, hf_llrp_max_num_opspec_per_accressspec, tvb, suboffset, 4, num, "No limit (%u)", num); else - PARAM_TREE_ADD_STAY(max_num_opspec_per_accressspec, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_max_num_opspec_per_accressspec, tvb, suboffset, 4, ENC_BIG_ENDIAN); suboffset += 4; break; case LLRP_TLV_REGU_CAPABILITIES: - PARAM_TREE_ADD(country_code, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(comm_standard, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_country_code, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_comm_standard, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_XMIT_POWER_LEVEL_ENTRY: - PARAM_TREE_ADD(index, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(transmit_power, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_index, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_transmit_power, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_FREQ_INFORMATION: - PARAM_TREE_ADD(hopping, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_hopping, tvb, suboffset, 1, ENC_NA); + suboffset += 1; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_FREQ_HOP_TABLE: - PARAM_TREE_ADD(hop_table_id, 1, ENC_NA); - PARAM_TREE_ADD(rfu, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_hop_table_id, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_rfu, tvb, suboffset, 1, ENC_NA); + suboffset += 1; suboffset = dissect_llrp_item_array(tvb, pinfo, param_tree, hf_llrp_num_hops, hf_llrp_frequency, 4, suboffset); break; @@ -1877,32 +1969,45 @@ dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, hf_llrp_num_freqs, hf_llrp_frequency, 4, suboffset); break; case LLRP_TLV_RF_SURVEY_FREQ_CAP: - PARAM_TREE_ADD(min_freq, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(max_freq, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_min_freq, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_max_freq, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_TLV_RO_SPEC: - PARAM_TREE_ADD(rospec_id, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(priority, 1, ENC_NA); - PARAM_TREE_ADD(cur_state, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_rospec_id, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_priority, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_cur_state, tvb, suboffset, 1, ENC_NA); + suboffset += 1; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_RO_SPEC_START_TRIGGER: - PARAM_TREE_ADD(rospec_start_trig_type, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_rospec_start_trig_type, tvb, suboffset, 1, ENC_NA); + suboffset += 1; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_PER_TRIGGER_VAL: - PARAM_TREE_ADD(offset, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(period, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_offset, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_period, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_GPI_TRIGGER_VAL: - PARAM_TREE_ADD(gpi_port, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(gpi_event, 1, ENC_NA); - PARAM_TREE_ADD(timeout, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_gpi_port, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_gpi_event, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_timeout, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_TLV_RO_SPEC_STOP_TRIGGER: - PARAM_TREE_ADD(rospec_stop_trig_type, 1, ENC_NA); - PARAM_TREE_ADD(duration_trig, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_rospec_stop_trig_type, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_duration_trig, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_AI_SPEC: @@ -1911,148 +2016,210 @@ dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_AI_SPEC_STOP: - PARAM_TREE_ADD(aispec_stop_trig_type, 1, ENC_NA); - PARAM_TREE_ADD(duration_trig, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_aispec_stop_trig_type, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_duration_trig, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_TAG_OBSERV_TRIGGER: - PARAM_TREE_ADD(trig_type, 1, ENC_NA); - PARAM_TREE_ADD(rfu, 1, ENC_NA); - PARAM_TREE_ADD(number_of_tags, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(number_of_attempts, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(t, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(timeout, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_trig_type, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_rfu, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_number_of_tags, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_number_of_attempts, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_t, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_timeout, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_TLV_INVENTORY_PARAM_SPEC: - PARAM_TREE_ADD(inventory_spec_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(protocol_id, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_inventory_spec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_protocol_id, tvb, suboffset, 1, ENC_NA); + suboffset += 1; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_RF_SURVEY_SPEC: - PARAM_TREE_ADD(antenna_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(start_freq, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(stop_freq, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_antenna_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_start_freq, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_stop_freq, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_RF_SURVEY_SPEC_STOP_TR: - PARAM_TREE_ADD(stop_trig_type, 1, ENC_NA); - PARAM_TREE_ADD(duration, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(n_4, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_stop_trig_type, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_duration, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_n_4, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_TLV_LOOP_SPEC: - PARAM_TREE_ADD(loop_count, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_loop_count, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_TLV_ACCESS_SPEC: - PARAM_TREE_ADD(accessspec_id, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(antenna_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(protocol_id, 1, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(access_cur_state, 1, ENC_NA); - PARAM_TREE_ADD(rospec_id, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_accessspec_id, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_antenna_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_protocol_id, tvb, suboffset, 1, ENC_BIG_ENDIAN); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_access_cur_state, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_rospec_id, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_ACCESS_SPEC_STOP_TRIG: - PARAM_TREE_ADD(access_stop_trig_type, 1, ENC_NA); - PARAM_TREE_ADD(operation_count, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_access_stop_trig_type, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_operation_count, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_CLIENT_REQ_OP_SPEC: - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_CLIENT_REQ_RESPONSE: - PARAM_TREE_ADD(accessspec_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_accessspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_LLRP_CONF_STATE_VAL: - PARAM_TREE_ADD(conf_value, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_conf_value, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_TLV_IDENT: - PARAM_TREE_ADD(id_type, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_id_type, tvb, suboffset, 1, ENC_NA); + suboffset += 1; num = tvb_get_ntohs(tvb, suboffset); - PARAM_TREE_ADD(reader_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_reader_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); suboffset += num; break; case LLRP_TLV_GPO_WRITE_DATA: - PARAM_TREE_ADD(gpo_port, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(gpo_data, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_gpo_port, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_gpo_data, tvb, suboffset, 1, ENC_NA); + suboffset += 1; break; case LLRP_TLV_KEEPALIVE_SPEC: - PARAM_TREE_ADD(keepalive_trig_type, 1, ENC_NA); - PARAM_TREE_ADD(time_iterval, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_keepalive_trig_type, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_time_iterval, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_TLV_ANTENNA_PROPS: - PARAM_TREE_ADD(antenna_connected, 1, ENC_NA); - PARAM_TREE_ADD(antenna_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(antenna_gain, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_antenna_connected, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_antenna_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_antenna_gain, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_ANTENNA_CONF: - PARAM_TREE_ADD(antenna_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_antenna_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_RF_RECEIVER: - PARAM_TREE_ADD(receiver_sense, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_receiver_sense, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_RF_TRANSMITTER: - PARAM_TREE_ADD(hop_table_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(channel_idx, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(transmit_power, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_hop_table_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_channel_idx, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_transmit_power, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_GPI_PORT_CURRENT_STATE: - PARAM_TREE_ADD(gpi_port, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(gpi_config, 1, ENC_NA); - PARAM_TREE_ADD(gpi_state, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_gpi_port, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_gpi_config, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_gpi_state, tvb, suboffset, 1, ENC_NA); + suboffset += 1; break; case LLRP_TLV_EVENTS_AND_REPORTS: - PARAM_TREE_ADD(hold_events_and_reports, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_hold_events_and_reports, tvb, suboffset, 1, ENC_NA); + suboffset += 1; break; case LLRP_TLV_RO_REPORT_SPEC: - PARAM_TREE_ADD(ro_report_trig, 1, ENC_NA); - PARAM_TREE_ADD(n_2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_ro_report_trig, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_n_2, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_TAG_REPORT_CONTENT_SEL: - PARAM_TREE_ADD_STAY(enable_rospec_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD_STAY(enable_spec_idx, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD_STAY(enable_inv_spec_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD_STAY(enable_antenna_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD_STAY(enable_channel_idx, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD_STAY(enable_peak_rssi, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD_STAY(enable_first_seen, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD_STAY(enable_last_seen, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD_STAY(enable_seen_count, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(enable_accessspec_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_enable_rospec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_enable_spec_idx, tvb, suboffset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_enable_inv_spec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_enable_antenna_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_enable_channel_idx, tvb, suboffset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_enable_peak_rssi, tvb, suboffset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_enable_first_seen, tvb, suboffset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_enable_last_seen, tvb, suboffset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_enable_seen_count, tvb, suboffset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_enable_accessspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_ACCESS_REPORT_SPEC: - PARAM_TREE_ADD(access_report_trig, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_access_report_trig, tvb, suboffset, 1, ENC_NA); + suboffset += 1; break; case LLRP_TLV_EPC_DATA: suboffset = dissect_llrp_bit_field(tvb, param_tree, hf_llrp_epc, suboffset); break; case LLRP_TLV_FREQ_RSSI_LEVEL_ENTRY: - PARAM_TREE_ADD(frequency, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(bandwidth, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(average_rssi, 1, ENC_NA); - PARAM_TREE_ADD(peak_rssi, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_frequency, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_bandwidth, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_average_rssi, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_peak_rssi, tvb, suboffset, 1, ENC_NA); + suboffset += 1; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_EVENT_NOTIF_STATE: - PARAM_TREE_ADD(event_type, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(notif_state, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_event_type, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_notif_state, tvb, suboffset, 1, ENC_NA); + suboffset += 1; break; case LLRP_TLV_HOPPING_EVENT: - PARAM_TREE_ADD(hop_table_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(next_chan_idx, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_hop_table_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_next_chan_idx, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_GPI_EVENT: - PARAM_TREE_ADD(gpi_port, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(gpi_event, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_gpi_port, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_gpi_event, tvb, suboffset, 1, ENC_NA); + suboffset += 1; break; case LLRP_TLV_RO_SPEC_EVENT: - PARAM_TREE_ADD(roevent_type, 1, ENC_NA); - PARAM_TREE_ADD(rospec_id, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(prem_rospec_id, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_roevent_type, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_rospec_id, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_prem_rospec_id, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_TLV_REPORT_BUF_LEVEL_WARN: - PARAM_TREE_ADD(buffer_full_percentage, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_buffer_full_percentage, tvb, suboffset, 1, ENC_NA); + suboffset += 1; break; case LLRP_TLV_REPORT_BUF_OVERFLOW_ERR: break; case LLRP_TLV_READER_EXCEPTION_EVENT: @@ -2060,194 +2227,273 @@ dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_RF_SURVEY_EVENT: - PARAM_TREE_ADD(rfevent_type, 1, ENC_NA); - PARAM_TREE_ADD(rospec_id, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(spec_idx, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_rfevent_type, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_rospec_id, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_spec_idx, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_AI_SPEC_EVENT: - PARAM_TREE_ADD(aievent_type, 1, ENC_NA); - PARAM_TREE_ADD(rospec_id, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(spec_idx, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_aievent_type, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_rospec_id, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_spec_idx, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_ANTENNA_EVENT: - PARAM_TREE_ADD(antenna_event_type, 1, ENC_NA); - PARAM_TREE_ADD(antenna_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_antenna_event_type, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_antenna_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_CONN_ATTEMPT_EVENT: - PARAM_TREE_ADD(conn_status, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_conn_status, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_CONN_CLOSE_EVENT: break; case LLRP_TLV_SPEC_LOOP_EVENT: - PARAM_TREE_ADD(rospec_id, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(loop_count, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_rospec_id, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_loop_count, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_TLV_LLRP_STATUS: - PARAM_TREE_ADD(status_code, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_status_code, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; suboffset = dissect_llrp_utf8_parameter(tvb, pinfo, param_tree, hf_llrp_error_desc, suboffset); suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_FIELD_ERROR: - PARAM_TREE_ADD(field_num, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(error_code, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_field_num, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_error_code, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_PARAM_ERROR: - PARAM_TREE_ADD(parameter_type, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(error_code, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_parameter_type, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_error_code, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_C1G2_LLRP_CAP: - PARAM_TREE_ADD_STAY(can_support_block_erase, 1, ENC_NA); - PARAM_TREE_ADD_STAY(can_support_block_write, 1, ENC_NA); - PARAM_TREE_ADD_STAY(can_support_block_permalock, 1, ENC_NA); - PARAM_TREE_ADD_STAY(can_support_tag_recomm, 1, ENC_NA); - PARAM_TREE_ADD_STAY(can_support_UMI_method2, 1, ENC_NA); - PARAM_TREE_ADD(can_support_XPC, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_can_support_block_erase, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_can_support_block_write, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_can_support_block_permalock, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_can_support_tag_recomm, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_can_support_UMI_method2, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_can_support_XPC, tvb, suboffset, 1, ENC_NA); + suboffset += 1; num = tvb_get_ntohs(tvb, suboffset); if(num == LLRP_NO_LIMIT) proto_tree_add_uint_format_value(param_tree, hf_llrp_max_num_spec_per_rospec, tvb, suboffset, 2, num, "No limit (%u)", num); else - PARAM_TREE_ADD_STAY(max_num_filter_per_query, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_max_num_filter_per_query, tvb, suboffset, 2, ENC_BIG_ENDIAN); suboffset += 2; break; case LLRP_TLV_C1G2_UHF_RF_MD_TBL_ENT: - PARAM_TREE_ADD(mode_ident, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD_STAY(DR, 1, ENC_NA); - PARAM_TREE_ADD(hag_conformance, 1, ENC_NA); - PARAM_TREE_ADD(mod, 1, ENC_NA); - PARAM_TREE_ADD(flm, 1, ENC_NA); - PARAM_TREE_ADD(m, 1, ENC_NA); - PARAM_TREE_ADD(bdr, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(pie, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(min_tari, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(max_tari, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(step_tari, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_mode_ident, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_DR, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_hag_conformance, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_mod, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_flm, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_m, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_bdr, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_pie, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_min_tari, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_max_tari, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_step_tari, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_TLV_C1G2_INVENTORY_COMMAND: - PARAM_TREE_ADD(inventory_state_aware, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_inventory_state_aware, tvb, suboffset, 1, ENC_NA); + suboffset += 1; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_C1G2_FILTER: - PARAM_TREE_ADD(trunc, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_trunc, tvb, suboffset, 1, ENC_NA); + suboffset += 1; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_C1G2_TAG_INV_MASK: - PARAM_TREE_ADD(mb, 1, ENC_NA); - PARAM_TREE_ADD(pointer, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_mb, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_pointer, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; suboffset = dissect_llrp_bit_field(tvb, param_tree, hf_llrp_tag_mask, suboffset); break; case LLRP_TLV_C1G2_TAG_INV_AWARE_FLTR: - PARAM_TREE_ADD(aware_filter_target, 1, ENC_NA); - PARAM_TREE_ADD(aware_filter_action, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_aware_filter_target, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_aware_filter_action, tvb, suboffset, 1, ENC_NA); + suboffset += 1; break; case LLRP_TLV_C1G2_TAG_INV_UNAWR_FLTR: - PARAM_TREE_ADD(unaware_filter_action, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_unaware_filter_action, tvb, suboffset, 1, ENC_NA); + suboffset += 1; break; case LLRP_TLV_C1G2_RF_CONTROL: - PARAM_TREE_ADD(mode_idx, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(tari, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_mode_idx, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_tari, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_C1G2_SINGULATION_CTRL: - PARAM_TREE_ADD(session, 1, ENC_NA); - PARAM_TREE_ADD(tag_population, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(tag_transit_time, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_session, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_tag_population, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_tag_transit_time, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_C1G2_TAG_INV_AWARE_SING: - PARAM_TREE_ADD_STAY(sing_i, 1, ENC_NA); - PARAM_TREE_ADD_STAY(sing_s, 1, ENC_NA); - PARAM_TREE_ADD(sing_a, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_sing_i, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_sing_s, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_sing_a, tvb, suboffset, 1, ENC_NA); + suboffset += 1; break; case LLRP_TLV_C1G2_TARGET_TAG: - PARAM_TREE_ADD_STAY(mb, 1, ENC_NA); - PARAM_TREE_ADD(match, 1, ENC_NA); - PARAM_TREE_ADD(pointer, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_mb, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_match, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_pointer, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; suboffset = dissect_llrp_bit_field(tvb, param_tree, hf_llrp_tag_mask, suboffset); suboffset = dissect_llrp_bit_field(tvb, param_tree, hf_llrp_tag_data, suboffset); break; case LLRP_TLV_C1G2_READ: case LLRP_TLV_C1G2_BLK_ERASE: - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(access_pass, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(mb, 1, ENC_NA); - PARAM_TREE_ADD(word_pointer, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(word_count, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_access_pass, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_mb, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_word_pointer, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_word_count, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_C1G2_WRITE: case LLRP_TLV_C1G2_BLK_WRITE: - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(access_pass, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(mb, 1, ENC_NA); - PARAM_TREE_ADD(word_pointer, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_access_pass, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_mb, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_word_pointer, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; suboffset = dissect_llrp_word_array(tvb, param_tree, hf_llrp_write_data, suboffset); break; case LLRP_TLV_C1G2_KILL: - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(kill_pass, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_kill_pass, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; break; case LLRP_TLV_C1G2_RECOMMISSION: - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(kill_pass, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD_STAY(kill_3, 1, ENC_NA); - PARAM_TREE_ADD_STAY(kill_2, 1, ENC_NA); - PARAM_TREE_ADD(kill_l, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_kill_pass, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_kill_3, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_kill_2, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_kill_l, tvb, suboffset, 1, ENC_NA); + suboffset += 1; break; case LLRP_TLV_C1G2_LOCK: - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(access_pass, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_access_pass, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; suboffset = dissect_llrp_parameters(tvb, pinfo, param_tree, suboffset, param_end, depth+1); break; case LLRP_TLV_C1G2_LOCK_PAYLOAD: - PARAM_TREE_ADD(privilege, 1, ENC_NA); - PARAM_TREE_ADD(data_field, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_privilege, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_data_field, tvb, suboffset, 1, ENC_NA); + suboffset += 1; break; case LLRP_TLV_C1G2_BLK_PERMALOCK: - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(access_pass, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(mb, 1, ENC_NA); - PARAM_TREE_ADD(block_pointer, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_access_pass, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 4; + proto_tree_add_item(param_tree, hf_llrp_mb, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_block_pointer, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; suboffset = dissect_llrp_word_array(tvb, param_tree, hf_llrp_block_mask, suboffset); break; case LLRP_TLV_C1G2_GET_BLK_PERMALOCK: - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(access_pass, 4, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(mb, 1, ENC_NA); - PARAM_TREE_ADD(block_pointer, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(block_range, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_access_pass, tvb, suboffset, 4, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_mb, tvb, suboffset, 1, ENC_NA); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_block_pointer, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_block_range, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_C1G2_EPC_MEMORY_SLCTOR: - PARAM_TREE_ADD_STAY(enable_crc, 1, ENC_NA); - PARAM_TREE_ADD_STAY(enable_pc, 1, ENC_NA); - PARAM_TREE_ADD(enable_xpc, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_enable_crc, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_enable_pc, tvb, suboffset, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_enable_xpc, tvb, suboffset, 1, ENC_NA); + suboffset += 1; break; case LLRP_TLV_C1G2_READ_OP_SPEC_RES: - PARAM_TREE_ADD(access_result, 1, ENC_NA); - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_access_result, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; suboffset = dissect_llrp_word_array(tvb, param_tree, hf_llrp_read_data, suboffset); break; case LLRP_TLV_C1G2_WRT_OP_SPEC_RES: case LLRP_TLV_C1G2_BLK_WRT_OP_SPC_RES: - PARAM_TREE_ADD(access_result, 1, ENC_NA); - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD(num_words_written, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_access_result, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; + proto_tree_add_item(param_tree, hf_llrp_num_words_written, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_C1G2_KILL_OP_SPEC_RES: case LLRP_TLV_C1G2_RECOM_OP_SPEC_RES: case LLRP_TLV_C1G2_LOCK_OP_SPEC_RES: case LLRP_TLV_C1G2_BLK_ERS_OP_SPC_RES: case LLRP_TLV_C1G2_BLK_PRL_OP_SPC_RES: - PARAM_TREE_ADD(access_result, 1, ENC_NA); - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_access_result, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; break; case LLRP_TLV_C1G2_BLK_PRL_STAT_RES: - PARAM_TREE_ADD(access_result, 1, ENC_NA); - PARAM_TREE_ADD(opspec_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_access_result, tvb, suboffset, 1, ENC_NA); + suboffset += 1; + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); + suboffset += 2; suboffset = dissect_llrp_word_array(tvb, param_tree, hf_llrp_permlock_status, suboffset); break; case LLRP_TLV_CUSTOM_PARAMETER: - num = tvb_get_ntohl(tvb, suboffset); - PARAM_TREE_ADD(vendor_id, 4, ENC_BIG_ENDIAN); + proto_tree_add_item_ret_uint(param_tree, hf_llrp_vendor_id, tvb, suboffset, 4, ENC_BIG_ENDIAN, &num); + suboffset += 4; switch(num) { case LLRP_VENDOR_IMPINJ: suboffset = dissect_llrp_impinj_parameter(tvb, pinfo, param_tree, suboffset, param_end); @@ -2337,59 +2583,59 @@ dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, switch (type) { case LLRP_TV_ANTENNA_ID: - PARAM_TREE_ADD_STAY(antenna_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_antenna_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); break; case LLRP_TV_FIRST_SEEN_TIME_UTC: case LLRP_TV_FIRST_SEEN_TIME_UPTIME: case LLRP_TV_LAST_SEEN_TIME_UTC: case LLRP_TV_LAST_SEEN_TIME_UPTIME: - PARAM_TREE_ADD_STAY(microseconds, 8, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_microseconds, tvb, suboffset, 8, ENC_BIG_ENDIAN); break; case LLRP_TV_PEAK_RSSI: - PARAM_TREE_ADD_STAY(peak_rssi, 1, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_peak_rssi, tvb, suboffset, 1, ENC_NA); break; case LLRP_TV_CHANNEL_INDEX: - PARAM_TREE_ADD_STAY(channel_idx, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_channel_idx, tvb, suboffset, 2, ENC_BIG_ENDIAN); break; case LLRP_TV_TAG_SEEN_COUNT: - PARAM_TREE_ADD_STAY(tag_count, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_tag_count, tvb, suboffset, 2, ENC_BIG_ENDIAN); break; case LLRP_TV_RO_SPEC_ID: - PARAM_TREE_ADD_STAY(rospec_id, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_rospec_id, tvb, suboffset, 4, ENC_BIG_ENDIAN); break; case LLRP_TV_INVENTORY_PARAM_SPEC_ID: - PARAM_TREE_ADD_STAY(inventory_spec_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_inventory_spec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); break; case LLRP_TV_C1G2_CRC: - PARAM_TREE_ADD_STAY(crc, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_crc, tvb, suboffset, 2, ENC_BIG_ENDIAN); break; case LLRP_TV_C1G2_PC: - PARAM_TREE_ADD_STAY(pc_bits, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_pc_bits, tvb, suboffset, 2, ENC_BIG_ENDIAN); break; case LLRP_TV_EPC96: - PARAM_TREE_ADD_STAY(epc, 96/8, ENC_NA); + proto_tree_add_item(param_tree, hf_llrp_epc, tvb, suboffset, 96/8, ENC_NA); break; case LLRP_TV_SPEC_INDEX: - PARAM_TREE_ADD_STAY(spec_idx, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_spec_idx, tvb, suboffset, 2, ENC_BIG_ENDIAN); break; case LLRP_TV_CLIENT_REQ_OP_SPEC_RES: - PARAM_TREE_ADD_STAY(opspec_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); break; case LLRP_TV_ACCESS_SPEC_ID: - PARAM_TREE_ADD_STAY(accessspec_id, 4, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_accessspec_id, tvb, suboffset, 4, ENC_BIG_ENDIAN); break; case LLRP_TV_OP_SPEC_ID: - PARAM_TREE_ADD_STAY(opspec_id, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_opspec_id, tvb, suboffset, 2, ENC_BIG_ENDIAN); break; case LLRP_TV_C1G2_SINGULATION_DET: - PARAM_TREE_ADD_STAY(num_coll, 2, ENC_BIG_ENDIAN); - PARAM_TREE_ADD_STAY(num_empty, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_num_coll, tvb, suboffset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_num_empty, tvb, suboffset, 2, ENC_BIG_ENDIAN); break; case LLRP_TV_C1G2_XPC_W1: - PARAM_TREE_ADD_STAY(xpc_w1, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_xpc_w1, tvb, suboffset, 2, ENC_BIG_ENDIAN); break; case LLRP_TV_C1G2_XPC_W2: - PARAM_TREE_ADD_STAY(xpc_w2, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(param_tree, hf_llrp_xpc_w2, tvb, suboffset, 2, ENC_BIG_ENDIAN); break; }; /* Unlike for TLV's, real_len for TV's doesn't include the standard @@ -2400,9 +2646,6 @@ dissect_llrp_parameters(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return offset; } -#undef PARAM_TREE_ADD_STAY -#undef PARAM_TREE_ADD - static guint dissect_llrp_impinj_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint offset) { |