aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-batadv.c18
-rw-r--r--epan/dissectors/packet-dcerpc-fileexp.c18
-rw-r--r--epan/dissectors/packet-dcerpc-spoolss.c27
-rw-r--r--epan/dissectors/packet-dcerpc.c3
-rw-r--r--epan/dissectors/packet-erldp.c4
5 files changed, 3 insertions, 67 deletions
diff --git a/epan/dissectors/packet-batadv.c b/epan/dissectors/packet-batadv.c
index 545fad6a5e..9db95b4594 100644
--- a/epan/dissectors/packet-batadv.c
+++ b/epan/dissectors/packet-batadv.c
@@ -242,11 +242,9 @@ static int hf_batadv_batman_seqno32 = -1;
static int hf_batadv_batman_orig = -1;
static int hf_batadv_batman_prev_sender = -1;
static int hf_batadv_batman_num_hna = -1;
-static int hf_batadv_batman_pad = -1;
static int hf_batadv_batman_hna = -1;
static int hf_batadv_bcast_version = -1;
-static int hf_batadv_bcast_pad = -1;
static int hf_batadv_bcast_orig = -1;
static int hf_batadv_bcast_seqno = -1;
static int hf_batadv_bcast_seqno32 = -1;
@@ -586,7 +584,7 @@ static int dissect_batadv_batman_v5(tvbuff_t *tvb, int offset, packet_info *pinf
proto_tree_add_item(batadv_batman_tree, hf_batadv_batman_num_hna, tvb, offset, 1, FALSE);
offset += 1;
- /* Hidden: proto_tree_add_item(batadv_batman_tree, hf_batadv_batman_pad, tvb, offset, 1, FALSE); */
+ /* Skip 1 byte of padding. */
offset += 1;
SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, orig_addr);
@@ -797,7 +795,7 @@ static int dissect_batadv_batman_v9(tvbuff_t *tvb, int offset, packet_info *pinf
dissect_batadv_gwflags(tvb, batman_packeth->gwflags, offset, tgw);
offset += 1;
- /* Hidden: proto_tree_add_item(batadv_batman_tree, hf_batadv_batman_pad, tvb, offset, 1, FALSE); */
+ /* Skip 1 byte of padding. */
offset += 1;
SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, orig_addr);
@@ -907,7 +905,7 @@ static int dissect_batadv_batman_v10(tvbuff_t *tvb, int offset, packet_info *pin
dissect_batadv_gwflags(tvb, batman_packeth->gwflags, offset, tgw);
offset += 1;
- /* Hidden: proto_tree_add_item(batadv_batman_tree, hf_batadv_batman_pad, tvb, offset, 1, FALSE); */
+ /* Skip 1 byte of padding. */
offset += 1;
SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, orig_addr);
@@ -2064,11 +2062,6 @@ void proto_register_batadv(void)
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
- { &hf_batadv_batman_pad,
- { "Padding", "batadv.batman.pad",
- FT_UINT8, BASE_DEC, NULL, 0x0,
- NULL, HFILL }
- },
{ &hf_batadv_batman_flags_directlink,
{ "DirectLink", "batadv.batman.flags.directlink",
FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x40,
@@ -2094,11 +2087,6 @@ void proto_register_batadv(void)
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL }
},
- { &hf_batadv_bcast_pad,
- { "Padding", "batadv.bcast.pad",
- FT_UINT8, BASE_DEC, NULL, 0x0,
- NULL, HFILL }
- },
{ &hf_batadv_bcast_orig,
{ "Originator", "batadv.bcast.orig",
FT_ETHER, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c
index 94fbdd9a53..ee9db67235 100644
--- a/epan/dissectors/packet-dcerpc-fileexp.c
+++ b/epan/dissectors/packet-dcerpc-fileexp.c
@@ -122,10 +122,6 @@ static int hf_fileexp_afsFid_volume_high = -1;
static int hf_fileexp_afsFid_volume_low = -1;
static int hf_fileexp_afsFid_Vnode = -1;
static int hf_fileexp_afsFid_Unique = -1;
-static int hf_fileexp_volume_high = -1;
-static int hf_fileexp_volume_low = -1;
-static int hf_fileexp_vnode = -1;
-static int hf_fileexp_unique = -1;
static int hf_fileexp_interfaceversion = -1;
static int hf_fileexp_filetype = -1;
static int hf_fileexp_linkcount = -1;
@@ -218,10 +214,7 @@ static int hf_fileexp_l_sysid = -1;
static int hf_fileexp_l_type = -1;
static int hf_fileexp_l_whence = -1;
static int hf_fileexp_acl_len = -1;
-static int hf_fileexp_st = -1;
-static int hf_fileexp_uint = -1;
static int hf_fileexp_setcontext_rqst_epochtime = -1;
-static int hf_fileexp_setcontext_rqst_secobjectid = -1;
static int hf_fileexp_setcontext_rqst_clientsizesattrs = -1;
static int hf_fileexp_setcontext_rqst_parm7 = -1;
static int hf_fileexp_afsNetAddr_type = -1;
@@ -252,7 +245,6 @@ static int hf_fileexp_offsetp_low = -1;
static int hf_fileexp_nextoffsetp_high = -1;
static int hf_fileexp_cellidp_low = -1;
static int hf_fileexp_tn_tag = -1;
-static int hf_fileexp_tn_size = -1;
static int hf_fileexp_tn_string = -1;
static int hf_fileexp_bulkfetchvv_numvols = -1;
static int hf_fileexp_bulkfetchvv_spare1 = -1;
@@ -267,7 +259,6 @@ static int hf_fileexp_gettime_syncdistance = -1;
static int hf_fileexp_gettime_usecondsp = -1;
static int hf_fileexp_readdir_size = -1;
static int hf_fileexp_afsNameString_t_principalName_size = -1;
-static int hf_fileexp_afsNameString_t_principalName_size2 = -1;
static int hf_fileexp_afsTaggedPath_tp_length = -1;
static int hf_fileexp_fstype = -1;
static int hf_fileexp_gettime_secondsp = -1;
@@ -4286,20 +4277,14 @@ proto_register_fileexp (void)
{ &hf_error_st, {"AFS4Int Error Status Code", "fileexp.st", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
{ &hf_fileexp_flags, {"DFS Flags", "fileexp.flags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
{ &hf_fileexp_tn_string, {"String", "fileexp.string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
- { &hf_fileexp_tn_size, {"String Size", "fileexp.tn_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
{ &hf_fileexp_opnum, {"Operation", "fileexp.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
{ &hf_fileexp_setcontext_rqst_epochtime, {"EpochTime:", "fileexp.setcontext_rqst_epochtime", FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL}},
- { &hf_fileexp_setcontext_rqst_secobjectid, { "SetObjectid:", "fileexp.setcontext_secobjextid", FT_STRING, BASE_NONE, NULL, 0x0, "UUID", HFILL} } ,
{ &hf_fileexp_setcontext_rqst_clientsizesattrs, { "ClientSizeAttrs:", "fileexp.setcontext_clientsizesattrs", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
{ &hf_fileexp_setcontext_rqst_parm7, { "Parm7:", "fileexp.setcontext.parm7", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
{ &hf_fileexp_acl_len, {"Acl Length", "fileexp.acl_len", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
{ &hf_fileexp_acltype, {"Acl type", "fileexp.acltype", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
{ &hf_fileexp_minvvp_high, {"minVVp high", "fileexp.minvvp_high", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
{ &hf_fileexp_minvvp_low, {"minVVp low", "fileexp.minvvp_low", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
- { &hf_fileexp_volume_low, { "Volume low", "fileexp.volume_low", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
- { &hf_fileexp_volume_high, { "Volume high", "fileexp.volume_high", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
- { &hf_fileexp_vnode, { "Vnode", "fileexp.vnode", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
- { &hf_fileexp_unique, { "Unique", "fileexp.unique", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
{ &hf_fileexp_accesstime_msec, { "Access time (msec)", "fileexp.accesstime_msec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
{ &hf_fileexp_accesstime_sec, { "Access time (sec)", "fileexp.accesstime_sec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
{ &hf_fileexp_aclexpirationtime, { "Acl expiration time", "fileexp.aclexpirationtime", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
@@ -4382,8 +4367,6 @@ proto_register_fileexp (void)
{ &hf_fileexp_storestatus_trunc_high, { "Store status trunc high", "fileexp.storestatus_trunc_high", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
{ &hf_fileexp_storestatus_trunc_low, { "Store status trunc low", "fileexp.storestatus_trunc_low", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
{ &hf_fileexp_storestatus_typeuuid, { "Store status type uuid", "fileexp.storestatus_typeuuid", FT_GUID, BASE_NONE, NULL, 0x0, "UUID", HFILL} } ,
- { &hf_fileexp_st, { "st", "fileexp.st", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
- { &hf_fileexp_uint, {"uint", "fileexp.uint", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
{ &hf_fileexp_l_end_pos, { "l_end_pos", "fileexp.l_end_pos", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
{ &hf_fileexp_l_end_pos_ext, { "l_end_pos_ext", "fileexp.l_end_pos_ext", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
{ &hf_fileexp_l_fstype, { "l_fstype", "fileexp.l_fstype", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
@@ -4437,7 +4420,6 @@ proto_register_fileexp (void)
{&hf_fileexp_gettime_usecondsp, {"GetTime usecondsp", "fileexp.gettime_usecondsp", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
{&hf_fileexp_readdir_size, {"Readdir Size", "fileexp.readdir.size", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
{&hf_fileexp_afsNameString_t_principalName_size, {"Principal Name Size", "fileexp.principalName_size", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
- {&hf_fileexp_afsNameString_t_principalName_size2, {"Principal Name Size2", "fileexp.principalName_size2", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
{&hf_fileexp_afsTaggedPath_tp_length, {"Tagged Path Length", "fileexp.afsTaggedPath_length", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
{&hf_fileexp_fstype, {"Filetype", "fileexp.fstype", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
{&hf_fileexp_gettime_secondsp, {"GetTime secondsp", "fileexp.gettime_secondsp", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c
index 2f1440653a..bc78b5abc1 100644
--- a/epan/dissectors/packet-dcerpc-spoolss.c
+++ b/epan/dissectors/packet-dcerpc-spoolss.c
@@ -6567,7 +6567,6 @@ SpoolssRouterReplyPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
}
static int hf_keybuffer_size = -1;
-static int hf_keybuffer_data = -1;
static int
dissect_spoolss_keybuffer(tvbuff_t *tvb, int offset, packet_info *pinfo,
@@ -6655,16 +6654,12 @@ SpoolssEnumPrinterKey_r(tvbuff_t *tvb, int offset,
return offset;
}
-static int hf_enumprinterdataex_num_values = -1;
static int hf_enumprinterdataex_name_offset = -1;
static int hf_enumprinterdataex_name_len = -1;
-static int hf_enumprinterdataex_name = -1;
-static int hf_enumprinterdataex_val_type = -1;
static int hf_enumprinterdataex_val_offset = -1;
static int hf_enumprinterdataex_val_len = -1;
static int hf_enumprinterdataex_val_dword_low = -1;
static int hf_enumprinterdataex_val_dword_high = -1;
-static int hf_enumprinterdataex_val_sz = -1;
static int
SpoolssEnumPrinterDataEx_q(tvbuff_t *tvb, int offset,
@@ -8261,11 +8256,6 @@ proto_register_dcerpc_spoolss(void)
/* EnumprinterdataEx RPC */
- { &hf_enumprinterdataex_num_values,
- { "Num values", "spoolss.enumprinterdataex.num_values",
- FT_UINT32, BASE_DEC, NULL, 0x0,
- "Number of values returned", HFILL }},
-
{ &hf_enumprinterdataex_name_offset,
{ "Name offset", "spoolss.enumprinterdataex.name_offset",
FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -8276,15 +8266,6 @@ proto_register_dcerpc_spoolss(void)
FT_UINT32, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- { &hf_enumprinterdataex_name,
- { "Name", "spoolss.enumprinterdataex.name",
- FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-
- { &hf_enumprinterdataex_val_type,
- { "Value type", "spoolss.enumprinterdataex.value_type",
- FT_UINT32, BASE_DEC, NULL, 0x0,
- NULL, HFILL }},
-
{ &hf_enumprinterdataex_val_offset,
{ "Value offset", "spoolss.enumprinterdataex.value_offset",
FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -8307,10 +8288,6 @@ proto_register_dcerpc_spoolss(void)
FT_UINT16, BASE_DEC, NULL, 0x0,
NULL, HFILL }},
- { &hf_enumprinterdataex_val_sz,
- { "SZ value", "spoolss.printerdata.val_sz",
- FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
-
/* RouterReplyPrinter RPC */
{ &hf_routerreplyprinter_condition,
@@ -8331,10 +8308,6 @@ proto_register_dcerpc_spoolss(void)
{ "Key Buffer size", "spoolss.keybuffer.size", FT_UINT32,
BASE_DEC, NULL, 0x0, "Size of buffer", HFILL }},
- { &hf_keybuffer_data,
- { "Key Buffer data", "spoolss.keybuffer.data", FT_BYTES,
- BASE_NONE, NULL, 0x0, "Contents of buffer", HFILL }},
-
/* SetJob RPC */
{ &hf_setjob_cmd,
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 2135241512..3791007e2d 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -483,7 +483,6 @@ static int hf_dcerpc_cn_rts_flags_recycle_channel = -1;
static int hf_dcerpc_cn_rts_flags_in_channel = -1;
static int hf_dcerpc_cn_rts_flags_out_channel = -1;
static int hf_dcerpc_cn_rts_flags_eof = -1;
-static int hf_dcerpc_cn_rts_flags_echo = -1;
static int hf_dcerpc_cn_rts_commands_nb = -1;
static int hf_dcerpc_cn_rts_command = -1;
static int hf_dcerpc_cn_rts_command_receivewindowsize = -1;
@@ -5813,8 +5812,6 @@ proto_register_dcerpc (void)
{ "Out Channel", "dcerpc.cn_rts_flags.out_channel", FT_BOOLEAN, 8, TFS(&tfs_set_notset), RTS_FLAG_OUT_CHANNEL, NULL, HFILL }},
{ &hf_dcerpc_cn_rts_flags_eof,
{ "EOF", "dcerpc.cn_rts_flags.eof", FT_BOOLEAN, 8, TFS(&tfs_set_notset), RTS_FLAG_EOF, NULL, HFILL }},
- { &hf_dcerpc_cn_rts_flags_echo,
- { "Echo", "dcerpc.cn_rts_flags.echo", FT_BOOLEAN, 8, TFS(&tfs_set_notset), RTS_FLAG_ECHO, NULL, HFILL }},
{ &hf_dcerpc_cn_rts_commands_nb,
{ "RTS Number of Commands", "dcerpc.cn_rts_commands_nb", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
{ &hf_dcerpc_cn_rts_command,
diff --git a/epan/dissectors/packet-erldp.c b/epan/dissectors/packet-erldp.c
index f68986a9db..9164edbc50 100644
--- a/epan/dissectors/packet-erldp.c
+++ b/epan/dissectors/packet-erldp.c
@@ -126,7 +126,6 @@ int proto_erldp = -1;
static int hf_erldp_length_2 = -1;
static int hf_erldp_length_4 = -1;
static int hf_erldp_tag = -1;
-static int hf_erldp_tagd = -1;
static int hf_erldp_type = -1;
static int hf_erldp_version = -1;
static int hf_erldp_flags = -1;
@@ -530,9 +529,6 @@ void proto_register_erldp(void) {
{ &hf_erldp_tag, { "Tag", "erldp.tag",
FT_STRING, BASE_NONE, NULL, 0x0,
NULL, HFILL}},
- { &hf_erldp_tagd, { "Tag", "erldp.tagd",
- FT_UINT8, BASE_DEC, NULL, 0x0,
- NULL, HFILL}},
{ &hf_erldp_type, { "Type", "erldp.type",
FT_UINT8, BASE_DEC, NULL, 0x0,
NULL, HFILL}},
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 23:07:34 +0000