osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix benign issue: For FT_BOOLEAN fields with a zero bitmask, use BASE_NONE for 'display' 

svn path=/trunk/; revision=41385
This commit is contained in:
Bill Meier 2012-03-06 22:12:42 +00:00
parent bd4c0f0691
commit 4f8e416fdc
5 changed files with 56 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
epan/dissectors/packet-adwin-config.c
View File

@ -106,9 +106,7 @@ static int hf_adwin_config_command = -1;
static int hf_adwin_config_data = -1;
static int hf_adwin_config_date = -1;
static int hf_adwin_config_description = -1;
static int hf_adwin_config_dhcp8 = -1;
static int hf_adwin_config_dhcp16 = -1;
static int hf_adwin_config_dhcp32 = -1;
static int hf_adwin_config_dhcp = -1;
static int hf_adwin_config_filename = -1;
static int hf_adwin_config_filesize = -1;
static int hf_adwin_config_gateway = -1;
@ -187,7 +185,7 @@ dissect_UDPStatus(tvbuff_t *tvb, proto_tree *adwin_tree)
ADWIN_ADD_BE(adwin_tree, mac, 20, 6);
ADWIN_ADD_LE(debug_tree, unused, 26, 2);
ADWIN_ADD_BE(adwin_tree, port16, 28, 2);
ADWIN_ADD_LE(adwin_tree, dhcp8, 30, 1);
ADWIN_ADD_LE(adwin_tree, dhcp, 30, 1);
ADWIN_ADD_LE(adwin_tree, netmask_count, 31, 1);
ADWIN_ADD_BE(adwin_tree, gateway, 32, 4);
ADWIN_ADD_LE(debug_tree, unused, 36, 11);
@ -249,7 +247,7 @@ dissect_UDPMessage(tvbuff_t *tvb, proto_tree *adwin_tree)
ADWIN_ADD_LE(adwin_tree, unused, 28, 4);
ADWIN_ADD_LE(adwin_tree, gateway, 32, 4);
ADWIN_ADD_LE(adwin_tree, unused, 36, 4);
ADWIN_ADD_LE(adwin_tree, dhcp32, 40, 4);
ADWIN_ADD_LE(adwin_tree, dhcp, 40, 4);
ADWIN_ADD_LE(adwin_tree, port32, 44, 4);
ADWIN_ADD_LE(adwin_tree, password, 48, 10);
ADWIN_ADD_LE(adwin_tree, bootloader, 58, 1);
@ -314,7 +312,7 @@ dissect_UDPOut(tvbuff_t *tvb, proto_tree *adwin_tree)
ADWIN_ADD_BE(adwin_tree, mac, 4, 6);
ADWIN_ADD_LE(adwin_tree, netmask, 10, 4);
ADWIN_ADD_BE(adwin_tree, gateway, 14, 4);
ADWIN_ADD_LE(adwin_tree, dhcp16, 18, 2);
ADWIN_ADD_LE(adwin_tree, dhcp, 18, 2);
ADWIN_ADD_BE(adwin_tree, port16, 20, 2);
}
@ -517,7 +515,7 @@ proto_register_adwin_config(void)
static hf_register_info hf[] = {
{ &hf_adwin_config_bootloader,
{ "Enable Bootloader", "adwin_config.bootloader",
FT_BOOLEAN, BASE_DEC, NULL, 0x0,
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_adwin_config_command,
@ -540,19 +538,9 @@ proto_register_adwin_config(void)
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_adwin_config_dhcp8,
{ &hf_adwin_config_dhcp,
{ "DHCP enabled", "adwin_config.dhcp",
FT_BOOLEAN, 8, NULL, 0x0,
NULL, HFILL }
},
{ &hf_adwin_config_dhcp16,
{ "DHCP enabled", "adwin_config.dhcp",
FT_BOOLEAN, 16, NULL, 0x0,
NULL, HFILL }
},
{ &hf_adwin_config_dhcp32,
{ "DHCP enabled", "adwin_config.dhcp",
FT_BOOLEAN, 32, NULL, 0x0,
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
NULL, HFILL }
},
{ &hf_adwin_config_filename,
@ -612,7 +600,7 @@ proto_register_adwin_config(void)
},
{ &hf_adwin_config_reboot,
{ "Reboot", "adwin_config.reboot",
FT_BOOLEAN, 32, NULL, 0x0,
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"Number of system reboots.", HFILL }
},
{ &hf_adwin_config_scan_id,
@ -622,7 +610,7 @@ proto_register_adwin_config(void)
},
{ &hf_adwin_config_reply_broadcast, /* send_normal in UDPStatus */
{ "Reply with broadcast", "adwin_config.reply_broadcast",
FT_BOOLEAN, 8, NULL, 0x0,
FT_BOOLEAN, BASE_NONE, NULL, 0x0,
"If this bit is set, the scanned system should reply with a broadcast.", HFILL }
},
{ &hf_adwin_config_revision,

50
epan/dissectors/packet-ansi_801.c
View File

@ -218,7 +218,7 @@ for_req_pseudo_meas(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
SHORT_DATA_CHECK(len, 3);
saved_offset = offset;
bit_offset = offset << 3;
bit_offset = offset << 3;
/* PREF_RESP_QUAL */
proto_tree_add_bits_item(tree, hf_ansi_801_pref_resp_qual, tvb, bit_offset, 3, ENC_BIG_ENDIAN);
@ -586,7 +586,7 @@ for_pr_gps_sense_ass(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
num_dr_p);
offset += 2;
oct = tvb_get_guint8(tvb, offset);
oct = tvb_get_guint8(tvb, offset);
other_decode_bitfield_value(bigbuf, value, 0x0001, 16);
value = ((value & 0x0001) << 7) | ((oct & 0xfe) >> 1);
@ -650,7 +650,7 @@ for_pr_gps_almanac(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
SHORT_DATA_CHECK(len, 4);
value = tvb_get_ntohl(tvb, offset);
value = tvb_get_ntohl(tvb, offset);
num_sv = (value & 0xfc000000) >> 26;
other_decode_bitfield_value(bigbuf, value, 0xfc000000, 32);
@ -703,7 +703,7 @@ for_pr_gps_nav_msg_bits(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offs
SHORT_DATA_CHECK(len, 2);
value = tvb_get_ntohs(tvb, offset);
value = tvb_get_ntohs(tvb, offset);
num_sv = (value & 0xfc00) >> 10;
other_decode_bitfield_value(bigbuf, value, 0xfc00, 16);
@ -753,7 +753,7 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
SHORT_DATA_CHECK(len, 11);
saved_offset = offset;
bit_offset = offset << 3;
bit_offset = offset << 3;
/* TIME_REF_CDMA */
value = tvb_get_bits16(tvb, bit_offset, 14, ENC_BIG_ENDIAN);
@ -769,14 +769,14 @@ pr_loc_response(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
bit_offset += 25;
/* LONG */
value = tvb_get_bits32(tvb, bit_offset, 26, ENC_BIG_ENDIAN);
value = tvb_get_bits32(tvb, bit_offset, 26, ENC_BIG_ENDIAN);
fl_value = (float)(-180.0 + ((float)value * 180 / 33554432));
proto_tree_add_float_bits_format_value(tree, hf_ansi_801_long, tvb, bit_offset, 26, fl_value,
"%.5f degrees %s (0x%08x)", fabs(fl_value), fl_value < 0 ? "West" : "East", value);
bit_offset += 26;
/* LOC_UNCRTNTY_ANG */
value = tvb_get_bits8(tvb, bit_offset, 4);
value = tvb_get_bits8(tvb, bit_offset, 4);
fl_value = (float)(5.625 * value);
proto_tree_add_float_bits_format_value(tree, hf_ansi_801_loc_uncrtnty_ang, tvb, bit_offset, 4, fl_value,
"%.5f degrees (0x%02x)", fl_value, value);
@ -922,7 +922,7 @@ for_pr_gps_sat_health(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset
SHORT_DATA_CHECK(len, 1);
saved_offset = offset;
bit_offset = offset << 3;
bit_offset = offset << 3;
/* BAD_SV_PRESENT */
proto_tree_add_bits_ret_val(tree, hf_ansi_801_bad_sv_present, tvb, bit_offset++, 1, &bad_sv_present, ENC_BIG_ENDIAN);
@ -965,7 +965,7 @@ rev_req_gps_acq_ass(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
SHORT_DATA_CHECK(len, 1);
saved_offset = offset;
bit_offset = offset << 3;
bit_offset = offset << 3;
proto_tree_add_bits_item(tree, hf_ansi_801_dopp_req, tvb, bit_offset++, 1, ENC_BIG_ENDIAN);
proto_tree_add_bits_item(tree, hf_ansi_801_add_dopp_req, tvb, bit_offset++, 1, ENC_BIG_ENDIAN);
@ -1493,7 +1493,7 @@ for_request(tvbuff_t *tvb, proto_tree *tree, guint32 *offset_p, guint8 pd_msg_ty
proto_item *item;
offset = *offset_p;
oct = tvb_get_guint8(tvb, offset);
oct = tvb_get_guint8(tvb, offset);
if (pd_msg_type == 0x00)
{
@ -1565,7 +1565,7 @@ for_response(tvbuff_t *tvb, proto_tree *tree, guint32 *offset_p)
proto_item *item;
offset = *offset_p;
oct = tvb_get_guint8(tvb, offset);
oct = tvb_get_guint8(tvb, offset);
other_decode_bitfield_value(bigbuf, oct, 0xe0, 8);
proto_tree_add_text(tree, tvb, offset, 1,
@ -1628,7 +1628,7 @@ rev_request(tvbuff_t *tvb, proto_tree *tree, guint32 *offset_p, guint8 pd_msg_ty
proto_item *item;
offset = *offset_p;
oct = tvb_get_guint8(tvb, offset);
oct = tvb_get_guint8(tvb, offset);
if (pd_msg_type == 0x00)
{
@ -1697,7 +1697,7 @@ rev_response(tvbuff_t *tvb, proto_tree *tree, guint32 *offset_p)
proto_item *item;
offset = *offset_p;
oct = tvb_get_guint8(tvb, offset);
oct = tvb_get_guint8(tvb, offset);
other_decode_bitfield_value(bigbuf, oct, 0xe0, 8);
proto_tree_add_text(tree, tvb, offset, 1,
@ -1760,7 +1760,7 @@ dissect_ansi_801_for_message(tvbuff_t *tvb, proto_tree *tree)
proto_item *hidden_item;
offset = 0;
oct = tvb_get_guint8(tvb, offset);
oct = tvb_get_guint8(tvb, offset);
other_decode_bitfield_value(bigbuf, oct, 0x80, 8);
proto_tree_add_text(tree, tvb, offset, 1,
@ -1947,7 +1947,7 @@ dissect_ansi_801_rev_message(tvbuff_t *tvb, proto_tree *tree)
proto_item *hidden_item;
offset = 0;
oct = tvb_get_guint8(tvb, offset);
oct = tvb_get_guint8(tvb, offset);
other_decode_bitfield_value(bigbuf, oct, 0x80, 8);
proto_tree_add_text(tree, tvb, offset, 1,
@ -2242,12 +2242,12 @@ proto_register_ansi_801(void)
},
{ &hf_ansi_801_fix_type,
{ "Fix type (FIX_TYPE)", "ansi_801.fix_type",
FT_BOOLEAN, 8, TFS(&ansi_801_fix_type_vals), 0x00,
FT_BOOLEAN, BASE_NONE, TFS(&ansi_801_fix_type_vals), 0x00,
NULL, HFILL }
},
{ &hf_ansi_801_velocity_incl,
{ "Velocity information included (VELOCITY_INCL)", "ansi_801.velocity_incl",
FT_BOOLEAN, 8, NULL, 0x00,
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_ansi_801_velocity_hor,
@ -2267,7 +2267,7 @@ proto_register_ansi_801(void)
},
{ &hf_ansi_801_clock_incl,
{ "Clock information included (CLOCK_INCL)", "ansi_801.clock_incl",
FT_BOOLEAN, 8, NULL, 0x00,
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_ansi_801_clock_bias,
@ -2282,7 +2282,7 @@ proto_register_ansi_801(void)
},
{ &hf_ansi_801_height_incl,
{ "Height information included (HEIGHT_INCL)", "ansi_801.height_incl",
FT_BOOLEAN, 8, NULL, 0x00,
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_ansi_801_height,
@ -2302,7 +2302,7 @@ proto_register_ansi_801(void)
},
{ &hf_ansi_801_bad_sv_present,
{ "Bad GPS satellites present (BAD_SV_PRESENT)", "ansi_801.bad_sv_present",
FT_BOOLEAN, 8, NULL, 0x00,
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_ansi_801_num_bad_sv,
@ -2317,22 +2317,22 @@ proto_register_ansi_801(void)
},
{ &hf_ansi_801_dopp_req,
{ "Doppler (0th order) term requested (DOPP_REQ)", "ansi_801.dopp_req",
FT_BOOLEAN, 8, NULL, 0x00,
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_ansi_801_add_dopp_req,
{ "Additional Doppler terms requested (ADD_DOPP_REQ)", "ansi_801.add_dopp_req",
FT_BOOLEAN, 8, NULL, 0x00,
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_ansi_801_code_ph_par_req,
{ "Code phase parameters requested (CODE_PH_PAR_REQ)", "ansi_801.code_ph_par_req",
FT_BOOLEAN, 8, NULL, 0x00,
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_ansi_801_az_el_req,
{ "Azimuth and elevation angle requested (AZ_EL_REQ)", "ansi_801.az_el_req",
FT_BOOLEAN, 8, NULL, 0x00,
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_ansi_801_pref_resp_qual,
@ -2352,7 +2352,7 @@ proto_register_ansi_801(void)
},
{ &hf_ansi_801_offset_req,
{ "Offset requested (OFFSET_REQ)", "ansi_801.offset_req",
FT_BOOLEAN, 8, NULL, 0x00,
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
};

10
epan/dissectors/packet-assa_r3.c
View File

@ -2399,7 +2399,7 @@ static hf_register_info hf [] =
{ &hf_r3_definetimezone_calendar, { "Calendar", "r3.definetimezone.calendar", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_r3_rmtauthretry_sequence, { "Remote Auth Retry Sequence", "r3.rmtauthretry.sequence", FT_UINT16, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_r3_rmtauthretry_retry, { "Remote Auth Retry Mode", "r3.rmtauthretry.mode", FT_BOOLEAN, 8, TFS (&tfs_rmtauthretry_flags), 0x0, NULL, HFILL }},
{ &hf_r3_rmtauthretry_retry, { "Remote Auth Retry Mode", "r3.rmtauthretry.mode", FT_BOOLEAN, BASE_NONE, TFS (&tfs_rmtauthretry_flags), 0x0, NULL, HFILL }},
{ &hf_r3_eventlogdump_starttime_year, { "Start Year", "r3.eventlogdump.start.year", FT_UINT8, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_r3_eventlogdump_starttime_month, { "Start Month", "r3.eventlogdump.start.month", FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_monthnames_ext, 0x0, NULL, HFILL }},
@ -2462,7 +2462,7 @@ static hf_register_info hf [] =
{ &hf_r3_alarm_length, { "Length", "r3.alarm.length", FT_UINT8, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_r3_alarm_id, { "ID", "r3.alarm.id", FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_alarmidnames_ext, 0x0, NULL, HFILL }},
{ &hf_r3_alarm_state, { "State", "r3.alarm.state", FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x0, NULL, HFILL }},
{ &hf_r3_alarm_state, { "State", "r3.alarm.state", FT_BOOLEAN, BASE_NONE, TFS (&tfs_enabled_disabled), 0x0, NULL, HFILL }},
{ &hf_r3_mfgfield_length, { "Field Length", "r3.mfgfield.length", FT_UINT8, BASE_DEC_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_r3_mfgfield, { "Field", "r3.mfgfield.field", FT_UINT8, BASE_DEC_HEX|BASE_EXT_STRING, &r3_mfgfieldnames_ext, 0x0, NULL, HFILL }},
@ -2511,11 +2511,11 @@ static hf_register_info hf [] =
{ &hf_r3_checksumresults , { "Checksum Results", "r3.checksumresults", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
{ &hf_r3_checksumresults_field, { "Field", "r3.checksumresults.field", FT_UINT8, BASE_HEX|BASE_EXT_STRING, & r3_checksumresultnames_ext, 0x0, NULL, HFILL }},
{ &hf_r3_checksumresults_length, { "Length", "r3.checksumresults.length", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
{ &hf_r3_checksumresults_state, { "State", "r3.checksumresults.state", FT_BOOLEAN, 8, TFS (&tfs_errornoerror_flags), 0x0, NULL, HFILL }},
{ &hf_r3_checksumresults_state, { "State", "r3.checksumresults.state", FT_BOOLEAN, BASE_NONE, TFS (&tfs_errornoerror_flags), 0x0, NULL, HFILL }},
{ &hf_r3_forceoptions_item, { "Item", "r3.forceoptions.item", FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_forceitemnames_ext, 0x0, NULL, HFILL }},
{ &hf_r3_forceoptions_length, { "Length", "r3.forceoptions.length", FT_UINT8, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_r3_forceoptions_state_8, { "State", "r3.forceoptions.state", FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x0, NULL, HFILL }},
{ &hf_r3_forceoptions_state_8, { "State", "r3.forceoptions.state", FT_BOOLEAN, BASE_NONE, TFS (&tfs_enabled_disabled), 0x0, NULL, HFILL }},
{ &hf_r3_forceoptions_state_16, { "State", "r3.forceoptions.state", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_r3_forceoptions_state_24, { "State", "r3.forceoptions.state", FT_UINT24, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_r3_forceoptions_state_32, { "State", "r3.forceoptions.state", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
@ -2574,7 +2574,7 @@ static hf_register_info hf [] =
/* { &hf_r3_mortisestatelog, { "Mortise State Log", "r3.mortisestatelog", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}, */
{ &hf_r3_mortisestatelog_pointer, { "Event Pointer", "r3.mortisestatelog.pointer", FT_UINT8, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_r3_mortisestatelog_mortisetype, { "Mortise Type", "r3.mortisestatelog.mortisetype", FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_mortisetypenames_ext, 0x0, NULL, HFILL }},
{ &hf_r3_mortisestatelog_waiting, { "Waiting For Door Closed", "r3.mortisestatelog.waiting", FT_BOOLEAN, 8, TFS (&tfs_true_false ), 0x00, NULL, HFILL }},
{ &hf_r3_mortisestatelog_waiting, { "Waiting For Door Closed", "r3.mortisestatelog.waiting", FT_BOOLEAN, BASE_NONE, TFS (&tfs_true_false ), 0x00, NULL, HFILL }},
{ &hf_r3_mortisestatelog_state, { "State", "r3.mortisestatelog.state", FT_UINT8, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_r3_mortisestatelog_last, { "Last State", "r3.mortisestatelog.laststate", FT_UINT8, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_r3_mortisestatelog_event, { "Event", "r3.mortisestatelog.event", FT_UINT8, BASE_HEX_DEC|BASE_EXT_STRING, &r3_mortiseeventnames_ext, 0x0, NULL, HFILL }},

8
epan/dissectors/packet-batadv.c
View File

@ -3409,24 +3409,24 @@ void proto_register_batadv(void)
},
{ &hf_msg_fragment_overlap,
{"Message fragment overlap", "batadv.unicast_frag.fragment.overlap",
FT_BOOLEAN, 0, NULL, 0x00,
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_msg_fragment_overlap_conflicts,
{"Message fragment overlapping with conflicting data",
"batadv.unicast_frag.fragment.overlap.conflicts",
FT_BOOLEAN, 0, NULL, 0x00,
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_msg_fragment_multiple_tails,
{"Message has multiple tail fragments",
"batadv.unicast_frag.fragment.multiple_tails",
FT_BOOLEAN, 0, NULL, 0x00,
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_msg_fragment_too_long_fragment,
{"Message fragment too long", "batadv.unicast_frag.fragment.too_long_fragment",
FT_BOOLEAN, 0, NULL, 0x00,
FT_BOOLEAN, BASE_NONE, NULL, 0x00,
NULL, HFILL }
},
{ &hf_msg_fragment_error,

26
epan/dissectors/packet-bootp.c
View File

@ -5017,7 +5017,7 @@ proto_register_bootp(void)
{ &hf_bootp_option_value_i32, { "Value", "bootp.option.value", FT_INT32, BASE_DEC, NULL, 0x0, "32-bit Bootp/Dhcp option value", HFILL }},
{ &hf_bootp_option_value_stringz, { "Value", "bootp.option.value", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Z-String Bootp/Dhcp option value", HFILL }},
{ &hf_bootp_option_value_ip_address, { "Value", "bootp.option.value", FT_IPv4, BASE_NONE, NULL, 0x00, "IP address Bootp/Dhcp option value", HFILL }},
{ &hf_bootp_option_value_boolean, { "Value", "bootp.option.value", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x00, "Boolean Bootp/Dhcp option value", HFILL }},
{ &hf_bootp_option_value_boolean, { "Value", "bootp.option.value", FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, "Boolean Bootp/Dhcp option value", HFILL }},
{ &hf_bootp_option_padding, { "Padding", "bootp.option.padding", FT_BYTES, BASE_NONE, NULL, 0x0, "Option 0: Padding", HFILL }},
{ &hf_bootp_option_subnet_mask, { "Subnet Mask", "bootp.option.subnet_mask", FT_IPv4, BASE_NONE, NULL, 0x00, "Option 1: Subnet Mask", HFILL }},
{ &hf_bootp_option_time_offset, { "Time Offset", "bootp.option.time_offset", FT_INT32, BASE_DEC, NULL, 0x00, "Option 2: Time Offset", HFILL }},
@ -5037,29 +5037,29 @@ proto_register_bootp(void)
{ &hf_bootp_option_swap_server, { "Swap Server", "bootp.option.swap_server", FT_IPv4, BASE_NONE, NULL, 0x00, "Option 16: Swap Server", HFILL }},
{ &hf_bootp_option_root_path, { "Root Path", "bootp.option.root_path", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Option 17: Root Path", HFILL }},
{ &hf_bootp_option_extension_path, { "Extensions Path", "bootp.option.extension_path", FT_STRINGZ, BASE_NONE, NULL, 0x0,"Option 18: Extensions Path", HFILL }},
{ &hf_bootp_option_ip_forwarding, { "IP Forwarding", "bootp.option.ip_forwarding", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x00, "Option 19: IP Forwarding", HFILL }},
{ &hf_bootp_option_ip_forwarding, { "IP Forwarding", "bootp.option.ip_forwarding", FT_BOOLEAN, BASE_NONE, TFS(&tfs_enabled_disabled), 0x00, "Option 19: IP Forwarding", HFILL }},
{ &hf_bootp_option_policy_filter_ip, { "IP Address", "bootp.option.policy_filter.ip", FT_IPv4, BASE_NONE, NULL, 0x00, "Option 21: IP address", HFILL }},
{ &hf_bootp_option_policy_filter_subnet_mask, { "Subnet Mask", "bootp.option.policy_filter.subnet_mask", FT_IPv4, BASE_NONE, NULL, 0x00, "Option 21: Subnet Mask", HFILL }},
{ &hf_bootp_option_non_local_source_routing, { "Non-Local Source Routing", "bootp.option.non_local_source_routing", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x00, "Option 20: Non-Local Source Routing", HFILL }},
{ &hf_bootp_option_non_local_source_routing, { "Non-Local Source Routing", "bootp.option.non_local_source_routing", FT_BOOLEAN, BASE_NONE, TFS(&tfs_enabled_disabled), 0x00, "Option 20: Non-Local Source Routing", HFILL }},
{ &hf_bootp_option_max_datagram_reassembly_size, { "Maximum Datagram Reassembly Size", "bootp.option.max_datagram_reassembly_size", FT_UINT16, BASE_DEC, NULL, 0x0, "Option 22: Maximum Datagram Reassembly Size", HFILL }},
{ &hf_bootp_option_default_ip_ttl, { "Default IP Time-to-Live", "bootp.option.default_ip_ttl", FT_UINT8, BASE_DEC, NULL, 0x0, "Option 23: Default IP Time-to-Live", HFILL }},
{ &hf_bootp_option_path_mtu_aging_timeout, { "Path MTU Aging Timeout", "bootp.option.path_mtu_aging_timeout", FT_UINT32, BASE_DEC, NULL, 0x00, "Option 24: Path MTU Aging Timeout", HFILL }},
{ &hf_bootp_option_path_mtu_plateau_table_item, { "Path MTU Plateau Table Item", "bootp.option.path_mtu_plateau_table_item", FT_UINT16, BASE_DEC, NULL, 0x0, "Option 25: Path MTU Plateau Table Item", HFILL }},
{ &hf_bootp_option_interface_mtu, { "Interface MTU", "bootp.option.interface_mtu", FT_UINT16, BASE_DEC, NULL, 0x0,"Option 26: Interface MTU", HFILL }},
{ &hf_bootp_option_all_subnets_are_local, { "All Subnets are Local", "bootp.option.all_subnets_are_local", FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x00, "Option 27: All Subnets are Local", HFILL }},
{ &hf_bootp_option_all_subnets_are_local, { "All Subnets are Local", "bootp.option.all_subnets_are_local", FT_BOOLEAN, BASE_NONE, TFS(&tfs_yes_no), 0x00, "Option 27: All Subnets are Local", HFILL }},
{ &hf_bootp_option_broadcast_address, { "Broadcast Address", "bootp.option.broadcast_address", FT_IPv4, BASE_NONE, NULL, 0x00, "Option 28: Broadcast Address", HFILL }},
{ &hf_bootp_option_perform_mask_discovery, { "Perform Mask Discovery", "bootp.option.perform_mask_discovery", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x00, "Option 29: Perform Mask Discovery", HFILL }},
{ &hf_bootp_option_mask_supplier, { "Mask Supplier", "bootp.option.mask_supplier", FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x00, "Option 30: Mask Supplier", HFILL }},
{ &hf_bootp_option_perform_router_discover, { "Perform Router Discover", "bootp.option.perform_router_discover", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x00, "Option 31: Perform Router Discover", HFILL }},
{ &hf_bootp_option_perform_mask_discovery, { "Perform Mask Discovery", "bootp.option.perform_mask_discovery", FT_BOOLEAN, BASE_NONE, TFS(&tfs_enabled_disabled), 0x00, "Option 29: Perform Mask Discovery", HFILL }},
{ &hf_bootp_option_mask_supplier, { "Mask Supplier", "bootp.option.mask_supplier", FT_BOOLEAN, BASE_NONE, TFS(&tfs_yes_no), 0x00, "Option 30: Mask Supplier", HFILL }},
{ &hf_bootp_option_perform_router_discover, { "Perform Router Discover", "bootp.option.perform_router_discover", FT_BOOLEAN, BASE_NONE, TFS(&tfs_enabled_disabled), 0x00, "Option 31: Perform Router Discover", HFILL }},
{ &hf_bootp_option_router_solicitation_address, { "Router Solicitation Address", "bootp.option.router_solicitation_address", FT_IPv4, BASE_NONE, NULL, 0x00, "Option 32: Router Solicitation Address", HFILL }},
{ &hf_bootp_option_static_route_ip, { "Destination IP Address", "bootp.option.static_route.ip", FT_IPv4, BASE_NONE, NULL, 0x00, "Option 33: Destination IP address", HFILL }},
{ &hf_bootp_option_static_route_router, { "Destination Router", "bootp.option.static_route.router", FT_IPv4, BASE_NONE, NULL, 0x00, "Option 33: Destination Router", HFILL }},
{ &hf_bootp_option_trailer_encapsulation, { "Trailer Encapsulation", "bootp.option.trailer_encapsulation", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x00, "Option 34: Trailer Encapsulation", HFILL }},
{ &hf_bootp_option_trailer_encapsulation, { "Trailer Encapsulation", "bootp.option.trailer_encapsulation", FT_BOOLEAN, BASE_NONE, TFS(&tfs_enabled_disabled), 0x00, "Option 34: Trailer Encapsulation", HFILL }},
{ &hf_bootp_option_arp_cache_timeout, { "ARP Cache Timeout", "bootp.option.arp_cache_timeout", FT_UINT32, BASE_DEC, NULL, 0x00, "Option 35: ARP Cache Timeout", HFILL }},
{ &hf_bootp_option_ethernet_encapsulation, { "Ethernet Encapsulation", "bootp.option.ethernet_encapsulation", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x00, "Option 36: Ethernet Encapsulation", HFILL }},
{ &hf_bootp_option_ethernet_encapsulation, { "Ethernet Encapsulation", "bootp.option.ethernet_encapsulation", FT_BOOLEAN, BASE_NONE, TFS(&tfs_enabled_disabled), 0x00, "Option 36: Ethernet Encapsulation", HFILL }},
{ &hf_bootp_option_tcp_default_ttl, { "TCP Default TTL", "bootp.option.tcp_default_ttl", FT_UINT8, BASE_DEC, NULL, 0x0, "Option 37: TCP Default TTL", HFILL }},
{ &hf_bootp_option_tcp_keepalive_interval, { "TCP Keepalive Interval", "bootp.option.tcp_keepalive_interval", FT_UINT32, BASE_DEC, NULL, 0x00, "Option 38: TCP Keepalive Interval", HFILL }},
{ &hf_bootp_option_tcp_keepalive_garbage, { "TCP Keepalive Garbage", "bootp.option.tcp_keepalive_garbage", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x00, "Option 39: TCP Keepalive Garbage", HFILL }},
{ &hf_bootp_option_tcp_keepalive_garbage, { "TCP Keepalive Garbage", "bootp.option.tcp_keepalive_garbage", FT_BOOLEAN, BASE_NONE, TFS(&tfs_enabled_disabled), 0x00, "Option 39: TCP Keepalive Garbage", HFILL }},
{ &hf_bootp_option_nis_domain, { "Network Information Service Domain", "bootp.option.nis_domain", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Option 40: Network Information Service Domain", HFILL }},
{ &hf_bootp_option_nis_server, { "Network Information Service Server", "bootp.option.nis_server", FT_IPv4, BASE_NONE, NULL, 0x00, "Option 41: Network Information Service Server", HFILL }},
{ &hf_bootp_option_ntp_server, { "Network Time Protocol Server", "bootp.option.ntp_server", FT_IPv4, BASE_NONE, NULL, 0x00, "Option 42: Network Time Protocol Server", HFILL }},
@ -5148,13 +5148,13 @@ proto_register_bootp(void)
{ &hf_bootp_option63_value, { "Value", "bootp.option.novell_options.value", FT_BYTES, BASE_NONE, NULL, 0x0, "Option 63: Suboption value", HFILL }},
{ &hf_bootp_option63_value_8, { "Value", "bootp.option.novell_options.value", FT_UINT8, BASE_DEC, NULL, 0x0, "Option 63: Suboption 8-bit value", HFILL }},
{ &hf_bootp_option63_value_ip_address, { "Value", "bootp.option.novell_options.value", FT_IPv4, BASE_NONE, NULL, 0x00, "Option 63: Suboption IP address", HFILL }},
{ &hf_bootp_option63_value_boolean, { "Value", "bootp.option.novell_options.value", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x00, "Option 63: Suboption Boolean value", HFILL }},
{ &hf_bootp_option63_broadcast, { "Broadcast for nearest Netware server", "bootp.option.novell_options.broadcast", FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x00, "Option 63:5 Broadcast for nearest Netware server", HFILL }},
{ &hf_bootp_option63_value_boolean, { "Value", "bootp.option.novell_options.value", FT_BOOLEAN, BASE_NONE, TFS(&tfs_true_false), 0x00, "Option 63: Suboption Boolean value", HFILL }},
{ &hf_bootp_option63_broadcast, { "Broadcast for nearest Netware server", "bootp.option.novell_options.broadcast", FT_BOOLEAN, BASE_NONE, TFS(&tfs_yes_no), 0x00, "Option 63:5 Broadcast for nearest Netware server", HFILL }},
{ &hf_bootp_option63_preferred_dss_server, { "Preferred DSS server", "bootp.option.novell_options.preferred_dss_server", FT_IPv4, BASE_NONE, NULL, 0x00, "Option 63:6 Preferred DSS server", HFILL }},
{ &hf_bootp_option63_nearest_nwip_server, { "Nearest NWIP server", "bootp.option.novell_options.nearest_nwip_server", FT_IPv4, BASE_NONE, NULL, 0x00, "Option 63:7 Nearest NWIP server", HFILL }},
{ &hf_bootp_option63_autoretries, { "Autoretries", "bootp.option.novell_options.autoretries", FT_UINT8, BASE_DEC, NULL, 0x0, "Option 63:8 Autoretries", HFILL }},
{ &hf_bootp_option63_autoretry_delay, { "Autoretry delay, sec", "bootp.option.novell_options.autoretry_delay", FT_UINT8, BASE_DEC, NULL, 0x0, "Option 63:9 Autoretry delay, sec", HFILL }},
{ &hf_bootp_option63_support_netware_v1_1, { "Broadcast for nearest Netware server", "bootp.option.novell_options.support_netware_v1_1", FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x00, "Option 63:10 Broadcast for nearest Netware server", HFILL }},
{ &hf_bootp_option63_support_netware_v1_1, { "Broadcast for nearest Netware server", "bootp.option.novell_options.support_netware_v1_1", FT_BOOLEAN, BASE_NONE, TFS(&tfs_yes_no), 0x00, "Option 63:10 Broadcast for nearest Netware server", HFILL }},
{ &hf_bootp_option63_primary_dss, { "Primary DSS", "bootp.option.novell_options.primary_dss", FT_IPv4, BASE_NONE, NULL, 0x00, "Option 63:11 Primary DSS", HFILL }},
{ &hf_bootp_option_nis_plus_domain, { "Network Information Service+ Domain", "bootp.option.nis_plus_domain", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Option 64: Network Information Service+ Domain", HFILL }},