* Routines for SMB mailslot packet dissection
* Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com>
*
- * $Id: packet-smb-mailslot.c,v 1.17 2001/10/04 23:06:49 guy Exp $
+ * $Id: packet-smb-mailslot.c,v 1.33 2002/08/28 21:00:31 jmayer Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
* Copied from packet-pop.c
- *
+ *
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <string.h>
#include "packet-smb-common.h"
#include "packet-smb-mailslot.h"
#include "packet-smb-browse.h"
static int ett_smb_msp = -1;
+static dissector_handle_t data_handle;
+
+#define MAILSLOT_UNKNOWN 0
+#define MAILSLOT_BROWSE 1
+#define MAILSLOT_LANMAN 2
+#define MAILSLOT_NET 3
+#define MAILSLOT_TEMP_NETLOGON 4
+#define MAILSLOT_MSSP 5
+
static const value_string opcode_vals[] = {
{1, "Write Mail Slot"},
{0, NULL}
{0, NULL}
};
-/* decode the SMB mail slot protocol */
+/* decode the SMB mail slot protocol
+ for requests
+ mailslot is the name of the mailslot, e.g. BROWSE
+ si->trans_subcmd is set to the symbolic constant matching the mailslot name.
+ for responses
+ mailslot is NULL
+ si->trans_subcmd gives us which mailslot this response refers to.
+*/
+
gboolean
-dissect_mailslot_smb(tvbuff_t *setup_tvb, tvbuff_t *tvb, packet_info *pinfo,
+dissect_mailslot_smb(tvbuff_t *mshdr_tvb, tvbuff_t *setup_tvb,
+ tvbuff_t *tvb, const char *mailslot, 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;
+ smb_info_t *smb_info;
+ smb_transact_info_t *tri;
+ int trans_subcmd;
+ proto_tree *tree = NULL;
+ proto_item *item = NULL;
guint16 opcode;
int offset = 0;
int len;
+ gboolean dissected;
if (!proto_is_protocol_enabled(proto_smb_msp)) {
return FALSE;
}
pinfo->current_proto = "SMB Mailslot";
- if (check_col(pinfo->fd, COL_PROTOCOL)) {
- col_set_str(pinfo->fd, COL_PROTOCOL, "SMB Mailslot");
+ if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB Mailslot");
}
- if (smb_info->data_offset < 0) {
+ if ((tvb==NULL) || (tvb_reported_length(tvb)==0)) {
/* Interim reply */
- col_set_str(pinfo->fd, COL_INFO, "Interim reply");
+ col_set_str(pinfo->cinfo, COL_INFO, "Interim reply");
return TRUE;
}
- /* do the opcode field */
- opcode = tvb_get_letohs(setup_tvb, offset);
+ if (check_col(pinfo->cinfo, COL_INFO)) {
+ col_clear(pinfo->cinfo, COL_INFO);
+ }
- if (check_col(pinfo->fd, COL_INFO)) {
- col_add_str(pinfo->fd, COL_INFO,
- val_to_str(opcode, opcode_vals, "Unknown opcode:0x%04x"));
+ smb_info = pinfo->private_data;
+ if (smb_info->sip != NULL)
+ tri = smb_info->sip->extra_info;
+ else
+ tri = NULL;
+
+ /* check which mailslot this is about */
+ trans_subcmd=MAILSLOT_UNKNOWN;
+ if(smb_info->request){
+ if(strncmp(mailslot,"BROWSE",6) == 0){
+ trans_subcmd=MAILSLOT_BROWSE;
+ } else if(strncmp(mailslot,"LANMAN",6) == 0){
+ trans_subcmd=MAILSLOT_LANMAN;
+ } else if(strncmp(mailslot,"NET",3) == 0){
+ trans_subcmd=MAILSLOT_NET;
+ } else if(strncmp(mailslot,"TEMP\\NETLOGON",13) == 0){
+ trans_subcmd=MAILSLOT_TEMP_NETLOGON;
+ } else if(strncmp(mailslot,"MSSP",4) == 0){
+ trans_subcmd=MAILSLOT_MSSP;
+ }
+ if (!pinfo->fd->flags.visited) {
+ if (tri != NULL)
+ tri->trans_subcmd = trans_subcmd;
+ }
+ } else {
+ trans_subcmd = tri->trans_subcmd;
}
- 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);
+ /* Only do these ones if we have them. For fragmented SMB Transactions
+ we may only have the setup area for the first fragment
+ */
+ if(mshdr_tvb && setup_tvb){
+ if (parent_tree) {
+ item = proto_tree_add_item(parent_tree, proto_smb_msp,
+ mshdr_tvb, 0, -1, FALSE);
+ tree = proto_item_add_subtree(item, ett_smb_msp);
+ }
+
+ /* do the opcode field */
+ opcode = tvb_get_letohs(setup_tvb, offset);
+
+ if (check_col(pinfo->cinfo, COL_INFO)) {
+ col_add_str(pinfo->cinfo, COL_INFO,
+ val_to_str(opcode, opcode_vals, "Unknown opcode: 0x%04x"));
+ }
+
+
+ /* These are in the setup words; use "setup_tvb". */
/* opcode */
proto_tree_add_uint(tree, hf_opcode, setup_tvb, offset, 2,
proto_tree_add_item(tree, hf_class, setup_tvb, offset, 2, TRUE);
offset += 2;
+ /* These are in the rest of the data; use "mshdr_tvb", which
+ starts at the same place "setup_tvb" does. */
+
/* size */
- proto_tree_add_item(tree, hf_size, setup_tvb, offset, 2, TRUE);
+ /* this is actually bytecount in the SMB Transaction command */
+ proto_tree_add_item(tree, hf_size, mshdr_tvb, offset, 2, TRUE);
offset += 2;
/* mailslot name */
- len = tvb_strsize(setup_tvb, offset);
- proto_tree_add_item(tree, hf_name, setup_tvb, offset, len,
- TRUE);
+ len = tvb_strsize(mshdr_tvb, offset);
+ proto_tree_add_item(tree, hf_name, mshdr_tvb, offset, len, TRUE);
offset += len;
+ proto_item_set_len(item, offset);
}
- /* Quit if we don't have the transaction command name (mailslot path) */
- if (smb_info->trans_cmd == NULL)
- return TRUE;
-
- /* create new tvb for subdissector */
- next_tvb = tvb_new_subset(tvb, smb_info->data_offset, -1, -1);
-
- /*** 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 */
- 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 */
- return dissect_smb_logon(next_tvb, pinfo, parent_tree);
+ dissected = FALSE;
+ switch(trans_subcmd){
+ case MAILSLOT_BROWSE:
+ dissected = dissect_mailslot_browse(tvb, pinfo, parent_tree);
+ break;
+ case MAILSLOT_LANMAN:
+ dissected = dissect_mailslot_lanman(tvb, pinfo, parent_tree);
+ break;
+ case MAILSLOT_NET:
+ case MAILSLOT_TEMP_NETLOGON:
+ case MAILSLOT_MSSP:
+ dissected = dissect_smb_logon(tvb, pinfo, parent_tree);
+ break;
+ }
+ if (!dissected) {
+ /*
+ * We dissected the mailslot header, but not the
+ * message; dissect the latter as data, but indicate
+ * that we successfully dissected the mailslot stuff.
+ */
+ call_dissector(data_handle,tvb, pinfo, parent_tree);
}
- /* Dump it as data */
- dissect_data(next_tvb, 0, pinfo, parent_tree);
return TRUE;
}
void
-register_proto_smb_mailslot(void)
+proto_register_smb_mailslot(void)
{
static hf_register_info hf[] = {
{ &hf_opcode,
proto_register_field_array(proto_smb_msp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+void
+proto_reg_handoff_smb_mailslot(void)
+{
+ data_handle = find_dissector("data");
+}