aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--epan/dissectors/packet-smb-common.c11
-rw-r--r--epan/dissectors/packet-smb-common.h2
-rw-r--r--epan/dissectors/packet-smb-logon.c11
3 files changed, 10 insertions, 14 deletions
diff --git a/epan/dissectors/packet-smb-common.c b/epan/dissectors/packet-smb-common.c
index 4199654b1a..fb6cdcdf11 100644
--- a/epan/dissectors/packet-smb-common.c
+++ b/epan/dissectors/packet-smb-common.c
@@ -288,14 +288,3 @@ get_unicode_or_ascii_string(tvbuff_t *tvb, int *offsetp,
*len = string_len;
return string;
}
-
-int
-dissect_smb_unknown(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset)
-{
- /* display data as unknown */
-
- proto_tree_add_text(tree, tvb, offset, -1, "Data (%u bytes)",
- tvb_reported_length_remaining(tvb, offset));
-
- return offset+tvb_length_remaining(tvb, offset);
-}
diff --git a/epan/dissectors/packet-smb-common.h b/epan/dissectors/packet-smb-common.h
index cdec298464..6cd353dae2 100644
--- a/epan/dissectors/packet-smb-common.h
+++ b/epan/dissectors/packet-smb-common.h
@@ -30,8 +30,6 @@
#include "smb.h"
-int dissect_smb_unknown(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset);
-
int display_unicode_string(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_index, char **data);
int display_ms_string(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_index, char **data);
diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c
index 86951f6af5..bfb72b3ffd 100644
--- a/epan/dissectors/packet-smb-logon.c
+++ b/epan/dissectors/packet-smb-logon.c
@@ -731,6 +731,16 @@ dissect_smb_sam_logon_resp(tvbuff_t *tvb, packet_info *pinfo _U_,
return offset;
}
+static int
+dissect_smb_unknown(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, int offset)
+{
+ /* display data as unknown */
+
+ proto_tree_add_text(tree, tvb, offset, -1, "Data (%u bytes)",
+ tvb_reported_length_remaining(tvb, offset));
+
+ return offset+tvb_length_remaining(tvb, offset);
+}
#define LOGON_LM10_LOGON_REQUEST 0x00
#define LOGON_LM10_LOGON_RESPONSE 0x01
@@ -790,7 +800,6 @@ static const value_string commands[] = {
{0, NULL}
};
-
static int (*dissect_smb_logon_cmds[])(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset) = {
dissect_smb_logon_request, /* 0x00 (LM1.0/LM2.0 LOGON Request) */
dissect_smb_logon_LM10_resp,/* 0x01 (LM1.0 LOGON Response) */