aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-11-21 06:04:39 +0000
committerGuy Harris <guy@alum.mit.edu>2001-11-21 06:04:39 +0000
commitdaef7e962dd701fb4f9b51fdbfcd37ee1efcf5f8 (patch)
treefe8c92fd106ff4a661493f2906b9968d0d41a638
parent81d7ded14ec32e29bd0330a72c1a5a9eaf22d397 (diff)
Support for Transaction Secondary and Transaction2 Secondary, from
Ronnie Sahlberg. svn path=/trunk/; revision=4243
-rw-r--r--packet-smb.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/packet-smb.c b/packet-smb.c
index f5bc9ab3f7..13bc8e9d39 100644
--- a/packet-smb.c
+++ b/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.164 2001/11/21 02:01:03 guy Exp $
+ * $Id: packet-smb.c,v 1.165 2001/11/21 06:04:39 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -8860,6 +8860,12 @@ dissect_trans_data(tvbuff_t *s_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb,
}
}
+/* This routine handles the following 4 calls
+ Transaction 0x25
+ Transaction Secondary 0x26
+ Transaction2 0x32
+ Transaction2 Secondary 0x33
+*/
static int
dissect_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_tree *smb_tree)
{
@@ -8990,6 +8996,9 @@ dissect_transaction_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
proto_tree_add_uint(tree, hf_smb_param_offset16, tvb, offset, 2, po);
offset += 2;
+ /* param displacement is zero here */
+ pd = 0;
+
/* data count */
dc = tvb_get_letohs(tvb, offset);
proto_tree_add_uint(tree, hf_smb_data_count16, tvb, offset, 2, dc);
@@ -10844,7 +10853,7 @@ smb_function smb_dissector[256] = {
/* 0x23 Query Info2*/ {dissect_fid, dissect_query_information2_response},
/* 0x24 Locking And X*/ {dissect_locking_andx_request, dissect_locking_andx_response},
/* 0x25 Transaction*/ {dissect_transaction_request, dissect_transaction_response},
- /* 0x26 */ {dissect_unknown, dissect_unknown},
+ /* 0x26 Transaction Secondary */ {dissect_transaction_request, dissect_unknown}, /*This SMB has no response */
/* 0x27 */ {dissect_unknown, dissect_unknown},
/* 0x28 */ {dissect_unknown, dissect_unknown},
/* 0x29 */ {dissect_unknown, dissect_unknown},
@@ -10858,7 +10867,7 @@ smb_function smb_dissector[256] = {
/* 0x30 */ {dissect_unknown, dissect_unknown},
/* 0x31 */ {dissect_unknown, dissect_unknown},
/* 0x32 Transaction2*/ {dissect_transaction_request, dissect_transaction_response},
- /* 0x33 */ {dissect_unknown, dissect_unknown},
+ /* 0x33 Transaction2 Secondary*/ {dissect_transaction_request, dissect_unknown}, /*This SMB has no response */
/* 0x34 Find Close2*/ {dissect_sid, dissect_empty},
/* 0x35 */ {dissect_unknown, dissect_unknown},
/* 0x36 */ {dissect_unknown, dissect_unknown},