diff options
Diffstat (limited to 'epan/dissectors/packet-smb2.c')
| -rw-r--r-- | epan/dissectors/packet-smb2.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 9620f15564..6b86e886c8 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -1329,13 +1329,8 @@ static const value_string smb2_ioctl_vals[] = { {0x0009C040, "FSCTL_SET_COMPRESSION"}, /* dissector implemented */ {0x0009C280, "FSCTL_SET_INTEGRITY_INFORMATION"}, {0x00110018, "FSCTL_PIPE_WAIT"}, -<<<<<<< HEAD {0x0011C017, "FSCTL_PIPE_TRANSCEIVE"}, /* dissector implemented */ {0x00140078, "FSCTL_SRV_REQUEST_RESUME_KEY"}, -======= - {0x0011C017, "FSCTL_PIPE_TRANSCEIVE" }, /* dissector implemented */ - {0x00140078, "FSCTL_SRV_REQUEST_RESUME_KEY" }, ->>>>>>> 24a7720... SMB2 - An out-of-order entry in smb2_ioctl_vals[] causes run-time error. {0x001401D4, "FSCTL_LMR_REQUEST_RESILIENCY"}, /* dissector implemented */ {0x001401FC, "FSCTL_QUERY_NETWORK_INTERFACE_INFO"}, /* dissector implemented */ {0x00140200, "FSCTL_VALIDATE_NEGOTIATE_INFO_224"}, /* dissector implemented */ |