forked from osmocom/wireshark
Tvbuffified SMB mailslot protocol dissector, from Ronnie Sahlberg.
svn path=/trunk/; revision=3832
This commit is contained in:
Guy Harris
parent
57091e1abb
commit
30296fc745
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for SMB mailslot packet dissection
|
||||
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
|
||||
*
|
||||
* $Id: packet-smb-mailslot.c,v 1.15 2001/08/05 00:16:36 guy Exp $
|
||||
* $Id: packet-smb-mailslot.c,v 1.16 2001/08/07 08:39:56 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -25,7 +25,6 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
|
||||
#include "packet-smb-common.h"
|
||||
#include "packet-smb-mailslot.h"
|
||||
#include "packet-smb-browse.h"
|
||||
|
|
@ -33,143 +32,148 @@
|
|||
#include "packet-smb-pipe.h"
|
||||
|
||||
static int proto_smb_msp = -1;
|
||||
static int hf_opcode = -1;
|
||||
static int hf_priority = -1;
|
||||
static int hf_class = -1;
|
||||
static int hf_size = -1;
|
||||
static int hf_name = -1;
|
||||
|
||||
static int ett_smb_msp = -1;
|
||||
|
||||
gboolean
|
||||
dissect_mailslot_smb(const u_char *pd, int offset, frame_data *fd,
|
||||
proto_tree *parent, proto_tree *tree, struct smb_info si, int max_data,
|
||||
int SMB_offset, int errcode, const u_char *command,
|
||||
int DataOffset, int DataCount, int ParameterOffset, int ParameterCount){
|
||||
static const value_string opcode_vals[] = {
|
||||
{1, "Write Mail Slot"},
|
||||
{0, NULL}
|
||||
};
|
||||
|
||||
static const value_string class_vals[] = {
|
||||
{1, "Reliable"},
|
||||
{2, "Unreliable & Broadcast"},
|
||||
{0, NULL}
|
||||
};
|
||||
|
||||
/* decode the SMB mail slot protocol */
|
||||
gboolean
|
||||
dissect_mailslot_smb(tvbuff_t *setup_tvb, tvbuff_t *tvb, packet_info *pinfo,
|
||||
proto_tree *parent_tree)
|
||||
{
|
||||
struct smb_info *smb_info = pinfo->private;
|
||||
proto_tree *tree = 0;
|
||||
proto_item *item;
|
||||
tvbuff_t *next_tvb = NULL;
|
||||
guint16 opcode;
|
||||
int offset = 0;
|
||||
int len;
|
||||
|
||||
proto_tree *smb_msp_tree = 0;
|
||||
proto_item *ti;
|
||||
|
||||
guint16 Temp16;
|
||||
const char *StrPtr;
|
||||
|
||||
if (!proto_is_protocol_enabled(proto_smb_msp))
|
||||
if (!proto_is_protocol_enabled(proto_smb_msp)) {
|
||||
return FALSE;
|
||||
|
||||
if (check_col(fd, COL_PROTOCOL))
|
||||
col_set_str(fd, COL_PROTOCOL, "SMB Mailslot");
|
||||
}
|
||||
pinfo->current_proto = "SMB Mailslot";
|
||||
|
||||
if (DataOffset < 0) {
|
||||
if (check_col(pinfo->fd, COL_PROTOCOL)) {
|
||||
col_set_str(pinfo->fd, COL_PROTOCOL, "SMB Mailslot");
|
||||
}
|
||||
|
||||
if (smb_info->data_offset < 0) {
|
||||
/* Interim reply */
|
||||
col_set_str(fd, COL_INFO, "Interim reply");
|
||||
col_set_str(pinfo->fd, COL_INFO, "Interim reply");
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
/* do the Op code field */
|
||||
|
||||
Temp16 = GSHORT(pd, offset); /* get Op code */
|
||||
/* do the opcode field */
|
||||
opcode = tvb_get_letohs(setup_tvb, offset);
|
||||
|
||||
if (check_col(fd, COL_INFO))
|
||||
col_set_str(fd, COL_INFO,
|
||||
( Temp16 == 1 ? "Write Mail slot" : "Unknown"));
|
||||
if (check_col(pinfo->fd, COL_INFO)) {
|
||||
col_add_str(pinfo->fd, COL_INFO,
|
||||
val_to_str(opcode, opcode_vals, "Unknown opcode:0x%04x"));
|
||||
}
|
||||
|
||||
if (parent_tree) {
|
||||
item = proto_tree_add_item(parent_tree, proto_smb_msp, setup_tvb,
|
||||
offset, tvb_length_remaining(setup_tvb, offset), FALSE);
|
||||
tree = proto_item_add_subtree(item, ett_smb_msp);
|
||||
|
||||
if (tree) {
|
||||
ti = proto_tree_add_item( parent, proto_smb_msp, NullTVB, offset,
|
||||
END_OF_FRAME, FALSE);
|
||||
smb_msp_tree = proto_item_add_subtree(ti, ett_smb_msp);
|
||||
/* opcode */
|
||||
proto_tree_add_uint(tree, hf_opcode, setup_tvb, offset, 2,
|
||||
opcode);
|
||||
offset += 2;
|
||||
|
||||
proto_tree_add_text(smb_msp_tree, NullTVB, offset, 2, "Op code: %u (%s)",
|
||||
Temp16, ( Temp16 == 1 ? "Write Mail slot" : "Unknown"));
|
||||
/* priority */
|
||||
proto_tree_add_item(tree, hf_priority, setup_tvb, offset, 2,
|
||||
TRUE);
|
||||
offset += 2;
|
||||
|
||||
offset += 2;
|
||||
|
||||
/* do the Priority field */
|
||||
Temp16 = GSHORT(pd, offset);
|
||||
proto_tree_add_text(smb_msp_tree, NullTVB, offset, 2,
|
||||
"Priority of transaction: %u", Temp16);
|
||||
|
||||
offset += 2;
|
||||
/* class */
|
||||
proto_tree_add_item(tree, hf_class, setup_tvb, offset, 2, TRUE);
|
||||
offset += 2;
|
||||
|
||||
/* do the Class field */
|
||||
Temp16 = GSHORT(pd, offset);
|
||||
|
||||
proto_tree_add_text(smb_msp_tree, NullTVB, offset, 2, "Class: %u (%s)",
|
||||
Temp16, ( Temp16 == 1) ? "Reliable" : (( Temp16 == 2) ?
|
||||
"Unreliable & Broadcast" : "Unknown"));
|
||||
|
||||
offset += 2;
|
||||
/* size */
|
||||
proto_tree_add_item(tree, hf_size, setup_tvb, offset, 2, TRUE);
|
||||
offset += 2;
|
||||
|
||||
/* do the data size field */
|
||||
Temp16 = GSHORT(pd, offset);
|
||||
proto_tree_add_text(smb_msp_tree, NullTVB, offset, 2,
|
||||
"Total size of mail data: %u", Temp16);
|
||||
/* mailslot name */
|
||||
len = tvb_strsize(setup_tvb, offset);
|
||||
proto_tree_add_item(tree, hf_name, setup_tvb, offset, len,
|
||||
TRUE);
|
||||
offset += len;
|
||||
}
|
||||
|
||||
offset += 2;
|
||||
}else { /* no tree value adjust offset*/
|
||||
offset += 8;
|
||||
}
|
||||
/* Quit if we don't have the transaction command name (mailslot path) */
|
||||
if (smb_info->trans_cmd == NULL)
|
||||
return TRUE;
|
||||
|
||||
/* Build display for: MailSlot Name */
|
||||
/* create new tvb for subdissector */
|
||||
next_tvb = tvb_new_subset(tvb, smb_info->data_offset, -1, -1);
|
||||
|
||||
StrPtr = &pd[offset]; /* load pointer to name */
|
||||
|
||||
if (smb_msp_tree) {
|
||||
proto_tree_add_text(smb_msp_tree, NullTVB, offset, strlen( StrPtr) + 1,
|
||||
"Mailslot Name: %s", StrPtr);
|
||||
}
|
||||
|
||||
offset += strlen( StrPtr) + 1;
|
||||
|
||||
/*** Decide what dissector to call based upon the command value ***/
|
||||
|
||||
if (command != NULL && strcmp(command, "BROWSE") == 0) {
|
||||
/* Decode a browse */
|
||||
|
||||
tvbuff_t *tvb;
|
||||
packet_info *pinfo = π
|
||||
tvb = tvb_create_from_top(DataOffset);
|
||||
|
||||
return dissect_mailslot_browse(tvb, pinfo, parent);
|
||||
}
|
||||
|
||||
else if (command != NULL && strcmp(command, "LANMAN") == 0) {
|
||||
/*** Decide what dissector to call based upon the command value ***/
|
||||
if (strcmp(smb_info->trans_cmd, "BROWSE") == 0) {
|
||||
return dissect_mailslot_browse(next_tvb, pinfo, parent_tree);
|
||||
} else if (strcmp(smb_info->trans_cmd, "LANMAN") == 0) {
|
||||
/* Decode a LANMAN browse */
|
||||
|
||||
tvbuff_t *tvb;
|
||||
packet_info *pinfo = π
|
||||
tvb = tvb_create_from_top(DataOffset);
|
||||
|
||||
return dissect_mailslot_lanman(tvb, pinfo, parent);
|
||||
}
|
||||
|
||||
return dissect_mailslot_lanman(next_tvb, pinfo, parent_tree);
|
||||
} else if ((strncmp(smb_info->trans_cmd, "NET", strlen("NET")) == 0) ||
|
||||
(strcmp(smb_info->trans_cmd, "TEMP\\NETLOGON") == 0) ||
|
||||
(strcmp(smb_info->trans_cmd, "MSSP") == 0)) {
|
||||
/* NOTE: use TEMP\\NETLOGON and MSSP because they seems very common, */
|
||||
/* NOTE: may need a look up list to check for the mailslot names passed */
|
||||
/* by the logon request packet */
|
||||
|
||||
else if (((command != NULL) &&
|
||||
strncmp(command, "NET", strlen("NET")) == 0) ||
|
||||
(strcmp(command, "TEMP\\NETLOGON") == 0) ||
|
||||
(strcmp(command, "MSSP") == 0)){
|
||||
tvbuff_t *tvb;
|
||||
packet_info *pinfo = π
|
||||
tvb = tvb_create_from_top(DataOffset);
|
||||
|
||||
return dissect_smb_logon(tvb, pinfo, parent);
|
||||
|
||||
}
|
||||
return TRUE;
|
||||
return dissect_smb_logon(next_tvb, pinfo, parent_tree);
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
register_proto_smb_mailslot( void){
|
||||
register_proto_smb_mailslot(void)
|
||||
{
|
||||
static hf_register_info hf[] = {
|
||||
{ &hf_opcode,
|
||||
{ "Opcode", "mailslot.opcode", FT_UINT16, BASE_DEC,
|
||||
VALS(opcode_vals), 0, "MAILSLOT OpCode", HFILL }},
|
||||
|
||||
{ &hf_priority,
|
||||
{ "Priority", "mailslot.priority", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, "MAILSLOT Priority of transaction", HFILL }},
|
||||
|
||||
{ &hf_class,
|
||||
{ "Class", "mailslot.class", FT_UINT16, BASE_DEC,
|
||||
VALS(class_vals), 0, "MAILSLOT Class of transaction", HFILL }},
|
||||
|
||||
{ &hf_size,
|
||||
{ "Size", "mailslot.size", FT_UINT16, BASE_DEC,
|
||||
NULL, 0, "MAILSLOT Total size of mail data", HFILL }},
|
||||
|
||||
{ &hf_name,
|
||||
{ "Mailslot Name", "mailslot.name", FT_STRING, BASE_NONE,
|
||||
NULL, 0, "MAILSLOT Name of mailslot", HFILL }},
|
||||
|
||||
};
|
||||
|
||||
static gint *ett[] = {
|
||||
&ett_smb_msp
|
||||
};
|
||||
|
||||
proto_smb_msp = proto_register_protocol(
|
||||
"SMB MailSlot Protocol", "SMB Mailslot", "mailslot");
|
||||
proto_smb_msp = proto_register_protocol(
|
||||
"SMB MailSlot Protocol", "SMB Mailslot", "mailslot");
|
||||
|
||||
proto_register_field_array(proto_smb_msp, hf, array_length(hf));
|
||||
proto_register_subtree_array(ett, array_length(ett));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* Declaration of routines for SMB mailslot packet dissection
|
||||
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
|
||||
*
|
||||
* $Id: packet-smb-mailslot.h,v 1.2 2001/08/05 00:16:36 guy Exp $
|
||||
* $Id: packet-smb-mailslot.h,v 1.3 2001/08/07 08:39:56 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -23,8 +23,12 @@
|
|||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef _PACKET_SMB_MAILSLOT_H_
|
||||
#define _PACKET_SMB_MAILSLOT_H_
|
||||
|
||||
gboolean
|
||||
dissect_mailslot_smb(const u_char *pd, int offset, frame_data *fd,
|
||||
proto_tree *parent, proto_tree *tree, struct smb_info si, int max_data,
|
||||
int SMB_offset, int errcode, const u_char *command,
|
||||
int DataOffset, int DataCount, int ParameterOffset, int ParameterCount);
|
||||
dissect_mailslot_smb(tvbuff_t *setup_tvb, tvbuff_t *tvb, packet_info *pinfo,
|
||||
proto_tree *tree);
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ XXX Fixme : shouldnt show [malformed frame] for long packets
|
|||
* significant rewrite to tvbuffify the dissector, Ronnie Sahlberg and
|
||||
* Guy Harris 2001
|
||||
*
|
||||
* $Id: packet-smb-pipe.c,v 1.27 2001/08/06 08:49:17 guy Exp $
|
||||
* $Id: packet-smb-pipe.c,v 1.28 2001/08/07 08:39:56 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -1524,14 +1524,15 @@ dissect_pipe_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
|
||||
|
||||
gboolean
|
||||
dissect_pipe_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
||||
char *command)
|
||||
dissect_pipe_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
struct smb_info *smb_info = pinfo->private;
|
||||
|
||||
if (!proto_is_protocol_enabled(proto_smb_lanman))
|
||||
return FALSE;
|
||||
pinfo->current_proto = "LANMAN";
|
||||
|
||||
if (command != NULL && strcmp(command, "LANMAN") == 0) {
|
||||
if (smb_info->trans_cmd && strcmp(smb_info->trans_cmd, "LANMAN") == 0) {
|
||||
/* Try to decode a LANMAN */
|
||||
|
||||
return dissect_pipe_lanman(tvb, pinfo, tree);
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* Declarations of routines for SMB named pipe packet dissection
|
||||
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
|
||||
*
|
||||
* $Id: packet-smb-pipe.h,v 1.4 2001/08/05 01:15:26 guy Exp $
|
||||
* $Id: packet-smb-pipe.h,v 1.5 2001/08/07 08:39:56 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -27,7 +27,6 @@
|
|||
#define _PACKET_SMB_PIPE_H_
|
||||
|
||||
gboolean
|
||||
dissect_pipe_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
||||
char *command);
|
||||
dissect_pipe_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
35
packet-smb.c
35
packet-smb.c
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for smb packet dissection
|
||||
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
|
||||
*
|
||||
* $Id: packet-smb.c,v 1.96 2001/08/06 00:59:14 guy Exp $
|
||||
* $Id: packet-smb.c,v 1.97 2001/08/07 08:39:56 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -9761,6 +9761,7 @@ dissect_transact_params(const u_char *pd, int offset, frame_data *fd,
|
|||
const gchar *Data;
|
||||
packet_info *pinfo;
|
||||
tvbuff_t *next_tvb;
|
||||
tvbuff_t *setup_tvb;
|
||||
|
||||
if (!TransactName)
|
||||
return;
|
||||
|
|
@ -9817,19 +9818,39 @@ dissect_transact_params(const u_char *pd, int offset, frame_data *fd,
|
|||
*/
|
||||
si.data_count = DataCount;
|
||||
|
||||
/*
|
||||
* Command.
|
||||
*/
|
||||
si.trans_cmd = trans_cmd;
|
||||
|
||||
/*
|
||||
* Pass "si" to the subdissector.
|
||||
*/
|
||||
pinfo->private = &si;
|
||||
|
||||
/*
|
||||
* Tvbuff for setup area, for mailslot call.
|
||||
*/
|
||||
/*
|
||||
* Is there a setup area?
|
||||
*/
|
||||
if (SetupAreaOffset < 0) {
|
||||
/*
|
||||
* No - create a zero-length tvbuff.
|
||||
*/
|
||||
setup_tvb = tvb_create_from_top(pi.captured_len);
|
||||
} else {
|
||||
/*
|
||||
* Create a tvbuff for the setup area.
|
||||
*/
|
||||
setup_tvb = tvb_create_from_top(SetupAreaOffset);
|
||||
}
|
||||
|
||||
if ((trans_cmd == NULL) ||
|
||||
(((trans_type == NULL || strcmp(trans_type, "MAILSLOT") != 0) ||
|
||||
!dissect_mailslot_smb(pd, SetupAreaOffset, fd, parent, tree, si,
|
||||
max_data, SMB_offset, errcode, trans_cmd,
|
||||
SMB_offset + DataOffset, DataCount,
|
||||
SMB_offset + ParameterOffset, ParameterCount)) &&
|
||||
!dissect_mailslot_smb(setup_tvb, next_tvb, pinfo, parent)) &&
|
||||
((trans_type == NULL || strcmp(trans_type, "PIPE") != 0) ||
|
||||
!dissect_pipe_smb(next_tvb, pinfo, parent, trans_cmd)))) {
|
||||
!dissect_pipe_smb(next_tvb, pinfo, parent)))) {
|
||||
|
||||
if (ParameterCount > 0) {
|
||||
|
||||
|
|
@ -10454,7 +10475,7 @@ dissect_transact_smb(const u_char *pd, int offset, frame_data *fd,
|
|||
|
||||
}
|
||||
|
||||
|
||||
|
||||
offset += 1; /* Skip Reserved3 */
|
||||
|
||||
SetupAreaOffset = offset;
|
||||
|
|
|
|||
3
smb.h
3
smb.h
|
|
@ -2,7 +2,7 @@
|
|||
* Defines for smb packet dissection
|
||||
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
|
||||
*
|
||||
* $Id: smb.h,v 1.10 2001/08/05 01:15:27 guy Exp $
|
||||
* $Id: smb.h,v 1.11 2001/08/07 08:39:57 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
|
@ -648,6 +648,7 @@ struct smb_info {
|
|||
int data_offset; /* Offset from parameter to data in transaction */
|
||||
int data_count; /* Number of bytes of data in transaction */
|
||||
guint16 ddisp; /* Data displacement for transaction commands */
|
||||
char *trans_cmd; /* Command for mailslot dissection */
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue