osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
wireshark/packet-smb.c

10976 lines
249 KiB
C
Raw Normal View History

Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
/* packet-smb.c
* Routines for smb packet dissection
* Copyright 1999, Richard Sharpe <rsharpe@ns.aus.com>
*
Put in a note about the use of some currently-undissected fields in the SMB header, as per a Microsoft document. svn path=/trunk/; revision=3149
2001-03-20 04:46:37 +00:00
* $Id: packet-smb.c,v 1.81 2001/03/20 04:46:37 guy Exp $
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
*
* Ethereal - Network traffic analyzer
Fix Gerald's e-mail address. svn path=/trunk/; revision=1437
2000-01-07 22:05:43 +00:00
* By Gerald Combs <gerald@zing.org>
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
* 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.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <stdio.h>
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif
Added #include <time.h> for AIX. svn path=/trunk/; revision=937
1999-10-27 19:30:23 +00:00
#include <time.h>
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
#include <string.h>
#include <glib.h>
Fixed the problem causing a SIGSEGV, and fixed problems with UNICODE strings in transact SMBs. Added decode of NetShareEnum transact request. Will have to clean that all up and use the decode engine when I get it done. Still more fix ups to be done, but the book is calling, and I have to write some stuff after an interview with LinuxCare. svn path=/trunk/; revision=1113
1999-11-26 06:27:22 +00:00
#include <ctype.h>
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
#include "packet.h"
Generalize the "ip_src" and "ip_dst" members of the "packet_info" structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst" addresses, where an address is an address type, an address length in bytes, and a pointer to that many bytes. "dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}" are the network-layer source/destination; "{src,dst}" are the source/destination from the highest of those two layers that we have in the packet. Add a port type to "packet_info" as well, specifying whether it's a TCP or UDP port. Don't set the address and port columns in the dissector functions; just set the address and port members of the "packet_info" structure. Set the columns in "fill_in_columns()"; this means that if we're showing COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate the string from "src" or "dst", we don't generate a string for the link-layer address and then overwrite it with a string for the network-layer address (generating those strings costs CPU). Add support for "conversations", where a "conversation" is (at present) a source and destination address and a source and destination port. (In the future, we may support "conversations" above the transport layer, e.g. a TFTP conversation, where the first packet goes from the client to the TFTP server port, but the reply comes back from a different port, and all subsequent packets go between the client address/port and the server address/new port, or an NFS conversation, which might include lock manager, status monitor, and mount packets, as well as NFS packets.) Currently, all we support is a call that takes the source and destination address/port pairs, looks them up in a hash table, and: if nothing is found, creates a new entry in the hash table, and assigns it a unique 32-bit conversation ID, and returns that conversation ID; if an entry is found, returns its conversation ID. Use that in the SMB and AFS code to keep track of individual SMB or AFS conversations. We need to match up requests and replies, as, for certain replies, the operation code for the request to which it's a reply doesn't show up in the reply - you have to find the request with a matching transaction ID. Transaction IDs are per-conversation, so the hash table for requests should include a conversation ID and transaction ID as the key. This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses transparently (and should allow the SMB decoder to handle NetBIOS atop other protocols as well, if the source and destination address and port values in the "packet_info" structure are set appropriately). In the "Follow TCP Connection" code, check to make sure that the addresses are IPv4 addressses; ultimately, that code should be changed to use the conversation code instead, which will let it handle IPv6 transparently. svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
#include "conversation.h"
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
#include "smb.h"
#include "alignment.h"
Move format_text(), get_token_len(), and fine_line_end(), into strutil.c This keeps tvbuff.c generic; it doesn't have to pull in packet.h and all of it's included files. svn path=/trunk/; revision=2409
2000-09-11 16:16:13 +00:00
#include "strutil.h"
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Correctly handle Interim responses to TRANSACTION requests. Move the declaration of routines exported from "packet-smb-mailslot.c" into a "packet-smb-mailslot.h" header file, and have modules that import those routines include "packet-smb-mailslot.h" rather than declaring the routines themselves; do the same for routines exported from "packet-smb-pipe.c". Make routines not exported static, and make routines that return a true/false return value "gboolean" rather than "guint32". svn path=/trunk/; revision=3146
2001-03-18 03:23:30 +00:00
#include "packet-smb-mailslot.h"
#include "packet-smb-pipe.h"
Jeff Foster's SMB Mailslot and Netlogin dissectors; he split "packet-smb.c" up into several files. svn path=/trunk/; revision=1629
2000-02-14 04:02:21 +00:00
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
static int proto_smb = -1;
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
A small set of patches to fix one small problem and start working on the filtering in packet-smb.c ... svn path=/trunk/; revision=2220
2000-08-07 14:49:03 +00:00
static int hf_smb_cmd = -1;
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
static gint ett_smb = -1;
static gint ett_smb_fileattributes = -1;
static gint ett_smb_capabilities = -1;
static gint ett_smb_aflags = -1;
static gint ett_smb_dialects = -1;
static gint ett_smb_mode = -1;
static gint ett_smb_rawmode = -1;
static gint ett_smb_flags = -1;
static gint ett_smb_flags2 = -1;
static gint ett_smb_desiredaccess = -1;
static gint ett_smb_search = -1;
static gint ett_smb_file = -1;
static gint ett_smb_openfunction = -1;
static gint ett_smb_filetype = -1;
static gint ett_smb_action = -1;
static gint ett_smb_writemode = -1;
static gint ett_smb_lock_type = -1;
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
/*
* Struct passed to each SMB decode routine of info it may need
*/
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
char *decode_smb_name(unsigned char);
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
int smb_packet_init_count = 200;
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
struct smb_request_key {
Generalize the "ip_src" and "ip_dst" members of the "packet_info" structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst" addresses, where an address is an address type, an address length in bytes, and a pointer to that many bytes. "dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}" are the network-layer source/destination; "{src,dst}" are the source/destination from the highest of those two layers that we have in the packet. Add a port type to "packet_info" as well, specifying whether it's a TCP or UDP port. Don't set the address and port columns in the dissector functions; just set the address and port members of the "packet_info" structure. Set the columns in "fill_in_columns()"; this means that if we're showing COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate the string from "src" or "dst", we don't generate a string for the link-layer address and then overwrite it with a string for the network-layer address (generating those strings costs CPU). Add support for "conversations", where a "conversation" is (at present) a source and destination address and a source and destination port. (In the future, we may support "conversations" above the transport layer, e.g. a TFTP conversation, where the first packet goes from the client to the TFTP server port, but the reply comes back from a different port, and all subsequent packets go between the client address/port and the server address/new port, or an NFS conversation, which might include lock manager, status monitor, and mount packets, as well as NFS packets.) Currently, all we support is a call that takes the source and destination address/port pairs, looks them up in a hash table, and: if nothing is found, creates a new entry in the hash table, and assigns it a unique 32-bit conversation ID, and returns that conversation ID; if an entry is found, returns its conversation ID. Use that in the SMB and AFS code to keep track of individual SMB or AFS conversations. We need to match up requests and replies, as, for certain replies, the operation code for the request to which it's a reply doesn't show up in the reply - you have to find the request with a matching transaction ID. Transaction IDs are per-conversation, so the hash table for requests should include a conversation ID and transaction ID as the key. This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses transparently (and should allow the SMB decoder to handle NetBIOS atop other protocols as well, if the source and destination address and port values in the "packet_info" structure are set appropriately). In the "Follow TCP Connection" code, check to make sure that the addresses are IPv4 addressses; ultimately, that code should be changed to use the conversation code instead, which will let it handle IPv6 transparently. svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
guint32 conversation;
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
guint16 mid;
};
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
GHashTable *smb_request_hash = NULL;
GMemChunk *smb_request_keys = NULL;
GMemChunk *smb_request_vals = NULL;
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
/* Hash Functions */
gint
smb_equal(gconstpointer v, gconstpointer w)
{
struct smb_request_key *v1 = (struct smb_request_key *)v;
struct smb_request_key *v2 = (struct smb_request_key *)w;
Generalize the "ip_src" and "ip_dst" members of the "packet_info" structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst" addresses, where an address is an address type, an address length in bytes, and a pointer to that many bytes. "dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}" are the network-layer source/destination; "{src,dst}" are the source/destination from the highest of those two layers that we have in the packet. Add a port type to "packet_info" as well, specifying whether it's a TCP or UDP port. Don't set the address and port columns in the dissector functions; just set the address and port members of the "packet_info" structure. Set the columns in "fill_in_columns()"; this means that if we're showing COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate the string from "src" or "dst", we don't generate a string for the link-layer address and then overwrite it with a string for the network-layer address (generating those strings costs CPU). Add support for "conversations", where a "conversation" is (at present) a source and destination address and a source and destination port. (In the future, we may support "conversations" above the transport layer, e.g. a TFTP conversation, where the first packet goes from the client to the TFTP server port, but the reply comes back from a different port, and all subsequent packets go between the client address/port and the server address/new port, or an NFS conversation, which might include lock manager, status monitor, and mount packets, as well as NFS packets.) Currently, all we support is a call that takes the source and destination address/port pairs, looks them up in a hash table, and: if nothing is found, creates a new entry in the hash table, and assigns it a unique 32-bit conversation ID, and returns that conversation ID; if an entry is found, returns its conversation ID. Use that in the SMB and AFS code to keep track of individual SMB or AFS conversations. We need to match up requests and replies, as, for certain replies, the operation code for the request to which it's a reply doesn't show up in the reply - you have to find the request with a matching transaction ID. Transaction IDs are per-conversation, so the hash table for requests should include a conversation ID and transaction ID as the key. This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses transparently (and should allow the SMB decoder to handle NetBIOS atop other protocols as well, if the source and destination address and port values in the "packet_info" structure are set appropriately). In the "Follow TCP Connection" code, check to make sure that the addresses are IPv4 addressses; ultimately, that code should be changed to use the conversation code instead, which will let it handle IPv6 transparently. svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
#if defined(DEBUG_SMB_HASH)
printf("Comparing %08X:%u\n and %08X:%u\n",
v1 -> conversation, v1 -> mid,
v2 -> conversation, v2 -> mid);
#endif
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
Generalize the "ip_src" and "ip_dst" members of the "packet_info" structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst" addresses, where an address is an address type, an address length in bytes, and a pointer to that many bytes. "dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}" are the network-layer source/destination; "{src,dst}" are the source/destination from the highest of those two layers that we have in the packet. Add a port type to "packet_info" as well, specifying whether it's a TCP or UDP port. Don't set the address and port columns in the dissector functions; just set the address and port members of the "packet_info" structure. Set the columns in "fill_in_columns()"; this means that if we're showing COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate the string from "src" or "dst", we don't generate a string for the link-layer address and then overwrite it with a string for the network-layer address (generating those strings costs CPU). Add support for "conversations", where a "conversation" is (at present) a source and destination address and a source and destination port. (In the future, we may support "conversations" above the transport layer, e.g. a TFTP conversation, where the first packet goes from the client to the TFTP server port, but the reply comes back from a different port, and all subsequent packets go between the client address/port and the server address/new port, or an NFS conversation, which might include lock manager, status monitor, and mount packets, as well as NFS packets.) Currently, all we support is a call that takes the source and destination address/port pairs, looks them up in a hash table, and: if nothing is found, creates a new entry in the hash table, and assigns it a unique 32-bit conversation ID, and returns that conversation ID; if an entry is found, returns its conversation ID. Use that in the SMB and AFS code to keep track of individual SMB or AFS conversations. We need to match up requests and replies, as, for certain replies, the operation code for the request to which it's a reply doesn't show up in the reply - you have to find the request with a matching transaction ID. Transaction IDs are per-conversation, so the hash table for requests should include a conversation ID and transaction ID as the key. This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses transparently (and should allow the SMB decoder to handle NetBIOS atop other protocols as well, if the source and destination address and port values in the "packet_info" structure are set appropriately). In the "Follow TCP Connection" code, check to make sure that the addresses are IPv4 addressses; ultimately, that code should be changed to use the conversation code instead, which will let it handle IPv6 transparently. svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
if (v1 -> conversation == v2 -> conversation &&
v1 -> mid == v2 -> mid) {
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
return 1;
}
return 0;
}
guint
smb_hash (gconstpointer v)
{
struct smb_request_key *key = (struct smb_request_key *)v;
guint val;
Generalize the "ip_src" and "ip_dst" members of the "packet_info" structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst" addresses, where an address is an address type, an address length in bytes, and a pointer to that many bytes. "dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}" are the network-layer source/destination; "{src,dst}" are the source/destination from the highest of those two layers that we have in the packet. Add a port type to "packet_info" as well, specifying whether it's a TCP or UDP port. Don't set the address and port columns in the dissector functions; just set the address and port members of the "packet_info" structure. Set the columns in "fill_in_columns()"; this means that if we're showing COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate the string from "src" or "dst", we don't generate a string for the link-layer address and then overwrite it with a string for the network-layer address (generating those strings costs CPU). Add support for "conversations", where a "conversation" is (at present) a source and destination address and a source and destination port. (In the future, we may support "conversations" above the transport layer, e.g. a TFTP conversation, where the first packet goes from the client to the TFTP server port, but the reply comes back from a different port, and all subsequent packets go between the client address/port and the server address/new port, or an NFS conversation, which might include lock manager, status monitor, and mount packets, as well as NFS packets.) Currently, all we support is a call that takes the source and destination address/port pairs, looks them up in a hash table, and: if nothing is found, creates a new entry in the hash table, and assigns it a unique 32-bit conversation ID, and returns that conversation ID; if an entry is found, returns its conversation ID. Use that in the SMB and AFS code to keep track of individual SMB or AFS conversations. We need to match up requests and replies, as, for certain replies, the operation code for the request to which it's a reply doesn't show up in the reply - you have to find the request with a matching transaction ID. Transaction IDs are per-conversation, so the hash table for requests should include a conversation ID and transaction ID as the key. This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses transparently (and should allow the SMB decoder to handle NetBIOS atop other protocols as well, if the source and destination address and port values in the "packet_info" structure are set appropriately). In the "Follow TCP Connection" code, check to make sure that the addresses are IPv4 addressses; ultimately, that code should be changed to use the conversation code instead, which will let it handle IPv6 transparently. svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
val = key -> conversation + key -> mid;
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
Generalize the "ip_src" and "ip_dst" members of the "packet_info" structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst" addresses, where an address is an address type, an address length in bytes, and a pointer to that many bytes. "dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}" are the network-layer source/destination; "{src,dst}" are the source/destination from the highest of those two layers that we have in the packet. Add a port type to "packet_info" as well, specifying whether it's a TCP or UDP port. Don't set the address and port columns in the dissector functions; just set the address and port members of the "packet_info" structure. Set the columns in "fill_in_columns()"; this means that if we're showing COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate the string from "src" or "dst", we don't generate a string for the link-layer address and then overwrite it with a string for the network-layer address (generating those strings costs CPU). Add support for "conversations", where a "conversation" is (at present) a source and destination address and a source and destination port. (In the future, we may support "conversations" above the transport layer, e.g. a TFTP conversation, where the first packet goes from the client to the TFTP server port, but the reply comes back from a different port, and all subsequent packets go between the client address/port and the server address/new port, or an NFS conversation, which might include lock manager, status monitor, and mount packets, as well as NFS packets.) Currently, all we support is a call that takes the source and destination address/port pairs, looks them up in a hash table, and: if nothing is found, creates a new entry in the hash table, and assigns it a unique 32-bit conversation ID, and returns that conversation ID; if an entry is found, returns its conversation ID. Use that in the SMB and AFS code to keep track of individual SMB or AFS conversations. We need to match up requests and replies, as, for certain replies, the operation code for the request to which it's a reply doesn't show up in the reply - you have to find the request with a matching transaction ID. Transaction IDs are per-conversation, so the hash table for requests should include a conversation ID and transaction ID as the key. This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses transparently (and should allow the SMB decoder to handle NetBIOS atop other protocols as well, if the source and destination address and port values in the "packet_info" structure are set appropriately). In the "Follow TCP Connection" code, check to make sure that the addresses are IPv4 addressses; ultimately, that code should be changed to use the conversation code instead, which will let it handle IPv6 transparently. svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
#if defined(DEBUG_SMB_HASH)
printf("SMB Hash calculated as %u\n", val);
#endif
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
return val;
}
/*
Provide a general mechanism by which dissectors can register "init" routines, which are called before a dissection pass is made over all the packets in a capture - the "init" routine would clear out any state information that needs to be initialized before such a dissection pass. Make the NCP, SMB, AFS, and ONC RPC dissectors register their "init" routines with that mechanism, have the code that reads in a capture file call the routine that calls all registered "init" routines rather than calling a wired-in set of "init" routines, and also have the code that runs a filtering or colorizing pass over all the packets call that routine, as a filtering or colorizing pass is a dissection pass. Have the ONC RPC "init" routine zero out the table of RPC calls, so that it completely erases any state from the previous dissection pass (so that, for example, if you run a filtering pass, it doesn't mark any non-duplicate packets as duplicates because it remembers them from the previous pass). svn path=/trunk/; revision=1050
1999-11-17 21:58:33 +00:00
* Free up any state information we've saved, and re-initialize the
* tables of state information.
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
*/
Provide a general mechanism by which dissectors can register "init" routines, which are called before a dissection pass is made over all the packets in a capture - the "init" routine would clear out any state information that needs to be initialized before such a dissection pass. Make the NCP, SMB, AFS, and ONC RPC dissectors register their "init" routines with that mechanism, have the code that reads in a capture file call the routine that calls all registered "init" routines rather than calling a wired-in set of "init" routines, and also have the code that runs a filtering or colorizing pass over all the packets call that routine, as a filtering or colorizing pass is a dissection pass. Have the ONC RPC "init" routine zero out the table of RPC calls, so that it completely erases any state from the previous dissection pass (so that, for example, if you run a filtering pass, it doesn't mark any non-duplicate packets as duplicates because it remembers them from the previous pass). svn path=/trunk/; revision=1050
1999-11-17 21:58:33 +00:00
static void
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
smb_init_protocol(void)
{
Generalize the "ip_src" and "ip_dst" members of the "packet_info" structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst" addresses, where an address is an address type, an address length in bytes, and a pointer to that many bytes. "dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}" are the network-layer source/destination; "{src,dst}" are the source/destination from the highest of those two layers that we have in the packet. Add a port type to "packet_info" as well, specifying whether it's a TCP or UDP port. Don't set the address and port columns in the dissector functions; just set the address and port members of the "packet_info" structure. Set the columns in "fill_in_columns()"; this means that if we're showing COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate the string from "src" or "dst", we don't generate a string for the link-layer address and then overwrite it with a string for the network-layer address (generating those strings costs CPU). Add support for "conversations", where a "conversation" is (at present) a source and destination address and a source and destination port. (In the future, we may support "conversations" above the transport layer, e.g. a TFTP conversation, where the first packet goes from the client to the TFTP server port, but the reply comes back from a different port, and all subsequent packets go between the client address/port and the server address/new port, or an NFS conversation, which might include lock manager, status monitor, and mount packets, as well as NFS packets.) Currently, all we support is a call that takes the source and destination address/port pairs, looks them up in a hash table, and: if nothing is found, creates a new entry in the hash table, and assigns it a unique 32-bit conversation ID, and returns that conversation ID; if an entry is found, returns its conversation ID. Use that in the SMB and AFS code to keep track of individual SMB or AFS conversations. We need to match up requests and replies, as, for certain replies, the operation code for the request to which it's a reply doesn't show up in the reply - you have to find the request with a matching transaction ID. Transaction IDs are per-conversation, so the hash table for requests should include a conversation ID and transaction ID as the key. This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses transparently (and should allow the SMB decoder to handle NetBIOS atop other protocols as well, if the source and destination address and port values in the "packet_info" structure are set appropriately). In the "Follow TCP Connection" code, check to make sure that the addresses are IPv4 addressses; ultimately, that code should be changed to use the conversation code instead, which will let it handle IPv6 transparently. svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
#if defined(DEBUG_SMB_HASH)
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
printf("Initializing SMB hashtable area\n");
Generalize the "ip_src" and "ip_dst" members of the "packet_info" structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst" addresses, where an address is an address type, an address length in bytes, and a pointer to that many bytes. "dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}" are the network-layer source/destination; "{src,dst}" are the source/destination from the highest of those two layers that we have in the packet. Add a port type to "packet_info" as well, specifying whether it's a TCP or UDP port. Don't set the address and port columns in the dissector functions; just set the address and port members of the "packet_info" structure. Set the columns in "fill_in_columns()"; this means that if we're showing COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate the string from "src" or "dst", we don't generate a string for the link-layer address and then overwrite it with a string for the network-layer address (generating those strings costs CPU). Add support for "conversations", where a "conversation" is (at present) a source and destination address and a source and destination port. (In the future, we may support "conversations" above the transport layer, e.g. a TFTP conversation, where the first packet goes from the client to the TFTP server port, but the reply comes back from a different port, and all subsequent packets go between the client address/port and the server address/new port, or an NFS conversation, which might include lock manager, status monitor, and mount packets, as well as NFS packets.) Currently, all we support is a call that takes the source and destination address/port pairs, looks them up in a hash table, and: if nothing is found, creates a new entry in the hash table, and assigns it a unique 32-bit conversation ID, and returns that conversation ID; if an entry is found, returns its conversation ID. Use that in the SMB and AFS code to keep track of individual SMB or AFS conversations. We need to match up requests and replies, as, for certain replies, the operation code for the request to which it's a reply doesn't show up in the reply - you have to find the request with a matching transaction ID. Transaction IDs are per-conversation, so the hash table for requests should include a conversation ID and transaction ID as the key. This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses transparently (and should allow the SMB decoder to handle NetBIOS atop other protocols as well, if the source and destination address and port values in the "packet_info" structure are set appropriately). In the "Follow TCP Connection" code, check to make sure that the addresses are IPv4 addressses; ultimately, that code should be changed to use the conversation code instead, which will let it handle IPv6 transparently. svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
#endif
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
if (smb_request_hash)
g_hash_table_destroy(smb_request_hash);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
if (smb_request_keys)
g_mem_chunk_destroy(smb_request_keys);
if (smb_request_vals)
g_mem_chunk_destroy(smb_request_vals);
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
smb_request_hash = g_hash_table_new(smb_hash, smb_equal);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
smb_request_keys = g_mem_chunk_new("smb_request_keys",
sizeof(struct smb_request_key),
smb_packet_init_count * sizeof(struct smb_request_key), G_ALLOC_AND_FREE);
smb_request_vals = g_mem_chunk_new("smb_request_vals",
sizeof(struct smb_request_val),
smb_packet_init_count * sizeof(struct smb_request_val), G_ALLOC_AND_FREE);
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
}
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
void (*dissect[256])(const u_char *, int, frame_data *, proto_tree *, proto_tree *, struct smb_info si, int, int, int, int);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A small set of patches to fix one small problem and start working on the filtering in packet-smb.c ... svn path=/trunk/; revision=2220
2000-08-07 14:49:03 +00:00
static const value_string smb_cmd_vals[] = {
{ 0x00, "SMBcreatedirectory" },
{ 0x01, "SMBdeletedirectory" },
{ 0x02, "SMBopen" },
{ 0x03, "SMBcreate" },
{ 0x04, "SMBclose" },
{ 0x05, "SMBflush" },
{ 0x06, "SMBunlink" },
{ 0x07, "SMBmv" },
{ 0x08, "SMBgetatr" },
{ 0x09, "SMBsetatr" },
{ 0x0A, "SMBread" },
{ 0x0B, "SMBwrite" },
{ 0x0C, "SMBlock" },
{ 0x0D, "SMBunlock" },
{ 0x0E, "SMBctemp" },
{ 0x0F, "SMBmknew" },
{ 0x10, "SMBchkpth" },
{ 0x11, "SMBexit" },
{ 0x12, "SMBlseek" },
{ 0x13, "SMBlockread" },
{ 0x14, "SMBwriteunlock" },
{ 0x15, "unknown-0x15" },
{ 0x16, "unknown-0x16" },
{ 0x17, "unknown-0x17" },
{ 0x18, "unknown-0x18" },
{ 0x19, "unknown-0x19" },
{ 0x1A, "SMBreadBraw" },
{ 0x1B, "SMBreadBmpx" },
{ 0x1C, "SMBreadBs" },
{ 0x1D, "SMBwriteBraw" },
{ 0x1E, "SMBwriteBmpx" },
{ 0x1F, "SMBwriteBs" },
{ 0x20, "SMBwriteC" },
{ 0x21, "unknown-0x21" },
{ 0x22, "SMBsetattrE" },
{ 0x23, "SMBgetattrE" },
{ 0x24, "SMBlockingX" },
{ 0x25, "SMBtrans" },
{ 0x26, "SMBtranss" },
{ 0x27, "SMBioctl" },
{ 0x28, "SMBioctls" },
{ 0x29, "SMBcopy" },
{ 0x2A, "SMBmove" },
{ 0x2B, "SMBecho" },
{ 0x2C, "SMBwriteclose" },
{ 0x2D, "SMBopenX" },
{ 0x2E, "SMBreadX" },
{ 0x2F, "SMBwriteX" },
{ 0x30, "unknown-0x30" },
{ 0x31, "SMBcloseandtreedisc" },
{ 0x32, "SMBtrans2" },
{ 0x33, "SMBtrans2secondary" },
{ 0x34, "SMBfindclose2" },
{ 0x35, "SMBfindnotifyclose" },
{ 0x36, "unknown-0x36" },
{ 0x37, "unknown-0x37" },
{ 0x38, "unknown-0x38" },
{ 0x39, "unknown-0x39" },
{ 0x3A, "unknown-0x3A" },
{ 0x3B, "unknown-0x3B" },
{ 0x3C, "unknown-0x3C" },
{ 0x3D, "unknown-0x3D" },
{ 0x3E, "unknown-0x3E" },
{ 0x3F, "unknown-0x3F" },
{ 0x40, "unknown-0x40" },
{ 0x41, "unknown-0x41" },
{ 0x42, "unknown-0x42" },
{ 0x43, "unknown-0x43" },
{ 0x44, "unknown-0x44" },
{ 0x45, "unknown-0x45" },
{ 0x46, "unknown-0x46" },
{ 0x47, "unknown-0x47" },
{ 0x48, "unknown-0x48" },
{ 0x49, "unknown-0x49" },
{ 0x4A, "unknown-0x4A" },
{ 0x4B, "unknown-0x4B" },
{ 0x4C, "unknown-0x4C" },
{ 0x4D, "unknown-0x4D" },
{ 0x4E, "unknown-0x4E" },
{ 0x4F, "unknown-0x4F" },
{ 0x50, "unknown-0x50" },
{ 0x51, "unknown-0x51" },
{ 0x52, "unknown-0x52" },
{ 0x53, "unknown-0x53" },
{ 0x54, "unknown-0x54" },
{ 0x55, "unknown-0x55" },
{ 0x56, "unknown-0x56" },
{ 0x57, "unknown-0x57" },
{ 0x58, "unknown-0x58" },
{ 0x59, "unknown-0x59" },
{ 0x5A, "unknown-0x5A" },
{ 0x5B, "unknown-0x5B" },
{ 0x5C, "unknown-0x5C" },
{ 0x5D, "unknown-0x5D" },
{ 0x5E, "unknown-0x5E" },
{ 0x5F, "unknown-0x5F" },
{ 0x60, "unknown-0x60" },
{ 0x61, "unknown-0x61" },
{ 0x62, "unknown-0x62" },
{ 0x63, "unknown-0x63" },
{ 0x64, "unknown-0x64" },
{ 0x65, "unknown-0x65" },
{ 0x66, "unknown-0x66" },
{ 0x67, "unknown-0x67" },
{ 0x68, "unknown-0x68" },
{ 0x69, "unknown-0x69" },
{ 0x6A, "unknown-0x6A" },
{ 0x6B, "unknown-0x6B" },
{ 0x6C, "unknown-0x6C" },
{ 0x6D, "unknown-0x6D" },
{ 0x6E, "unknown-0x6E" },
{ 0x6F, "unknown-0x6F" },
{ 0x70, "SMBtcon" },
{ 0x71, "SMBtdis" },
{ 0x72, "SMBnegprot" },
{ 0x73, "SMBsesssetupX" },
{ 0x74, "SMBlogoffX" },
{ 0x75, "SMBtconX" },
{ 0x76, "unknown-0x76" },
{ 0x77, "unknown-0x77" },
{ 0x78, "unknown-0x78" },
{ 0x79, "unknown-0x79" },
{ 0x7A, "unknown-0x7A" },
{ 0x7B, "unknown-0x7B" },
{ 0x7C, "unknown-0x7C" },
{ 0x7D, "unknown-0x7D" },
{ 0x7E, "unknown-0x7E" },
{ 0x7F, "unknown-0x7F" },
{ 0x80, "SMBdskattr" },
{ 0x81, "SMBsearch" },
{ 0x82, "SMBffirst" },
{ 0x83, "SMBfunique" },
{ 0x84, "SMBfclose" },
{ 0x85, "unknown-0x85" },
{ 0x86, "unknown-0x86" },
{ 0x87, "unknown-0x87" },
{ 0x88, "unknown-0x88" },
{ 0x89, "unknown-0x89" },
{ 0x8A, "unknown-0x8A" },
{ 0x8B, "unknown-0x8B" },
{ 0x8C, "unknown-0x8C" },
{ 0x8D, "unknown-0x8D" },
{ 0x8E, "unknown-0x8E" },
{ 0x8F, "unknown-0x8F" },
{ 0x90, "unknown-0x90" },
{ 0x91, "unknown-0x91" },
{ 0x92, "unknown-0x92" },
{ 0x93, "unknown-0x93" },
{ 0x94, "unknown-0x94" },
{ 0x95, "unknown-0x95" },
{ 0x96, "unknown-0x96" },
{ 0x97, "unknown-0x97" },
{ 0x98, "unknown-0x98" },
{ 0x99, "unknown-0x99" },
{ 0x9A, "unknown-0x9A" },
{ 0x9B, "unknown-0x9B" },
{ 0x9C, "unknown-0x9C" },
{ 0x9D, "unknown-0x9D" },
{ 0x9E, "unknown-0x9E" },
{ 0x9F, "unknown-0x9F" },
{ 0xA0, "SMBnttransact" },
{ 0xA1, "SMBnttransactsecondary" },
{ 0xA2, "SMBntcreateX" },
{ 0xA3, "unknown-0xA3" },
{ 0xA4, "SMBntcancel" },
{ 0xA5, "unknown-0xA5" },
{ 0xA6, "unknown-0xA6" },
{ 0xA7, "unknown-0xA7" },
{ 0xA8, "unknown-0xA8" },
{ 0xA9, "unknown-0xA9" },
{ 0xAA, "unknown-0xAA" },
{ 0xAB, "unknown-0xAB" },
{ 0xAC, "unknown-0xAC" },
{ 0xAD, "unknown-0xAD" },
{ 0xAE, "unknown-0xAE" },
{ 0xAF, "unknown-0xAF" },
{ 0xB0, "unknown-0xB0" },
{ 0xB1, "unknown-0xB1" },
{ 0xB2, "unknown-0xB2" },
{ 0xB3, "unknown-0xB3" },
{ 0xB4, "unknown-0xB4" },
{ 0xB5, "unknown-0xB5" },
{ 0xB6, "unknown-0xB6" },
{ 0xB7, "unknown-0xB7" },
{ 0xB8, "unknown-0xB8" },
{ 0xB9, "unknown-0xB9" },
{ 0xBA, "unknown-0xBA" },
{ 0xBB, "unknown-0xBB" },
{ 0xBC, "unknown-0xBC" },
{ 0xBD, "unknown-0xBD" },
{ 0xBE, "unknown-0xBE" },
{ 0xBF, "unknown-0xBF" },
{ 0xC0, "SMBsplopen" },
{ 0xC1, "SMBsplwr" },
{ 0xC2, "SMBsplclose" },
{ 0xC3, "SMBsplretq" },
{ 0xC4, "unknown-0xC4" },
{ 0xC5, "unknown-0xC5" },
{ 0xC6, "unknown-0xC6" },
{ 0xC7, "unknown-0xC7" },
{ 0xC8, "unknown-0xC8" },
{ 0xC9, "unknown-0xC9" },
{ 0xCA, "unknown-0xCA" },
{ 0xCB, "unknown-0xCB" },
{ 0xCC, "unknown-0xCC" },
{ 0xCD, "unknown-0xCD" },
{ 0xCE, "unknown-0xCE" },
{ 0xCF, "unknown-0xCF" },
{ 0xD0, "SMBsends" },
{ 0xD1, "SMBsendb" },
{ 0xD2, "SMBfwdname" },
{ 0xD3, "SMBcancelf" },
{ 0xD4, "SMBgetmac" },
{ 0xD5, "SMBsendstrt" },
{ 0xD6, "SMBsendend" },
{ 0xD7, "SMBsendtxt" },
{ 0xD8, "SMBreadbulk" },
{ 0xD9, "SMBwritebulk" },
{ 0xDA, "SMBwritebulkdata" },
{ 0xDB, "unknown-0xDB" },
{ 0xDC, "unknown-0xDC" },
{ 0xDD, "unknown-0xDD" },
{ 0xDE, "unknown-0xDE" },
{ 0xDF, "unknown-0xDF" },
{ 0xE0, "unknown-0xE0" },
{ 0xE1, "unknown-0xE1" },
{ 0xE2, "unknown-0xE2" },
{ 0xE3, "unknown-0xE3" },
{ 0xE4, "unknown-0xE4" },
{ 0xE5, "unknown-0xE5" },
{ 0xE6, "unknown-0xE6" },
{ 0xE7, "unknown-0xE7" },
{ 0xE8, "unknown-0xE8" },
{ 0xE9, "unknown-0xE9" },
{ 0xEA, "unknown-0xEA" },
{ 0xEB, "unknown-0xEB" },
{ 0xEC, "unknown-0xEC" },
{ 0xED, "unknown-0xED" },
{ 0xEE, "unknown-0xEE" },
{ 0xEF, "unknown-0xEF" },
{ 0xF0, "unknown-0xF0" },
{ 0xF1, "unknown-0xF1" },
{ 0xF2, "unknown-0xF2" },
{ 0xF3, "unknown-0xF3" },
{ 0xF4, "unknown-0xF4" },
{ 0xF5, "unknown-0xF5" },
{ 0xF6, "unknown-0xF6" },
{ 0xF7, "unknown-0xF7" },
{ 0xF8, "unknown-0xF8" },
{ 0xF9, "unknown-0xF9" },
{ 0xFA, "unknown-0xFA" },
{ 0xFB, "unknown-0xFB" },
{ 0xFC, "unknown-0xFC" },
{ 0xFD, "unknown-0xFD" },
{ 0xFE, "SMBinvalid" },
{ 0xFF, "unknown-0xFF" },
Ensure that all value_string arrays end in {0, NULL}. Dissectors got away with not terminating their arrays because they knew the limits of the value used to look up strings in the value_string array, but the dfilter_expr_dlg does not know these limits and must rely on the terminating {0, NULL} record. Also, in SNA fixed a bug in which a field should have been defined as FT_UINT8 but was defined as FT_BOOLEAN. In WTP, fixed a value string which had duplicate keys. svn path=/trunk/; revision=2817
2001-01-03 16:41:08 +00:00
{ 0x00, NULL },
A small set of patches to fix one small problem and start working on the filtering in packet-smb.c ... svn path=/trunk/; revision=2220
2000-08-07 14:49:03 +00:00
};
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
char *SMB_names[256] = {
Add some SMB codes and error codes from the "draft-leach-cifs-v1-spec-01.txt" CIFS Internet draft. svn path=/trunk/; revision=274
1999-05-11 07:22:31 +00:00
"SMBcreatedirectory",
"SMBdeletedirectory",
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
"SMBopen",
"SMBcreate",
"SMBclose",
"SMBflush",
"SMBunlink",
"SMBmv",
"SMBgetatr",
"SMBsetatr",
"SMBread",
"SMBwrite",
"SMBlock",
"SMBunlock",
"SMBctemp",
"SMBmknew",
"SMBchkpth",
"SMBexit",
"SMBlseek",
"SMBlockread",
"SMBwriteunlock",
"unknown-0x15",
"unknown-0x16",
"unknown-0x17",
"unknown-0x18",
"unknown-0x19",
"SMBreadBraw",
"SMBreadBmpx",
"SMBreadBs",
"SMBwriteBraw",
"SMBwriteBmpx",
"SMBwriteBs",
"SMBwriteC",
"unknown-0x21",
"SMBsetattrE",
"SMBgetattrE",
"SMBlockingX",
"SMBtrans",
"SMBtranss",
"SMBioctl",
"SMBioctls",
"SMBcopy",
"SMBmove",
"SMBecho",
"SMBwriteclose",
"SMBopenX",
"SMBreadX",
"SMBwriteX",
"unknown-0x30",
Add some SMB codes and error codes from the "draft-leach-cifs-v1-spec-01.txt" CIFS Internet draft. svn path=/trunk/; revision=274
1999-05-11 07:22:31 +00:00
"SMBcloseandtreedisc",
"SMBtrans2",
"SMBtrans2secondary",
"SMBfindclose2",
"SMBfindnotifyclose",
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
"unknown-0x36",
"unknown-0x37",
"unknown-0x38",
"unknown-0x39",
"unknown-0x3A",
"unknown-0x3B",
"unknown-0x3C",
"unknown-0x3D",
"unknown-0x3E",
"unknown-0x3F",
"unknown-0x40",
"unknown-0x41",
"unknown-0x42",
"unknown-0x43",
"unknown-0x44",
"unknown-0x45",
"unknown-0x46",
"unknown-0x47",
"unknown-0x48",
"unknown-0x49",
"unknown-0x4A",
"unknown-0x4B",
"unknown-0x4C",
"unknown-0x4D",
"unknown-0x4E",
"unknown-0x4F",
"unknown-0x50",
"unknown-0x51",
"unknown-0x52",
"unknown-0x53",
"unknown-0x54",
"unknown-0x55",
"unknown-0x56",
"unknown-0x57",
"unknown-0x58",
"unknown-0x59",
"unknown-0x5A",
"unknown-0x5B",
"unknown-0x5C",
"unknown-0x5D",
"unknown-0x5E",
"unknown-0x5F",
"unknown-0x60",
"unknown-0x61",
"unknown-0x62",
"unknown-0x63",
"unknown-0x64",
"unknown-0x65",
"unknown-0x66",
"unknown-0x67",
"unknown-0x68",
"unknown-0x69",
"unknown-0x6A",
"unknown-0x6B",
"unknown-0x6C",
"unknown-0x6D",
"unknown-0x6E",
"unknown-0x6F",
"SMBtcon",
"SMBtdis",
"SMBnegprot",
"SMBsesssetupX",
Add some SMB codes and error codes from the "draft-leach-cifs-v1-spec-01.txt" CIFS Internet draft. svn path=/trunk/; revision=274
1999-05-11 07:22:31 +00:00
"SMBlogoffX",
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
"SMBtconX",
"unknown-0x76",
"unknown-0x77",
"unknown-0x78",
"unknown-0x79",
"unknown-0x7A",
"unknown-0x7B",
"unknown-0x7C",
"unknown-0x7D",
"unknown-0x7E",
"unknown-0x7F",
"SMBdskattr",
"SMBsearch",
"SMBffirst",
"SMBfunique",
"SMBfclose",
"unknown-0x85",
"unknown-0x86",
"unknown-0x87",
"unknown-0x88",
"unknown-0x89",
"unknown-0x8A",
"unknown-0x8B",
"unknown-0x8C",
"unknown-0x8D",
"unknown-0x8E",
"unknown-0x8F",
"unknown-0x90",
"unknown-0x91",
"unknown-0x92",
"unknown-0x93",
"unknown-0x94",
"unknown-0x95",
"unknown-0x96",
"unknown-0x97",
"unknown-0x98",
"unknown-0x99",
"unknown-0x9A",
"unknown-0x9B",
"unknown-0x9C",
"unknown-0x9D",
"unknown-0x9E",
"unknown-0x9F",
Add some SMB codes and error codes from the "draft-leach-cifs-v1-spec-01.txt" CIFS Internet draft. svn path=/trunk/; revision=274
1999-05-11 07:22:31 +00:00
"SMBnttransact",
"SMBnttransactsecondary",
"SMBntcreateX",
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
"unknown-0xA3",
Add some SMB codes and error codes from the "draft-leach-cifs-v1-spec-01.txt" CIFS Internet draft. svn path=/trunk/; revision=274
1999-05-11 07:22:31 +00:00
"SMBntcancel",
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
"unknown-0xA5",
"unknown-0xA6",
"unknown-0xA7",
"unknown-0xA8",
"unknown-0xA9",
"unknown-0xAA",
"unknown-0xAB",
"unknown-0xAC",
"unknown-0xAD",
"unknown-0xAE",
"unknown-0xAF",
"unknown-0xB0",
"unknown-0xB1",
"unknown-0xB2",
"unknown-0xB3",
"unknown-0xB4",
"unknown-0xB5",
"unknown-0xB6",
"unknown-0xB7",
"unknown-0xB8",
"unknown-0xB9",
"unknown-0xBA",
"unknown-0xBB",
"unknown-0xBC",
"unknown-0xBD",
"unknown-0xBE",
"unknown-0xBF",
"SMBsplopen",
"SMBsplwr",
"SMBsplclose",
"SMBsplretq",
"unknown-0xC4",
"unknown-0xC5",
"unknown-0xC6",
"unknown-0xC7",
"unknown-0xC8",
"unknown-0xC9",
"unknown-0xCA",
"unknown-0xCB",
"unknown-0xCC",
"unknown-0xCD",
"unknown-0xCE",
"unknown-0xCF",
"SMBsends",
"SMBsendb",
"SMBfwdname",
"SMBcancelf",
"SMBgetmac",
"SMBsendstrt",
"SMBsendend",
"SMBsendtxt",
Add some SMB codes and error codes from the "draft-leach-cifs-v1-spec-01.txt" CIFS Internet draft. svn path=/trunk/; revision=274
1999-05-11 07:22:31 +00:00
"SMBreadbulk",
"SMBwritebulk",
"SMBwritebulkdata",
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
"unknown-0xDB",
"unknown-0xDC",
"unknown-0xDD",
"unknown-0xDE",
"unknown-0xDF",
"unknown-0xE0",
"unknown-0xE1",
"unknown-0xE2",
"unknown-0xE3",
"unknown-0xE4",
"unknown-0xE5",
"unknown-0xE6",
"unknown-0xE7",
"unknown-0xE8",
"unknown-0xE9",
"unknown-0xEA",
"unknown-0xEB",
"unknown-0xEC",
"unknown-0xED",
"unknown-0xEE",
"unknown-0xEF",
"unknown-0xF0",
"unknown-0xF1",
"unknown-0xF2",
"unknown-0xF3",
"unknown-0xF4",
"unknown-0xF5",
"unknown-0xF6",
"unknown-0xF7",
"unknown-0xF8",
"unknown-0xF9",
"unknown-0xFA",
"unknown-0xFB",
"unknown-0xFC",
"unknown-0xFD",
"SMBinvalid",
"unknown-0xFF"
};
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_unknown_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, int dirn)
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
{
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, END_OF_FRAME, "Data (%u bytes)",
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
END_OF_FRAME);
}
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/*
* Dissect a UNIX like date ...
*/
Patch from Greg Kilfoyle of Redback Networks: Don't use a global variable named "gmtime" - some versions of NetBSD define it in <time.h> - use "_gmtime" instead, so we can build on those NetBSD systems. svn path=/trunk/; revision=1375
1999-12-23 20:47:16 +00:00
struct tm *_gtime; /* Add leading underscore ("_") to prevent symbol
conflict with /usr/include/time.h on some NetBSD
systems */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
static char *
dissect_smbu_date(guint16 date, guint16 time)
{
Patches to prevent problems under Windows when time formats are negative. Make sure that if _gtime is null, a bad format message returned. Also noticed that I am going to have to do something about Unicode strings soon and the SMBopenX dissect is slightly wrong ... Oh well, it is the Xmas break soon :-) No rest for the Wicca'd (please don't interpret that as a statement of my religious affiliation, it is just a cute saying :-) svn path=/trunk/; revision=2764
2000-12-17 03:48:44 +00:00
static char datebuf[4+2+2+2+1+10];
"gmtime()" takes a pointer to a "time_t", not a pointer to a "guint32", as an argument. ("time_t" could be 64 bits - I think it is 64 bits on some platforms, e.g. Alpha Linux - and it's typically signed rather than unsigned.) svn path=/trunk/; revision=760
1999-10-03 05:01:56 +00:00
time_t ltime = (date << 16) + time;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Patch from Greg Kilfoyle of Redback Networks: Don't use a global variable named "gmtime" - some versions of NetBSD define it in <time.h> - use "_gmtime" instead, so we can build on those NetBSD systems. svn path=/trunk/; revision=1375
1999-12-23 20:47:16 +00:00
_gtime = gmtime(&ltime);
Patches to prevent problems under Windows when time formats are negative. Make sure that if _gtime is null, a bad format message returned. Also noticed that I am going to have to do something about Unicode strings soon and the SMBopenX dissect is slightly wrong ... Oh well, it is the Xmas break soon :-) No rest for the Wicca'd (please don't interpret that as a statement of my religious affiliation, it is just a cute saying :-) svn path=/trunk/; revision=2764
2000-12-17 03:48:44 +00:00
if (_gtime)
sprintf(datebuf, "%04d-%02d-%02d",
1900 + (_gtime -> tm_year), 1 + (_gtime -> tm_mon), _gtime -> tm_mday);
else
sprintf(datebuf, "Bad date format");
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
return datebuf;
}
/*
* Relies on time
*/
static char *
dissect_smbu_time(guint16 date, guint16 time)
{
Patches to prevent problems under Windows when time formats are negative. Make sure that if _gtime is null, a bad format message returned. Also noticed that I am going to have to do something about Unicode strings soon and the SMBopenX dissect is slightly wrong ... Oh well, it is the Xmas break soon :-) No rest for the Wicca'd (please don't interpret that as a statement of my religious affiliation, it is just a cute saying :-) svn path=/trunk/; revision=2764
2000-12-17 03:48:44 +00:00
static char timebuf[2+2+2+2+1+10];
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Patches to prevent problems under Windows when time formats are negative. Make sure that if _gtime is null, a bad format message returned. Also noticed that I am going to have to do something about Unicode strings soon and the SMBopenX dissect is slightly wrong ... Oh well, it is the Xmas break soon :-) No rest for the Wicca'd (please don't interpret that as a statement of my religious affiliation, it is just a cute saying :-) svn path=/trunk/; revision=2764
2000-12-17 03:48:44 +00:00
if (_gtime)
sprintf(timebuf, "%02d:%02d:%02d",
_gtime -> tm_hour, _gtime -> tm_min, _gtime -> tm_sec);
else
sprintf(timebuf, "Bad time format");
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
return timebuf;
}
Add decoding of DOS-format dates and times (one of the N different date/time formats used in SMB...). svn path=/trunk/; revision=273
1999-05-11 01:18:30 +00:00
/*
* Dissect a DOS-format date.
*/
static char *
dissect_dos_date(guint16 date)
{
static char datebuf[4+2+2+1];
sprintf(datebuf, "%04d-%02d-%02d",
((date>>9)&0x7F) + 1980, (date>>5)&0x0F, date&0x1F);
return datebuf;
}
/*
* Dissect a DOS-format time.
*/
static char *
dissect_dos_time(guint16 time)
{
static char timebuf[2+2+2+1];
sprintf(timebuf, "%02d:%02d:%02d",
(time>>11)&0x1F, (time>>5)&0x3F, (time&0x1F)*2);
return timebuf;
}
Turn "arpaddr_to_str()" into "bytes_to_str()", and make it public, so it can be used by dissectors other than ARP to display byte arrays as strings of hex digits. Add a routine to extract a null-terminated Unicode string and turn it into an ISO 8859-1 string for display. (Ultimately, we should determine what character sets the X server or printer or whatever can handle, and turn it into the appropriate character set.) Display the challenge in "core-to-LANMAN-2.1" Negotiate Protocol responses as a string of hex digits - but only if the length is non-zero. (It's a counted array, not a null-terminated string.) Display some additional security mode bits in an NT LM 0.12 Negotiate Protocol response. Display some additional bits in the "capabilities" field of the Negotiate Protocol response. Display the challenge in an NT LM 0.12 Negotiate Protocol response as a string of hex digits (it's a counted array, not a null-terminated string). Display the domain name as Unicode in an NT LM 0.12 Negotiate Protocol response if the capabilities field has the "supports Unicode" bit set (no, not the "Unicode" bit in the "flags2" field - NT doesn't set that in the response, even though it sends the domain name over in Unicode!). Display some additional bits in the "flags2" field of an SMB. svn path=/trunk/; revision=275
1999-05-11 08:21:39 +00:00
/* Max string length for displaying Unicode strings. */
#define MAX_UNICODE_STR_LEN 256
/* Turn a little-endian Unicode '\0'-terminated string into a string we
can display.
XXX - for now, we just handle the ISO 8859-1 characters. */
static gchar *
unicode_to_str(const guint8 *us, int *us_lenp) {
static gchar str[3][MAX_UNICODE_STR_LEN+3+1];
static gchar *cur;
gchar *p;
int len;
int us_len;
int overflow = 0;
if (cur == &str[0][0]) {
cur = &str[1][0];
} else if (cur == &str[1][0]) {
cur = &str[2][0];
} else {
cur = &str[0][0];
}
p = cur;
len = MAX_UNICODE_STR_LEN;
us_len = 0;
while (*us != 0 || *(us + 1) != 0) {
if (len > 0) {
*p++ = *us;
len--;
} else
overflow = 1;
us += 2;
us_len += 2;
}
if (overflow) {
/* Note that we're not showing the full string. */
*p++ = '.';
*p++ = '.';
*p++ = '.';
}
*p = '\0';
*us_lenp = us_len;
return cur;
}
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
/*
* Each dissect routine is passed an offset to wct and works from there
*/
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_flush_file_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, int dirn)
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
{
guint8 WordCount;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
guint16 FID;
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
guint16 ByteCount;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: FID */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
FID = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip FID */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ByteCount = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count: %u", ByteCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WCT) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ByteCount = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_get_disk_attr_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, int dirn)
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint16 TotalUnits;
guint16 Reserved;
guint16 FreeUnits;
guint16 ByteCount;
guint16 BlocksPerUnit;
guint16 BlockSize;
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (dirn == 1) { /* Request(s) dissect code */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Word Count (WCT) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
WordCount = GBYTE(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WCT) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ByteCount = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (WordCount > 0) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Total Units */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
TotalUnits = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Total Units: %u", TotalUnits);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Total Units */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Blocks Per Unit */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
BlocksPerUnit = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Blocks Per Unit: %u", BlocksPerUnit);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Blocks Per Unit */
/* Build display for: Block Size */
BlockSize = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Block Size: %u", BlockSize);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Block Size */
/* Build display for: Free Units */
FreeUnits = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Free Units: %u", FreeUnits);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Free Units */
/* Build display for: Reserved */
Reserved = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved: %u", Reserved);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved */
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_set_file_attr_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, int dirn)
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
{
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
proto_tree *Attributes_tree;
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
proto_item *ti;
guint8 WordCount;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
guint8 ByteCount;
guint8 BufferFormat;
guint16 Reserved5;
guint16 Reserved4;
guint16 Reserved3;
guint16 Reserved2;
guint16 Reserved1;
guint16 LastWriteTime;
guint16 LastWriteDate;
guint16 Attributes;
const char *FileName;
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (dirn == 1) { /* Request(s) dissect code */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Word Count (WCT) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
WordCount = GBYTE(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WCT) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (WordCount > 0) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Attributes */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Attributes = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Attributes: 0x%02x", Attributes);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Attributes_tree = proto_item_add_subtree(ti, ett_smb_fileattributes);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x01, 16, "Read-only file", "Not a read-only file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x02, 16, "Hidden file", "Not a hidden file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x04, 16, "System file", "Not a system file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x08, 16, " Volume", "Not a volume"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x10, 16, " Directory", "Not a directory"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x20, 16, " Archived", "Not archived"));
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Attributes */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Last Write Time */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
LastWriteTime = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Last Write Time: %s", dissect_dos_time(LastWriteTime));
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Last Write Time */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Last Write Date */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
LastWriteDate = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Last Write Date: %s", dissect_dos_date(LastWriteDate));
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Last Write Date */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Reserved 1 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Reserved1 = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 1: %u", Reserved1);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Reserved 1 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Reserved 2 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Reserved2 = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 2: %u", Reserved2);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Reserved 2 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Reserved 3 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Reserved3 = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 3: %u", Reserved3);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Reserved 3 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Reserved 4 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Reserved4 = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 4: %u", Reserved4);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Reserved 4 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Reserved 5 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Reserved5 = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 5: %u", Reserved5);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Reserved 5 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ByteCount = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Buffer Format */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
BufferFormat = GBYTE(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format: %u", BufferFormat);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Buffer Format */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: File Name */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
FileName = pd + offset;
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(FileName) + 1, "File Name: %s", FileName);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += strlen(FileName) + 1; /* Skip File Name */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (dirn == 0) { /* Response(s) dissect code */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Word Count (WCT) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
WordCount = GBYTE(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WCT) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ByteCount = GBYTE(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Byte Count (BCC): %u", ByteCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_write_file_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, int dirn)
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint8 BufferFormat;
guint32 Offset;
guint16 Remaining;
guint16 FID;
guint16 DataLength;
guint16 Count;
guint16 ByteCount;
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (dirn == 1) { /* Request(s) dissect code */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Word Count (WCT) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
WordCount = GBYTE(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WCT) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: FID */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
FID = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip FID */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Count = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Count: %u", Count);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Offset */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Offset = GWORD(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Offset: %u", Offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 4; /* Skip Offset */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Remaining */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Remaining = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Remaining: %u", Remaining);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Remaining */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ByteCount = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Buffer Format */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
BufferFormat = GBYTE(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format: %u", BufferFormat);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Buffer Format */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Data Length */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
DataLength = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Length: %u", DataLength);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Data Length */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
if (ByteCount > 0 && tree) {
if(END_OF_FRAME >= ByteCount)
proto_tree_add_text(tree, NullTVB, offset, ByteCount, "Data (%u bytes)", ByteCount);
else
proto_tree_add_text(tree, NullTVB, offset, END_OF_FRAME, "Data (first %u bytes)", END_OF_FRAME);
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (dirn == 0) { /* Response(s) dissect code */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Word Count (WCT) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
WordCount = GBYTE(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WCT) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Count = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Count: %u", Count);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ByteCount = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_read_mpx_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *arent, proto_tree *tree, struct smb_info si, int max_data, int SMB_offset, int errcode, int dirn)
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint8 Pad;
guint32 Reserved1;
guint32 Offset;
guint16 Reserved2;
guint16 Reserved;
guint16 MinCount;
guint16 MaxCount;
guint16 FID;
guint16 DataOffset;
guint16 DataLength;
guint16 DataCompactionMode;
guint16 Count;
guint16 ByteCount;
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (dirn == 1) { /* Request(s) dissect code */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Word Count (WCT) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
WordCount = GBYTE(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WCT) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: FID */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
FID = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip FID */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Offset */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Offset = GWORD(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Offset: %u", Offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 4; /* Skip Offset */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Max Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
MaxCount = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Max Count: %u", MaxCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Max Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Min Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
MinCount = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Min Count: %u", MinCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Min Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Reserved 1 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Reserved1 = GWORD(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Reserved 1: %u", Reserved1);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 4; /* Skip Reserved 1 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Reserved 2 */
Reserved2 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 2: %u", Reserved2);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Reserved 2 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
if (dirn == 0) { /* Response(s) dissect code */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Word Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count: %u", WordCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (WordCount > 0) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Offset */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Offset = GWORD(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Offset: %u", Offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 4; /* Skip Offset */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Count = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Count: %u", Count);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Reserved */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Reserved = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved: %u", Reserved);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Reserved */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Data Compaction Mode */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
DataCompactionMode = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Compaction Mode: %u", DataCompactionMode);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Data Compaction Mode */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Reserved */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Reserved = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved: %u", Reserved);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Reserved */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Data Length */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
DataLength = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Length: %u", DataLength);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Data Length */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Data Offset */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
DataOffset = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Offset: %u", DataOffset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Data Offset */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Pad */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Pad = GBYTE(pd, offset);
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Pad: %u", Pad);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Pad */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_delete_file_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *paernt, proto_tree *tree, struct smb_info si, int max_data, int SMB_offset, int errcode, int dirn)
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
{
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
guint8 WordCount;
guint8 BufferFormat;
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
guint16 SearchAttributes;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
guint16 ByteCount;
const char *FileName;
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (dirn == 1) { /* Request(s) dissect code */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Word Count (WCT) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
WordCount = GBYTE(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WCT) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
/* Build display for: SearchAttributes */
SearchAttributes = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "Search Attributes: %u", SearchAttributes);
}
offset += 2; /* Skip SearchAttributes */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Buffer Format */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
BufferFormat = GBYTE(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format: %u", BufferFormat);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Buffer Format */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: File Name */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
FileName = pd + offset;
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(FileName) + 1, "File Name: %s", FileName);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += strlen(FileName) + 1; /* Skip File Name */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (dirn == 0) { /* Response(s) dissect code */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Word Count (WCT) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
WordCount = GBYTE(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WCT) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_query_info2_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, int dirn)
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
proto_tree *Attributes_tree;
proto_item *ti;
guint8 WordCount;
guint32 FileDataSize;
guint32 FileAllocationSize;
guint16 LastWriteTime;
guint16 LastWriteDate;
guint16 LastAccessTime;
guint16 LastAccessDate;
guint16 FID;
guint16 CreationTime;
guint16 CreationDate;
guint16 ByteCount;
guint16 Attributes;
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (dirn == 1) { /* Request(s) dissect code */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WCT) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: FID */
FID = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip FID */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count */
ByteCount = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count: %u", ByteCount);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (dirn == 0) { /* Response(s) dissect code */
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WCT) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (WordCount > 0) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Creation Date */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
CreationDate = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Creation Date: %s", dissect_dos_date(CreationDate));
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Creation Date */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Creation Time */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
CreationTime = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Creation Time: %s", dissect_dos_time(CreationTime));
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Creation Time */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Last Access Date */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
LastAccessDate = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Last Access Date: %s", dissect_dos_date(LastAccessDate));
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Last Access Date */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Last Access Time */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
LastAccessTime = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Last Access Time: %s", dissect_dos_time(LastAccessTime));
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Last Access Time */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Last Write Date */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
LastWriteDate = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Last Write Date: %s", dissect_dos_date(LastWriteDate));
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Last Write Date */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Last Write Time */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
LastWriteTime = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Last Write Time: %s", dissect_dos_time(LastWriteTime));
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Last Write Time */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: File Data Size */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
FileDataSize = GWORD(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "File Data Size: %u", FileDataSize);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 4; /* Skip File Data Size */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: File Allocation Size */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
FileAllocationSize = GWORD(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "File Allocation Size: %u", FileAllocationSize);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 4; /* Skip File Allocation Size */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Attributes */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Attributes = GSHORT(pd, offset);
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Attributes: 0x%02x", Attributes);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Attributes_tree = proto_item_add_subtree(ti, ett_smb_fileattributes);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x01, 16, "Read-only file", "Not a read-only file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x02, 16, "Hidden file", "Not a hidden file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x04, 16, "System file", "Not a system file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x08, 16, " Volume", "Not a volume"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x10, 16, " Directory", "Not a directory"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x20, 16, " Archived", "Not archived"));
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Attributes */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ByteCount = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count: %u", ByteCount);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count */
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_treecon_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, int dirn)
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint8 BufferFormat3;
guint8 BufferFormat2;
guint8 BufferFormat1;
guint16 TID;
guint16 MaxBufferSize;
guint16 ByteCount;
const char *SharePath;
const char *Service;
const char *Password;
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (dirn == 1) { /* Request(s) dissect code */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WCT) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count (BCC) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ByteCount = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: BufferFormat1 */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
BufferFormat1 = GBYTE(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "BufferFormat1: %u", BufferFormat1);
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip BufferFormat1 */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Share Path */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
SharePath = pd + offset;
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(SharePath) + 1, "Share Path: %s", SharePath);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += strlen(SharePath) + 1; /* Skip Share Path */
/* Build display for: BufferFormat2 */
BufferFormat2 = GBYTE(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "BufferFormat2: %u", BufferFormat2);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip BufferFormat2 */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Password */
Password = pd + offset;
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(Password) + 1, "Password: %s", Password);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += strlen(Password) + 1; /* Skip Password */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: BufferFormat3 */
BufferFormat3 = GBYTE(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "BufferFormat3: %u", BufferFormat3);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip BufferFormat3 */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Service */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Service = pd + offset;
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(Service) + 1, "Service: %s", Service);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += strlen(Service) + 1; /* Skip Service */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (dirn == 0) { /* Response(s) dissect code */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Word Count (WCT) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
WordCount = GBYTE(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (errcode != 0) return;
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WCT) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Max Buffer Size */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
MaxBufferSize = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Max Buffer Size: %u", MaxBufferSize);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Max Buffer Size */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: TID */
TID = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "TID: %u", TID);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip TID */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Generated by build-dissect.pl Vesion 0.6 27-Jun-1999, ACT */
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_ssetup_andx_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
proto_tree *Capabilities_tree;
proto_item *ti;
guint8 WordCount;
guint8 AndXReserved;
guint8 AndXCommand = 0xFF;
guint32 SessionKey;
guint32 Reserved;
guint32 Capabilities;
guint16 VcNumber;
guint16 UNICODEAccountPasswordLength;
guint16 PasswordLen;
guint16 MaxMpxCount;
guint16 MaxBufferSize;
guint16 ByteCount;
Some general fixups and some fixes for protocol decode problems exposed by Win2000 interacting with a Samba server ... svn path=/trunk/; revision=1010
1999-11-11 13:56:58 +00:00
guint16 AndXOffset = 0;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
guint16 Action;
guint16 ANSIAccountPasswordLength;
const char *UNICODEPassword;
Some general fixups and some fixes for protocol decode problems exposed by Win2000 interacting with a Samba server ... svn path=/trunk/; revision=1010
1999-11-11 13:56:58 +00:00
const char *Password;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
const char *PrimaryDomain;
const char *NativeOS;
const char *NativeLanManType;
const char *NativeLanMan;
const char *AccountName;
const char *ANSIPassword;
if (dirn == 1) { /* Request(s) dissect code */
WordCount = GBYTE(pd, offset);
switch (WordCount) {
case 10:
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: AndXCommand */
AndXCommand = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXCommand: %s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
(AndXCommand == 0xFF ? "No further commands" : decode_smb_name(AndXCommand)));
}
offset += 1; /* Skip AndXCommand */
/* Build display for: AndXReserved */
AndXReserved = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXReserved: %u", AndXReserved);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip AndXReserved */
/* Build display for: AndXOffset */
AndXOffset = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "AndXOffset: %u", AndXOffset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip AndXOffset */
/* Build display for: MaxBufferSize */
MaxBufferSize = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "MaxBufferSize: %u", MaxBufferSize);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip MaxBufferSize */
/* Build display for: MaxMpxCount */
MaxMpxCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "MaxMpxCount: %u", MaxMpxCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip MaxMpxCount */
/* Build display for: VcNumber */
VcNumber = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "VcNumber: %u", VcNumber);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip VcNumber */
/* Build display for: SessionKey */
SessionKey = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "SessionKey: %u", SessionKey);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip SessionKey */
/* Build display for: PasswordLen */
PasswordLen = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "PasswordLen: %u", PasswordLen);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip PasswordLen */
/* Build display for: Reserved */
Reserved = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Reserved: %u", Reserved);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Reserved */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
if (ByteCount > 0) {
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Some general fixups and some fixes for protocol decode problems exposed by Win2000 interacting with a Samba server ... svn path=/trunk/; revision=1010
1999-11-11 13:56:58 +00:00
/* Build displat for: Password */
Password = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(Password) + 1, "Password: %s", Password);
Some general fixups and some fixes for protocol decode problems exposed by Win2000 interacting with a Samba server ... svn path=/trunk/; revision=1010
1999-11-11 13:56:58 +00:00
}
offset += PasswordLen;
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
/* Build display for: AccountName */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
AccountName = pd + offset;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
if (tree) {
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(AccountName) + 1, "AccountName: %s", AccountName);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
offset += strlen(AccountName) + 1; /* Skip AccountName */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
/* Build display for: PrimaryDomain */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
PrimaryDomain = pd + offset;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
if (tree) {
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(PrimaryDomain) + 1, "PrimaryDomain: %s", PrimaryDomain);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
offset += strlen(PrimaryDomain) + 1; /* Skip PrimaryDomain */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
/* Build display for: NativeOS */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
NativeOS = pd + offset;
if (tree) {
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(NativeOS) + 1, "Native OS: %s", NativeOS);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
offset += strlen(NativeOS) + 1; /* Skip NativeOS */
Some general fixups and some fixes for protocol decode problems exposed by Win2000 interacting with a Samba server ... svn path=/trunk/; revision=1010
1999-11-11 13:56:58 +00:00
/* Build display for: NativeLanMan */
NativeLanMan = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(NativeLanMan) + 1, "Native Lan Manager: %s", NativeLanMan);
Some general fixups and some fixes for protocol decode problems exposed by Win2000 interacting with a Samba server ... svn path=/trunk/; revision=1010
1999-11-11 13:56:58 +00:00
}
offset += strlen(NativeLanMan) + 1; /* Skip NativeLanMan */
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
break;
case 13:
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: AndXCommand */
AndXCommand = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXCommand: %s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
(AndXCommand == 0xFF ? "No further commands" : decode_smb_name(AndXCommand)));
}
offset += 1; /* Skip AndXCommand */
/* Build display for: AndXReserved */
AndXReserved = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXReserved: %u", AndXReserved);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip AndXReserved */
/* Build display for: AndXOffset */
AndXOffset = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "AndXOffset: %u", AndXOffset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip AndXOffset */
/* Build display for: MaxBufferSize */
MaxBufferSize = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "MaxBufferSize: %u", MaxBufferSize);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip MaxBufferSize */
/* Build display for: MaxMpxCount */
MaxMpxCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "MaxMpxCount: %u", MaxMpxCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip MaxMpxCount */
/* Build display for: VcNumber */
VcNumber = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "VcNumber: %u", VcNumber);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip VcNumber */
/* Build display for: SessionKey */
SessionKey = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "SessionKey: %u", SessionKey);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip SessionKey */
/* Build display for: ANSI Account Password Length */
ANSIAccountPasswordLength = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "ANSI Account Password Length: %u", ANSIAccountPasswordLength);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip ANSI Account Password Length */
/* Build display for: UNICODE Account Password Length */
UNICODEAccountPasswordLength = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "UNICODE Account Password Length: %u", UNICODEAccountPasswordLength);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip UNICODE Account Password Length */
/* Build display for: Reserved */
Reserved = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Reserved: %u", Reserved);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Reserved */
/* Build display for: Capabilities */
Capabilities = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 4, "Capabilities: 0x%04x", Capabilities);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Capabilities_tree = proto_item_add_subtree(ti, ett_smb_capabilities);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Capabilities_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Capabilities, 0x0001, 32, " Raw Mode supported", " Raw Mode not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Capabilities_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Capabilities, 0x0002, 32, " Raw Mode supported", " MPX Mode not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Capabilities_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Capabilities, 0x0004, 32," Unicode supported", " Unicode not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Capabilities_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Capabilities, 0x0008, 32, " Large Files supported", " Large Files not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Capabilities_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Capabilities, 0x0010, 32, " NT LM 0.12 SMBs supported", " NT LM 0.12 SMBs not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Capabilities_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Capabilities, 0x0020, 32, " RPC Remote APIs supported", " RPC Remote APIs not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Capabilities_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Capabilities, 0x0040, 32, " NT Status Codes supported", " NT Status Codes not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Capabilities_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Capabilities, 0x0080, 32, " Level 2 OpLocks supported", " Level 2 OpLocks not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Capabilities_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Capabilities, 0x0100, 32, " Lock&Read supported", " Lock&Read not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Capabilities_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Capabilities, 0x0200, 32, " NT Find supported", " NT Find not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Capabilities_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Capabilities, 0x1000, 32, " DFS supported", " DFS not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Capabilities_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Capabilities, 0x4000, 32, " Large READX supported", " Large READX not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Capabilities_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Capabilities, 0x8000, 32, " Large WRITEX supported", " Large WRITEX not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Capabilities_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Capabilities, 0x80000000, 32, " Extended Security Exchanges supported", " Extended Security Exchanges not supported"));
}
offset += 4; /* Skip Capabilities */
/* Build display for: Byte Count */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count: %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count */
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
if (ByteCount > 0) {
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
/* Build display for: ANSI Password */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
ANSIPassword = pd + offset;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
if (ANSIAccountPasswordLength > 0) {
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
if (tree) {
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
proto_tree_add_text(tree, NullTVB, offset, ANSIAccountPasswordLength, "ANSI Password: %s", format_text(ANSIPassword, ANSIAccountPasswordLength));
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
offset += ANSIAccountPasswordLength; /* Skip ANSI Password */
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
/* Build display for: UNICODE Password */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
UNICODEPassword = pd + offset;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
if (UNICODEAccountPasswordLength > 0) {
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, UNICODEAccountPasswordLength, "UNICODE Password: %s", format_text(UNICODEPassword, UNICODEAccountPasswordLength));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
}
Some small fixes to the smb decoding of sessionsetup&X. Will have to do some more soon. svn path=/trunk/; revision=1216
1999-12-05 08:22:22 +00:00
offset += UNICODEAccountPasswordLength; /* Skip UNICODE Password */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
/* Build display for: Account Name */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
AccountName = pd + offset;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
if (tree) {
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(AccountName) + 1, "Account Name: %s", AccountName);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
offset += strlen(AccountName) + 1; /* Skip Account Name */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
/* Build display for: Primary Domain */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
PrimaryDomain = pd + offset;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
if (tree) {
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(PrimaryDomain) + 1, "Primary Domain: %s", PrimaryDomain);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
offset += strlen(PrimaryDomain) + 1; /* Skip Primary Domain */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
/* Build display for: Native OS */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
NativeOS = pd + offset;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
if (tree) {
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(NativeOS) + 1, "Native OS: %s", NativeOS);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
offset += strlen(NativeOS) + 1; /* Skip Native OS */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
/* Build display for: Native LanMan Type */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
NativeLanManType = pd + offset;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
if (tree) {
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(NativeLanManType) + 1, "Native LanMan Type: %s", NativeLanManType);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
offset += strlen(NativeLanManType) + 1; /* Skip Native LanMan Type */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
break;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
if (AndXCommand != 0xFF) {
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
(dissect[AndXCommand])(pd, SMB_offset + AndXOffset, fd, parent, tree, si, max_data, SMB_offset, errcode, dirn);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
if (WordCount > 0) {
/* Build display for: AndXCommand */
AndXCommand = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXCommand: %s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
(AndXCommand == 0xFF ? "No futher commands" : decode_smb_name(AndXCommand)));
}
offset += 1; /* Skip AndXCommand */
/* Build display for: AndXReserved */
AndXReserved = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXReserved: %u", AndXReserved);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip AndXReserved */
/* Build display for: AndXOffset */
AndXOffset = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "AndXOffset: %u", AndXOffset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip AndXOffset */
/* Build display for: Action */
Action = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Action: %u", Action);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Action */
}
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
if (errcode != 0 && WordCount == 0xFF) return; /* No more here ... */
offset += 2; /* Skip Byte Count (BCC) */
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
if (ByteCount > 0) {
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
/* Build display for: NativeOS */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
NativeOS = pd + offset;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
if (tree) {
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(NativeOS) + 1, "NativeOS: %s", NativeOS);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
offset += strlen(NativeOS) + 1; /* Skip NativeOS */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
/* Build display for: NativeLanMan */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
NativeLanMan = pd + offset;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
if (tree) {
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(NativeLanMan) + 1, "NativeLanMan: %s", NativeLanMan);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
offset += strlen(NativeLanMan) + 1; /* Skip NativeLanMan */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
/* Build display for: PrimaryDomain */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
PrimaryDomain = pd + offset;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
if (tree) {
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(PrimaryDomain) + 1, "PrimaryDomain: %s", PrimaryDomain);
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
offset += strlen(PrimaryDomain) + 1; /* Skip PrimaryDomain */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (AndXCommand != 0xFF) {
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
(dissect[AndXCommand])(pd, SMB_offset + AndXOffset, fd, parent, tree, si, max_data, SMB_offset, errcode, dirn);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_tcon_andx_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
Some small fixes to get rid of compiler warnings svn path=/trunk/; revision=929
1999-10-26 21:30:11 +00:00
guint8 wct, andxcmd = 0xFF;
Some general fixups and some fixes for protocol decode problems exposed by Win2000 interacting with a Samba server ... svn path=/trunk/; revision=1010
1999-11-11 13:56:58 +00:00
guint16 andxoffs = 0, flags, passwdlen, bcc, optionsup;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
const char *str;
proto_tree *flags_tree;
proto_item *ti;
wct = pd[offset];
/* Now figure out what format we are talking about, 2, 3, or 4 response
* words ...
*/
if (!((dirn == 1) && (wct == 4)) && !((dirn == 0) && (wct == 2)) &&
!((dirn == 0) && (wct == 3)) && !(wct == 0)) {
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Invalid TCON_ANDX format. WCT should be 0, 2, 3, or 4 ..., not %u", wct);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, END_OF_FRAME, "Data");
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
return;
}
}
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", wct);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1;
if (wct > 0) {
andxcmd = pd[offset];
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Next Command: %s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
(andxcmd == 0xFF) ? "No further commands":
decode_smb_name(andxcmd));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset + 1, 1, "Reserved (MBZ): %u", pd[offset+1]);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
andxoffs = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Offset to next command: %u", andxoffs);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
}
switch (wct) {
case 0:
bcc = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", bcc);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
break;
case 4:
flags = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Additional Flags: 0x%02x", flags);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
flags_tree = proto_item_add_subtree(ti, ett_smb_aflags);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(flags_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(flags, 0x01, 16,
"Disconnect TID",
"Don't disconnect TID"));
}
offset += 2;
passwdlen = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Password Length: %u", passwdlen);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
bcc = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", bcc);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
str = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(str) + 1, "Password: %s", format_text(str, passwdlen));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
offset += passwdlen;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
str = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(str) + 1, "Path: %s", str);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(str) + 1;
str = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(str) + 1, "Service: %s", str);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
break;
case 2:
bcc = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", bcc);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
str = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(str) + 1, "Service Type: %s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
str);
}
offset += strlen(str) + 1;
break;
case 3:
optionsup = GSHORT(pd, offset);
if (tree) { /* Should break out the bits */
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Optional Support: 0x%04x",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
optionsup);
}
offset += 2;
bcc = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", bcc);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
str = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(str) + 1, "Service: %s", str);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(str) + 1;
str = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(str) + 1, "Native File System: %s", str);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(str) + 1;
break;
default:
; /* nothing */
break;
}
if (andxcmd != 0xFF) /* Process that next command ... ??? */
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
(dissect[andxcmd])(pd, SMB_offset + andxoffs, fd, parent, tree, si, max_data - offset, SMB_offset, errcode, dirn);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_negprot_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 wct, enckeylen;
guint16 bcc, mode, rawmode, dialect;
guint32 caps;
proto_tree *dialects = NULL, *mode_tree, *caps_tree, *rawmode_tree;
proto_item *ti;
const char *str;
char *ustr;
int ustr_len;
wct = pd[offset]; /* Should be 0, 1 or 13 or 17, I think */
if (!((wct == 0) && (dirn == 1)) && !((wct == 1) && (dirn == 0)) &&
!((wct == 13) && (dirn == 0)) && !((wct == 17) && (dirn == 0))) {
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Invalid Negotiate Protocol format. WCT should be zero or 1 or 13 or 17 ..., not %u", wct);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, END_OF_FRAME, "Data");
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
return;
}
}
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %d", wct);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
if (dirn == 0 && errcode != 0) return; /* No more info ... */
offset += 1;
/* Now decode the various formats ... */
switch (wct) {
case 0: /* A request */
bcc = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", bcc);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, END_OF_FRAME, "Dialects");
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
dialects = proto_item_add_subtree(ti, ett_smb_dialects);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
while (IS_DATA_IN_FRAME(offset)) {
const char *str;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(dialects, NullTVB, offset, 1, "Dialect Marker: %d", pd[offset]);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1;
str = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(dialects, NullTVB, offset, strlen(str)+1, "Dialect: %s", str);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(str) + 1;
}
break;
case 1: /* PC NETWORK PROGRAM 1.0 */
dialect = GSHORT(pd, offset);
if (tree) { /* Hmmmm, what if none of the dialects is recognized */
if (dialect == 0xFFFF) { /* Server didn't like them dialects */
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Supplied dialects not recognized");
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
else {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Dialect Index: %u, PC NETWORK PROTGRAM 1.0", dialect);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
}
offset += 2;
bcc = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", bcc);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
break;
case 13: /* Greater than Core and up to and incl LANMAN2.1 */
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Dialect Index: %u, Greater than CORE PROTOCOL and up to LANMAN2.1", GSHORT(pd, offset));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
/* Much of this is similar to response 17 below */
offset += 2;
mode = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Security Mode: 0x%04x", mode);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
mode_tree = proto_item_add_subtree(ti, ett_smb_mode);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(mode_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(mode, 0x0001, 16,
"Security = User",
"Security = Share"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(mode_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(mode, 0x0002, 16,
"Passwords = Encrypted",
"Passwords = Plaintext"));
}
offset += 2;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Max buffer size: %u", GSHORT(pd, offset));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Max multiplex count: %u", GSHORT(pd, offset));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Max vcs: %u", GSHORT(pd, offset));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
rawmode = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Raw Mode: 0x%04x", rawmode);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
rawmode_tree = proto_item_add_subtree(ti, ett_smb_rawmode);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(rawmode_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(rawmode, 0x01, 16,
"Read Raw supported",
"Read Raw not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(rawmode_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(rawmode, 0x02, 16,
"Write Raw supported",
"Write Raw not supported"));
}
offset += 2;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Session key: %08x", GWORD(pd, offset));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4;
/* Now the server time, two short parameters ... */
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Server Time: %s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
dissect_dos_time(GSHORT(pd, offset)));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset + 2, 2, "Server Date: %s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
dissect_dos_date(GSHORT(pd, offset + 2)));
}
offset += 4;
/* Server Time Zone, SHORT */
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Server time zone: %i min from UTC",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
(signed)GSSHORT(pd, offset));
}
offset += 2;
/* Challenge Length */
enckeylen = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Challenge Length: %u", enckeylen);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved: %u (MBZ)", GSHORT(pd, offset));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
bcc = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", bcc);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
if (enckeylen) { /* only if non-zero key len */
str = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, enckeylen, "Challenge: %s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
bytes_to_str(str, enckeylen));
}
offset += enckeylen;
}
/* Primary Domain ... */
str = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(str)+1, "Primary Domain: %s", str);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
break;
case 17: /* Greater than LANMAN2.1 */
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Dialect Index: %u, Greater than LANMAN2.1", GSHORT(pd, offset));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
mode = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 1, "Security Mode: 0x%02x", mode);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
mode_tree = proto_item_add_subtree(ti, ett_smb_mode);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(mode_tree, NullTVB, offset, 1, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(mode, 0x01, 8,
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
"Security = User",
"Security = Share"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(mode_tree, NullTVB, offset, 1, "%s",
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
decode_boolean_bitfield(mode, 0x02, 8,
"Passwords = Encrypted",
"Passwords = Plaintext"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(mode_tree, NullTVB, offset, 1, "%s",
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
decode_boolean_bitfield(mode, 0x04, 8,
"Security signatures enabled",
"Security signatures not enabled"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(mode_tree, NullTVB, offset, 1, "%s",
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
decode_boolean_bitfield(mode, 0x08, 8,
"Security signatures required",
"Security signatures not required"));
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Max multiplex count: %u", GSHORT(pd, offset));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Max vcs: %u", GSHORT(pd, offset));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Max buffer size: %u", GWORD(pd, offset));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Max raw size: %u", GWORD(pd, offset));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Session key: %08x", GWORD(pd, offset));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4;
caps = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 4, "Capabilities: 0x%04x", caps);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
caps_tree = proto_item_add_subtree(ti, ett_smb_capabilities);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(caps_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(caps, 0x0001, 32,
"Raw Mode supported",
"Raw Mode not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(caps_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(caps, 0x0002, 32,
"MPX Mode supported",
"MPX Mode not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(caps_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(caps, 0x0004, 32,
"Unicode supported",
"Unicode not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(caps_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(caps, 0x0008, 32,
"Large files supported",
"Large files not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(caps_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(caps, 0x0010, 32,
"NT LM 0.12 SMBs supported",
"NT LM 0.12 SMBs not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(caps_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(caps, 0x0020, 32,
"RPC remote APIs supported",
"RPC remote APIs not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(caps_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(caps, 0x0040, 32,
"NT status codes supported",
"NT status codes not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(caps_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(caps, 0x0080, 32,
"Level 2 OpLocks supported",
"Level 2 OpLocks not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(caps_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(caps, 0x0100, 32,
"Lock&Read supported",
"Lock&Read not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(caps_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(caps, 0x0200, 32,
"NT Find supported",
"NT Find not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(caps_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(caps, 0x1000, 32,
"DFS supported",
"DFS not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(caps_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(caps, 0x4000, 32,
"Large READX supported",
"Large READX not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(caps_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(caps, 0x8000, 32,
"Large WRITEX supported",
"Large WRITEX not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(caps_tree, NullTVB, offset, 4, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(caps, 0x80000000, 32,
"Extended security exchanges supported",
"Extended security exchanges not supported"));
}
offset += 4;
/* Server time, 2 WORDS */
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "System Time Low: 0x%08x", GWORD(pd, offset));
proto_tree_add_text(tree, NullTVB, offset + 4, 4, "System Time High: 0x%08x", GWORD(pd, offset + 4));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 8;
/* Server Time Zone, SHORT */
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Server time zone: %i min from UTC",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
(signed)GSSHORT(pd, offset));
}
offset += 2;
/* Encryption key len */
enckeylen = pd[offset];
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Encryption key len: %u", enckeylen);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1;
bcc = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte count (BCC): %u", bcc);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2;
if (enckeylen) { /* only if non-zero key len */
/* Encryption challenge key */
str = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, enckeylen, "Challenge encryption key: %s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
bytes_to_str(str, enckeylen));
}
offset += enckeylen;
}
/* The domain, a null terminated string; Unicode if "caps" has
the 0x0004 bit set, ASCII (OEM character set) otherwise.
XXX - for now, we just handle the ISO 8859-1 subset of Unicode. */
str = pd + offset;
if (tree) {
if (caps & 0x0004) {
ustr = unicode_to_str(str, &ustr_len);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, ustr_len+2, "OEM domain name: %s", ustr);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
} else {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(str)+1, "OEM domain name: %s", str);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
}
break;
default: /* Baddd */
if (tree)
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Bad format, should never get here");
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
return;
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_deletedir_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint8 BufferFormat;
guint16 ByteCount;
const char *DirectoryName;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Buffer Format */
BufferFormat = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format: %u", BufferFormat);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format */
/* Build display for: Directory Name */
DirectoryName = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(DirectoryName) + 1, "Directory Name: %s", DirectoryName);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(DirectoryName) + 1; /* Skip Directory Name */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_createdir_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint8 BufferFormat;
guint16 ByteCount;
const char *DirectoryName;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Buffer Format */
BufferFormat = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format: %u", BufferFormat);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format */
/* Build display for: Directory Name */
DirectoryName = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(DirectoryName) + 1, "Directory Name: %s", DirectoryName);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(DirectoryName) + 1; /* Skip Directory Name */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_checkdir_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint8 BufferFormat;
guint16 ByteCount;
const char *DirectoryName;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Buffer Format */
BufferFormat = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format: %u", BufferFormat);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format */
/* Build display for: Directory Name */
DirectoryName = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(DirectoryName) + 1, "Directory Name: %s", DirectoryName);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(DirectoryName) + 1; /* Skip Directory Name */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_open_andx_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
static const value_string OpenFunction_0x10[] = {
{ 0, "Fail if file does not exist"},
{ 16, "Create file if it does not exist"},
{ 0, NULL}
};
static const value_string OpenFunction_0x03[] = {
{ 0, "Fail if file exists"},
{ 1, "Open file if it exists"},
{ 2, "Truncate File if it exists"},
{ 0, NULL}
};
static const value_string FileType_0xFFFF[] = {
{ 0, "Disk file or directory"},
{ 1, "Named pipe in byte mode"},
{ 2, "Named pipe in message mode"},
{ 3, "Spooled printer"},
{ 0, NULL}
};
static const value_string DesiredAccess_0x70[] = {
{ 00, "Compatibility mode"},
{ 16, "Deny read/write/execute (exclusive)"},
{ 32, "Deny write"},
{ 48, "Deny read/execute"},
{ 64, "Deny none"},
{ 0, NULL}
};
static const value_string DesiredAccess_0x700[] = {
{ 0, "Locality of reference unknown"},
{ 256, "Mainly sequential access"},
{ 512, "Mainly random access"},
{ 768, "Random access with some locality"},
{0, NULL}
};
static const value_string DesiredAccess_0x4000[] = {
{ 0, "Write through mode disabled"},
{ 16384, "Write through mode enabled"},
{0, NULL}
};
static const value_string DesiredAccess_0x1000[] = {
{ 0, "Normal file (caching permitted)"},
{ 4096, "Do not cache this file"},
{0, NULL}
};
static const value_string DesiredAccess_0x07[] = {
{ 0, "Open for reading"},
{ 1, "Open for writing"},
{ 2, "Open for reading and writing"},
{ 3, "Open for execute"},
{0, NULL}
};
static const value_string Action_0x8000[] = {
{ 0, "File opened by another user (or mode not supported by server)"},
{ 32768, "File is opened only by this user at present"},
{0, NULL}
};
static const value_string Action_0x0003[] = {
{ 0, "No action taken?"},
{ 1, "The file existed and was opened"},
{ 2, "The file did not exist but was created"},
{ 3, "The file existed and was truncated"},
{0, NULL}
};
proto_tree *Search_tree;
proto_tree *OpenFunction_tree;
proto_tree *Flags_tree;
proto_tree *File_tree;
proto_tree *FileType_tree;
proto_tree *FileAttributes_tree;
proto_tree *DesiredAccess_tree;
proto_tree *Action_tree;
proto_item *ti;
guint8 WordCount;
guint8 AndXReserved;
guint8 AndXCommand = 0xFF;
guint32 ServerFID;
guint32 Reserved2;
guint32 Reserved1;
guint32 DataSize;
guint32 AllocatedSize;
guint16 Search;
guint16 Reserved;
guint16 OpenFunction;
guint16 LastWriteTime;
guint16 LastWriteDate;
guint16 GrantedAccess;
guint16 Flags;
guint16 FileType;
guint16 FileAttributes;
guint16 File;
guint16 FID;
guint16 DeviceState;
guint16 DesiredAccess;
guint16 CreationTime;
guint16 CreationDate;
guint16 ByteCount;
Some general fixups and some fixes for protocol decode problems exposed by Win2000 interacting with a Samba server ... svn path=/trunk/; revision=1010
1999-11-11 13:56:58 +00:00
guint16 AndXOffset = 0;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
guint16 Action;
const char *FileName;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: AndXCommand */
AndXCommand = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXCommand: %s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
(AndXCommand == 0xFF ? "No further commands" : decode_smb_name(AndXCommand)));
}
offset += 1; /* Skip AndXCommand */
/* Build display for: AndXReserved */
AndXReserved = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXReserved: %u", AndXReserved);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip AndXReserved */
/* Build display for: AndXOffset */
AndXOffset = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "AndXOffset: %u", AndXOffset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip AndXOffset */
/* Build display for: Flags */
Flags = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Flags: 0x%02x", Flags);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Flags_tree = proto_item_add_subtree(ti, ett_smb_flags);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Flags_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Flags, 0x01, 16, "Dont Return Additional Info", "Return Additional Info"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Flags_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Flags, 0x02, 16, "Exclusive OpLock not Requested", "Exclusive OpLock Requested"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Flags_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Flags, 0x04, 16, "Batch OpLock not Requested", "Batch OpLock Requested"));
}
offset += 2; /* Skip Flags */
/* Build display for: Desired Access */
DesiredAccess = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Desired Access: 0x%02x", DesiredAccess);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
DesiredAccess_tree = proto_item_add_subtree(ti, ett_smb_desiredaccess);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(DesiredAccess_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_enumerated_bitfield(DesiredAccess, 0x07, 16, DesiredAccess_0x07, "%s"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(DesiredAccess_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_enumerated_bitfield(DesiredAccess, 0x70, 16, DesiredAccess_0x70, "%s"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(DesiredAccess_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_enumerated_bitfield(DesiredAccess, 0x700, 16, DesiredAccess_0x700, "%s"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(DesiredAccess_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_enumerated_bitfield(DesiredAccess, 0x1000, 16, DesiredAccess_0x1000, "%s"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(DesiredAccess_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_enumerated_bitfield(DesiredAccess, 0x4000, 16, DesiredAccess_0x4000, "%s"));
}
offset += 2; /* Skip Desired Access */
/* Build display for: Search */
Search = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Search: 0x%02x", Search);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Search_tree = proto_item_add_subtree(ti, ett_smb_search);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Search_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Search, 0x01, 16, "Read only file", "Not a read only file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Search_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Search, 0x02, 16, "Hidden file", "Not a hidden file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Search_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Search, 0x04, 16, "System file", "Not a system file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Search_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Search, 0x08, 16, " Volume", "Not a volume"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Search_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Search, 0x10, 16, " Directory", "Not a directory"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Search_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Search, 0x20, 16, "Archive file", "Do not archive file"));
}
offset += 2; /* Skip Search */
/* Build display for: File */
File = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "File: 0x%02x", File);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
File_tree = proto_item_add_subtree(ti, ett_smb_file);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(File_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(File, 0x01, 16, "Read only file", "Not a read only file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(File_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(File, 0x02, 16, "Hidden file", "Not a hidden file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(File_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(File, 0x04, 16, "System file", "Not a system file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(File_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(File, 0x08, 16, " Volume", "Not a volume"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(File_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(File, 0x10, 16, " Directory", "Not a directory"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(File_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(File, 0x20, 16, "Archive file", "Do not archive file"));
}
offset += 2; /* Skip File */
/* Build display for: Creation Time */
CreationTime = GSHORT(pd, offset);
if (tree) {
}
offset += 2; /* Skip Creation Time */
/* Build display for: Creation Date */
CreationDate = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Creation Date: %s", dissect_smbu_date(CreationDate, CreationTime));
proto_tree_add_text(tree, NullTVB, offset, 2, "Creation Time: %s", dissect_smbu_time(CreationDate, CreationTime));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Creation Date */
/* Build display for: Open Function */
OpenFunction = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Open Function: 0x%02x", OpenFunction);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
OpenFunction_tree = proto_item_add_subtree(ti, ett_smb_openfunction);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(OpenFunction_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_enumerated_bitfield(OpenFunction, 0x10, 16, OpenFunction_0x10, "%s"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(OpenFunction_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_enumerated_bitfield(OpenFunction, 0x03, 16, OpenFunction_0x03, "%s"));
}
offset += 2; /* Skip Open Function */
/* Build display for: Allocated Size */
AllocatedSize = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Allocated Size: %u", AllocatedSize);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Allocated Size */
/* Build display for: Reserved1 */
Reserved1 = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Reserved1: %u", Reserved1);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Reserved1 */
/* Build display for: Reserved2 */
Reserved2 = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Reserved2: %u", Reserved2);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Reserved2 */
/* Build display for: Byte Count */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count: %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count */
/* Build display for: File Name */
FileName = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(FileName) + 1, "File Name: %s", FileName);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(FileName) + 1; /* Skip File Name */
if (AndXCommand != 0xFF) {
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
(dissect[AndXCommand])(pd, SMB_offset + AndXOffset, fd, parent, tree, si, max_data, SMB_offset, errcode, dirn);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
if (WordCount > 0) {
/* Build display for: AndXCommand */
AndXCommand = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXCommand: %s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
(AndXCommand == 0xFF ? "No further commands" : decode_smb_name(AndXCommand)));
}
offset += 1; /* Skip AndXCommand */
/* Build display for: AndXReserved */
AndXReserved = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXReserved: %u", AndXReserved);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip AndXReserved */
/* Build display for: AndXOffset */
AndXOffset = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "AndXOffset: %u", AndXOffset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip AndXOffset */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
/* Build display for: FileAttributes */
FileAttributes = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "FileAttributes: 0x%02x", FileAttributes);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
FileAttributes_tree = proto_item_add_subtree(ti, ett_smb_fileattributes);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(FileAttributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(FileAttributes, 0x01, 16, "Read only file", "Not a read only file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(FileAttributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(FileAttributes, 0x02, 16, "Hidden file", "Not a hidden file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(FileAttributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(FileAttributes, 0x04, 16, "System file", "Not a system file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(FileAttributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(FileAttributes, 0x08, 16, " Volume", "Not a volume"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(FileAttributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(FileAttributes, 0x10, 16, " Directory", "Not a directory"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(FileAttributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(FileAttributes, 0x20, 16, "Archive file", "Do not archive file"));
}
offset += 2; /* Skip FileAttributes */
/* Build display for: Last Write Time */
LastWriteTime = GSHORT(pd, offset);
if (tree) {
}
offset += 2; /* Skip Last Write Time */
/* Build display for: Last Write Date */
LastWriteDate = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Last Write Date: %s", dissect_smbu_date(LastWriteDate, LastWriteTime));
proto_tree_add_text(tree, NullTVB, offset, 2, "Last Write Time: %s", dissect_smbu_time(LastWriteDate, LastWriteTime));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Last Write Date */
/* Build display for: Data Size */
DataSize = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Data Size: %u", DataSize);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Data Size */
/* Build display for: Granted Access */
GrantedAccess = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Granted Access: %u", GrantedAccess);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Granted Access */
/* Build display for: File Type */
FileType = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "File Type: 0x%02x", FileType);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
FileType_tree = proto_item_add_subtree(ti, ett_smb_filetype);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(FileType_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_enumerated_bitfield(FileType, 0xFFFF, 16, FileType_0xFFFF, "%s"));
}
offset += 2; /* Skip File Type */
/* Build display for: Device State */
DeviceState = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Device State: %u", DeviceState);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Device State */
/* Build display for: Action */
Action = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Action: 0x%02x", Action);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Action_tree = proto_item_add_subtree(ti, ett_smb_action);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Action_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_enumerated_bitfield(Action, 0x8000, 16, Action_0x8000, "%s"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Action_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_enumerated_bitfield(Action, 0x0003, 16, Action_0x0003, "%s"));
}
offset += 2; /* Skip Action */
/* Build display for: Server FID */
ServerFID = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Server FID: %u", ServerFID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Server FID */
/* Build display for: Reserved */
Reserved = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved: %u", Reserved);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved */
}
/* Build display for: Byte Count */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count: %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count */
if (AndXCommand != 0xFF) {
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
(dissect[AndXCommand])(pd, SMB_offset + AndXOffset, fd, parent, tree, si, max_data, SMB_offset, errcode, dirn);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_write_raw_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
proto_tree *WriteMode_tree;
proto_item *ti;
guint8 WordCount;
guint8 Pad;
guint32 Timeout;
guint32 Reserved2;
guint32 Offset;
guint16 WriteMode;
guint16 Reserved1;
guint16 Remaining;
guint16 FID;
guint16 DataOffset;
guint16 DataLength;
guint16 Count;
guint16 ByteCount;
if (dirn == 1) { /* Request(s) dissect code */
WordCount = GBYTE(pd, offset);
switch (WordCount) {
case 12:
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
/* Build display for: Count */
Count = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Count: %u", Count);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Count */
/* Build display for: Reserved 1 */
Reserved1 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 1: %u", Reserved1);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved 1 */
/* Build display for: Offset */
Offset = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Offset: %u", Offset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Offset */
/* Build display for: Timeout */
Timeout = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Timeout: %u", Timeout);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Timeout */
/* Build display for: WriteMode */
WriteMode = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "WriteMode: 0x%02x", WriteMode);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
WriteMode_tree = proto_item_add_subtree(ti, ett_smb_writemode);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(WriteMode_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(WriteMode, 0x01, 16, "Write through requested", "Write through not requested"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(WriteMode_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(WriteMode, 0x02, 16, "Return Remaining (pipe/dev)", "Dont return Remaining (pipe/dev)"));
}
offset += 2; /* Skip WriteMode */
/* Build display for: Reserved 2 */
Reserved2 = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Reserved 2: %u", Reserved2);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Reserved 2 */
/* Build display for: Data Length */
DataLength = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Length: %u", DataLength);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Data Length */
/* Build display for: Data Offset */
DataOffset = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Offset: %u", DataOffset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Data Offset */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Pad */
Pad = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Pad: %u", Pad);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Pad */
break;
case 14:
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
/* Build display for: Count */
Count = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Count: %u", Count);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Count */
/* Build display for: Reserved 1 */
Reserved1 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 1: %u", Reserved1);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved 1 */
/* Build display for: Timeout */
Timeout = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Timeout: %u", Timeout);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Timeout */
/* Build display for: WriteMode */
WriteMode = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "WriteMode: 0x%02x", WriteMode);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
WriteMode_tree = proto_item_add_subtree(ti, ett_smb_writemode);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(WriteMode_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(WriteMode, 0x01, 16, "Write through requested", "Write through not requested"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(WriteMode_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(WriteMode, 0x02, 16, "Return Remaining (pipe/dev)", "Dont return Remaining (pipe/dev)"));
}
offset += 2; /* Skip WriteMode */
/* Build display for: Reserved 2 */
Reserved2 = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Reserved 2: %u", Reserved2);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Reserved 2 */
/* Build display for: Data Length */
DataLength = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Length: %u", DataLength);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Data Length */
/* Build display for: Data Offset */
DataOffset = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Offset: %u", DataOffset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Data Offset */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Pad */
Pad = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Pad: %u", Pad);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Pad */
break;
}
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
if (WordCount > 0) {
/* Build display for: Remaining */
Remaining = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Remaining: %u", Remaining);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Remaining */
}
/* Build display for: Byte Count */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count: %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_tdis_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint16 ByteCount;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_move_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
static const value_string Flags_0x03[] = {
{ 0, "Target must be a file"},
{ 1, "Target must be a directory"},
{ 2, "Reserved"},
{ 3, "Reserved"},
{ 4, "Verify all writes"},
{ 0, NULL}
};
proto_tree *Flags_tree;
proto_item *ti;
guint8 WordCount;
guint8 ErrorFileFormat;
guint16 TID2;
guint16 OpenFunction;
guint16 Flags;
guint16 Count;
guint16 ByteCount;
const char *ErrorFileName;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: TID2 */
TID2 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "TID2: %u", TID2);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip TID2 */
/* Build display for: Open Function */
OpenFunction = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Open Function: %u", OpenFunction);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Open Function */
/* Build display for: Flags */
Flags = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Flags: 0x%02x", Flags);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Flags_tree = proto_item_add_subtree(ti, ett_smb_flags);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Flags_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_enumerated_bitfield(Flags, 0x03, 16, Flags_0x03, "%s"));
}
offset += 2; /* Skip Flags */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
if (WordCount > 0) {
/* Build display for: Count */
Count = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Count: %u", Count);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Count */
}
/* Build display for: Byte Count */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count: %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count */
/* Build display for: Error File Format */
ErrorFileFormat = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Error File Format: %u", ErrorFileFormat);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Error File Format */
/* Build display for: Error File Name */
ErrorFileName = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(ErrorFileName) + 1, "Error File Name: %s", ErrorFileName);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(ErrorFileName) + 1; /* Skip Error File Name */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_rename_file_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint8 BufferFormat2;
guint8 BufferFormat1;
guint16 SearchAttributes;
guint16 ByteCount;
const char *OldFileName;
const char *NewFileName;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Search Attributes */
SearchAttributes = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Search Attributes: %u", SearchAttributes);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Search Attributes */
/* Build display for: Byte Count */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count: %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count */
/* Build display for: Buffer Format 1 */
BufferFormat1 = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format 1: %u", BufferFormat1);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format 1 */
/* Build display for: Old File Name */
OldFileName = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(OldFileName) + 1, "Old File Name: %s", OldFileName);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(OldFileName) + 1; /* Skip Old File Name */
/* Build display for: Buffer Format 2 */
BufferFormat2 = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format 2: %u", BufferFormat2);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format 2 */
/* Build display for: New File Name */
NewFileName = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(NewFileName) + 1, "New File Name: %s", NewFileName);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(NewFileName) + 1; /* Skip New File Name */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_open_print_file_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
static const value_string Mode_0x03[] = {
{ 0, "Text mode (DOS expands TABs)"},
{ 1, "Graphics mode"},
{ 0, NULL}
};
proto_tree *Mode_tree;
proto_item *ti;
guint8 WordCount;
guint8 BufferFormat;
guint16 SetupLength;
guint16 Mode;
guint16 FID;
guint16 ByteCount;
const char *IdentifierString;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Setup Length */
SetupLength = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Setup Length: %u", SetupLength);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Setup Length */
/* Build display for: Mode */
Mode = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Mode: 0x%02x", Mode);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Mode_tree = proto_item_add_subtree(ti, ett_smb_mode);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Mode_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_enumerated_bitfield(Mode, 0x03, 16, Mode_0x03, "%s"));
}
offset += 2; /* Skip Mode */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Buffer Format */
BufferFormat = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format: %u", BufferFormat);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format */
/* Build display for: Identifier String */
IdentifierString = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(IdentifierString) + 1, "Identifier String: %s", IdentifierString);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(IdentifierString) + 1; /* Skip Identifier String */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_close_print_file_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint16 FID;
guint16 ByteCount;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count: %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_read_raw_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint32 Timeout;
guint32 OffsetHigh;
guint32 Offset;
guint16 Reserved;
guint16 MinCount;
guint16 MaxCount;
guint16 FID;
guint16 ByteCount;
if (dirn == 1) { /* Request(s) dissect code */
WordCount = GBYTE(pd, offset);
switch (WordCount) {
case 8:
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
/* Build display for: Offset */
Offset = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Offset: %u", Offset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Offset */
/* Build display for: Max Count */
MaxCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Max Count: %u", MaxCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Max Count */
/* Build display for: Min Count */
MinCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Min Count: %u", MinCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Min Count */
/* Build display for: Timeout */
Timeout = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Timeout: %u", Timeout);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Timeout */
/* Build display for: Reserved */
Reserved = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved: %u", Reserved);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
break;
case 10:
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
/* Build display for: Offset */
Offset = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Offset: %u", Offset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Offset */
/* Build display for: Max Count */
MaxCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Max Count: %u", MaxCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Max Count */
/* Build display for: Min Count */
MinCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Min Count: %u", MinCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Min Count */
/* Build display for: Timeout */
Timeout = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Timeout: %u", Timeout);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Timeout */
/* Build display for: Reserved */
Reserved = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved: %u", Reserved);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved */
/* Build display for: Offset High */
OffsetHigh = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Offset High: %u", OffsetHigh);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Offset High */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
break;
}
}
if (dirn == 0) { /* Response(s) dissect code */
}
}
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
void
dissect_read_andx_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, int dirn)
{
guint8 WordCount;
guint8 AndXReserved;
guint8 AndXCommand = 0xFF;
guint16 ByteCount;
guint16 AndXOffset = 0;
guint16 FID;
guint16 DataCompactionMode;
guint16 DataLength;
guint16 DataOffset;
guint16 Remaining;
guint16 MaxCount;
guint16 MinCount;
guint16 Reserved;
guint32 Offset;
guint32 OffsetHigh;
int i;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: AndXCommand */
AndXCommand = GBYTE(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXCommand: %u", AndXCommand);
}
offset += 1; /* Skip AndXCommand */
/* Build display for: AndXReserved */
AndXReserved = GBYTE(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXReserved: %u", AndXReserved);
}
offset += 1; /* Skip AndXReserved */
/* Build display for: AndXOffset */
AndXOffset = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "AndXOffset: %u", AndXOffset);
}
offset += 2; /* Skip AndXOffset */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
}
offset += 2; /* Skip FID */
/* Build display for: Offset */
Offset = GWORD(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 4, "Offset: %u", Offset);
}
offset += 4; /* Skip Offset */
/* Build display for: Max Count */
MaxCount = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "Max Count: %u", MaxCount);
}
offset += 2; /* Skip Max Count */
/* Build display for: Min Count */
MinCount = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "Min Count: %u", MinCount);
}
offset += 2; /* Skip Min Count */
/* Build display for: Reserved */
Reserved = GWORD(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 4, "Reserved: %u", Reserved);
}
offset += 4; /* Skip Reserved */
/* Build display for: Remaining */
Remaining = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "Remaining: %u", Remaining);
}
offset += 2; /* Skip Remaining */
if (WordCount == 12) {
/* Build display for: Offset High */
OffsetHigh = GWORD(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 4, "Offset High: %u", OffsetHigh);
}
offset += 4; /* Skip Offset High */
}
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
}
offset += 2; /* Skip Byte Count (BCC) */
if (AndXCommand != 0xFF) {
(dissect[AndXCommand])(pd, SMB_offset + AndXOffset, fd, parent, tree, si, max_data, SMB_offset, errcode, dirn);
}
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: AndXCommand */
AndXCommand = GBYTE(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXCommand: %u", AndXCommand);
}
offset += 1; /* Skip AndXCommand */
/* Build display for: AndXReserved */
AndXReserved = GBYTE(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXReserved: %u", AndXReserved);
}
offset += 1; /* Skip AndXReserved */
/* Build display for: AndXOffset */
AndXOffset = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "AndXOffset: %u", AndXOffset);
}
offset += 2; /* Skip AndXOffset */
/* Build display for: Remaining */
Remaining = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "Remaining: %u", Remaining);
}
offset += 2; /* Skip Remaining */
/* Build display for: Data Compaction Mode */
DataCompactionMode = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Compaction Mode: %u", DataCompactionMode);
}
offset += 2; /* Skip Data Compaction Mode */
/* Build display for: Reserved */
Reserved = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved: %u", Reserved);
}
offset += 2; /* Skip Reserved */
/* Build display for: Data Length */
DataLength = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Length: %u", DataLength);
}
offset += 2; /* Skip Data Length */
/* Build display for: Data Offset */
DataOffset = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Offset: %u", DataOffset);
}
offset += 2; /* Skip Data Offset */
/* Build display for: Reserved[5] */
for(i = 1; i <= 5; ++i) {
Reserved = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved%u: %u", i, Reserved);
}
offset += 2;
}
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for data */
if (tree) {
offset = SMB_offset + DataOffset;
if(END_OF_FRAME >= DataLength)
proto_tree_add_text(tree, NullTVB, offset, DataLength, "Data (%u bytes)", DataLength);
else
proto_tree_add_text(tree, NullTVB, offset, END_OF_FRAME, "Data (first %u bytes)", END_OF_FRAME);
}
if (AndXCommand != 0xFF) {
(dissect[AndXCommand])(pd, SMB_offset + AndXOffset, fd, parent, tree, si, max_data, SMB_offset, errcode, dirn);
}
}
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_logoff_andx_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint8 AndXReserved;
guint8 AndXCommand = 0xFF;
guint16 ByteCount;
Some general fixups and some fixes for protocol decode problems exposed by Win2000 interacting with a Samba server ... svn path=/trunk/; revision=1010
1999-11-11 13:56:58 +00:00
guint16 AndXOffset = 0;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: AndXCommand */
AndXCommand = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXCommand: %u", AndXCommand);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip AndXCommand */
/* Build display for: AndXReserved */
AndXReserved = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXReserved: %u", AndXReserved);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip AndXReserved */
/* Build display for: AndXOffset */
AndXOffset = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "AndXOffset: %u", AndXOffset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip AndXOffset */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
if (AndXCommand != 0xFF) {
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
(dissect[AndXCommand])(pd, SMB_offset + AndXOffset, fd, parent, tree, si, max_data, SMB_offset, errcode, dirn);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: AndXCommand */
AndXCommand = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXCommand: %u", AndXCommand);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip AndXCommand */
/* Build display for: AndXReserved */
AndXReserved = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXReserved: %u", AndXReserved);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip AndXReserved */
/* Build display for: AndXOffset */
AndXOffset = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "AndXOffset: %u", AndXOffset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip AndXOffset */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
if (AndXCommand != 0xFF) {
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
(dissect[AndXCommand])(pd, SMB_offset + AndXOffset, fd, parent, tree, si, max_data, SMB_offset, errcode, dirn);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_seek_file_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
static const value_string Mode_0x03[] = {
{ 0, "Seek from start of file"},
{ 1, "Seek from current position"},
{ 2, "Seek from end of file"},
{ 0, NULL}
};
proto_tree *Mode_tree;
proto_item *ti;
guint8 WordCount;
guint32 Offset;
guint16 Mode;
guint16 FID;
guint16 ByteCount;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
/* Build display for: Mode */
Mode = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Mode: 0x%02x", Mode);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Mode_tree = proto_item_add_subtree(ti, ett_smb_mode);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Mode_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_enumerated_bitfield(Mode, 0x03, 16, Mode_0x03, "%s"));
}
offset += 2; /* Skip Mode */
/* Build display for: Offset */
Offset = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Offset: %u", Offset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Offset */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Offset */
Offset = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Offset: %u", Offset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Offset */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_write_and_unlock_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint8 BufferFormat;
guint32 Offset;
guint16 Remaining;
guint16 FID;
guint16 DataLength;
guint16 Count;
guint16 ByteCount;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
/* Build display for: Count */
Count = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Count: %u", Count);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Count */
/* Build display for: Offset */
Offset = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Offset: %u", Offset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Offset */
/* Build display for: Remaining */
Remaining = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Remaining: %u", Remaining);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Remaining */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Buffer Format */
BufferFormat = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format: %u", BufferFormat);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format */
/* Build display for: Data Length */
DataLength = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Length: %u", DataLength);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Data Length */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Count */
Count = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Count: %u", Count);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Count */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_set_info2_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint16 LastWriteTime;
guint16 LastWriteDate;
guint16 LastAccessTime;
guint16 LastAccessDate;
guint16 FID;
guint16 CreationTime;
guint16 CreationDate;
guint16 ByteCount;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count: %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
/* Build display for: Creation Date */
CreationDate = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Creation Date: %s", dissect_dos_date(CreationDate));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Creation Date */
/* Build display for: Creation Time */
CreationTime = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Creation Time: %s", dissect_dos_time(CreationTime));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Creation Time */
/* Build display for: Last Access Date */
LastAccessDate = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Last Access Date: %s", dissect_dos_date(LastAccessDate));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Last Access Date */
/* Build display for: Last Access Time */
LastAccessTime = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Last Access Time: %s", dissect_dos_time(LastAccessTime));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Last Access Time */
/* Build display for: Last Write Date */
LastWriteDate = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Last Write Date: %s", dissect_dos_date(LastWriteDate));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Last Write Date */
/* Build display for: Last Write Time */
LastWriteTime = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Last Write Time: %s", dissect_dos_time(LastWriteTime));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Last Write Time */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCC) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCC): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCC) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_lock_bytes_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint32 Offset;
guint32 Count;
guint16 FID;
guint16 ByteCount;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
/* Build display for: Count */
Count = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Count: %u", Count);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Count */
/* Build display for: Offset */
Offset = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Offset: %u", Offset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Offset */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_get_print_queue_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint8 BufferFormat;
guint16 StartIndex;
guint16 RestartIndex;
guint16 MaxCount;
guint16 DataLength;
guint16 Count;
guint16 ByteCount;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count: %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count */
/* Build display for: Max Count */
MaxCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Max Count: %u", MaxCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Max Count */
/* Build display for: Start Index */
StartIndex = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Start Index: %u", StartIndex);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Start Index */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
if (WordCount > 0) {
/* Build display for: Count */
Count = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Count: %u", Count);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Count */
/* Build display for: Restart Index */
RestartIndex = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Restart Index: %u", RestartIndex);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Restart Index */
/* Build display for: Byte Count (BCC) */
}
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Buffer Format */
BufferFormat = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format: %u", BufferFormat);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format */
/* Build display for: Data Length */
DataLength = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Length: %u", DataLength);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Data Length */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_locking_andx_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
proto_tree *LockType_tree;
proto_item *ti;
Some general fixups and some fixes for protocol decode problems exposed by Win2000 interacting with a Samba server ... svn path=/trunk/; revision=1010
1999-11-11 13:56:58 +00:00
guint8 LockType;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
guint8 WordCount;
guint8 OplockLevel;
guint8 AndXReserved;
guint8 AndXCommand = 0xFF;
guint32 Timeout;
guint16 NumberofLocks;
guint16 NumberOfUnlocks;
guint16 FID;
guint16 ByteCount;
guint16 AndXoffset;
Some general fixups and some fixes for protocol decode problems exposed by Win2000 interacting with a Samba server ... svn path=/trunk/; revision=1010
1999-11-11 13:56:58 +00:00
guint16 AndXOffset = 0;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: AndXCommand */
AndXCommand = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXCommand: %u", AndXCommand);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip AndXCommand */
/* Build display for: AndXReserved */
AndXReserved = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXReserved: %u", AndXReserved);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip AndXReserved */
/* Build display for: AndXOffset */
AndXOffset = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "AndXOffset: %u", AndXOffset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip AndXOffset */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
/* Build display for: Lock Type */
LockType = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 1, "Lock Type: 0x%01x", LockType);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
LockType_tree = proto_item_add_subtree(ti, ett_smb_lock_type);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(LockType_tree, NullTVB, offset, 1, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(LockType, 0x01, 16, "Read-only lock", "Not a Read-only lock"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(LockType_tree, NullTVB, offset, 1, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(LockType, 0x02, 16, "Oplock break notification", "Not an Oplock break notification"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(LockType_tree, NullTVB, offset, 1, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(LockType, 0x04, 16, "Change lock type", "Not a lock type change"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(LockType_tree, NullTVB, offset, 1, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(LockType, 0x08, 16, "Cancel outstanding request", "Dont cancel outstanding request"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(LockType_tree, NullTVB, offset, 1, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(LockType, 0x10, 16, "Large file locking format", "Not a large file locking format"));
}
offset += 1; /* Skip Lock Type */
/* Build display for: OplockLevel */
OplockLevel = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "OplockLevel: %u", OplockLevel);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip OplockLevel */
/* Build display for: Timeout */
Timeout = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Timeout: %u", Timeout);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Timeout */
/* Build display for: Number Of Unlocks */
NumberOfUnlocks = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Number Of Unlocks: %u", NumberOfUnlocks);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Number Of Unlocks */
/* Build display for: Number of Locks */
NumberofLocks = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Number of Locks: %u", NumberofLocks);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Number of Locks */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
if (AndXCommand != 0xFF) {
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
(dissect[AndXCommand])(pd, SMB_offset + AndXOffset, fd, parent, tree, si, max_data, SMB_offset, errcode, dirn);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
if (WordCount > 0) {
/* Build display for: AndXCommand */
AndXCommand = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXCommand: %s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
(AndXCommand == 0xFF ? "No further commands" : decode_smb_name(AndXCommand)));
}
offset += 1; /* Skip AndXCommand */
/* Build display for: AndXReserved */
AndXReserved = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "AndXReserved: %u", AndXReserved);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip AndXReserved */
/* Build display for: AndXoffset */
AndXoffset = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "AndXoffset: %u", AndXoffset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip AndXoffset */
}
/* Build display for: Byte Count */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count: %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count */
if (AndXCommand != 0xFF) {
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
(dissect[AndXCommand])(pd, SMB_offset + AndXOffset, fd, parent, tree, si, max_data, SMB_offset, errcode, dirn);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_unlock_bytes_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint32 Offset;
guint32 Count;
guint16 FID;
guint16 ByteCount;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
/* Build display for: Count */
Count = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Count: %u", Count);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Count */
/* Build display for: Offset */
Offset = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Offset: %u", Offset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Offset */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_create_file_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
proto_tree *Attributes_tree;
proto_item *ti;
guint8 WordCount;
guint8 BufferFormat;
guint16 FID;
guint16 CreationTime;
guint16 ByteCount;
guint16 Attributes;
const char *FileName;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Attributes */
Attributes = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Attributes: 0x%02x", Attributes);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Attributes_tree = proto_item_add_subtree(ti, ett_smb_fileattributes);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x01, 16, "Read-only file", "Not a read-only file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x02, 16, "Hidden file", "Not a hidden file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x04, 16, "System file", "Not a system file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x08, 16, " Volume", "Not a volume"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x10, 16, " Directory", "Not a directory"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x20, 16, " Archived", "Not archived"));
}
offset += 2; /* Skip Attributes */
/* Build display for: Creation Time */
CreationTime = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Creation Time: %s", dissect_dos_time(CreationTime));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Creation Time */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Buffer Format */
BufferFormat = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format: %u", BufferFormat);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format */
/* Build display for: File Name */
FileName = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(FileName) + 1, "File Name: %s", FileName);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(FileName) + 1; /* Skip File Name */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
if (WordCount > 0) {
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
}
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_search_dir_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint8 BufferFormat2;
guint8 BufferFormat1;
guint8 BufferFormat;
guint16 SearchAttributes;
guint16 ResumeKeyLength;
guint16 MaxCount;
guint16 DataLength;
guint16 Count;
guint16 ByteCount;
const char *FileName;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Max Count */
MaxCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Max Count: %u", MaxCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Max Count */
/* Build display for: Search Attributes */
SearchAttributes = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Search Attributes: %u", SearchAttributes);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Search Attributes */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Buffer Format 1 */
BufferFormat1 = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format 1: %u", BufferFormat1);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format 1 */
/* Build display for: File Name */
FileName = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(FileName) + 1, "File Name: %s", FileName);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(FileName) + 1; /* Skip File Name */
/* Build display for: Buffer Format 2 */
BufferFormat2 = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format 2: %u", BufferFormat2);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format 2 */
/* Build display for: Resume Key Length */
ResumeKeyLength = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Resume Key Length: %u", ResumeKeyLength);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Resume Key Length */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
if (WordCount > 0) {
/* Build display for: Count */
Count = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Count: %u", Count);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Count */
}
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Buffer Format */
BufferFormat = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format: %u", BufferFormat);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format */
/* Build display for: Data Length */
DataLength = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Length: %u", DataLength);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Data Length */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_create_temporary_file_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint8 BufferFormat;
guint16 Reserved;
guint16 FID;
guint16 CreationTime;
guint16 CreationDate;
guint16 ByteCount;
const char *FileName;
const char *DirectoryName;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Reserved */
Reserved = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved: %u", Reserved);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved */
/* Build display for: Creation Time */
CreationTime = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Creation Time: %s", dissect_dos_time(CreationTime));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Creation Time */
/* Build display for: Creation Date */
CreationDate = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Creation Date: %s", dissect_dos_date(CreationDate));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Creation Date */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Buffer Format */
BufferFormat = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format: %u", BufferFormat);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format */
/* Build display for: Directory Name */
DirectoryName = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(DirectoryName) + 1, "Directory Name: %s", DirectoryName);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(DirectoryName) + 1; /* Skip Directory Name */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
if (WordCount > 0) {
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
}
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Buffer Format */
BufferFormat = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format: %u", BufferFormat);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format */
/* Build display for: File Name */
FileName = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(FileName) + 1, "File Name: %s", FileName);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(FileName) + 1; /* Skip File Name */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_close_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint16 LastWriteTime;
guint16 LastWriteDate;
guint16 FID;
guint16 ByteCount;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
/* Build display for: Last Write Time */
LastWriteTime = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Last Write Time: %s", dissect_dos_time(LastWriteTime));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Last Write Time */
/* Build display for: Last Write Date */
LastWriteDate = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Last Write Date: %s", dissect_dos_date(LastWriteDate));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Last Write Date */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_write_print_file_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint8 BufferFormat;
guint16 FID;
guint16 DataLength;
guint16 ByteCount;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Buffer Format */
BufferFormat = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format: %u", BufferFormat);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format */
/* Build display for: Data Length */
DataLength = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Length: %u", DataLength);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Data Length */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_lock_and_read_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint8 BufferFormat;
guint32 Offset;
guint16 Reserved4;
guint16 Reserved3;
guint16 Reserved2;
guint16 Reserved1;
guint16 Remaining;
guint16 FID;
guint16 DataLength;
guint16 Count;
guint16 ByteCount;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: FID */
FID = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip FID */
/* Build display for: Count */
Count = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Count: %u", Count);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Count */
/* Build display for: Offset */
Offset = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Offset: %u", Offset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Offset */
/* Build display for: Remaining */
Remaining = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Remaining: %u", Remaining);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Remaining */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
if (WordCount > 0) {
/* Build display for: Count */
Count = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Count: %u", Count);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Count */
/* Build display for: Reserved 1 */
Reserved1 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 1: %u", Reserved1);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved 1 */
/* Build display for: Reserved 2 */
Reserved2 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 2: %u", Reserved2);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved 2 */
/* Build display for: Reserved 3 */
Reserved3 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 3: %u", Reserved3);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved 3 */
/* Build display for: Reserved 4 */
Reserved4 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 4: %u", Reserved4);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved 4 */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Buffer Format */
BufferFormat = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format: %u", BufferFormat);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format */
/* Build display for: Data Length */
DataLength = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Length: %u", DataLength);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Data Length */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_process_exit_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint16 ByteCount;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_get_file_attr_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
proto_tree *Attributes_tree;
proto_item *ti;
guint8 WordCount;
guint8 BufferFormat;
guint32 FileSize;
guint16 Reserved5;
guint16 Reserved4;
guint16 Reserved3;
guint16 Reserved2;
guint16 Reserved1;
guint16 LastWriteTime;
guint16 LastWriteDate;
guint16 ByteCount;
guint16 Attributes;
const char *FileName;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Buffer Format */
BufferFormat = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Buffer Format: %u", BufferFormat);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Buffer Format */
/* Build display for: File Name */
FileName = pd + offset;
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, strlen(FileName) + 1, "File Name: %s", FileName);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += strlen(FileName) + 1; /* Skip File Name */
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
if (WordCount > 0) {
/* Build display for: Attributes */
Attributes = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Attributes: 0x%02x", Attributes);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Attributes_tree = proto_item_add_subtree(ti, ett_smb_fileattributes);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x01, 16, "Read-only file", "Not a read-only file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x02, 16, "Hidden file", "Not a hidden file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x04, 16, "System file", "Not a system file"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x08, 16, " Volume", "Not a volume"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x10, 16, " Directory", "Not a directory"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Attributes_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Attributes, 0x20, 16, " Archived", "Not archived"));
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Attributes */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Last Write Time */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
LastWriteTime = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Last Write Time */
/* Build display for: Last Write Date */
LastWriteDate = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Last Write Date: %s", dissect_smbu_date(LastWriteDate, LastWriteTime));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Patches to prevent problems under Windows when time formats are negative. Make sure that if _gtime is null, a bad format message returned. Also noticed that I am going to have to do something about Unicode strings soon and the SMBopenX dissect is slightly wrong ... Oh well, it is the Xmas break soon :-) No rest for the Wicca'd (please don't interpret that as a statement of my religious affiliation, it is just a cute saying :-) svn path=/trunk/; revision=2764
2000-12-17 03:48:44 +00:00
proto_tree_add_text(tree, NullTVB, offset - 2, 2, "Last Write Time: %s", dissect_smbu_time(LastWriteDate, LastWriteTime));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Last Write Date */
/* Build display for: File Size */
FileSize = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "File Size: %u", FileSize);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip File Size */
/* Build display for: Reserved 1 */
Reserved1 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 1: %u", Reserved1);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved 1 */
/* Build display for: Reserved 2 */
Reserved2 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 2: %u", Reserved2);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved 2 */
/* Build display for: Reserved 3 */
Reserved3 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 3: %u", Reserved3);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved 3 */
/* Build display for: Reserved 4 */
Reserved4 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 4: %u", Reserved4);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved 4 */
/* Build display for: Reserved 5 */
Reserved5 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 5: %u", Reserved5);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved 5 */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
}
}
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_read_file_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, int dirn)
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{
guint8 WordCount;
guint32 Offset;
guint16 Reserved4;
guint16 Reserved3;
guint16 Reserved2;
guint16 Reserved1;
guint16 Remaining;
guint16 FID;
guint16 DataLength;
guint16 Count;
guint16 ByteCount;
guint16 BufferFormat;
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: FID */
FID = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip FID */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Count */
Count = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Count: %u", Count);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Count */
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Offset */
Offset = GWORD(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Offset: %u", Offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 4; /* Skip Offset */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Remaining */
Remaining = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Remaining: %u", Remaining);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Remaining */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count (BCC) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ByteCount = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
if (dirn == 0) { /* Response(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WCT) */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (WordCount > 0) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Count */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Count = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Count: %u", Count);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Count */
/* Build display for: Reserved 1 */
Reserved1 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 1: %u", Reserved1);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved 1 */
/* Build display for: Reserved 2 */
Reserved2 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 2: %u", Reserved2);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved 2 */
/* Build display for: Reserved 3 */
Reserved3 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 3: %u", Reserved3);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved 3 */
/* Build display for: Reserved 4 */
Reserved4 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 4: %u", Reserved4);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Reserved 4 */
}
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Buffer Format */
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
BufferFormat = GSHORT(pd, offset);
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Buffer Format: %u", BufferFormat);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Buffer Format */
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Data Length */
DataLength = GSHORT(pd, offset);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Length: %u", DataLength);
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Data Length */
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
More decoding of fields. Now handle enumerated fields, but still have problems with single bit fields when declared as an enumerated field. It shows an unknown ... Damn ... Can't see what the problem is. svn path=/trunk/; revision=353
1999-07-10 14:01:53 +00:00
}
}
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_write_mpx_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, int dirn)
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
{
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
proto_tree *WriteMode_tree;
proto_item *ti;
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
guint8 WordCount;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
guint8 Pad;
guint32 Timeout;
guint32 ResponseMask;
guint32 RequestMask;
guint16 WriteMode;
guint16 Reserved1;
guint16 FID;
guint16 DataOffset;
guint16 DataLength;
guint16 Count;
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
guint16 ByteCount;
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (dirn == 1) { /* Request(s) dissect code */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
/* Build display for: Word Count (WCT) */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
WordCount = GBYTE(pd, offset);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
offset += 1; /* Skip Word Count (WCT) */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: FID */
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
FID = GSHORT(pd, offset);
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip FID */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Count */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Count = GSHORT(pd, offset);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Count: %u", Count);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Count */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Reserved 1 */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Reserved1 = GSHORT(pd, offset);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved 1: %u", Reserved1);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Reserved 1 */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Timeout */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Timeout = GWORD(pd, offset);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Timeout: %u", Timeout);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 4; /* Skip Timeout */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: WriteMode */
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
WriteMode = GSHORT(pd, offset);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "WriteMode: 0x%02x", WriteMode);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
WriteMode_tree = proto_item_add_subtree(ti, ett_smb_writemode);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(WriteMode_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(WriteMode, 0x01, 16, "Write through requested", "Write through not requested"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(WriteMode_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(WriteMode, 0x02, 16, "Return Remaining", "Dont return Remaining"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(WriteMode_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(WriteMode, 0x40, 16, "Connectionless mode requested", "Connectionless mode not requested"));
}
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip WriteMode */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Request Mask */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
RequestMask = GWORD(pd, offset);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Request Mask: %u", RequestMask);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 4; /* Skip Request Mask */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Data Length */
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
DataLength = GSHORT(pd, offset);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Length: %u", DataLength);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Data Length */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Data Offset */
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
DataOffset = GSHORT(pd, offset);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Offset: %u", DataOffset);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Data Offset */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count (BCC) */
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ByteCount = GSHORT(pd, offset);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Pad */
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Pad = GBYTE(pd, offset);
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Pad: %u", Pad);
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Pad */
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (dirn == 0) { /* Response(s) dissect code */
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
/* Build display for: Word Count (WCT) */
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
WordCount = GBYTE(pd, offset);
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
}
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
offset += 1; /* Skip Word Count (WCT) */
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (WordCount > 0) {
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Response Mask */
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ResponseMask = GWORD(pd, offset);
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Response Mask: %u", ResponseMask);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 4; /* Skip Response Mask */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
}
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
offset += 2; /* Skip Byte Count (BCC) */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
}
}
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_find_close2_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, int dirn)
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
{
guint8 WordCount;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
guint8 ByteCount;
guint16 FID;
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (dirn == 1) { /* Request(s) dissect code */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Word Count (WTC) */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
WordCount = GBYTE(pd, offset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WTC): %u", WordCount);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WTC) */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: FID */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
FID = GSHORT(pd, offset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "FID: %u", FID);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip FID */
Some of my fixes did get lost - put 'em back. Fix the "proto_tree_add_item()" used when the server didn't support any of the dialects the client offered not to print the dialect index. In the "Core to LANMAN 2.1" "negotiate protocol" decode, show the time zone as minutes from UTC, just as is done for the "post-LANMAN 2.1" decode. svn path=/trunk/; revision=272
1999-05-11 00:28:18 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count (BCC) */
Some of my fixes did get lost - put 'em back. Fix the "proto_tree_add_item()" used when the server didn't support any of the dialects the client offered not to print the dialect index. In the "Core to LANMAN 2.1" "negotiate protocol" decode, show the time zone as minutes from UTC, just as is done for the "post-LANMAN 2.1" decode. svn path=/trunk/; revision=272
1999-05-11 00:28:18 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ByteCount = GSHORT(pd, offset);
Some of my fixes did get lost - put 'em back. Fix the "proto_tree_add_item()" used when the server didn't support any of the dialects the client offered not to print the dialect index. In the "Core to LANMAN 2.1" "negotiate protocol" decode, show the time zone as minutes from UTC, just as is done for the "post-LANMAN 2.1" decode. svn path=/trunk/; revision=272
1999-05-11 00:28:18 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (dirn == 0) { /* Response(s) dissect code */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
/* Build display for: Word Count (WCT) */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
WordCount = GBYTE(pd, offset);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
}
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
offset += 1; /* Skip Word Count (WCT) */
Some of my fixes did get lost - put 'em back. Fix the "proto_tree_add_item()" used when the server didn't support any of the dialects the client offered not to print the dialect index. In the "Core to LANMAN 2.1" "negotiate protocol" decode, show the time zone as minutes from UTC, just as is done for the "post-LANMAN 2.1" decode. svn path=/trunk/; revision=272
1999-05-11 00:28:18 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
/* Build display for: Byte Count (BCC) */
Some of my fixes did get lost - put 'em back. Fix the "proto_tree_add_item()" used when the server didn't support any of the dialects the client offered not to print the dialect index. In the "Core to LANMAN 2.1" "negotiate protocol" decode, show the time zone as minutes from UTC, just as is done for the "post-LANMAN 2.1" decode. svn path=/trunk/; revision=272
1999-05-11 00:28:18 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ByteCount = GBYTE(pd, offset);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Fix up the decode of "greater than core and up to and including LANMAN 2.1" "negotiate protocol" responses. Display unsigned fields in "negotiate protocol" as unsigned, rather than signed, values. svn path=/trunk/; revision=268
1999-05-10 21:36:40 +00:00
if (tree) {
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Byte Count (BCC): %u", ByteCount);
Fix up the decode of "greater than core and up to and including LANMAN 2.1" "negotiate protocol" responses. Display unsigned fields in "negotiate protocol" as unsigned, rather than signed, values. svn path=/trunk/; revision=268
1999-05-10 21:36:40 +00:00
Some of my fixes did get lost - put 'em back. Fix the "proto_tree_add_item()" used when the server didn't support any of the dialects the client offered not to print the dialect index. In the "Core to LANMAN 2.1" "negotiate protocol" decode, show the time zone as minutes from UTC, just as is done for the "post-LANMAN 2.1" decode. svn path=/trunk/; revision=272
1999-05-11 00:28:18 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Byte Count (BCC) */
Some of my fixes did get lost - put 'em back. Fix the "proto_tree_add_item()" used when the server didn't support any of the dialects the client offered not to print the dialect index. In the "Core to LANMAN 2.1" "negotiate protocol" decode, show the time zone as minutes from UTC, just as is done for the "post-LANMAN 2.1" decode. svn path=/trunk/; revision=272
1999-05-11 00:28:18 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
Some of my fixes did get lost - put 'em back. Fix the "proto_tree_add_item()" used when the server didn't support any of the dialects the client offered not to print the dialect index. In the "Core to LANMAN 2.1" "negotiate protocol" decode, show the time zone as minutes from UTC, just as is done for the "post-LANMAN 2.1" decode. svn path=/trunk/; revision=272
1999-05-11 00:28:18 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
Some of my fixes did get lost - put 'em back. Fix the "proto_tree_add_item()" used when the server didn't support any of the dialects the client offered not to print the dialect index. In the "Core to LANMAN 2.1" "negotiate protocol" decode, show the time zone as minutes from UTC, just as is done for the "post-LANMAN 2.1" decode. svn path=/trunk/; revision=272
1999-05-11 00:28:18 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
char *trans2_cmd_names[] = {
"TRANS2_OPEN",
"TRANS2_FIND_FIRST2",
"TRANS2_FIND_NEXT2",
"TRANS2_QUERY_FS_INFORMATION",
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
"no such command",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
"TRANS2_QUERY_PATH_INFORMATION",
"TRANS2_SET_PATH_INFORMATION",
"TRANS2_QUERY_FILE_INFORMATION",
"TRANS2_SET_FILE_INFORMATION",
"TRANS2_FSCTL",
"TRANS2_IOCTL2",
"TRANS2_FIND_NOTIFY_FIRST",
"TRANS2_FIND_NOTIFY_NEXT",
"TRANS2_CREATE_DIRECTORY",
"TRANS2_SESSION_SETUP",
"TRANS2_GET_DFS_REFERRAL",
"no such command",
"TRANS2_REPORT_DFS_INCONSISTENCY"};
char *decode_trans2_name(int code)
{
if (code > 17 || code < 0) {
return("no such command");
}
return trans2_cmd_names[code];
}
Generalize the "ip_src" and "ip_dst" members of the "packet_info" structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst" addresses, where an address is an address type, an address length in bytes, and a pointer to that many bytes. "dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}" are the network-layer source/destination; "{src,dst}" are the source/destination from the highest of those two layers that we have in the packet. Add a port type to "packet_info" as well, specifying whether it's a TCP or UDP port. Don't set the address and port columns in the dissector functions; just set the address and port members of the "packet_info" structure. Set the columns in "fill_in_columns()"; this means that if we're showing COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate the string from "src" or "dst", we don't generate a string for the link-layer address and then overwrite it with a string for the network-layer address (generating those strings costs CPU). Add support for "conversations", where a "conversation" is (at present) a source and destination address and a source and destination port. (In the future, we may support "conversations" above the transport layer, e.g. a TFTP conversation, where the first packet goes from the client to the TFTP server port, but the reply comes back from a different port, and all subsequent packets go between the client address/port and the server address/new port, or an NFS conversation, which might include lock manager, status monitor, and mount packets, as well as NFS packets.) Currently, all we support is a call that takes the source and destination address/port pairs, looks them up in a hash table, and: if nothing is found, creates a new entry in the hash table, and assigns it a unique 32-bit conversation ID, and returns that conversation ID; if an entry is found, returns its conversation ID. Use that in the SMB and AFS code to keep track of individual SMB or AFS conversations. We need to match up requests and replies, as, for certain replies, the operation code for the request to which it's a reply doesn't show up in the reply - you have to find the request with a matching transaction ID. Transaction IDs are per-conversation, so the hash table for requests should include a conversation ID and transaction ID as the key. This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses transparently (and should allow the SMB decoder to handle NetBIOS atop other protocols as well, if the source and destination address and port values in the "packet_info" structure are set appropriately). In the "Follow TCP Connection" code, check to make sure that the addresses are IPv4 addressses; ultimately, that code should be changed to use the conversation code instead, which will let it handle IPv6 transparently. svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_transact2_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, int dirn)
Fix up the decode of "greater than core and up to and including LANMAN 2.1" "negotiate protocol" responses. Display unsigned fields in "negotiate protocol" as unsigned, rather than signed, values. svn path=/trunk/; revision=268
1999-05-10 21:36:40 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
{
proto_tree *Flags_tree;
proto_item *ti;
guint8 WordCount;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
guint8 SetupCount;
guint8 Reserved3;
guint8 Reserved1;
guint8 MaxSetupCount;
guint8 Data;
guint32 Timeout;
guint16 TotalParameterCount;
guint16 TotalDataCount;
Some small fixes to get rid of compiler warnings svn path=/trunk/; revision=929
1999-10-26 21:30:11 +00:00
guint16 Setup = 0;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
guint16 Reserved2;
guint16 ParameterOffset;
guint16 ParameterDisplacement;
guint16 ParameterCount;
guint16 MaxParameterCount;
guint16 MaxDataCount;
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
guint16 Flags;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
guint16 DataOffset;
guint16 DataDisplacement;
guint16 DataCount;
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
guint16 ByteCount;
Export the data structure used to represent a conversation. Replace "add_to_conversation()" with: "conversation_new()", which creates a new conversation, given source and destination addresses and ports, and returns a pointer to the structure for the conversation; "find_conversation()", which tries to find a conversation for given source and destination addresses and ports, and returns a pointer to the structure for the conversation if found, and a null pointer if not found. Add a private data pointer field to the conversation structure, and have "conversation_new()" take an argument that specifies what to set that pointer to; that lets clients of the conversation code hang arbitrary data off the conversation (e.g., a hash table of protocol requests and replies, in case the protocol is a request/reply protocol wherein the reply doesn't say what type of request it's a reply to, and you need that information to dissect the reply). svn path=/trunk/; revision=920
1999-10-24 07:27:20 +00:00
conversation_t *conversation;
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
struct smb_request_key request_key, *new_request_key;
struct smb_request_val *request_val;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
/*
Export the data structure used to represent a conversation. Replace "add_to_conversation()" with: "conversation_new()", which creates a new conversation, given source and destination addresses and ports, and returns a pointer to the structure for the conversation; "find_conversation()", which tries to find a conversation for given source and destination addresses and ports, and returns a pointer to the structure for the conversation if found, and a null pointer if not found. Add a private data pointer field to the conversation structure, and have "conversation_new()" take an argument that specifies what to set that pointer to; that lets clients of the conversation code hang arbitrary data off the conversation (e.g., a hash table of protocol requests and replies, in case the protocol is a request/reply protocol wherein the reply doesn't say what type of request it's a reply to, and you need that information to dissect the reply). svn path=/trunk/; revision=920
1999-10-24 07:27:20 +00:00
* Find out what conversation this packet is part of.
Generalize the "ip_src" and "ip_dst" members of the "packet_info" structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst" addresses, where an address is an address type, an address length in bytes, and a pointer to that many bytes. "dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}" are the network-layer source/destination; "{src,dst}" are the source/destination from the highest of those two layers that we have in the packet. Add a port type to "packet_info" as well, specifying whether it's a TCP or UDP port. Don't set the address and port columns in the dissector functions; just set the address and port members of the "packet_info" structure. Set the columns in "fill_in_columns()"; this means that if we're showing COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate the string from "src" or "dst", we don't generate a string for the link-layer address and then overwrite it with a string for the network-layer address (generating those strings costs CPU). Add support for "conversations", where a "conversation" is (at present) a source and destination address and a source and destination port. (In the future, we may support "conversations" above the transport layer, e.g. a TFTP conversation, where the first packet goes from the client to the TFTP server port, but the reply comes back from a different port, and all subsequent packets go between the client address/port and the server address/new port, or an NFS conversation, which might include lock manager, status monitor, and mount packets, as well as NFS packets.) Currently, all we support is a call that takes the source and destination address/port pairs, looks them up in a hash table, and: if nothing is found, creates a new entry in the hash table, and assigns it a unique 32-bit conversation ID, and returns that conversation ID; if an entry is found, returns its conversation ID. Use that in the SMB and AFS code to keep track of individual SMB or AFS conversations. We need to match up requests and replies, as, for certain replies, the operation code for the request to which it's a reply doesn't show up in the reply - you have to find the request with a matching transaction ID. Transaction IDs are per-conversation, so the hash table for requests should include a conversation ID and transaction ID as the key. This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses transparently (and should allow the SMB decoder to handle NetBIOS atop other protocols as well, if the source and destination address and port values in the "packet_info" structure are set appropriately). In the "Follow TCP Connection" code, check to make sure that the addresses are IPv4 addressses; ultimately, that code should be changed to use the conversation code instead, which will let it handle IPv6 transparently. svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
* XXX - this should really be done by the transport-layer protocol,
* although for connectionless transports, we may not want to do that
* unless we know some higher-level protocol will want it - or we
* may want to do it, so you can say e.g. "show only the packets in
* this UDP 'connection'".
*
* Note that we don't have to worry about the direction this packet
* was going - the conversation code handles that for us, treating
* packets from A:X to B:Y as being part of the same conversation as
* packets from B:Y to A:X.
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
*/
Export the data structure used to represent a conversation. Replace "add_to_conversation()" with: "conversation_new()", which creates a new conversation, given source and destination addresses and ports, and returns a pointer to the structure for the conversation; "find_conversation()", which tries to find a conversation for given source and destination addresses and ports, and returns a pointer to the structure for the conversation if found, and a null pointer if not found. Add a private data pointer field to the conversation structure, and have "conversation_new()" take an argument that specifies what to set that pointer to; that lets clients of the conversation code hang arbitrary data off the conversation (e.g., a hash table of protocol requests and replies, in case the protocol is a request/reply protocol wherein the reply doesn't say what type of request it's a reply to, and you need that information to dissect the reply). svn path=/trunk/; revision=920
1999-10-24 07:27:20 +00:00
conversation = find_conversation(&pi.src, &pi.dst, pi.ptype,
Support for conversations with "wildcard" destination addresses, from Jeff Foster. svn path=/trunk/; revision=2523
2000-10-21 05:52:28 +00:00
pi.srcport, pi.destport, 0);
Export the data structure used to represent a conversation. Replace "add_to_conversation()" with: "conversation_new()", which creates a new conversation, given source and destination addresses and ports, and returns a pointer to the structure for the conversation; "find_conversation()", which tries to find a conversation for given source and destination addresses and ports, and returns a pointer to the structure for the conversation if found, and a null pointer if not found. Add a private data pointer field to the conversation structure, and have "conversation_new()" take an argument that specifies what to set that pointer to; that lets clients of the conversation code hang arbitrary data off the conversation (e.g., a hash table of protocol requests and replies, in case the protocol is a request/reply protocol wherein the reply doesn't say what type of request it's a reply to, and you need that information to dissect the reply). svn path=/trunk/; revision=920
1999-10-24 07:27:20 +00:00
if (conversation == NULL) {
/* It's not part of any conversation - create a new one. */
conversation = conversation_new(&pi.src, &pi.dst, pi.ptype,
Support for conversations with "wildcard" destination addresses, from Jeff Foster. svn path=/trunk/; revision=2523
2000-10-21 05:52:28 +00:00
pi.srcport, pi.destport, NULL, 0);
Export the data structure used to represent a conversation. Replace "add_to_conversation()" with: "conversation_new()", which creates a new conversation, given source and destination addresses and ports, and returns a pointer to the structure for the conversation; "find_conversation()", which tries to find a conversation for given source and destination addresses and ports, and returns a pointer to the structure for the conversation if found, and a null pointer if not found. Add a private data pointer field to the conversation structure, and have "conversation_new()" take an argument that specifies what to set that pointer to; that lets clients of the conversation code hang arbitrary data off the conversation (e.g., a hash table of protocol requests and replies, in case the protocol is a request/reply protocol wherein the reply doesn't say what type of request it's a reply to, and you need that information to dissect the reply). svn path=/trunk/; revision=920
1999-10-24 07:27:20 +00:00
}
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
si.conversation = conversation; /* Save this for later */
Generalize the "ip_src" and "ip_dst" members of the "packet_info" structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst" addresses, where an address is an address type, an address length in bytes, and a pointer to that many bytes. "dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}" are the network-layer source/destination; "{src,dst}" are the source/destination from the highest of those two layers that we have in the packet. Add a port type to "packet_info" as well, specifying whether it's a TCP or UDP port. Don't set the address and port columns in the dissector functions; just set the address and port members of the "packet_info" structure. Set the columns in "fill_in_columns()"; this means that if we're showing COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate the string from "src" or "dst", we don't generate a string for the link-layer address and then overwrite it with a string for the network-layer address (generating those strings costs CPU). Add support for "conversations", where a "conversation" is (at present) a source and destination address and a source and destination port. (In the future, we may support "conversations" above the transport layer, e.g. a TFTP conversation, where the first packet goes from the client to the TFTP server port, but the reply comes back from a different port, and all subsequent packets go between the client address/port and the server address/new port, or an NFS conversation, which might include lock manager, status monitor, and mount packets, as well as NFS packets.) Currently, all we support is a call that takes the source and destination address/port pairs, looks them up in a hash table, and: if nothing is found, creates a new entry in the hash table, and assigns it a unique 32-bit conversation ID, and returns that conversation ID; if an entry is found, returns its conversation ID. Use that in the SMB and AFS code to keep track of individual SMB or AFS conversations. We need to match up requests and replies, as, for certain replies, the operation code for the request to which it's a reply doesn't show up in the reply - you have to find the request with a matching transaction ID. Transaction IDs are per-conversation, so the hash table for requests should include a conversation ID and transaction ID as the key. This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses transparently (and should allow the SMB decoder to handle NetBIOS atop other protocols as well, if the source and destination address and port values in the "packet_info" structure are set appropriately). In the "Follow TCP Connection" code, check to make sure that the addresses are IPv4 addressses; ultimately, that code should be changed to use the conversation code instead, which will let it handle IPv6 transparently. svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
/*
* Check for and insert entry in request hash table if does not exist
*/
Export the data structure used to represent a conversation. Replace "add_to_conversation()" with: "conversation_new()", which creates a new conversation, given source and destination addresses and ports, and returns a pointer to the structure for the conversation; "find_conversation()", which tries to find a conversation for given source and destination addresses and ports, and returns a pointer to the structure for the conversation if found, and a null pointer if not found. Add a private data pointer field to the conversation structure, and have "conversation_new()" take an argument that specifies what to set that pointer to; that lets clients of the conversation code hang arbitrary data off the conversation (e.g., a hash table of protocol requests and replies, in case the protocol is a request/reply protocol wherein the reply doesn't say what type of request it's a reply to, and you need that information to dissect the reply). svn path=/trunk/; revision=920
1999-10-24 07:27:20 +00:00
request_key.conversation = conversation->index;
Generalize the "ip_src" and "ip_dst" members of the "packet_info" structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst" addresses, where an address is an address type, an address length in bytes, and a pointer to that many bytes. "dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}" are the network-layer source/destination; "{src,dst}" are the source/destination from the highest of those two layers that we have in the packet. Add a port type to "packet_info" as well, specifying whether it's a TCP or UDP port. Don't set the address and port columns in the dissector functions; just set the address and port members of the "packet_info" structure. Set the columns in "fill_in_columns()"; this means that if we're showing COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate the string from "src" or "dst", we don't generate a string for the link-layer address and then overwrite it with a string for the network-layer address (generating those strings costs CPU). Add support for "conversations", where a "conversation" is (at present) a source and destination address and a source and destination port. (In the future, we may support "conversations" above the transport layer, e.g. a TFTP conversation, where the first packet goes from the client to the TFTP server port, but the reply comes back from a different port, and all subsequent packets go between the client address/port and the server address/new port, or an NFS conversation, which might include lock manager, status monitor, and mount packets, as well as NFS packets.) Currently, all we support is a call that takes the source and destination address/port pairs, looks them up in a hash table, and: if nothing is found, creates a new entry in the hash table, and assigns it a unique 32-bit conversation ID, and returns that conversation ID; if an entry is found, returns its conversation ID. Use that in the SMB and AFS code to keep track of individual SMB or AFS conversations. We need to match up requests and replies, as, for certain replies, the operation code for the request to which it's a reply doesn't show up in the reply - you have to find the request with a matching transaction ID. Transaction IDs are per-conversation, so the hash table for requests should include a conversation ID and transaction ID as the key. This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses transparently (and should allow the SMB decoder to handle NetBIOS atop other protocols as well, if the source and destination address and port values in the "packet_info" structure are set appropriately). In the "Follow TCP Connection" code, check to make sure that the addresses are IPv4 addressses; ultimately, that code should be changed to use the conversation code instead, which will let it handle IPv6 transparently. svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
request_key.mid = si.mid;
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
request_val = (struct smb_request_val *) g_hash_table_lookup(smb_request_hash, &request_key);
if (!request_val) { /* Create one */
new_request_key = g_mem_chunk_alloc(smb_request_keys);
Export the data structure used to represent a conversation. Replace "add_to_conversation()" with: "conversation_new()", which creates a new conversation, given source and destination addresses and ports, and returns a pointer to the structure for the conversation; "find_conversation()", which tries to find a conversation for given source and destination addresses and ports, and returns a pointer to the structure for the conversation if found, and a null pointer if not found. Add a private data pointer field to the conversation structure, and have "conversation_new()" take an argument that specifies what to set that pointer to; that lets clients of the conversation code hang arbitrary data off the conversation (e.g., a hash table of protocol requests and replies, in case the protocol is a request/reply protocol wherein the reply doesn't say what type of request it's a reply to, and you need that information to dissect the reply). svn path=/trunk/; revision=920
1999-10-24 07:27:20 +00:00
new_request_key -> conversation = conversation->index;
Generalize the "ip_src" and "ip_dst" members of the "packet_info" structure to "dl_src"/"dl_dst", "net_src"/"net_dst", and "src"/"dst" addresses, where an address is an address type, an address length in bytes, and a pointer to that many bytes. "dl_{src,dst}" are the link-layer source/destination; "net_{src,dst}" are the network-layer source/destination; "{src,dst}" are the source/destination from the highest of those two layers that we have in the packet. Add a port type to "packet_info" as well, specifying whether it's a TCP or UDP port. Don't set the address and port columns in the dissector functions; just set the address and port members of the "packet_info" structure. Set the columns in "fill_in_columns()"; this means that if we're showing COL_{DEF,RES,UNRES}_SRC" or "COL_{DEF,RES,UNRES}_DST", we only generate the string from "src" or "dst", we don't generate a string for the link-layer address and then overwrite it with a string for the network-layer address (generating those strings costs CPU). Add support for "conversations", where a "conversation" is (at present) a source and destination address and a source and destination port. (In the future, we may support "conversations" above the transport layer, e.g. a TFTP conversation, where the first packet goes from the client to the TFTP server port, but the reply comes back from a different port, and all subsequent packets go between the client address/port and the server address/new port, or an NFS conversation, which might include lock manager, status monitor, and mount packets, as well as NFS packets.) Currently, all we support is a call that takes the source and destination address/port pairs, looks them up in a hash table, and: if nothing is found, creates a new entry in the hash table, and assigns it a unique 32-bit conversation ID, and returns that conversation ID; if an entry is found, returns its conversation ID. Use that in the SMB and AFS code to keep track of individual SMB or AFS conversations. We need to match up requests and replies, as, for certain replies, the operation code for the request to which it's a reply doesn't show up in the reply - you have to find the request with a matching transaction ID. Transaction IDs are per-conversation, so the hash table for requests should include a conversation ID and transaction ID as the key. This allows SMB and AFS decoders to handle IPv4 or IPv6 addresses transparently (and should allow the SMB decoder to handle NetBIOS atop other protocols as well, if the source and destination address and port values in the "packet_info" structure are set appropriately). In the "Follow TCP Connection" code, check to make sure that the addresses are IPv4 addressses; ultimately, that code should be changed to use the conversation code instead, which will let it handle IPv6 transparently. svn path=/trunk/; revision=909
1999-10-22 07:18:23 +00:00
new_request_key -> mid = si.mid;
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
request_val = g_mem_chunk_alloc(smb_request_vals);
request_val -> mid = si.mid;
request_val -> last_transact2_command = 0xFFFF;
g_hash_table_insert(smb_request_hash, new_request_key, request_val);
}
else { /* Update the transact request */
request_val -> mid = si.mid;
}
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
si.request_val = request_val; /* Save this for later */
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
if (dirn == 1) { /* Request(s) dissect code */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Fix up the decode of "greater than core and up to and including LANMAN 2.1" "negotiate protocol" responses. Display unsigned fields in "negotiate protocol" as unsigned, rather than signed, values. svn path=/trunk/; revision=268
1999-05-10 21:36:40 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Word Count (WCT) */
Fix up the decode of "greater than core and up to and including LANMAN 2.1" "negotiate protocol" responses. Display unsigned fields in "negotiate protocol" as unsigned, rather than signed, values. svn path=/trunk/; revision=268
1999-05-10 21:36:40 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Total Parameter Count */
Turn "arpaddr_to_str()" into "bytes_to_str()", and make it public, so it can be used by dissectors other than ARP to display byte arrays as strings of hex digits. Add a routine to extract a null-terminated Unicode string and turn it into an ISO 8859-1 string for display. (Ultimately, we should determine what character sets the X server or printer or whatever can handle, and turn it into the appropriate character set.) Display the challenge in "core-to-LANMAN-2.1" Negotiate Protocol responses as a string of hex digits - but only if the length is non-zero. (It's a counted array, not a null-terminated string.) Display some additional security mode bits in an NT LM 0.12 Negotiate Protocol response. Display some additional bits in the "capabilities" field of the Negotiate Protocol response. Display the challenge in an NT LM 0.12 Negotiate Protocol response as a string of hex digits (it's a counted array, not a null-terminated string). Display the domain name as Unicode in an NT LM 0.12 Negotiate Protocol response if the capabilities field has the "supports Unicode" bit set (no, not the "Unicode" bit in the "flags2" field - NT doesn't set that in the response, even though it sends the domain name over in Unicode!). Display some additional bits in the "flags2" field of an SMB. svn path=/trunk/; revision=275
1999-05-11 08:21:39 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
TotalParameterCount = GSHORT(pd, offset);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Total Parameter Count: %u", TotalParameterCount);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Total Parameter Count */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Total Data Count */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
TotalDataCount = GSHORT(pd, offset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Total Data Count: %u", TotalDataCount);
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
Turn "arpaddr_to_str()" into "bytes_to_str()", and make it public, so it can be used by dissectors other than ARP to display byte arrays as strings of hex digits. Add a routine to extract a null-terminated Unicode string and turn it into an ISO 8859-1 string for display. (Ultimately, we should determine what character sets the X server or printer or whatever can handle, and turn it into the appropriate character set.) Display the challenge in "core-to-LANMAN-2.1" Negotiate Protocol responses as a string of hex digits - but only if the length is non-zero. (It's a counted array, not a null-terminated string.) Display some additional security mode bits in an NT LM 0.12 Negotiate Protocol response. Display some additional bits in the "capabilities" field of the Negotiate Protocol response. Display the challenge in an NT LM 0.12 Negotiate Protocol response as a string of hex digits (it's a counted array, not a null-terminated string). Display the domain name as Unicode in an NT LM 0.12 Negotiate Protocol response if the capabilities field has the "supports Unicode" bit set (no, not the "Unicode" bit in the "flags2" field - NT doesn't set that in the response, even though it sends the domain name over in Unicode!). Display some additional bits in the "flags2" field of an SMB. svn path=/trunk/; revision=275
1999-05-11 08:21:39 +00:00
}
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Total Data Count */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Max Parameter Count */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
MaxParameterCount = GSHORT(pd, offset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Max Parameter Count: %u", MaxParameterCount);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Max Parameter Count */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Max Data Count */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
MaxDataCount = GSHORT(pd, offset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Max Data Count: %u", MaxDataCount);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Max Data Count */
/* Build display for: Max Setup Count */
MaxSetupCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Max Setup Count: %u", MaxSetupCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Max Setup Count */
/* Build display for: Reserved1 */
Reserved1 = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Reserved1: %u", Reserved1);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 1; /* Skip Reserved1 */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
/* Build display for: Flags */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
Flags = GSHORT(pd, offset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Flags: 0x%02x", Flags);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Flags_tree = proto_item_add_subtree(ti, ett_smb_flags);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Flags_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Flags, 0x01, 16, "Also disconnect TID", "Dont disconnect TID"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Flags_tree, NullTVB, offset, 2, "%s",
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
decode_boolean_bitfield(Flags, 0x02, 16, "One way transaction", "Two way transaction"));
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
Correctly handle Interim responses to TRANSACTION requests. Move the declaration of routines exported from "packet-smb-mailslot.c" into a "packet-smb-mailslot.h" header file, and have modules that import those routines include "packet-smb-mailslot.h" rather than declaring the routines themselves; do the same for routines exported from "packet-smb-pipe.c". Make routines not exported static, and make routines that return a true/false return value "gboolean" rather than "guint32". svn path=/trunk/; revision=3146
2001-03-18 03:23:30 +00:00
}
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
offset += 2; /* Skip Flags */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Timeout */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Timeout = GWORD(pd, offset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Timeout: %u", Timeout);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 4; /* Skip Timeout */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Reserved2 */
Reserved2 = GSHORT(pd, offset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved2: %u", Reserved2);
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Some clean-ups. I hope I have not disturbed any of Guy's fixes, as I had to manually apply his fixes. It is a long story, but my development environment is, umm, interesting. Thanks to Guy for spotting the problems in my Core Proto to LanMan 2.0 decode probs. I did not spot them and I do not have any such traces to check against. svn path=/trunk/; revision=271
1999-05-11 00:00:40 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Reserved2 */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Parameter Count */
ParameterCount = GSHORT(pd, offset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Parameter Count: %u", ParameterCount);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Parameter Count */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Parameter Offset */
ParameterOffset = GSHORT(pd, offset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Parameter Offset: %u", ParameterOffset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Parameter Offset */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Data Count */
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
DataCount = GSHORT(pd, offset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Count: %u", DataCount);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Data Count */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Data Offset */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
DataOffset = GSHORT(pd, offset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Offset: %u", DataOffset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Data Offset */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Setup Count */
SetupCount = GBYTE(pd, offset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Setup Count: %u", SetupCount);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Setup Count */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Reserved3 */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Reserved3 = GBYTE(pd, offset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Reserved3: %u", Reserved3);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Reserved3 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Setup */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (SetupCount > 0) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
int i = SetupCount;
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Setup = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
request_val -> last_transact2_command = Setup; /* Save for later */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (check_col(fd, COL_INFO)) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
col_add_fstr(fd, COL_INFO, "%s %s", decode_trans2_name(Setup), (dirn ? "Request" : "Response"));
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
for (i = 1; i <= SetupCount; i++) {
int Setup1;
Setup1 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Setup%i: %u", i, Setup1);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Setup */
}
}
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
/* Build display for: Transact Name */
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Transact Name: %s", decode_trans2_name(Setup));
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
if (offset < (SMB_offset + ParameterOffset)) {
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
int pad1Count = SMB_offset + ParameterOffset - offset;
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
/* Build display for: Pad1 */
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
if (tree) {
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
proto_tree_add_text(tree, NullTVB, offset, pad1Count, "Pad1: %s", format_text(pd + offset, pad1Count));
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
offset += pad1Count; /* Skip Pad1 */
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
if (ParameterCount > 0) {
/* Build display for: Parameters */
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, SMB_offset + ParameterOffset, ParameterCount, "Parameters: %s", format_text(pd + SMB_offset + ParameterOffset, ParameterCount));
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += ParameterCount; /* Skip Parameters */
}
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
if (DataCount > 0 && offset < (SMB_offset + DataOffset)) {
int pad2Count = SMB_offset + DataOffset - offset;
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
/* Build display for: Pad2 */
if (tree) {
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
proto_tree_add_text(tree, NullTVB, offset, pad2Count, "Pad2: %s", format_text(pd + offset, pad2Count));
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
offset += pad2Count; /* Skip Pad2 */
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
if (DataCount > 0) {
/* Build display for: Data */
Data = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, SMB_offset + DataOffset, DataCount, "Data: %s", format_text(&pd[offset], DataCount));
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += DataCount; /* Skip Data */
}
}
if (dirn == 0) { /* Response(s) dissect code */
/* Pick up the last transact2 command and put it in the right places */
if (check_col(fd, COL_INFO)) {
col_add_fstr(fd, COL_INFO, "%s %s", decode_trans2_name(request_val -> last_transact2_command), "response");
}
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Total Parameter Count */
TotalParameterCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Total Parameter Count: %u", TotalParameterCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Total Parameter Count */
/* Build display for: Total Data Count */
TotalDataCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Total Data Count: %u", TotalDataCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Total Data Count */
/* Build display for: Reserved2 */
Reserved2 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved2: %u", Reserved2);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Reserved2 */
/* Build display for: Parameter Count */
ParameterCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Parameter Count: %u", ParameterCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Parameter Count */
/* Build display for: Parameter Offset */
ParameterOffset = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Parameter Offset: %u", ParameterOffset);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Parameter Offset */
/* Build display for: Parameter Displacement */
ParameterDisplacement = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Parameter Displacement: %u", ParameterDisplacement);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Parameter Displacement */
/* Build display for: Data Count */
DataCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Count: %u", DataCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Data Count */
/* Build display for: Data Offset */
DataOffset = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Offset: %u", DataOffset);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Data Offset */
/* Build display for: Data Displacement */
DataDisplacement = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Displacement: %u", DataDisplacement);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Data Displacement */
/* Build display for: Setup Count */
SetupCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Setup Count: %u", SetupCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 1; /* Skip Setup Count */
/* Build display for: Reserved3 */
Reserved3 = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Reserved3: %u", Reserved3);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 1; /* Skip Reserved3 */
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
if (SetupCount > 0) {
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
int i = SetupCount;
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
Setup = GSHORT(pd, offset);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
for (i = 1; i <= SetupCount; i++) {
Setup = GSHORT(pd, offset);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "Setup%i: %u", i, Setup);
}
offset += 2; /* Skip Setup */
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
}
}
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Byte Count (BCC) */
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
if (offset < (SMB_offset + ParameterOffset)) {
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
int pad1Count = SMB_offset + ParameterOffset - offset;
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
/* Build display for: Pad1 */
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
if (tree) {
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
proto_tree_add_text(tree, NullTVB, offset, pad1Count, "Pad1: %s", format_text(pd + offset, pad1Count));
}
offset += pad1Count; /* Skip Pad1 */
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
}
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
/* Build display for: Parameter */
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
if (ParameterCount > 0) {
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
if (tree) {
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, ParameterCount, "Parameter: %s", format_text(pd + SMB_offset + ParameterOffset, ParameterCount));
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
}
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
offset += ParameterCount; /* Skip Parameter */
}
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
if (DataCount > 0 && offset < (SMB_offset + DataOffset)) {
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
int pad2Count = SMB_offset + DataOffset - offset;
/* Build display for: Pad2 */
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
if (tree) {
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
proto_tree_add_text(tree, NullTVB, offset, pad2Count, "Pad2: %s", format_text(pd + offset, pad2Count));
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
}
offset += pad2Count; /* Skip Pad2 */
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
}
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
/* Build display for: Data */
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
if (DataCount > 0) {
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
if (tree) {
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, DataCount, "Data: %s", format_text(pd + SMB_offset + DataOffset, DataCount));
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
}
offset += DataCount; /* Skip Data */
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
}
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
}
Some more fixups. Decode NetServerEnum2 responses, removed those ugly wannings, and added start of general params decode. May all change drastically though. svn path=/trunk/; revision=1093
1999-11-22 10:30:22 +00:00
Correctly handle Interim responses to TRANSACTION requests. Move the declaration of routines exported from "packet-smb-mailslot.c" into a "packet-smb-mailslot.h" header file, and have modules that import those routines include "packet-smb-mailslot.h" rather than declaring the routines themselves; do the same for routines exported from "packet-smb-pipe.c". Make routines not exported static, and make routines that return a true/false return value "gboolean" rather than "guint32". svn path=/trunk/; revision=3146
2001-03-18 03:23:30 +00:00
static void
dissect_transact_params(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, int dirn, int DataOffset, int DataCount,
int ParameterOffset, int ParameterCount, int SetupAreaOffset,
int SetupCount, const char *TransactName)
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
{
char *TransactNameCopy;
Fixed the problem causing a SIGSEGV, and fixed problems with UNICODE strings in transact SMBs. Added decode of NetShareEnum transact request. Will have to clean that all up and use the decode engine when I get it done. Still more fix ups to be done, but the book is calling, and I have to write some stuff after an interview with LinuxCare. svn path=/trunk/; revision=1113
1999-11-26 06:27:22 +00:00
char *trans_type = NULL, *trans_cmd, *loc_of_slash = NULL;
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
int index;
Some more fixups. Decode NetServerEnum2 responses, removed those ugly wannings, and added start of general params decode. May all change drastically though. svn path=/trunk/; revision=1093
1999-11-22 10:30:22 +00:00
const gchar *Data;
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
Don't take strlen of TransactName if NULL. In fact, don't do *anything* and return if TransactName == NULL. svn path=/trunk/; revision=1431
2000-01-07 04:27:06 +00:00
if (!TransactName)
return;
Apply Jeroen Ruigrok van der Werven's patches ... svn path=/trunk/; revision=2699
2000-11-22 21:19:38 +00:00
TransactNameCopy = g_malloc(TransactName ? strlen(TransactName) + 1 : 1);
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
/* Should check for error here ... */
Apply Jeroen Ruigrok van der Werven's patches ... svn path=/trunk/; revision=2699
2000-11-22 21:19:38 +00:00
strcpy(TransactNameCopy, TransactName ? TransactName : "");
Fixed the problem causing a SIGSEGV, and fixed problems with UNICODE strings in transact SMBs. Added decode of NetShareEnum transact request. Will have to clean that all up and use the decode engine when I get it done. Still more fix ups to be done, but the book is calling, and I have to write some stuff after an interview with LinuxCare. svn path=/trunk/; revision=1113
1999-11-26 06:27:22 +00:00
if (TransactNameCopy[0] == '\\') {
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
trans_type = TransactNameCopy + 1; /* Skip the slash */
Apply Jeroen Ruigrok van der Werven's patches ... svn path=/trunk/; revision=2699
2000-11-22 21:19:38 +00:00
loc_of_slash = trans_type ? strchr(trans_type, '\\') : NULL;
Fixed the problem causing a SIGSEGV, and fixed problems with UNICODE strings in transact SMBs. Added decode of NetShareEnum transact request. Will have to clean that all up and use the decode engine when I get it done. Still more fix ups to be done, but the book is calling, and I have to write some stuff after an interview with LinuxCare. svn path=/trunk/; revision=1113
1999-11-26 06:27:22 +00:00
}
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
if (loc_of_slash) {
index = loc_of_slash - trans_type; /* Make it a real index */
trans_cmd = trans_type + index + 1;
trans_type[index] = '\0';
}
else
trans_cmd = NULL;
Fixed the problem causing a SIGSEGV, and fixed problems with UNICODE strings in transact SMBs. Added decode of NetShareEnum transact request. Will have to clean that all up and use the decode engine when I get it done. Still more fix ups to be done, but the book is calling, and I have to write some stuff after an interview with LinuxCare. svn path=/trunk/; revision=1113
1999-11-26 06:27:22 +00:00
if ((trans_cmd == NULL) ||
Apply Jeroen Ruigrok van der Werven's patches ... svn path=/trunk/; revision=2699
2000-11-22 21:19:38 +00:00
(((trans_type == NULL || strcmp(trans_type, "MAILSLOT") != 0) ||
Correctly handle Interim responses to TRANSACTION requests. Move the declaration of routines exported from "packet-smb-mailslot.c" into a "packet-smb-mailslot.h" header file, and have modules that import those routines include "packet-smb-mailslot.h" rather than declaring the routines themselves; do the same for routines exported from "packet-smb-pipe.c". Make routines not exported static, and make routines that return a true/false return value "gboolean" rather than "guint32". svn path=/trunk/; revision=3146
2001-03-18 03:23:30 +00:00
!dissect_mailslot_smb(pd, SetupAreaOffset, fd, parent, tree, si,
max_data, SMB_offset, errcode, dirn, trans_cmd,
SMB_offset + DataOffset, DataCount,
SMB_offset + ParameterOffset, ParameterCount)) &&
Apply Jeroen Ruigrok van der Werven's patches ... svn path=/trunk/; revision=2699
2000-11-22 21:19:38 +00:00
((trans_type == NULL || strcmp(trans_type, "PIPE") != 0) ||
Correctly handle Interim responses to TRANSACTION requests. Move the declaration of routines exported from "packet-smb-mailslot.c" into a "packet-smb-mailslot.h" header file, and have modules that import those routines include "packet-smb-mailslot.h" rather than declaring the routines themselves; do the same for routines exported from "packet-smb-pipe.c". Make routines not exported static, and make routines that return a true/false return value "gboolean" rather than "guint32". svn path=/trunk/; revision=3146
2001-03-18 03:23:30 +00:00
!dissect_pipe_smb(pd, offset, fd, parent, tree, si, max_data,
SMB_offset, errcode, dirn, trans_cmd, DataOffset,
DataCount, ParameterOffset, ParameterCount)))) {
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
if (ParameterCount > 0) {
/* Build display for: Parameters */
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, SMB_offset + ParameterOffset, ParameterCount, "Parameters: %s", format_text(pd + SMB_offset + ParameterOffset, ParameterCount));
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
}
offset = SMB_offset + ParameterOffset + ParameterCount; /* Skip Parameters */
}
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
if (DataCount > 0 && offset < (SMB_offset + DataOffset)) {
int pad2Count = SMB_offset + DataOffset - offset;
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
/* Build display for: Pad2 */
if (tree) {
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
proto_tree_add_text(tree, NullTVB, offset, pad2Count, "Pad2: %s", format_text(pd + offset, pad2Count));
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
}
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
offset += pad2Count; /* Skip Pad2 */
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
}
if (DataCount > 0) {
/* Build display for: Data */
Some more fixups. Decode NetServerEnum2 responses, removed those ugly wannings, and added start of general params decode. May all change drastically though. svn path=/trunk/; revision=1093
1999-11-22 10:30:22 +00:00
Data = pd + SMB_offset + DataOffset;
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, SMB_offset + DataOffset, DataCount, "Data: %s", format_text(pd + SMB_offset + DataOffset, DataCount));
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
}
offset += DataCount; /* Skip Data */
}
}
}
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
void
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
dissect_transact_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, int dirn)
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
{
proto_tree *Flags_tree;
proto_item *ti;
guint8 WordCount;
guint8 SetupCount;
guint8 Reserved3;
guint8 Reserved1;
guint8 MaxSetupCount;
guint32 Timeout;
guint16 TotalParameterCount;
guint16 TotalDataCount;
Some small fixes to get rid of compiler warnings svn path=/trunk/; revision=929
1999-10-26 21:30:11 +00:00
guint16 Setup = 0;
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
guint16 Reserved2;
guint16 ParameterOffset;
guint16 ParameterDisplacement;
guint16 ParameterCount;
guint16 MaxParameterCount;
guint16 MaxDataCount;
guint16 Flags;
guint16 DataOffset;
guint16 DataDisplacement;
guint16 DataCount;
guint16 ByteCount;
Fixed the problem causing a SIGSEGV, and fixed problems with UNICODE strings in transact SMBs. Added decode of NetShareEnum transact request. Will have to clean that all up and use the decode engine when I get it done. Still more fix ups to be done, but the book is calling, and I have to write some stuff after an interview with LinuxCare. svn path=/trunk/; revision=1113
1999-11-26 06:27:22 +00:00
int TNlen;
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
const char *TransactName;
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
conversation_t *conversation;
struct smb_request_key request_key, *new_request_key;
struct smb_request_val *request_val;
Jeff Foster's SMB Mailslot and Netlogin dissectors; he split "packet-smb.c" up into several files. svn path=/trunk/; revision=1629
2000-02-14 04:02:21 +00:00
guint16 SetupAreaOffset;
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
/*
* Find out what conversation this packet is part of
*/
conversation = find_conversation(&pi.src, &pi.dst, pi.ptype,
Support for conversations with "wildcard" destination addresses, from Jeff Foster. svn path=/trunk/; revision=2523
2000-10-21 05:52:28 +00:00
pi.srcport, pi.destport, 0);
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
if (conversation == NULL) { /* Create a new conversation */
conversation = conversation_new(&pi.src, &pi.dst, pi.ptype,
Support for conversations with "wildcard" destination addresses, from Jeff Foster. svn path=/trunk/; revision=2523
2000-10-21 05:52:28 +00:00
pi.srcport, pi.destport, NULL, 0);
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
}
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
si.conversation = conversation; /* Save this */
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
/*
* Check for and insert entry in request hash table if does not exist
*/
request_key.conversation = conversation->index;
request_key.mid = si.mid;
request_val = (struct smb_request_val *) g_hash_table_lookup(smb_request_hash, &request_key);
if (!request_val) { /* Create one */
new_request_key = g_mem_chunk_alloc(smb_request_keys);
new_request_key -> conversation = conversation -> index;
new_request_key -> mid = si.mid;
request_val = g_mem_chunk_alloc(smb_request_vals);
request_val -> mid = si.mid;
request_val -> last_transact_command = NULL;
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
request_val -> last_param_descrip = NULL;
request_val -> last_data_descrip = NULL;
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
g_hash_table_insert(smb_request_hash, new_request_key, request_val);
}
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
si.request_val = request_val; /* Save this for later */
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
if (dirn == 1) { /* Request(s) dissect code */
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
/* Build display for: Total Parameter Count */
TotalParameterCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Total Parameter Count: %u", TotalParameterCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Total Parameter Count */
/* Build display for: Total Data Count */
TotalDataCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Total Data Count: %u", TotalDataCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Total Data Count */
/* Build display for: Max Parameter Count */
MaxParameterCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Max Parameter Count: %u", MaxParameterCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Max Parameter Count */
/* Build display for: Max Data Count */
MaxDataCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Max Data Count: %u", MaxDataCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Max Data Count */
/* Build display for: Max Setup Count */
MaxSetupCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Max Setup Count: %u", MaxSetupCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 1; /* Skip Max Setup Count */
/* Build display for: Reserved1 */
Reserved1 = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Reserved1: %u", Reserved1);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 1; /* Skip Reserved1 */
/* Build display for: Flags */
Flags = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
ti = proto_tree_add_text(tree, NullTVB, offset, 2, "Flags: 0x%02x", Flags);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
Flags_tree = proto_item_add_subtree(ti, ett_smb_flags);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Flags_tree, NullTVB, offset, 2, "%s",
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
decode_boolean_bitfield(Flags, 0x01, 16, "Also disconnect TID", "Dont disconnect TID"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(Flags_tree, NullTVB, offset, 2, "%s",
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
decode_boolean_bitfield(Flags, 0x02, 16, "One way transaction", "Two way transaction"));
Correctly handle Interim responses to TRANSACTION requests. Move the declaration of routines exported from "packet-smb-mailslot.c" into a "packet-smb-mailslot.h" header file, and have modules that import those routines include "packet-smb-mailslot.h" rather than declaring the routines themselves; do the same for routines exported from "packet-smb-pipe.c". Make routines not exported static, and make routines that return a true/false return value "gboolean" rather than "guint32". svn path=/trunk/; revision=3146
2001-03-18 03:23:30 +00:00
}
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
offset += 2; /* Skip Flags */
/* Build display for: Timeout */
Timeout = GWORD(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 4, "Timeout: %u", Timeout);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 4; /* Skip Timeout */
/* Build display for: Reserved2 */
Reserved2 = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved2: %u", Reserved2);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Reserved2 */
/* Build display for: Parameter Count */
ParameterCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Parameter Count: %u", ParameterCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Parameter Count */
/* Build display for: Parameter Offset */
ParameterOffset = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Parameter Offset: %u", ParameterOffset);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Parameter Offset */
/* Build display for: Data Count */
DataCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Count: %u", DataCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Data Count */
/* Build display for: Data Offset */
DataOffset = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Offset: %u", DataOffset);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 2; /* Skip Data Offset */
/* Build display for: Setup Count */
SetupCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Setup Count: %u", SetupCount);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 1; /* Skip Setup Count */
/* Build display for: Reserved3 */
Reserved3 = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Reserved3: %u", Reserved3);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
}
offset += 1; /* Skip Reserved3 */
Jeff Foster's SMB Mailslot and Netlogin dissectors; he split "packet-smb.c" up into several files. svn path=/trunk/; revision=1629
2000-02-14 04:02:21 +00:00
SetupAreaOffset = offset;
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
/* Build display for: Setup */
if (SetupCount > 0) {
int i = SetupCount;
Setup = GSHORT(pd, offset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
for (i = 1; i <= SetupCount; i++) {
Setup = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Setup%i: %u", i, Setup);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
offset += 2; /* Skip Setup */
}
}
/* Build display for: Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
ByteCount = GSHORT(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Transact Name */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Fixed the problem causing a SIGSEGV, and fixed problems with UNICODE strings in transact SMBs. Added decode of NetShareEnum transact request. Will have to clean that all up and use the decode engine when I get it done. Still more fix ups to be done, but the book is calling, and I have to write some stuff after an interview with LinuxCare. svn path=/trunk/; revision=1113
1999-11-26 06:27:22 +00:00
/* Watch out for Unicode names */
if (si.unicode) {
if (offset % 2) offset++; /* Looks like a pad byte there sometimes */
TransactName = unicode_to_str(pd + offset, &TNlen);
TNlen += 2;
}
else {
TransactName = pd + offset;
TNlen = strlen(TransactName) + 1;
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
if (request_val -> last_transact_command) g_free(request_val -> last_transact_command);
request_val -> last_transact_command = g_malloc(strlen(TransactName) + 1);
if (request_val -> last_transact_command)
strcpy(request_val -> last_transact_command, TransactName);
if (check_col(fd, COL_INFO)) {
col_add_fstr(fd, COL_INFO, "%s %s", TransactName, (dirn ? "Request" : "Response"));
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, TNlen, "Transact Name: %s", TransactName);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
Fixed the problem causing a SIGSEGV, and fixed problems with UNICODE strings in transact SMBs. Added decode of NetShareEnum transact request. Will have to clean that all up and use the decode engine when I get it done. Still more fix ups to be done, but the book is calling, and I have to write some stuff after an interview with LinuxCare. svn path=/trunk/; revision=1113
1999-11-26 06:27:22 +00:00
offset += TNlen; /* Skip Transact Name */
if (si.unicode) offset += 2; /* There are two more extraneous bytes there*/
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
if (offset < (SMB_offset + ParameterOffset)) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
int pad1Count = SMB_offset + ParameterOffset - offset;
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
/* Build display for: Pad1 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
if (tree) {
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
proto_tree_add_text(tree, NullTVB, offset, pad1Count, "Pad1: %s", format_text(pd + offset, pad1Count));
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
offset += pad1Count; /* Skip Pad1 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
/* Let's see if we can decode this */
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
Jeff Foster's SMB Mailslot and Netlogin dissectors; he split "packet-smb.c" up into several files. svn path=/trunk/; revision=1629
2000-02-14 04:02:21 +00:00
dissect_transact_params(pd, offset, fd, parent, tree, si, max_data, SMB_offset, errcode, dirn, DataOffset, DataCount, ParameterOffset, ParameterCount, SetupAreaOffset, SetupCount, TransactName);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
if (dirn == 0) { /* Response(s) dissect code */
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
if (check_col(fd, COL_INFO)) {
Andreas Sikkema's patch to make the SMB dissector not blithely pass a null "request_val->last_transact_command" to "col_add_fstr()". svn path=/trunk/; revision=1738
2000-03-21 10:15:50 +00:00
if ( request_val -> last_transact_command )
col_add_fstr(fd, COL_INFO, "%s %s", request_val -> last_transact_command, "Response");
else col_add_fstr(fd, COL_INFO, "Response to unknown message");
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
/* Build display for: Word Count (WCT) */
WordCount = GBYTE(pd, offset);
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Word Count (WCT): %u", WordCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
offset += 1; /* Skip Word Count (WCT) */
Correctly handle Interim responses to TRANSACTION requests. Move the declaration of routines exported from "packet-smb-mailslot.c" into a "packet-smb-mailslot.h" header file, and have modules that import those routines include "packet-smb-mailslot.h" rather than declaring the routines themselves; do the same for routines exported from "packet-smb-pipe.c". Make routines not exported static, and make routines that return a true/false return value "gboolean" rather than "guint32". svn path=/trunk/; revision=3146
2001-03-18 03:23:30 +00:00
if (WordCount == 0) {
/* Interim response.
XXX - should we tag it as such? */
/* Build display for: Byte Count (BCC) */
ByteCount = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
}
offset += 2; /* Skip Byte Count (BCC) */
/* Dissect the interim response by showing the type of request to
which it's a reply. */
dissect_transact_params(pd, offset, fd, parent, tree, si, max_data,
SMB_offset, errcode, dirn, -1, -1, -1, -1, -1, -1,
si.request_val -> last_transact_command);
return;
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Total Parameter Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
TotalParameterCount = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Total Parameter Count: %u", TotalParameterCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Total Parameter Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Total Data Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
TotalDataCount = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Total Data Count: %u", TotalDataCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Total Data Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Reserved2 */
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Reserved2 = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Reserved2: %u", Reserved2);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Reserved2 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Parameter Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ParameterCount = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Parameter Count: %u", ParameterCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Parameter Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Parameter Offset */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ParameterOffset = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Parameter Offset: %u", ParameterOffset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Parameter Offset */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Parameter Displacement */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ParameterDisplacement = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Parameter Displacement: %u", ParameterDisplacement);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Parameter Displacement */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Data Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
DataCount = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Count: %u", DataCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Data Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Data Offset */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
DataOffset = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Offset: %u", DataOffset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Data Offset */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Data Displacement */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
DataDisplacement = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Data Displacement: %u", DataDisplacement);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Data Displacement */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Setup Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
SetupCount = GBYTE(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
if (tree) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Setup Count: %u", SetupCount);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Setup Count */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Jeff Foster's SMB Mailslot and Netlogin dissectors; he split "packet-smb.c" up into several files. svn path=/trunk/; revision=1629
2000-02-14 04:02:21 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Reserved3 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Reserved3 = GBYTE(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 1, "Reserved3: %u", Reserved3);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
Jeff Foster's SMB Mailslot and Netlogin dissectors; he split "packet-smb.c" up into several files. svn path=/trunk/; revision=1629
2000-02-14 04:02:21 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 1; /* Skip Reserved3 */
Jeff Foster's SMB Mailslot and Netlogin dissectors; he split "packet-smb.c" up into several files. svn path=/trunk/; revision=1629
2000-02-14 04:02:21 +00:00
SetupAreaOffset = offset;
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Setup */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
if (SetupCount > 0) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
int i = SetupCount;
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
Setup = GSHORT(pd, offset);
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
for (i = 1; i <= SetupCount; i++) {
Setup = GSHORT(pd, offset);
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
if (tree) {
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Setup%i: %u", i, Setup);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
}
offset += 2; /* Skip Setup */
}
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Fixed some more small problems and added support for decoding MS Windows Browser messages. Can decode host announcements now. Still need to decode more. Also need to break the new code out. I also have the Browse tree at the wrong location. Can I get at the parent of the tree somewhere, or do I have to pass it in as a variable? svn path=/trunk/; revision=1024
1999-11-14 02:42:03 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
ByteCount = GSHORT(pd, offset);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(tree, NullTVB, offset, 2, "Byte Count (BCC): %u", ByteCount);
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
offset += 2; /* Skip Byte Count (BCC) */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
/* Build display for: Pad1 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
if (offset < (SMB_offset + ParameterOffset)) {
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
int pad1Count = SMB_offset + ParameterOffset - offset;
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
/* Build display for: Pad1 */
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
if (tree) {
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
proto_tree_add_text(tree, NullTVB, offset, pad1Count, "Pad1: %s", format_text(pd + offset, pad1Count));
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
}
Assorted padding fixes from Mark Burton. svn path=/trunk/; revision=1999
2000-05-25 08:32:13 +00:00
offset += pad1Count; /* Skip Pad1 */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
}
Jeff Foster's SMB Mailslot and Netlogin dissectors; he split "packet-smb.c" up into several files. svn path=/trunk/; revision=1629
2000-02-14 04:02:21 +00:00
dissect_transact_params(pd, offset, fd, parent, tree, si, max_data, SMB_offset, errcode, dirn, DataOffset, DataCount, ParameterOffset, ParameterCount, SetupAreaOffset, SetupCount, si.request_val -> last_transact_command);
Beginning to handle LANMAN in a data-driven way, with tables etc. Next will handle responses, and data returned ... svn path=/trunk/; revision=1283
1999-12-10 11:53:18 +00:00
}
}
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
Added support or NetServerEnum2 LANMAN messages. I still have compile warnings, but I am too tired to chase them down. Have also fixed a number of problems. Next thing to add is a general engine that can decode Transact messages as they can be decode from the descriptors in the Parameters area, and I can feed in a list of names where we know what a structure looks like, otherwise we use made up names. svn path=/trunk/; revision=1079
1999-11-20 13:48:26 +00:00
Fixed the problem causing a SIGSEGV, and fixed problems with UNICODE strings in transact SMBs. Added decode of NetShareEnum transact request. Will have to clean that all up and use the decode engine when I get it done. Still more fix ups to be done, but the book is calling, and I have to write some stuff after an interview with LinuxCare. svn path=/trunk/; revision=1113
1999-11-26 06:27:22 +00:00
Jeff Foster's SMB Mailslot and Netlogin dissectors; he split "packet-smb.c" up into several files. svn path=/trunk/; revision=1629
2000-02-14 04:02:21 +00:00
void (*dissect[256])(const u_char *, int, frame_data *, proto_tree *, proto_tree *, struct smb_info, int, int, int, int) = {
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
dissect_createdir_smb, /* unknown SMB 0x00 */
dissect_deletedir_smb, /* unknown SMB 0x01 */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
dissect_unknown_smb, /* SMBopen open a file */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
dissect_create_file_smb, /* SMBcreate create a file */
dissect_close_smb, /* SMBclose close a file */
dissect_flush_file_smb, /* SMBflush flush a file */
dissect_delete_file_smb, /* SMBunlink delete a file */
dissect_rename_file_smb, /* SMBmv rename a file */
dissect_get_file_attr_smb,/* SMBgetatr get file attributes */
dissect_set_file_attr_smb,/* SMBsetatr set file attributes */
dissect_read_file_smb, /* SMBread read from a file */
dissect_write_file_smb, /* SMBwrite write to a file */
dissect_lock_bytes_smb, /* SMBlock lock a byte range */
dissect_unlock_bytes_smb, /* SMBunlock unlock a byte range */
dissect_create_temporary_file_smb,/* SMBctemp create a temporary file */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
dissect_unknown_smb, /* SMBmknew make a new file */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
dissect_checkdir_smb, /* SMBchkpth check a directory path */
dissect_process_exit_smb, /* SMBexit process exit */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
dissect_unknown_smb, /* SMBlseek seek */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
dissect_lock_and_read_smb,/* SMBlockread Lock a range and read it */
dissect_write_and_unlock_smb,/* SMBwriteunlock Unlock a range and then write */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
dissect_unknown_smb, /* unknown SMB 0x15 */
dissect_unknown_smb, /* unknown SMB 0x16 */
dissect_unknown_smb, /* unknown SMB 0x17 */
dissect_unknown_smb, /* unknown SMB 0x18 */
dissect_unknown_smb, /* unknown SMB 0x19 */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
dissect_read_raw_smb, /* SMBreadBraw read block raw */
dissect_read_mpx_smb, /* SMBreadBmpx read block multiplexed */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
dissect_unknown_smb, /* SMBreadBs read block (secondary response) */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
dissect_write_raw_smb, /* SMBwriteBraw write block raw */
dissect_write_mpx_smb, /* SMBwriteBmpx write block multiplexed */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
dissect_unknown_smb, /* SMBwriteBs write block (secondary request) */
dissect_unknown_smb, /* SMBwriteC write complete response */
dissect_unknown_smb, /* unknown SMB 0x21 */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
dissect_set_info2_smb, /* SMBsetattrE set file attributes expanded */
dissect_query_info2_smb, /* SMBgetattrE get file attributes expanded */
dissect_locking_andx_smb, /* SMBlockingX lock/unlock byte ranges and X */
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
dissect_transact_smb, /* SMBtrans transaction - name, bytes in/out */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
dissect_unknown_smb, /* SMBtranss transaction (secondary request/response) */
dissect_unknown_smb, /* SMBioctl IOCTL */
dissect_unknown_smb, /* SMBioctls IOCTL (secondary request/response) */
dissect_unknown_smb, /* SMBcopy copy */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
dissect_move_smb, /* SMBmove move */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
dissect_unknown_smb, /* SMBecho echo */
dissect_unknown_smb, /* SMBwriteclose write a file and then close it */
Some more updates. Now have open_andx decoded mostly ... Still some funnies and some difficult things. I should not have blown away any of Gilbert's stuff this time around ... Hope not anyway ... svn path=/trunk/; revision=357
1999-07-12 14:26:16 +00:00
dissect_open_andx_smb, /* SMBopenX open and X */
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
dissect_read_andx_smb, /* SMBreadX read and X */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
dissect_unknown_smb, /* SMBwriteX write and X */
dissect_unknown_smb, /* unknown SMB 0x30 */
dissect_unknown_smb, /* unknown SMB 0x31 */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
dissect_transact2_smb, /* unknown SMB 0x32 */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
dissect_unknown_smb, /* unknown SMB 0x33 */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
dissect_find_close2_smb, /* unknown SMB 0x34 */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
dissect_unknown_smb, /* unknown SMB 0x35 */
dissect_unknown_smb, /* unknown SMB 0x36 */
dissect_unknown_smb, /* unknown SMB 0x37 */
dissect_unknown_smb, /* unknown SMB 0x38 */
dissect_unknown_smb, /* unknown SMB 0x39 */
dissect_unknown_smb, /* unknown SMB 0x3a */
dissect_unknown_smb, /* unknown SMB 0x3b */
dissect_unknown_smb, /* unknown SMB 0x3c */
dissect_unknown_smb, /* unknown SMB 0x3d */
dissect_unknown_smb, /* unknown SMB 0x3e */
dissect_unknown_smb, /* unknown SMB 0x3f */
dissect_unknown_smb, /* unknown SMB 0x40 */
dissect_unknown_smb, /* unknown SMB 0x41 */
dissect_unknown_smb, /* unknown SMB 0x42 */
dissect_unknown_smb, /* unknown SMB 0x43 */
dissect_unknown_smb, /* unknown SMB 0x44 */
dissect_unknown_smb, /* unknown SMB 0x45 */
dissect_unknown_smb, /* unknown SMB 0x46 */
dissect_unknown_smb, /* unknown SMB 0x47 */
dissect_unknown_smb, /* unknown SMB 0x48 */
dissect_unknown_smb, /* unknown SMB 0x49 */
dissect_unknown_smb, /* unknown SMB 0x4a */
dissect_unknown_smb, /* unknown SMB 0x4b */
dissect_unknown_smb, /* unknown SMB 0x4c */
dissect_unknown_smb, /* unknown SMB 0x4d */
dissect_unknown_smb, /* unknown SMB 0x4e */
dissect_unknown_smb, /* unknown SMB 0x4f */
dissect_unknown_smb, /* unknown SMB 0x50 */
dissect_unknown_smb, /* unknown SMB 0x51 */
dissect_unknown_smb, /* unknown SMB 0x52 */
dissect_unknown_smb, /* unknown SMB 0x53 */
dissect_unknown_smb, /* unknown SMB 0x54 */
dissect_unknown_smb, /* unknown SMB 0x55 */
dissect_unknown_smb, /* unknown SMB 0x56 */
dissect_unknown_smb, /* unknown SMB 0x57 */
dissect_unknown_smb, /* unknown SMB 0x58 */
dissect_unknown_smb, /* unknown SMB 0x59 */
dissect_unknown_smb, /* unknown SMB 0x5a */
dissect_unknown_smb, /* unknown SMB 0x5b */
dissect_unknown_smb, /* unknown SMB 0x5c */
dissect_unknown_smb, /* unknown SMB 0x5d */
dissect_unknown_smb, /* unknown SMB 0x5e */
dissect_unknown_smb, /* unknown SMB 0x5f */
dissect_unknown_smb, /* unknown SMB 0x60 */
dissect_unknown_smb, /* unknown SMB 0x61 */
dissect_unknown_smb, /* unknown SMB 0x62 */
dissect_unknown_smb, /* unknown SMB 0x63 */
dissect_unknown_smb, /* unknown SMB 0x64 */
dissect_unknown_smb, /* unknown SMB 0x65 */
dissect_unknown_smb, /* unknown SMB 0x66 */
dissect_unknown_smb, /* unknown SMB 0x67 */
dissect_unknown_smb, /* unknown SMB 0x68 */
dissect_unknown_smb, /* unknown SMB 0x69 */
dissect_unknown_smb, /* unknown SMB 0x6a */
dissect_unknown_smb, /* unknown SMB 0x6b */
dissect_unknown_smb, /* unknown SMB 0x6c */
dissect_unknown_smb, /* unknown SMB 0x6d */
dissect_unknown_smb, /* unknown SMB 0x6e */
dissect_unknown_smb, /* unknown SMB 0x6f */
Added some more, auto-generated decoding to packet-smb.c. Hope it is all OK. This is getting interesting. svn path=/trunk/; revision=334
1999-06-28 10:57:57 +00:00
dissect_treecon_smb, /* SMBtcon tree connect */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
dissect_tdis_smb, /* SMBtdis tree disconnect */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
dissect_negprot_smb, /* SMBnegprot negotiate a protocol */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
dissect_ssetup_andx_smb, /* SMBsesssetupX Session Set Up & X (including User Logon) */
dissect_logoff_andx_smb, /* SMBlogof Logoff & X */
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
dissect_tcon_andx_smb, /* SMBtconX tree connect and X */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
dissect_unknown_smb, /* unknown SMB 0x76 */
dissect_unknown_smb, /* unknown SMB 0x77 */
dissect_unknown_smb, /* unknown SMB 0x78 */
dissect_unknown_smb, /* unknown SMB 0x79 */
dissect_unknown_smb, /* unknown SMB 0x7a */
dissect_unknown_smb, /* unknown SMB 0x7b */
dissect_unknown_smb, /* unknown SMB 0x7c */
dissect_unknown_smb, /* unknown SMB 0x7d */
dissect_unknown_smb, /* unknown SMB 0x7e */
dissect_unknown_smb, /* unknown SMB 0x7f */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
dissect_get_disk_attr_smb,/* SMBdskattr get disk attributes */
dissect_search_dir_smb, /* SMBsearch search a directory */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
dissect_unknown_smb, /* SMBffirst find first */
dissect_unknown_smb, /* SMBfunique find unique */
dissect_unknown_smb, /* SMBfclose find close */
dissect_unknown_smb, /* unknown SMB 0x85 */
dissect_unknown_smb, /* unknown SMB 0x86 */
dissect_unknown_smb, /* unknown SMB 0x87 */
dissect_unknown_smb, /* unknown SMB 0x88 */
dissect_unknown_smb, /* unknown SMB 0x89 */
dissect_unknown_smb, /* unknown SMB 0x8a */
dissect_unknown_smb, /* unknown SMB 0x8b */
dissect_unknown_smb, /* unknown SMB 0x8c */
dissect_unknown_smb, /* unknown SMB 0x8d */
dissect_unknown_smb, /* unknown SMB 0x8e */
dissect_unknown_smb, /* unknown SMB 0x8f */
dissect_unknown_smb, /* unknown SMB 0x90 */
dissect_unknown_smb, /* unknown SMB 0x91 */
dissect_unknown_smb, /* unknown SMB 0x92 */
dissect_unknown_smb, /* unknown SMB 0x93 */
dissect_unknown_smb, /* unknown SMB 0x94 */
dissect_unknown_smb, /* unknown SMB 0x95 */
dissect_unknown_smb, /* unknown SMB 0x96 */
dissect_unknown_smb, /* unknown SMB 0x97 */
dissect_unknown_smb, /* unknown SMB 0x98 */
dissect_unknown_smb, /* unknown SMB 0x99 */
dissect_unknown_smb, /* unknown SMB 0x9a */
dissect_unknown_smb, /* unknown SMB 0x9b */
dissect_unknown_smb, /* unknown SMB 0x9c */
dissect_unknown_smb, /* unknown SMB 0x9d */
dissect_unknown_smb, /* unknown SMB 0x9e */
dissect_unknown_smb, /* unknown SMB 0x9f */
dissect_unknown_smb, /* unknown SMB 0xa0 */
dissect_unknown_smb, /* unknown SMB 0xa1 */
dissect_unknown_smb, /* unknown SMB 0xa2 */
dissect_unknown_smb, /* unknown SMB 0xa3 */
dissect_unknown_smb, /* unknown SMB 0xa4 */
dissect_unknown_smb, /* unknown SMB 0xa5 */
dissect_unknown_smb, /* unknown SMB 0xa6 */
dissect_unknown_smb, /* unknown SMB 0xa7 */
dissect_unknown_smb, /* unknown SMB 0xa8 */
dissect_unknown_smb, /* unknown SMB 0xa9 */
dissect_unknown_smb, /* unknown SMB 0xaa */
dissect_unknown_smb, /* unknown SMB 0xab */
dissect_unknown_smb, /* unknown SMB 0xac */
dissect_unknown_smb, /* unknown SMB 0xad */
dissect_unknown_smb, /* unknown SMB 0xae */
dissect_unknown_smb, /* unknown SMB 0xaf */
dissect_unknown_smb, /* unknown SMB 0xb0 */
dissect_unknown_smb, /* unknown SMB 0xb1 */
dissect_unknown_smb, /* unknown SMB 0xb2 */
dissect_unknown_smb, /* unknown SMB 0xb3 */
dissect_unknown_smb, /* unknown SMB 0xb4 */
dissect_unknown_smb, /* unknown SMB 0xb5 */
dissect_unknown_smb, /* unknown SMB 0xb6 */
dissect_unknown_smb, /* unknown SMB 0xb7 */
dissect_unknown_smb, /* unknown SMB 0xb8 */
dissect_unknown_smb, /* unknown SMB 0xb9 */
dissect_unknown_smb, /* unknown SMB 0xba */
dissect_unknown_smb, /* unknown SMB 0xbb */
dissect_unknown_smb, /* unknown SMB 0xbc */
dissect_unknown_smb, /* unknown SMB 0xbd */
dissect_unknown_smb, /* unknown SMB 0xbe */
dissect_unknown_smb, /* unknown SMB 0xbf */
dissect_unknown_smb, /* SMBsplopen open a print spool file */
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
dissect_write_print_file_smb,/* SMBsplwr write to a print spool file */
dissect_close_print_file_smb,/* SMBsplclose close a print spool file */
dissect_get_print_queue_smb, /* SMBsplretq return print queue */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
dissect_unknown_smb, /* unknown SMB 0xc4 */
dissect_unknown_smb, /* unknown SMB 0xc5 */
dissect_unknown_smb, /* unknown SMB 0xc6 */
dissect_unknown_smb, /* unknown SMB 0xc7 */
dissect_unknown_smb, /* unknown SMB 0xc8 */
dissect_unknown_smb, /* unknown SMB 0xc9 */
dissect_unknown_smb, /* unknown SMB 0xca */
dissect_unknown_smb, /* unknown SMB 0xcb */
dissect_unknown_smb, /* unknown SMB 0xcc */
dissect_unknown_smb, /* unknown SMB 0xcd */
dissect_unknown_smb, /* unknown SMB 0xce */
dissect_unknown_smb, /* unknown SMB 0xcf */
dissect_unknown_smb, /* SMBsends send a single block message */
dissect_unknown_smb, /* SMBsendb send a broadcast message */
dissect_unknown_smb, /* SMBfwdname forward user name */
dissect_unknown_smb, /* SMBcancelf cancel forward */
dissect_unknown_smb, /* SMBgetmac get a machine name */
dissect_unknown_smb, /* SMBsendstrt send start of multi-block message */
dissect_unknown_smb, /* SMBsendend send end of multi-block message */
dissect_unknown_smb, /* SMBsendtxt send text of multi-block message */
dissect_unknown_smb, /* unknown SMB 0xd8 */
dissect_unknown_smb, /* unknown SMB 0xd9 */
dissect_unknown_smb, /* unknown SMB 0xda */
dissect_unknown_smb, /* unknown SMB 0xdb */
dissect_unknown_smb, /* unknown SMB 0xdc */
dissect_unknown_smb, /* unknown SMB 0xdd */
dissect_unknown_smb, /* unknown SMB 0xde */
dissect_unknown_smb, /* unknown SMB 0xdf */
dissect_unknown_smb, /* unknown SMB 0xe0 */
dissect_unknown_smb, /* unknown SMB 0xe1 */
dissect_unknown_smb, /* unknown SMB 0xe2 */
dissect_unknown_smb, /* unknown SMB 0xe3 */
dissect_unknown_smb, /* unknown SMB 0xe4 */
dissect_unknown_smb, /* unknown SMB 0xe5 */
dissect_unknown_smb, /* unknown SMB 0xe6 */
dissect_unknown_smb, /* unknown SMB 0xe7 */
dissect_unknown_smb, /* unknown SMB 0xe8 */
dissect_unknown_smb, /* unknown SMB 0xe9 */
dissect_unknown_smb, /* unknown SMB 0xea */
dissect_unknown_smb, /* unknown SMB 0xeb */
dissect_unknown_smb, /* unknown SMB 0xec */
dissect_unknown_smb, /* unknown SMB 0xed */
dissect_unknown_smb, /* unknown SMB 0xee */
dissect_unknown_smb, /* unknown SMB 0xef */
dissect_unknown_smb, /* unknown SMB 0xf0 */
dissect_unknown_smb, /* unknown SMB 0xf1 */
dissect_unknown_smb, /* unknown SMB 0xf2 */
dissect_unknown_smb, /* unknown SMB 0xf3 */
dissect_unknown_smb, /* unknown SMB 0xf4 */
dissect_unknown_smb, /* unknown SMB 0xf5 */
dissect_unknown_smb, /* unknown SMB 0xf6 */
dissect_unknown_smb, /* unknown SMB 0xf7 */
dissect_unknown_smb, /* unknown SMB 0xf8 */
dissect_unknown_smb, /* unknown SMB 0xf9 */
dissect_unknown_smb, /* unknown SMB 0xfa */
dissect_unknown_smb, /* unknown SMB 0xfb */
dissect_unknown_smb, /* unknown SMB 0xfc */
dissect_unknown_smb, /* unknown SMB 0xfd */
dissect_unknown_smb, /* SMBinvalid invalid command */
dissect_unknown_smb /* unknown SMB 0xff */
};
static const value_string errcls_types[] = {
{ SMB_SUCCESS, "Success"},
{ SMB_ERRDOS, "DOS Error"},
{ SMB_ERRSRV, "Server Error"},
{ SMB_ERRHRD, "Hardware Error"},
{ SMB_ERRCMD, "Command Error - Not an SMB format command"},
Ensure that all value_string arrays end in {0, NULL}. Dissectors got away with not terminating their arrays because they knew the limits of the value used to look up strings in the value_string array, but the dfilter_expr_dlg does not know these limits and must rely on the terminating {0, NULL} record. Also, in SNA fixed a bug in which a field should have been defined as FT_UINT8 but was defined as FT_BOOLEAN. In WTP, fixed a value string which had duplicate keys. svn path=/trunk/; revision=2817
2001-01-03 16:41:08 +00:00
{ 0, NULL }
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
};
char *decode_smb_name(unsigned char cmd)
{
return(SMB_names[cmd]);
}
static const value_string DOS_errors[] = {
{SMBE_badfunc, "Invalid function (or system call)"},
{SMBE_badfile, "File not found (pathname error)"},
{SMBE_badpath, "Directory not found"},
{SMBE_nofids, "Too many open files"},
{SMBE_noaccess, "Access denied"},
{SMBE_badfid, "Invalid fid"},
{SMBE_nomem, "Out of memory"},
{SMBE_badmem, "Invalid memory block address"},
{SMBE_badenv, "Invalid environment"},
{SMBE_badaccess, "Invalid open mode"},
{SMBE_baddata, "Invalid data (only from ioctl call)"},
{SMBE_res, "Reserved error code?"},
{SMBE_baddrive, "Invalid drive"},
{SMBE_remcd, "Attempt to delete current directory"},
{SMBE_diffdevice, "Rename/move across different filesystems"},
{SMBE_nofiles, "no more files found in file search"},
{SMBE_badshare, "Share mode on file conflict with open mode"},
{SMBE_lock, "Lock request conflicts with existing lock"},
{SMBE_unsup, "Request unsupported, returned by Win 95"},
Added a new error code I just found ... no such share. svn path=/trunk/; revision=2956
2001-01-29 08:14:42 +00:00
{SMBE_nosuchshare, "Requested share does not exist"},
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
{SMBE_filexists, "File in operation already exists"},
{SMBE_cannotopen, "Cannot open the file specified"},
{SMBE_unknownlevel, "Unknown level??"},
{SMBE_badpipe, "Named pipe invalid"},
{SMBE_pipebusy, "All instances of pipe are busy"},
{SMBE_pipeclosing, "Named pipe close in progress"},
{SMBE_notconnected, "No process on other end of named pipe"},
{SMBE_moredata, "More data to be returned"},
{SMBE_baddirectory, "Invalid directory name in a path."},
{SMBE_eas_didnt_fit, "Extended attributes didn't fit"},
{SMBE_eas_nsup, "Extended attributes not supported"},
{SMBE_notify_buf_small, "Buffer too small to return change notify."},
{SMBE_unknownipc, "Unknown IPC Operation"},
{SMBE_noipc, "Don't support ipc"},
Ensure that all value_string arrays end in {0, NULL}. Dissectors got away with not terminating their arrays because they knew the limits of the value used to look up strings in the value_string array, but the dfilter_expr_dlg does not know these limits and must rely on the terminating {0, NULL} record. Also, in SNA fixed a bug in which a field should have been defined as FT_UINT8 but was defined as FT_BOOLEAN. In WTP, fixed a value string which had duplicate keys. svn path=/trunk/; revision=2817
2001-01-03 16:41:08 +00:00
{0, NULL}
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
};
/* Error codes for the ERRSRV class */
static const value_string SRV_errors[] = {
{SMBE_error, "Non specific error code"},
{SMBE_badpw, "Bad password"},
{SMBE_badtype, "Reserved"},
{SMBE_access, "No permissions to perform the requested operation"},
{SMBE_invnid, "TID invalid"},
A bunch of fixes for SMB decode. 1. Fix some silly errors. 2. Dont decode beyond Word Count if errcode > 0 3. Decode a bunch mode SMBs Next is to keep state so we can do a better job ... svn path=/trunk/; revision=758
1999-10-03 01:14:33 +00:00
{SMBE_invnetname, "Invalid network name. Service not found"},
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
{SMBE_invdevice, "Invalid device"},
{SMBE_unknownsmb, "Unknown SMB, from NT 3.5 response"},
{SMBE_qfull, "Print queue full"},
{SMBE_qtoobig, "Queued item too big"},
Add some SMB codes and error codes from the "draft-leach-cifs-v1-spec-01.txt" CIFS Internet draft. svn path=/trunk/; revision=274
1999-05-11 07:22:31 +00:00
{SMBE_qeof, "EOF on print queue dump"},
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
{SMBE_invpfid, "Invalid print file in smb_fid"},
{SMBE_smbcmd, "Unrecognised command"},
{SMBE_srverror, "SMB server internal error"},
{SMBE_filespecs, "Fid and pathname invalid combination"},
{SMBE_badlink, "Bad link in request ???"},
{SMBE_badpermits, "Access specified for a file is not valid"},
{SMBE_badpid, "Bad process id in request"},
{SMBE_setattrmode, "Attribute mode invalid"},
{SMBE_paused, "Message server paused"},
{SMBE_msgoff, "Not receiving messages"},
{SMBE_noroom, "No room for message"},
{SMBE_rmuns, "Too many remote usernames"},
{SMBE_timeout, "Operation timed out"},
{SMBE_noresource, "No resources currently available for request."},
{SMBE_toomanyuids, "Too many userids"},
{SMBE_baduid, "Bad userid"},
{SMBE_useMPX, "Temporarily unable to use raw mode, use MPX mode"},
{SMBE_useSTD, "Temporarily unable to use raw mode, use standard mode"},
{SMBE_contMPX, "Resume MPX mode"},
{SMBE_badPW, "Bad Password???"},
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
{SMBE_nosupport, "Operation not supported"},
Ensure that all value_string arrays end in {0, NULL}. Dissectors got away with not terminating their arrays because they knew the limits of the value used to look up strings in the value_string array, but the dfilter_expr_dlg does not know these limits and must rely on the terminating {0, NULL} record. Also, in SNA fixed a bug in which a field should have been defined as FT_UINT8 but was defined as FT_BOOLEAN. In WTP, fixed a value string which had duplicate keys. svn path=/trunk/; revision=2817
2001-01-03 16:41:08 +00:00
{ 0, NULL}
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
};
/* Error codes for the ERRHRD class */
static const value_string HRD_errors[] = {
{SMBE_nowrite, "read only media"},
{SMBE_badunit, "Unknown device"},
{SMBE_notready, "Drive not ready"},
{SMBE_badcmd, "Unknown command"},
{SMBE_data, "Data (CRC) error"},
{SMBE_badreq, "Bad request structure length"},
{SMBE_seek, "Seek error???"},
{SMBE_badmedia, "Bad media???"},
{SMBE_badsector, "Bad sector???"},
{SMBE_nopaper, "No paper in printer???"},
{SMBE_write, "Write error???"},
{SMBE_read, "Read error???"},
{SMBE_general, "General error???"},
Add some SMB codes and error codes from the "draft-leach-cifs-v1-spec-01.txt" CIFS Internet draft. svn path=/trunk/; revision=274
1999-05-11 07:22:31 +00:00
{SMBE_badshare, "A open conflicts with an existing open"},
{SMBE_lock, "Lock/unlock error"},
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
{SMBE_wrongdisk, "Wrong disk???"},
{SMBE_FCBunavail, "FCB unavailable???"},
{SMBE_sharebufexc, "Share buffer excluded???"},
{SMBE_diskfull, "Disk full???"},
Ensure that all value_string arrays end in {0, NULL}. Dissectors got away with not terminating their arrays because they knew the limits of the value used to look up strings in the value_string array, but the dfilter_expr_dlg does not know these limits and must rely on the terminating {0, NULL} record. Also, in SNA fixed a bug in which a field should have been defined as FT_UINT8 but was defined as FT_BOOLEAN. In WTP, fixed a value string which had duplicate keys. svn path=/trunk/; revision=2817
2001-01-03 16:41:08 +00:00
{0, NULL}
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
};
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
char *decode_smb_error(guint8 errcls, guint16 errcode)
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
{
switch (errcls) {
case SMB_SUCCESS:
return("No Error"); /* No error ??? */
break;
case SMB_ERRDOS:
return(val_to_str(errcode, DOS_errors, "Unknown DOS error (%x)"));
break;
case SMB_ERRSRV:
return(val_to_str(errcode, SRV_errors, "Unknown SRV error (%x)"));
break;
case SMB_ERRHRD:
Add some SMB codes and error codes from the "draft-leach-cifs-v1-spec-01.txt" CIFS Internet draft. svn path=/trunk/; revision=274
1999-05-11 07:22:31 +00:00
return(val_to_str(errcode, HRD_errors, "Unknown HRD error (%x)"));
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
break;
default:
return("Unknown error class!");
}
}
#define SMB_FLAGS_DIRN 0x80
void
dissect_smb(const u_char *pd, int offset, frame_data *fd, proto_tree *tree, int max_data)
{
Decode the "flags2" field in the SMB header. Squelch another "variable may be used without being initialized" complaint (also due to insufficiently sophisticated dataflow analysis by EGCS 1.1), and a number of "unused variable" complaints, as well as "assigning a 'const XXX *' to an 'XXX *'" complaints. svn path=/trunk/; revision=266
1999-05-10 20:30:27 +00:00
proto_tree *smb_tree = tree, *flags_tree, *flags2_tree;
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
proto_item *ti, *tf;
guint8 cmd, errcls, errcode1, flags;
Decode the "flags2" field in the SMB header. Squelch another "variable may be used without being initialized" complaint (also due to insufficiently sophisticated dataflow analysis by EGCS 1.1), and a number of "unused variable" complaints, as well as "assigning a 'const XXX *' to an 'XXX *'" complaints. svn path=/trunk/; revision=266
1999-05-10 20:30:27 +00:00
guint16 flags2, errcode, tid, pid, uid, mid;
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
guint32 status;
Big bunch of fixes to packet-smb.c for things I need. Also added first pass of state keeping. I am using glib's hash functions. Modelled after packet-ncp.c. We will need to standardize the <proto>_init_protocol functions called in file.c at some stage ... I will have a couple of more goes at the state keeping before I am finished. At the moment, the infrastructure is there but I do nothing with it. svn path=/trunk/; revision=798
1999-10-10 11:50:45 +00:00
int SMB_offset = offset;
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
struct smb_info si;
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Add the "Edit:Protocols..." feature which currently only implements the following: It is now possible to enable/disable a particular protocol decoding (i.e. the protocol dissector is void or not). When a protocol is disabled, it is displayed as Data and of course, all linked sub-protocols are disabled as well. Disabling a protocol could be interesting: - in case of buggy dissectors - in case of wrong heuristics - for performance reasons - to decode the data as another protocol (TODO) Currently (if I am not wrong), all dissectors but NFS can be disabled (and dissectors that do not register protocols :-) I do not like the way the RPC sub-dissectors are disabled (in the sub-dissectors) since this could be done in the RPC dissector itself, knowing the sub-protocol hfinfo entry (this is why, I've not modified the NFS one yet). Two functions are added in proto.c : gboolean proto_is_protocol_enabled(int n); void proto_set_decoding(int n, gboolean enabled); and two MACROs which can be used in dissectors: OLD_CHECK_DISPLAY_AS_DATA(index, pd, offset, fd, tree) CHECK_DISPLAY_AS_DATA(index, tvb, pinfo, tree) See also the XXX in proto_dlg.c and proto.c around the new functions. svn path=/trunk/; revision=2267
2000-08-13 14:09:15 +00:00
OLD_CHECK_DISPLAY_AS_DATA(proto_smb, pd, offset, fd, tree);
Fixed the problem causing a SIGSEGV, and fixed problems with UNICODE strings in transact SMBs. Added decode of NetShareEnum transact request. Will have to clean that all up and use the decode engine when I get it done. Still more fix ups to be done, but the book is calling, and I have to write some stuff after an interview with LinuxCare. svn path=/trunk/; revision=1113
1999-11-26 06:27:22 +00:00
si.unicode = 0;
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
cmd = pd[offset + SMB_hdr_com_offset];
if (check_col(fd, COL_PROTOCOL))
For each column, have both a buffer into which strings for that column can be put, and a pointer to the string for the column, which might or might not point to that buffer. Add a routine "col_set_str()", which sets the string for the column to the string passed to it as an argument; it should only be handed a static string (a string constant would be ideal). It doesn't do any copying, so it's faster than "col_add_str()". Make the routines that append to columns check whether the pointer to the string for the column points to the buffer for the column and, if not, copy the string for the column to the buffer for the column so that you can append to it (so you can use "col_set_str()" and then use "col_append_str()" or "col_append_fstr()"). Convert a bunch of "col_add_str()" calls that take a string constant as an argument to "col_set_str()" calls. Convert some "col_add_fstr()" calls that take a string constant as the only argument - i.e., the format string doesn't have any "%" slots into which to put strings for subsequent arguments to "col_set_str()" calls (those calls are just like "col_add_str()" calls). Replace an END_OF_FRAME reference in a tvbuffified dissector with a "tvb_length(tvb)" call. svn path=/trunk/; revision=2670
2000-11-19 08:54:37 +00:00
col_set_str(fd, COL_PROTOCOL, "SMB");
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
/* Hmmm, poor coding here ... Also, should check the type */
if (check_col(fd, COL_INFO)) {
col_add_fstr(fd, COL_INFO, "%s %s", decode_smb_name(cmd), (pi.match_port == pi.destport)? "Request" : "Response");
}
if (tree) {
Add routines for adding items to a protocol tree that take arguments of a particular type, rather than taking a varargs list, along the lines of the "proto_tree_add_XXX_format()" routines. Replace most calls to "proto_tree_add_item()" and "proto_tree_add_item_hidden()" with calls to those routines. Rename "proto_tree_add_item()" and "proto_tree_add_item_hidden()" to "proto_tree_add_item_old()" and "proto_tree_add_item_hidden_old()", and add new "proto_tree_add_item()" and "proto_tree_add_item_hidden()" routines that don't take the item to be added as an argument - instead, they fetch the argument from the packet whose tvbuff was handed to them, from the offset handed to them. svn path=/trunk/; revision=2031
2000-05-31 05:09:07 +00:00
ti = proto_tree_add_item(tree, proto_smb, NullTVB, offset, END_OF_FRAME, FALSE);
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
smb_tree = proto_item_add_subtree(ti, ett_smb);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
/* 0xFFSMB is actually a 1 byte msg type and 3 byte server
* component ... SMB is only one used
*/
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(smb_tree, NullTVB, offset, 1, "Message Type: 0xFF");
proto_tree_add_text(smb_tree, NullTVB, offset+1, 3, "Server Component: SMB");
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
}
offset += 4; /* Skip the marker */
if (tree) {
A small set of patches to fix one small problem and start working on the filtering in packet-smb.c ... svn path=/trunk/; revision=2220
2000-08-07 14:49:03 +00:00
proto_tree_add_uint(smb_tree, hf_smb_cmd, NullTVB, offset, 1, cmd);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
}
offset += 1;
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
/* Handle error code */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
if (GSHORT(pd, SMB_offset + 10) & 0x4000) {
A small set of patches to fix one small problem and start working on the filtering in packet-smb.c ... svn path=/trunk/; revision=2220
2000-08-07 14:49:03 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
/* handle NT 32 bit error code */
errcode = 0; /* better than a random number */
status = GWORD(pd, offset);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
if (tree) {
proto_tree_add_text(smb_tree, NullTVB, offset, 4, "Status: 0x%08x",
status);
}
offset += 4;
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
}
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
else {
/* handle DOS error code & class */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
/* Next, look at the error class, SMB_RETCLASS */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
errcls = pd[offset];
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
if (tree) {
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
proto_tree_add_text(smb_tree, NullTVB, offset, 1, "Error Class: %s",
val_to_str((guint8)pd[offset], errcls_types, "Unknown Error Class (%x)"));
}
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
offset += 1;
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
/* Error code, SMB_HEINFO ... */
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
errcode1 = pd[offset];
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
if (tree) {
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
proto_tree_add_text(smb_tree, NullTVB, offset, 1, "Reserved: %i", errcode1);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
}
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
offset += 1;
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Assorted enhancements from Mark Burton. svn path=/trunk/; revision=2000
2000-05-25 08:38:54 +00:00
errcode = GSHORT(pd, offset);
if (tree) {
proto_tree_add_text(smb_tree, NullTVB, offset, 2, "Error Code: %s",
decode_smb_error(errcls, errcode));
}
offset += 2;
}
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
/* Now for the flags: Bit 0 = 0 means cmd, 0 = 1 means resp */
flags = pd[offset];
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
tf = proto_tree_add_text(smb_tree, NullTVB, offset, 1, "Flags: 0x%02x", flags);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
flags_tree = proto_item_add_subtree(tf, ett_smb_flags);
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(flags_tree, NullTVB, offset, 1, "%s",
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
decode_boolean_bitfield(flags, 0x01, 8,
"Lock&Read, Write&Unlock supported",
"Lock&Read, Write&Unlock not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(flags_tree, NullTVB, offset, 1, "%s",
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
decode_boolean_bitfield(flags, 0x02, 8,
"Receive buffer posted",
"Receive buffer not posted"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(flags_tree, NullTVB, offset, 1, "%s",
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
decode_boolean_bitfield(flags, 0x08, 8,
"Path names caseless",
"Path names case sensitive"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(flags_tree, NullTVB, offset, 1, "%s",
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
decode_boolean_bitfield(flags, 0x10, 8,
"Pathnames canonicalized",
"Pathnames not canonicalized"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(flags_tree, NullTVB, offset, 1, "%s",
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
decode_boolean_bitfield(flags, 0x20, 8,
"OpLocks requested/granted",
"OpLocks not requested/granted"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(flags_tree, NullTVB, offset, 1, "%s",
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
decode_boolean_bitfield(flags, 0x40, 8,
"Notify all",
"Notify open only"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(flags_tree, NullTVB, offset, 1, "%s",
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
decode_boolean_bitfield(flags, SMB_FLAGS_DIRN,
8, "Response to client/redirector", "Request to server"));
}
offset += 1;
Decode the "flags2" field in the SMB header. Squelch another "variable may be used without being initialized" complaint (also due to insufficiently sophisticated dataflow analysis by EGCS 1.1), and a number of "unused variable" complaints, as well as "assigning a 'const XXX *' to an 'XXX *'" complaints. svn path=/trunk/; revision=266
1999-05-10 20:30:27 +00:00
flags2 = GSHORT(pd, offset);
if (tree) {
A small set of patches to fix one small problem and start working on the filtering in packet-smb.c ... svn path=/trunk/; revision=2220
2000-08-07 14:49:03 +00:00
tf = proto_tree_add_text(smb_tree, NullTVB, offset, 2, "Flags2: 0x%04x", flags2);
Decode the "flags2" field in the SMB header. Squelch another "variable may be used without being initialized" complaint (also due to insufficiently sophisticated dataflow analysis by EGCS 1.1), and a number of "unused variable" complaints, as well as "assigning a 'const XXX *' to an 'XXX *'" complaints. svn path=/trunk/; revision=266
1999-05-10 20:30:27 +00:00
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
flags2_tree = proto_item_add_subtree(tf, ett_smb_flags2);
A small set of patches to fix one small problem and start working on the filtering in packet-smb.c ... svn path=/trunk/; revision=2220
2000-08-07 14:49:03 +00:00
proto_tree_add_text(flags2_tree, NullTVB, offset, 2, "%s",
Decode the "flags2" field in the SMB header. Squelch another "variable may be used without being initialized" complaint (also due to insufficiently sophisticated dataflow analysis by EGCS 1.1), and a number of "unused variable" complaints, as well as "assigning a 'const XXX *' to an 'XXX *'" complaints. svn path=/trunk/; revision=266
1999-05-10 20:30:27 +00:00
decode_boolean_bitfield(flags2, 0x0001, 16,
"Long file names supported",
"Long file names not supported"));
A small set of patches to fix one small problem and start working on the filtering in packet-smb.c ... svn path=/trunk/; revision=2220
2000-08-07 14:49:03 +00:00
proto_tree_add_text(flags2_tree, NullTVB, offset, 2, "%s",
Decode the "flags2" field in the SMB header. Squelch another "variable may be used without being initialized" complaint (also due to insufficiently sophisticated dataflow analysis by EGCS 1.1), and a number of "unused variable" complaints, as well as "assigning a 'const XXX *' to an 'XXX *'" complaints. svn path=/trunk/; revision=266
1999-05-10 20:30:27 +00:00
decode_boolean_bitfield(flags2, 0x0002, 16,
"Extended attributes supported",
"Extended attributes not supported"));
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(flags2_tree, NullTVB, offset, 1, "%s",
Turn "arpaddr_to_str()" into "bytes_to_str()", and make it public, so it can be used by dissectors other than ARP to display byte arrays as strings of hex digits. Add a routine to extract a null-terminated Unicode string and turn it into an ISO 8859-1 string for display. (Ultimately, we should determine what character sets the X server or printer or whatever can handle, and turn it into the appropriate character set.) Display the challenge in "core-to-LANMAN-2.1" Negotiate Protocol responses as a string of hex digits - but only if the length is non-zero. (It's a counted array, not a null-terminated string.) Display some additional security mode bits in an NT LM 0.12 Negotiate Protocol response. Display some additional bits in the "capabilities" field of the Negotiate Protocol response. Display the challenge in an NT LM 0.12 Negotiate Protocol response as a string of hex digits (it's a counted array, not a null-terminated string). Display the domain name as Unicode in an NT LM 0.12 Negotiate Protocol response if the capabilities field has the "supports Unicode" bit set (no, not the "Unicode" bit in the "flags2" field - NT doesn't set that in the response, even though it sends the domain name over in Unicode!). Display some additional bits in the "flags2" field of an SMB. svn path=/trunk/; revision=275
1999-05-11 08:21:39 +00:00
decode_boolean_bitfield(flags2, 0x0004, 16,
"Security signatures supported",
"Security signatures not supported"));
A small set of patches to fix one small problem and start working on the filtering in packet-smb.c ... svn path=/trunk/; revision=2220
2000-08-07 14:49:03 +00:00
proto_tree_add_text(flags2_tree, NullTVB, offset, 2, "%s",
Turn "arpaddr_to_str()" into "bytes_to_str()", and make it public, so it can be used by dissectors other than ARP to display byte arrays as strings of hex digits. Add a routine to extract a null-terminated Unicode string and turn it into an ISO 8859-1 string for display. (Ultimately, we should determine what character sets the X server or printer or whatever can handle, and turn it into the appropriate character set.) Display the challenge in "core-to-LANMAN-2.1" Negotiate Protocol responses as a string of hex digits - but only if the length is non-zero. (It's a counted array, not a null-terminated string.) Display some additional security mode bits in an NT LM 0.12 Negotiate Protocol response. Display some additional bits in the "capabilities" field of the Negotiate Protocol response. Display the challenge in an NT LM 0.12 Negotiate Protocol response as a string of hex digits (it's a counted array, not a null-terminated string). Display the domain name as Unicode in an NT LM 0.12 Negotiate Protocol response if the capabilities field has the "supports Unicode" bit set (no, not the "Unicode" bit in the "flags2" field - NT doesn't set that in the response, even though it sends the domain name over in Unicode!). Display some additional bits in the "flags2" field of an SMB. svn path=/trunk/; revision=275
1999-05-11 08:21:39 +00:00
decode_boolean_bitfield(flags2, 0x0800, 16,
"Extended security negotiation supported",
"Extended security negotiation not supported"));
A small set of patches to fix one small problem and start working on the filtering in packet-smb.c ... svn path=/trunk/; revision=2220
2000-08-07 14:49:03 +00:00
proto_tree_add_text(flags2_tree, NullTVB, offset, 2, "%s",
Decode the "flags2" field in the SMB header. Squelch another "variable may be used without being initialized" complaint (also due to insufficiently sophisticated dataflow analysis by EGCS 1.1), and a number of "unused variable" complaints, as well as "assigning a 'const XXX *' to an 'XXX *'" complaints. svn path=/trunk/; revision=266
1999-05-10 20:30:27 +00:00
decode_boolean_bitfield(flags2, 0x1000, 16,
Fix up the decode of "greater than core and up to and including LANMAN 2.1" "negotiate protocol" responses. Display unsigned fields in "negotiate protocol" as unsigned, rather than signed, values. svn path=/trunk/; revision=268
1999-05-10 21:36:40 +00:00
"Resolve pathnames with DFS",
"Don't resolve pathnames with DFS"));
A small set of patches to fix one small problem and start working on the filtering in packet-smb.c ... svn path=/trunk/; revision=2220
2000-08-07 14:49:03 +00:00
proto_tree_add_text(flags2_tree, NullTVB, offset, 2, "%s",
Decode the "flags2" field in the SMB header. Squelch another "variable may be used without being initialized" complaint (also due to insufficiently sophisticated dataflow analysis by EGCS 1.1), and a number of "unused variable" complaints, as well as "assigning a 'const XXX *' to an 'XXX *'" complaints. svn path=/trunk/; revision=266
1999-05-10 20:30:27 +00:00
decode_boolean_bitfield(flags2, 0x2000, 16,
"Permit reads if execute-only",
"Don't permit reads if execute-only"));
A small set of patches to fix one small problem and start working on the filtering in packet-smb.c ... svn path=/trunk/; revision=2220
2000-08-07 14:49:03 +00:00
proto_tree_add_text(flags2_tree, NullTVB, offset, 2, "%s",
Decode the "flags2" field in the SMB header. Squelch another "variable may be used without being initialized" complaint (also due to insufficiently sophisticated dataflow analysis by EGCS 1.1), and a number of "unused variable" complaints, as well as "assigning a 'const XXX *' to an 'XXX *'" complaints. svn path=/trunk/; revision=266
1999-05-10 20:30:27 +00:00
decode_boolean_bitfield(flags2, 0x4000, 16,
"Error codes are NT error codes",
"Error codes are DOS error codes"));
A small set of patches to fix one small problem and start working on the filtering in packet-smb.c ... svn path=/trunk/; revision=2220
2000-08-07 14:49:03 +00:00
proto_tree_add_text(flags2_tree, NullTVB, offset, 2, "%s",
Decode the "flags2" field in the SMB header. Squelch another "variable may be used without being initialized" complaint (also due to insufficiently sophisticated dataflow analysis by EGCS 1.1), and a number of "unused variable" complaints, as well as "assigning a 'const XXX *' to an 'XXX *'" complaints. svn path=/trunk/; revision=266
1999-05-10 20:30:27 +00:00
decode_boolean_bitfield(flags2, 0x8000, 16,
"Strings are Unicode",
"Strings are ASCII"));
}
Fixed the problem causing a SIGSEGV, and fixed problems with UNICODE strings in transact SMBs. Added decode of NetShareEnum transact request. Will have to clean that all up and use the decode engine when I get it done. Still more fix ups to be done, but the book is calling, and I have to write some stuff after an interview with LinuxCare. svn path=/trunk/; revision=1113
1999-11-26 06:27:22 +00:00
if (flags2 & 0x8000) si.unicode = 1; /* Mark them as Unicode */
Decode the "flags2" field in the SMB header. Squelch another "variable may be used without being initialized" complaint (also due to insufficiently sophisticated dataflow analysis by EGCS 1.1), and a number of "unused variable" complaints, as well as "assigning a 'const XXX *' to an 'XXX *'" complaints. svn path=/trunk/; revision=266
1999-05-10 20:30:27 +00:00
offset += 2;
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
if (tree) {
Put in a note about the use of some currently-undissected fields in the SMB header, as per a Microsoft document. svn path=/trunk/; revision=3149
2001-03-20 04:46:37 +00:00
/*
* The document at
*
* http://www.samba.org/samba/ftp/specs/smbpub.txt
*
* (a text version of "Microsoft Networks SMB FILE SHARING
* PROTOCOL, Document Version 6.0p") says that:
*
* the first 2 bytes of these 12 bytes are, for NT Create and X,
* the "High Part of PID";
*
* the next four bytes are reserved;
*
* the next four bytes are, for SMB-over-IPX (with no
* NetBIOS involved) two bytes of Session ID and two bytes
* of SequenceNumber.
*
* If we ever implement SMB-over-IPX (which I suspect goes over
* IPX sockets 0x0550, 0x0552, and maybe 0x0554, as per the
* document in question), we'd probably want to have some way
* to determine whether this is SMB-over-IPX or not (which could
* be done by adding a PT_IPXSOCKET port type, having the
* IPX dissector set "pinfo->srcport" and "pinfo->destport",
* and having the SMB dissector check for a port type of
* PT_IPXSOCKET and for "pinfo->match_port" being either
* IPX_SOCKET_NWLINK_SMB_SERVER or IPX_SOCKET_NWLINK_SMB_REDIR
* or, if it also uses 0x0554, IPX_SOCKET_NWLINK_SMB_MESSENGER).
*/
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(smb_tree, NullTVB, offset, 12, "Reserved: 6 WORDS");
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
}
Decode the "flags2" field in the SMB header. Squelch another "variable may be used without being initialized" complaint (also due to insufficiently sophisticated dataflow analysis by EGCS 1.1), and a number of "unused variable" complaints, as well as "assigning a 'const XXX *' to an 'XXX *'" complaints. svn path=/trunk/; revision=266
1999-05-10 20:30:27 +00:00
offset += 12;
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
/* Now the TID, tree ID */
tid = GSHORT(pd, offset);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
si.tid = tid;
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(smb_tree, NullTVB, offset, 2, "Network Path/Tree ID (TID): %i (%04x)", tid, tid);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
}
offset += 2;
/* Now the PID, Process ID */
pid = GSHORT(pd, offset);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
si.pid = pid;
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(smb_tree, NullTVB, offset, 2, "Process ID (PID): %i (%04x)", pid, pid);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
}
offset += 2;
/* Now the UID, User ID */
uid = GSHORT(pd, offset);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
si.uid = uid;
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(smb_tree, NullTVB, offset, 2, "User ID (UID): %i (%04x)", uid, uid);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
}
offset += 2;
/* Now the MID, Multiplex ID */
mid = GSHORT(pd, offset);
Completed first pass of state keeping code in packet-smb.c. Added decoder for transact SMBs. Changed things a lot for state keeping. Next thing is to decode transacts and transact2s more. svn path=/trunk/; revision=860
1999-10-16 16:02:46 +00:00
si.mid = mid;
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
if (tree) {
Add tvbuff class. Add exceptions routines. Convert proto_tree_add_*() routines to require tvbuff_t* argument. Convert all dissectors to pass NULL argument ("NullTVB" macro == NULL) as the tvbuff_t* argument to proto_tree_add_*() routines. dissect_packet() creates a tvbuff_t, wraps the next dissect call in a TRY block, will print "Short Frame" on the proto_tree if a BoundsError exception is caught. The FDDI dissector is converted to use tvbuff's. svn path=/trunk/; revision=1939
2000-05-11 08:18:09 +00:00
proto_tree_add_text(smb_tree, NullTVB, offset, 2, "Multiplex ID (MID): %i (%04x)", mid, mid);
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
}
offset += 2;
/* Now vector through the table to dissect them */
OK, much more complete decoding of browse messages. They are now shown in the parent tree as well. I still have problems with: 1. Times 2. Election criteral I also haven't been able to see a BecomeBackup request, nor a GetBackupListResp with more than one browser ... Should run a Windows NT server or another Samba on my network. I am also not sure of there are any more message types. Damn! Old, and wrong MS documents! svn path=/trunk/; revision=1025
1999-11-14 06:54:42 +00:00
(dissect[cmd])(pd, offset, fd, tree, smb_tree, si, max_data, SMB_offset, errcode,
Mode decoded SMBs ... Now decode part of a TCONX request, but not the responses, and do not handle the ANDX part yet, but I have a Linux course to develop, so that is enough for now. svn path=/trunk/; revision=261
1999-05-10 00:27:32 +00:00
((flags & 0x80) == 0));
Added new files for SMB decode: packet-smb.c, alignment.h, smb.h svn path=/trunk/; revision=259
1999-05-09 04:20:59 +00:00
}
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
Jeff Foster's SMB Mailslot and Netlogin dissectors; he split "packet-smb.c" up into several files. svn path=/trunk/; revision=1629
2000-02-14 04:02:21 +00:00
/*** External routines called during the registration process */
extern void register_proto_smb_browse( void);
extern void register_proto_smb_logon( void);
extern void register_proto_smb_mailslot( void);
extern void register_proto_smb_pipe( void);
extern void register_proto_smb_mailslot( void);
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
void
proto_register_smb(void)
{
A small set of patches to fix one small problem and start working on the filtering in packet-smb.c ... svn path=/trunk/; revision=2220
2000-08-07 14:49:03 +00:00
static hf_register_info hf[] = {
{ &hf_smb_cmd,
{ "SMB Command", "smb.cmd",
FT_UINT8, BASE_HEX, VALS(smb_cmd_vals), 0x0, "" }}
};
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
static gint *ett[] = {
&ett_smb,
&ett_smb_fileattributes,
&ett_smb_capabilities,
&ett_smb_aflags,
&ett_smb_dialects,
&ett_smb_mode,
&ett_smb_rawmode,
&ett_smb_flags,
&ett_smb_flags2,
&ett_smb_desiredaccess,
&ett_smb_search,
&ett_smb_file,
&ett_smb_openfunction,
&ett_smb_filetype,
&ett_smb_action,
&ett_smb_writemode,
&ett_smb_lock_type,
};
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
Have "proto_register_protocol()" build a list of data structures for protocols, in addition to adding structures to the list of filterable fields. Give it an extra argument that specifies a "short name" for the protocol, for use in such places as pinfo->current_proto; the dialog box for constructing filters; the preferences tab for the protocol; and so on (although we're not yet using it in all those places). Make the preference name that appears in the preferences file and the command line for the DIAMETER protocol "diameter", not "Diameter"; the convention is that the name in question be all-lower-case. Make some routines and variables that aren't exported static. Update a comment in the ICP dissector to make it clear that the dissector won't see fragments other than the first fragment of a fragmented datagram. svn path=/trunk/; revision=2810
2001-01-03 06:56:03 +00:00
proto_smb = proto_register_protocol("SMB (Server Message Block Protocol)",
"SMB", "smb");
Jeff Foster's SMB Mailslot and Netlogin dissectors; he split "packet-smb.c" up into several files. svn path=/trunk/; revision=1629
2000-02-14 04:02:21 +00:00
Replace the ETT_ "enum" members, declared in "packet.h", with dynamically-assigned "ett_" integer values, assigned by "proto_register_subtree_array()"; this: obviates the need to update "packet.h" whenever you add a new subtree type - you only have to add a call to "proto_register_subtree_array()" to a "register" routine and an array of pointers to "ett_", if they're not already there, and add a pointer to the new "ett_" variable to the array, if they are there; would allow run-time-loaded dissectors to allocate subtree types when they're loaded. svn path=/trunk/; revision=1043
1999-11-16 11:44:20 +00:00
proto_register_subtree_array(ett, array_length(ett));
A small set of patches to fix one small problem and start working on the filtering in packet-smb.c ... svn path=/trunk/; revision=2220
2000-08-07 14:49:03 +00:00
proto_register_field_array(proto_smb, hf, array_length(hf));
Provide a general mechanism by which dissectors can register "init" routines, which are called before a dissection pass is made over all the packets in a capture - the "init" routine would clear out any state information that needs to be initialized before such a dissection pass. Make the NCP, SMB, AFS, and ONC RPC dissectors register their "init" routines with that mechanism, have the code that reads in a capture file call the routine that calls all registered "init" routines rather than calling a wired-in set of "init" routines, and also have the code that runs a filtering or colorizing pass over all the packets call that routine, as a filtering or colorizing pass is a dissection pass. Have the ONC RPC "init" routine zero out the table of RPC calls, so that it completely erases any state from the previous dissection pass (so that, for example, if you run a filtering pass, it doesn't mark any non-duplicate packets as duplicates because it remembers them from the previous pass). svn path=/trunk/; revision=1050
1999-11-17 21:58:33 +00:00
register_init_routine(&smb_init_protocol);
Jeff Foster's SMB Mailslot and Netlogin dissectors; he split "packet-smb.c" up into several files. svn path=/trunk/; revision=1629
2000-02-14 04:02:21 +00:00
register_proto_smb_browse();
register_proto_smb_logon( );
register_proto_smb_mailslot();
register_proto_smb_pipe();
Made the protocol (but not the fields) use the new proto_tree routine, allowing users to filter on the existence of these protocols. I also added packet-clip.c to the Nmake makefile. svn path=/trunk/; revision=402
1999-07-29 05:47:07 +00:00
}