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

3113 lines
82 KiB
C
Raw Normal View History

Rename the "packet-msrpc-XXX.[ch]" files to "packet-dcerpc-XXX.[ch]", as per Todd Sabin's suggestion. svn path=/trunk/; revision=4242
2001-11-21 02:08:57 +00:00
/* packet-dcerpc-spoolss.c
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
* Routines for SMB \PIPE\spoolss packet disassembly
Decode some bits of the PRINTER_INFO_2 structure that we were missing before. Display which info level a getprinter response contains in COL_INFO. Fixed some bugs in dissecting devicemodes - the device name and form name live in a 64-byte buffer instead of a NULL terminated unicode string. svn path=/trunk/; revision=5102
2002-04-05 03:07:28 +00:00
* Copyright 2001-2002, Tim Potter <tpot@samba.org>
Support for DCE RPC atop SMB, and support for several Microsoft DCE RPC services used with SMB, from Tim Potter. svn path=/trunk/; revision=4194
2001-11-12 08:58:45 +00:00
*
Add a "remove an argument" change, from Joerg Mayer, that I'd missed. Put in a comment noting a problem in the code. svn path=/trunk/; revision=5341
2002-05-01 21:22:06 +00:00
* $Id: packet-dcerpc-spoolss.c,v 1.25 2002/05/01 21:22:06 guy Exp $
Support for DCE RPC atop SMB, and support for several Microsoft DCE RPC services used with SMB, from Tim Potter. svn path=/trunk/; revision=4194
2001-11-12 08:58:45 +00:00
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
* Copyright 1998 Gerald Combs
*
* 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 <glib.h>
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
#include <string.h>
Include files from the "epan" directory and subdirectories thereof with "epan/..." pathnames, so as to avoid collisions with header files in any of the directories in which we look (e.g., "proto.h", as some other package has its own "proto.h" file which it installs in the top-level include directory). Don't add "-I" flags to search "epan", as that's no longer necessary (and we want includes of "epan" headers to fail if the "epan/" is left out, so that we don't re-introduce includes lacking "epan/"). svn path=/trunk/; revision=4586
2002-01-21 07:37:49 +00:00
#include <epan/packet.h>
Support for DCE RPC atop SMB, and support for several Microsoft DCE RPC services used with SMB, from Tim Potter. svn path=/trunk/; revision=4194
2001-11-12 08:58:45 +00:00
#include "packet-dcerpc.h"
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
#include "packet-dcerpc-nt.h"
Rename the "packet-msrpc-XXX.[ch]" files to "packet-dcerpc-XXX.[ch]", as per Todd Sabin's suggestion. svn path=/trunk/; revision=4242
2001-11-21 02:08:57 +00:00
#include "packet-dcerpc-spoolss.h"
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
#include "packet-dcerpc-reg.h"
#include "smb.h"
Include "packet-smb-common.h" to get the declaration of "dissect_nt_sec_desc()". svn path=/trunk/; revision=5093
2002-04-04 00:56:06 +00:00
#include "packet-smb-common.h"
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/*
* New system for handling pointers and buffers. We act more like the NDR
* specification and have a list of deferred pointers which are processed
* after a structure has been parsed.
*
* Each structure has a parse function which takes as an argument a GList.
* As pointers are processed, they are appended onto this list. When the
* structure is complete, the pointers (referents) are processed by calling
* prs_referents(). In the case of function arguments, the
* prs_struct_and_referents() function is called as pointers are always
* processed immediately after the argument.
*/
typedef int prs_fn(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **data);
/* Deferred referent */
struct deferred_ptr {
prs_fn *fn; /* Parse function to call */
proto_tree *tree; /* Tree context */
};
/* A structure to hold needed ethereal state to pass to GList foreach
iterator. */
struct deferred_ptr_state {
tvbuff_t *tvb;
int *poffset;
packet_info *pinfo;
GList **dp_list;
void **ptr_data;
};
void defer_ptr(GList **list, prs_fn *fn, proto_tree *tree)
{
struct deferred_ptr *dr;
dr = g_malloc(sizeof(struct deferred_ptr));
dr->fn = fn;
dr->tree = tree;
*list = g_list_append(*list, dr);
}
/* Parse a pointer */
static int prs_ptr(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, guint32 *data, char *name)
{
guint32 ptr;
offset = prs_uint32(tvb, offset, pinfo, tree, &ptr, NULL);
if (tree && name)
proto_tree_add_text(tree, tvb, offset - 4, 4,
"%s pointer: 0x%08x", name, ptr);
if (data)
*data = ptr;
return offset;
}
/* Iterator function for prs_referents */
static void dr_iterator(gpointer data, gpointer user_data)
{
struct deferred_ptr *dp = (struct deferred_ptr *)data;
struct deferred_ptr_state *s = (struct deferred_ptr_state *)user_data;
/* Parse pointer */
*s->poffset = dp->fn(s->tvb, *s->poffset, s->pinfo, dp->tree,
s->dp_list, s->ptr_data);
if (s->ptr_data)
s->ptr_data++; /* Ready for next parse fn */
}
/* Call the parse function for each element in the deferred pointers list.
If there are any additional pointers in these structures they are pushed
onto parent_dp_list. */
int prs_referents(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, GList **list,
void ***ptr_data)
{
struct deferred_ptr_state s;
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
int new_offset = offset;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Create a list of void pointers to store return data */
if (ptr_data) {
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
int len = g_list_length(*dp_list) * sizeof(void *);
if (len > 0) {
*ptr_data = malloc(len);
memset(*ptr_data, 0, len);
} else
*ptr_data = NULL;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
}
/* Set up iterator data */
s.tvb = tvb;
s.poffset = &new_offset;
s.pinfo = pinfo;
s.dp_list = dp_list;
s.ptr_data = ptr_data ? *ptr_data : NULL;
g_list_foreach(*list, dr_iterator, &s);
*list = NULL; /* XXX: free list */
return new_offset;
}
/* Parse a structure then clean up any deferred referants it creates. */
static int prs_struct_and_referents(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
prs_fn *fn, void **data, void ***ptr_data)
{
GList *dp_list = NULL;
offset = fn(tvb, offset, pinfo, tree, &dp_list, data);
offset = prs_referents(tvb, offset, pinfo, tree, &dp_list,
&dp_list, ptr_data);
return offset;
}
/* Parse a Win32 error, basically a DOS error. The spoolss API doesn't
use NT status codes. */
static int prs_werror(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, guint32 *data)
{
guint32 status;
offset = prs_uint32(tvb, offset, pinfo, tree, &status, NULL);
if (tree)
proto_tree_add_text(tree, tvb, offset - 4, 4, "Status: %s",
val_to_str(status, DOS_errors,
"Unknown error"));
if (status != 0 && check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
val_to_str(status, DOS_errors,
"Unknown error"));
if (data)
*data = status;
return offset;
}
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
/* Display a policy handle in the protocol tree */
static gint ett_POLICY_HND = -1;
static void display_pol(proto_tree *tree, tvbuff_t *tvb, int offset,
const guint8 *policy_hnd)
{
proto_item *item;
char *pol_name = NULL;
int pol_open_frame = 0, pol_close_frame = 0;
proto_tree *subtree;
dcerpc_smb_fetch_pol(policy_hnd, &pol_name, &pol_open_frame,
&pol_close_frame);
item = proto_tree_add_text(tree, tvb, offset, 20,
"Policy handle%s%s",
pol_name ? ": " : "",
pol_name ? pol_name : "");
subtree = proto_item_add_subtree(item, ett_POLICY_HND);
if (pol_open_frame)
proto_tree_add_text(subtree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Opened in frame %u", pol_open_frame);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
if (pol_close_frame)
proto_tree_add_text(subtree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Closed in frame %u", pol_close_frame);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
proto_tree_add_text(subtree, tvb, offset, 20, "Policy Handle: %s",
tvb_bytes_to_str(tvb, offset, 20));
}
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/*
* SpoolssClosePrinter
*/
static int SpoolssClosePrinter_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
const guint8 *policy_hnd;
Start of support for setprinter calls. Currently on setprinter level 3 is decoded properly. Add printer name to COL_INFO field in ClosePrinter request. svn path=/trunk/; revision=5322
2002-05-01 05:28:56 +00:00
char *pol_name;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Start of support for setprinter calls. Currently on setprinter level 3 is decoded properly. Add printer name to COL_INFO field in ClosePrinter request. svn path=/trunk/; revision=5322
2002-05-01 05:28:56 +00:00
dcerpc_smb_fetch_pol(policy_hnd, &pol_name, 0, 0);
if (check_col(pinfo->cinfo, COL_INFO) && pol_name)
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
pol_name);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_store_pol(policy_hnd, NULL, 0, pinfo->fd->num);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
display_pol(tree, tvb, offset - 20, policy_hnd);
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
static int SpoolssClosePrinter_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
const guint8 *policy_hnd;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
display_pol(tree, tvb, offset - 20, policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/* Parse a UNISTR2 structure */
static gint ett_UNISTR2 = -1;
static int prs_UNISTR2_dp(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **data)
{
proto_item *item;
proto_tree *subtree;
guint32 length, the_offset, max_len;
int old_offset = offset;
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
int data16_offset;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
char *text;
offset = prs_uint32(tvb, offset, pinfo, tree, &length, NULL);
offset = prs_uint32(tvb, offset, pinfo, tree, &the_offset, NULL);
offset = prs_uint32(tvb, offset, pinfo, tree, &max_len, NULL);
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
offset = prs_uint16s(tvb, offset, pinfo, tree, max_len, &data16_offset,
NULL);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
text = fake_unicode(tvb, data16_offset, max_len);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
item = proto_tree_add_text(tree, tvb, old_offset, offset - old_offset,
"UNISTR2: %s", text);
subtree = proto_item_add_subtree(item, ett_UNISTR2);
if (data)
*data = text;
else
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
g_free(text);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
proto_tree_add_text(subtree, tvb, old_offset, 4, "Length: %u", length);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
old_offset += 4;
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
proto_tree_add_text(subtree, tvb, old_offset, 4, "Offset: %u",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
the_offset);
old_offset += 4;
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
proto_tree_add_text(subtree, tvb, old_offset, 4, "Max length: %u",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
max_len);
old_offset += 4;
proto_tree_add_text(subtree, tvb, old_offset, max_len * 2, "Data");
return offset;
}
/*
* SpoolssGetPrinterData
*/
static int SpoolssGetPrinterData_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
char *value_name = NULL;
const guint8 *policy_hnd;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
display_pol(tree, tvb, offset - 20, policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_UNISTR2_dp, (void **)&value_name,
NULL);
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", value_name);
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
g_free(value_name);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Size");
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
static int SpoolssGetPrinterData_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
guint32 size, type;
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
offset = prs_uint32(tvb, offset, pinfo, tree, &type, NULL);
proto_tree_add_text(tree, tvb, offset - 4, 4, "Type: %s",
val_to_str(type, reg_datatypes, "Unknown type"));
offset = prs_uint32(tvb, offset, pinfo, tree, &size, "Size");
offset = prs_uint8s(tvb, offset, pinfo, tree, size, NULL, "Data");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Needed");
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/*
* SpoolssGetPrinterDataEx
*/
static int SpoolssGetPrinterDataEx_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
char *key_name, *value_name;
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
const guint8 *policy_hnd;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
display_pol(tree, tvb, offset - 20, policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_UNISTR2_dp, (void **)&key_name,
NULL);
Add a cleanup function to close a potential memory leak. Get rid of an assigned-to-but-not-used variable. From Steven French: add names for some additional calls. svn path=/trunk/; revision=5003
2002-03-22 10:03:36 +00:00
/*
* Register a cleanup function in case on of our tvbuff accesses
* throws an exception. We need to clean up key_name.
*/
CLEANUP_PUSH(g_free, key_name);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_UNISTR2_dp, (void **)&value_name,
NULL);
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s/%s",
key_name, value_name);
Add a cleanup function to close a potential memory leak. Get rid of an assigned-to-but-not-used variable. From Steven French: add names for some additional calls. svn path=/trunk/; revision=5003
2002-03-22 10:03:36 +00:00
/*
* We're done with key_name, so we can call the cleanup handler to
* free it, and then pop the cleanup handler.
*/
CLEANUP_CALL_AND_POP;
/*
* We're also done with value_name.
*/
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
g_free(value_name);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Size");
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
static int SpoolssGetPrinterDataEx_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
guint32 size, type;
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
offset = prs_uint32(tvb, offset, pinfo, tree, &type, NULL);
proto_tree_add_text(tree, tvb, offset - 4, 4, "Type: %s",
val_to_str(type, reg_datatypes, "Unknown type"));
offset = prs_uint32(tvb, offset, pinfo, tree, &size, "Size");
offset = prs_uint8s(tvb, offset, pinfo, tree, size, NULL, "Data");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Needed");
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/*
* SpoolssSetPrinterData
*/
static int SpoolssSetPrinterData_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
char *value_name = NULL;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
guint32 type, max_len;
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
const guint8 *policy_hnd;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
display_pol(tree, tvb, offset - 20, policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_UNISTR2_dp, (void **)&value_name,
NULL);
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", value_name);
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
g_free(value_name);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, &type, NULL);
proto_tree_add_text(tree, tvb, offset - 4, 4, "Type: %s",
val_to_str(type, reg_datatypes, "Unknown type"));
offset = prs_uint32(tvb, offset, pinfo, tree, &max_len, "Max length");
offset = prs_uint8s(tvb, offset, pinfo, tree, max_len, NULL,
"Data");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Real length");
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
static int SpoolssSetPrinterData_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/*
* SpoolssSetPrinterDataEx
*/
static int SpoolssSetPrinterDataEx_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
char *key_name, *value_name;
guint32 type, max_len;
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
const guint8 *policy_hnd;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
display_pol(tree, tvb, offset - 20, policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_UNISTR2_dp, (void **)&key_name,
NULL);
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_UNISTR2_dp, (void **)&value_name,
NULL);
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s/%s",
key_name, value_name);
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
g_free(key_name);
g_free(value_name);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, &type, NULL);
proto_tree_add_text(tree, tvb, offset - 4, 4, "Type: %s",
val_to_str(type, reg_datatypes, "Unknown type"));
offset = prs_uint32(tvb, offset, pinfo, tree, &max_len, "Max length");
offset = prs_uint8s(tvb, offset, pinfo, tree, max_len, NULL,
"Data");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Real length");
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
static int SpoolssSetPrinterDataEx_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/* Yet another way to represent a unicode string - sheesh. */
static int prs_uint16uni(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, void **data, char *name)
{
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
gint len = 0, remaining;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
char *text;
offset = prs_align(offset, 2);
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
/* Get remaining data in buffer as a string */
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
The length argument to "fake_unicode()" is in characters, not bytes. svn path=/trunk/; revision=4992
2002-03-20 09:09:07 +00:00
remaining = tvb_length_remaining(tvb, offset)/2;
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
text = fake_unicode(tvb, offset, remaining);
len = strlen(text);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
if (name)
proto_tree_add_text(tree, tvb, offset, (len + 1) * 2,
"%s: %s", name ? name : "UINT16UNI",
text);
if (data)
*data = text;
else
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
g_free(text);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset + (len + 1) * 2;
}
/*
* DEVMODE
*/
static gint ett_DEVMODE = -1;
static int prs_DEVMODE(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **data)
{
proto_item *item;
proto_tree *subtree;
guint16 extra;
item = proto_tree_add_text(tree, tvb, offset, 0, "DEVMODE");
subtree = proto_item_add_subtree(item, ett_DEVMODE);
A devicemode contains a uint32 at the start which represents the size of the structure. Fixed an off by one but in displaying the device mode in a PRINTER_INFO_2 structure. The devicemode in a devicemode container is not a deferred pointer but rather occurs immediately after the pointer if it is non-NULL. svn path=/trunk/; revision=5114
2002-04-08 00:27:36 +00:00
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Size");
Decode some bits of the PRINTER_INFO_2 structure that we were missing before. Display which info level a getprinter response contains in COL_INFO. Fixed some bugs in dissecting devicemodes - the device name and form name live in a 64-byte buffer instead of a NULL terminated unicode string. svn path=/trunk/; revision=5102
2002-04-05 03:07:28 +00:00
/* The device name is stored in a 32-wchar buffer */
prs_uint16uni(tvb, offset, pinfo, subtree, NULL, "Devicename");
offset += 64;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Spec version");
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Driver version");
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Size");
offset = prs_uint16(tvb, offset, pinfo, subtree, &extra, "Driver extra");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Fields");
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Orientation");
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Paper size");
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Paper length");
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Paper width");
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Scale");
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Copies");
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Default source");
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Print quality");
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Color");
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Duplex");
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Y resolution");
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "TT option");
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Collate");
Decode some bits of the PRINTER_INFO_2 structure that we were missing before. Display which info level a getprinter response contains in COL_INFO. Fixed some bugs in dissecting devicemodes - the device name and form name live in a 64-byte buffer instead of a NULL terminated unicode string. svn path=/trunk/; revision=5102
2002-04-05 03:07:28 +00:00
prs_uint16uni(tvb, offset, pinfo, subtree, NULL, "Form name");
offset += 64;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Log pixels");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Bits per pel");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Pels width");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Pels height");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Display flags");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Display frequency");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "ICM method");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "ICM intent");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Media type");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Dither type");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Reserved");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Reserved");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Panning width");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Panning height");
if (extra != 0)
offset = prs_uint8s(tvb, offset, pinfo, subtree, extra, NULL,
"Private");
return offset;
}
/*
* Relative string given by offset into the current buffer. Note that
* the offset for subsequent relstrs are against the structure start, not
* the point where the offset is parsed from.
*/
static gint ett_RELSTR = -1;
static int prs_relstr(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, int struct_start,
void **data, char *name)
{
proto_item *item;
proto_tree *subtree;
guint32 relstr_offset, relstr_start, relstr_end;
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
char *text = strdup("NULL");
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, &relstr_offset, NULL);
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
/* A relative offset of zero is a NULL string */
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
relstr_start = relstr_offset + struct_start;
if (relstr_offset)
relstr_end = prs_uint16uni(tvb, relstr_start, pinfo, tree,
(void **)&text, NULL);
else
relstr_end = offset;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
item = proto_tree_add_text(tree, tvb, relstr_start,
relstr_end - relstr_start, "%s: %s",
name ? name : "RELSTR", text);
subtree = proto_item_add_subtree(item, ett_RELSTR);
if (data)
*data = text;
else
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
g_free(text);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
proto_tree_add_text(subtree, tvb, offset - 4, 4,
"Relative offset: %d", relstr_offset);
proto_tree_add_text(subtree, tvb, relstr_start,
relstr_end - relstr_start, "Data");
return offset;
}
/*
* PRINTER_INFO_0
*/
static gint ett_PRINTER_INFO_0 = -1;
static int prs_PRINTER_INFO_0(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **data)
{
int struct_start = offset;
offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start,
NULL, "Printer name");
offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start,
NULL, "Server name");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "CJobs");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Total jobs");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Total bytes");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Year");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Month");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Day of week");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Day");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Hour");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Minute");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Second");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Milliseconds");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Global counter");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Total pages");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Major version");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Build version");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Session counter");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Printer errors");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Change id");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Status");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "C_setprinter");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint16(tvb, offset, pinfo, tree, NULL, "Unknown");
return offset;
}
/*
* PRINTER_INFO_1
*/
static gint ett_PRINTER_INFO_1 = -1;
static int prs_PRINTER_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **data)
{
Decode PRINTER_INFO_1 and PRINTER_INFO_3 structures. svn path=/trunk/; revision=5092
2002-04-03 23:32:23 +00:00
int struct_start = offset;
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Flags");
offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start,
NULL, "Description");
offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start,
NULL, "Name");
offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start,
NULL, "Comment");
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/*
* PRINTER_INFO_2
*/
static gint ett_PRINTER_INFO_2 = -1;
static int prs_PRINTER_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo,
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
proto_tree *tree, int len, GList **dp_list,
void **data)
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
{
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
int struct_start = offset;
Decode some bits of the PRINTER_INFO_2 structure that we were missing before. Display which info level a getprinter response contains in COL_INFO. Fixed some bugs in dissecting devicemodes - the device name and form name live in a 64-byte buffer instead of a NULL terminated unicode string. svn path=/trunk/; revision=5102
2002-04-05 03:07:28 +00:00
guint32 rel_offset;
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start,
NULL, "Server name");
offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start,
NULL, "Printer name");
offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start,
NULL, "Share name");
offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start,
NULL, "Port name");
offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start,
NULL, "Driver name");
offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start,
NULL, "Comment");
offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start,
NULL, "Location");
Decode some bits of the PRINTER_INFO_2 structure that we were missing before. Display which info level a getprinter response contains in COL_INFO. Fixed some bugs in dissecting devicemodes - the device name and form name live in a 64-byte buffer instead of a NULL terminated unicode string. svn path=/trunk/; revision=5102
2002-04-05 03:07:28 +00:00
/* This is a relative devicemode */
offset = prs_uint32(tvb, offset, pinfo, tree, &rel_offset, NULL);
A devicemode contains a uint32 at the start which represents the size of the structure. Fixed an off by one but in displaying the device mode in a PRINTER_INFO_2 structure. The devicemode in a devicemode container is not a deferred pointer but rather occurs immediately after the pointer if it is non-NULL. svn path=/trunk/; revision=5114
2002-04-08 00:27:36 +00:00
prs_DEVMODE(tvb, struct_start + rel_offset - 4, pinfo, tree,
dp_list, NULL);
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
Decode some bits of the PRINTER_INFO_2 structure that we were missing before. Display which info level a getprinter response contains in COL_INFO. Fixed some bugs in dissecting devicemodes - the device name and form name live in a 64-byte buffer instead of a NULL terminated unicode string. svn path=/trunk/; revision=5102
2002-04-05 03:07:28 +00:00
offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start,
NULL, "Separator file");
offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start,
NULL, "Print processor");
offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start,
NULL, "Datatype");
offset = prs_relstr(tvb, offset, pinfo, tree, dp_list, struct_start,
NULL, "Parameters");
/* This is a relative security descriptor */
offset = prs_uint32(tvb, offset, pinfo, tree, &rel_offset, NULL);
Add a "remove an argument" change, from Joerg Mayer, that I'd missed. Put in a comment noting a problem in the code. svn path=/trunk/; revision=5341
2002-05-01 21:22:06 +00:00
/*
* XXX - what *is* the length of this security descriptor?
* "prs_PRINTER_INFO_2()" is passed to "defer_ptr()", but
* "defer_ptr" takes, as an argument, a function with a
* different calling sequence from "prs_PRINTER_INFO_2()",
* lacking the "len" argument, so that won't work.
*/
From Joerg Mayer: get rid of unused "pinfo" argument to "dissect_nt_sec_desc()". Also, get rid of code to handle lengths of -1 in "dissect_nt_sec_desc()" - we never pass it a length of -1, as security descriptors aren't sent over the wire with NDR syntax. svn path=/trunk/; revision=5317
2002-04-30 23:48:15 +00:00
dissect_nt_sec_desc(tvb, struct_start + rel_offset, tree, len);
Decode some bits of the PRINTER_INFO_2 structure that we were missing before. Display which info level a getprinter response contains in COL_INFO. Fixed some bugs in dissecting devicemodes - the device name and form name live in a 64-byte buffer instead of a NULL terminated unicode string. svn path=/trunk/; revision=5102
2002-04-05 03:07:28 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Attributes");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Priority");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL,
"Default priority");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Start time");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "End time");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Status");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Jobs");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Average PPM");
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/*
* PRINTER_INFO_3
*/
static gint ett_PRINTER_INFO_3 = -1;
static int prs_PRINTER_INFO_3(tvbuff_t *tvb, int offset, packet_info *pinfo,
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
proto_tree *tree, int len, GList **dp_list,
void **data)
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
{
Decode PRINTER_INFO_1 and PRINTER_INFO_3 structures. svn path=/trunk/; revision=5092
2002-04-03 23:32:23 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Flags");
From Joerg Mayer: get rid of unused "pinfo" argument to "dissect_nt_sec_desc()". Also, get rid of code to handle lengths of -1 in "dissect_nt_sec_desc()" - we never pass it a length of -1, as security descriptors aren't sent over the wire with NDR syntax. svn path=/trunk/; revision=5317
2002-04-30 23:48:15 +00:00
offset = dissect_nt_sec_desc(tvb, offset, tree, len);
Decode PRINTER_INFO_1 and PRINTER_INFO_3 structures. svn path=/trunk/; revision=5092
2002-04-03 23:32:23 +00:00
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/*
* DEVMODE_CTR
*/
static gint ett_DEVMODE_CTR = -1;
static int prs_DEVMODE_CTR(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **data)
{
proto_item *item;
proto_tree *subtree;
guint32 ptr = 0;
item = proto_tree_add_text(tree, tvb, offset, 0, "DEVMODE_CTR");
subtree = proto_item_add_subtree(item, ett_DEVMODE_CTR);
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Size");
offset = prs_ptr(tvb, offset, pinfo, subtree, &ptr, "Devicemode");
if (ptr)
A devicemode contains a uint32 at the start which represents the size of the structure. Fixed an off by one but in displaying the device mode in a PRINTER_INFO_2 structure. The devicemode in a devicemode container is not a deferred pointer but rather occurs immediately after the pointer if it is non-NULL. svn path=/trunk/; revision=5114
2002-04-08 00:27:36 +00:00
offset = prs_DEVMODE(tvb, offset, pinfo, subtree, dp_list,
data);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/*
* PRINTER_DEFAULT structure
*/
static gint ett_PRINTER_DEFAULT = -1;
static int prs_PRINTER_DEFAULT(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **data)
{
GList *child_dp_list = NULL;
proto_item *item;
proto_tree *subtree;
guint32 ptr = 0, access;
item = proto_tree_add_text(tree, tvb, offset, 0, "PRINTER_DEFAULT");
subtree = proto_item_add_subtree(item, ett_PRINTER_DEFAULT);
offset = prs_ptr(tvb, offset, pinfo, subtree, &ptr, "Datatype");
/* Not sure why this isn't a deferred pointer. I think this may be
two structures stuck together. */
if (ptr)
offset = prs_UNISTR2_dp(tvb, offset, pinfo, subtree, dp_list,
NULL);
offset = prs_DEVMODE_CTR(tvb, offset, pinfo, subtree,
&child_dp_list, NULL);
offset = prs_uint32(tvb, offset, pinfo, subtree, &access, NULL);
proto_tree_add_text(subtree, tvb, offset - 4, 4,
"Access required: 0x%08x", access);
offset = prs_referents(tvb, offset, pinfo, subtree, dp_list,
&child_dp_list, NULL);
return offset;
}
/*
* USER_LEVEL_1 structure
*/
static gint ett_USER_LEVEL_1 = -1;
static int prs_USER_LEVEL_1(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **data)
{
proto_item *item;
proto_tree *subtree;
guint32 ptr = 0;
item = proto_tree_add_text(tree, tvb, offset, 0, "USER_LEVEL_1");
subtree = proto_item_add_subtree(item, ett_USER_LEVEL_1);
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Size");
offset = prs_ptr(tvb, offset, pinfo, subtree, &ptr, "Client name");
if (ptr)
defer_ptr(dp_list, prs_UNISTR2_dp, subtree);
offset = prs_ptr(tvb, offset, pinfo, subtree, &ptr, "User name");
if (ptr)
defer_ptr(dp_list, prs_UNISTR2_dp, subtree);
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Build");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Major");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Minor");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Processor");
return offset;
}
/*
* USER_LEVEL structure
*/
static gint ett_USER_LEVEL = -1;
static int prs_USER_LEVEL(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **parent_dp_list,
void **data)
{
proto_item *item;
proto_tree *subtree;
guint32 ptr = 0;
guint32 level;
item = proto_tree_add_text(tree, tvb, offset, 0, "USER_LEVEL");
subtree = proto_item_add_subtree(item, ett_USER_LEVEL);
offset = prs_uint32(tvb, offset, pinfo, subtree, &level, "Info level");
offset = prs_ptr(tvb, offset, pinfo, subtree, &ptr, "User level");
if (ptr) {
switch (level) {
case 1:
defer_ptr(parent_dp_list, prs_USER_LEVEL_1, subtree);
break;
default:
proto_tree_add_text(
tree, tvb, offset, 0,
"[GetPrinter level %d not decoded]", level);
break;
}
}
return offset;
}
/*
* SpoolssOpenPrinterEx
*/
static int SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
guint32 ptr = 0;
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
offset = prs_ptr(tvb, offset, pinfo, tree, &ptr, "Printer name");
if (ptr) {
char *printer_name;
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_UNISTR2_dp,
(void **)&printer_name,
NULL);
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
printer_name);
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
/* Store printer name to match with reply packet */
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcv->private_data = printer_name;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
}
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_PRINTER_DEFAULT, NULL, NULL);
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "User switch");
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_USER_LEVEL, NULL, NULL);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
static int SpoolssOpenPrinterEx_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
guint32 status;
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
const guint8 *policy_hnd;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
display_pol(tree, tvb, offset - 20, policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_werror(tvb, offset, pinfo, tree, &status);
if (status == 0) {
/* Associate the returned printer handle with a name */
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
if (dcv->private_data) {
dcerpc_smb_store_pol(policy_hnd, dcv->private_data,
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
pinfo->fd->num, 0);
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
g_free(dcv->private_data);
dcv->private_data = NULL;
}
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
}
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/*
* NOTIFY_OPTION_DATA structure
*/
static gint ett_NOTIFY_OPTION_DATA = -1;
static int prs_NOTIFY_OPTION_DATA(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
GList **parent_dp_list, void **data)
{
proto_item *item;
proto_tree *subtree;
guint32 count, i;
item = proto_tree_add_text(tree, tvb, offset, 0, "NOTIFY_OPTION_DATA");
subtree = proto_item_add_subtree(item, ett_NOTIFY_OPTION_DATA);
offset = prs_uint32(tvb, offset, pinfo, subtree, &count, "Count");
for (i = 0; i < count; i++)
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL,
"Field");
return offset;
}
/*
* NOTIFY_OPTION structure
*/
static gint ett_NOTIFY_OPTION = -1;
static int prs_NOTIFY_OPTION(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **parent_dp_list,
void **data)
{
proto_item *item;
proto_tree *subtree;
guint32 ptr = 0;
item = proto_tree_add_text(tree, tvb, offset, 0, "NOTIFY_OPTION");
subtree = proto_item_add_subtree(item, ett_NOTIFY_OPTION);
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Type");
offset = prs_uint16(tvb, offset, pinfo, subtree, NULL, "Reserved");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Reserved");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Reserved");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Count");
offset = prs_ptr(tvb, offset, pinfo, subtree, &ptr, "Fields");
if (ptr)
defer_ptr(parent_dp_list, prs_NOTIFY_OPTION_DATA, subtree);
return offset;
}
/*
* NOTIFY_OPTION_CTR structure
*/
static gint ett_NOTIFY_OPTION_CTR = -1;
static int prs_NOTIFY_OPTION_CTR(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
GList **dp_list, void **data)
{
GList *child_dp_list = NULL;
proto_item *item;
proto_tree *subtree;
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
guint32 count, i;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
item = proto_tree_add_text(tree, tvb, offset, 0,
"NOTIFY_OPTION_CTR");
subtree = proto_item_add_subtree(item, ett_NOTIFY_OPTION_CTR);
offset = prs_uint32(tvb, offset, pinfo, subtree, &count, "Count");
for (i = 0; i < count; i++)
offset = prs_NOTIFY_OPTION(tvb, offset, pinfo, subtree,
&child_dp_list, NULL);
offset = prs_referents(tvb, offset, pinfo, subtree, dp_list,
&child_dp_list, NULL);
return offset;
}
/*
* NOTIFY_OPTION structure
*/
gint ett_NOTIFY_OPTION_ARRAY = -1;
static int prs_NOTIFY_OPTION_ARRAY(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
GList **dp_list, void **data)
{
proto_item *item;
proto_tree *subtree;
guint32 ptr = 0;
item = proto_tree_add_text(tree, tvb, offset, 0,
"NOTIFY_OPTION_ARRAY");
subtree = proto_item_add_subtree(item, ett_NOTIFY_OPTION_ARRAY);
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Version");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Flags");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Count");
offset = prs_ptr(tvb, offset, pinfo, subtree, &ptr, "Option type");
if (ptr)
defer_ptr(dp_list, prs_NOTIFY_OPTION_CTR, subtree);
return offset;
}
/*
* SpoolssRFFPCNEX
*/
static int SpoolssRFFPCNEX_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
char *printer_name;
guint32 ptr = 0;
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
const guint8 *policy_hnd;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
display_pol(tree, tvb, offset - 20, policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Flags");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Options");
offset = prs_ptr(tvb, offset, pinfo, tree, &ptr, "Local machine");
if (ptr) {
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_UNISTR2_dp,
(void *)&printer_name, NULL);
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
printer_name);
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
g_free(printer_name);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
}
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Printer local");
offset = prs_ptr(tvb, offset, pinfo, tree, &ptr, "Option");
if (ptr) {
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_NOTIFY_OPTION_ARRAY,
NULL, NULL);
}
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
static int SpoolssRFFPCNEX_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/*
* SpoolssReplyOpenPrinter
*/
static int SpoolssReplyOpenPrinter_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
guint32 type;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_UNISTR2_dp, NULL, NULL);
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Printer");
offset = prs_uint32(tvb, offset, pinfo, tree, &type, NULL);
proto_tree_add_text(tree, tvb, offset - 4, 4, "Type: %s",
val_to_str(type, reg_datatypes, "Unknown type"));
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown");
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
static int SpoolssReplyOpenPrinter_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
const guint8 *policy_hnd;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
display_pol(tree, tvb, offset - 20, policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/*
* BUFFER_DATA
*/
static gint ett_BUFFER_DATA = -1;
static gint ett_BUFFER_DATA_BUFFER = -1;
struct BUFFER_DATA {
proto_item *item; /* proto_item holding proto_tree */
proto_tree *tree; /* proto_tree holding buffer data */
tvbuff_t *tvb;
int offset; /* Offset where data starts in tvb*/
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
int size; /* Size of buffer data */
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
};
static int prs_BUFFER_DATA(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **data)
{
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
proto_item *item, *subitem;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
proto_tree *subtree, *subsubtree;
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
guint32 size;
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
int data8_offset;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
item = proto_tree_add_text(tree, tvb, offset, 0, "BUFFER_DATA");
subtree = proto_item_add_subtree(item, ett_BUFFER_DATA);
offset = prs_uint32(tvb, offset, pinfo, subtree, &size, "Size");
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
subitem = proto_tree_add_text(subtree, tvb, offset, size, "Data");
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
subsubtree = proto_item_add_subtree(subitem, ett_BUFFER_DATA_BUFFER);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
offset = prs_uint8s(tvb, offset, pinfo, subsubtree, size,
&data8_offset, NULL);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Return some info which will help the caller "cast" the buffer
data and dissect it further. */
if (data) {
struct BUFFER_DATA *bd;
bd = (struct BUFFER_DATA *)malloc(sizeof(struct BUFFER_DATA));
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
bd->item = subitem;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
bd->tree = subsubtree;
bd->tvb = tvb;
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
bd->offset = data8_offset;
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
bd->size = size;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
*data = bd;
}
return offset;
}
/*
* BUFFER
*/
static gint ett_BUFFER = -1;
static int prs_BUFFER(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **data)
{
proto_item *item;
proto_tree *subtree;
guint32 ptr = 0;
item = proto_tree_add_text(tree, tvb, offset, 0, "BUFFER");
subtree = proto_item_add_subtree(item, ett_BUFFER);
offset = prs_ptr(tvb, offset, pinfo, subtree, &ptr, "Data");
if (ptr)
defer_ptr(dp_list, prs_BUFFER_DATA, subtree);
return offset;
}
/*
* SpoolssGetPrinter
*/
static int SpoolssGetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
guint32 level;
const guint8 *policy_hnd;
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
display_pol(tree, tvb, offset - 20, policy_hnd);
Support for DCE RPC atop SMB, and support for several Microsoft DCE RPC services used with SMB, from Tim Potter. svn path=/trunk/; revision=4194
2001-11-12 08:58:45 +00:00
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, &level, "Level");
Support for DCE RPC atop SMB, and support for several Microsoft DCE RPC services used with SMB, from Tim Potter. svn path=/trunk/; revision=4194
2001-11-12 08:58:45 +00:00
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", level %d", level);
Support for DCE RPC atop SMB, and support for several Microsoft DCE RPC services used with SMB, from Tim Potter. svn path=/trunk/; revision=4194
2001-11-12 08:58:45 +00:00
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_BUFFER, NULL, NULL);
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcv->private_data = (void *)level;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Offered");
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
static int SpoolssGetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
GList *dp_list = NULL;
void **data_list;
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
struct BUFFER_DATA *bd = NULL;
Decode some bits of the PRINTER_INFO_2 structure that we were missing before. Display which info level a getprinter response contains in COL_INFO. Fixed some bugs in dissecting devicemodes - the device name and form name live in a 64-byte buffer instead of a NULL terminated unicode string. svn path=/trunk/; revision=5102
2002-04-05 03:07:28 +00:00
gint16 level = (guint32)dcv->private_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Decode some bits of the PRINTER_INFO_2 structure that we were missing before. Display which info level a getprinter response contains in COL_INFO. Fixed some bugs in dissecting devicemodes - the device name and form name live in a 64-byte buffer instead of a NULL terminated unicode string. svn path=/trunk/; revision=5102
2002-04-05 03:07:28 +00:00
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", level %d", level);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
Add a cleanup function to close a potential memory leak. Get rid of an assigned-to-but-not-used variable. From Steven French: add names for some additional calls. svn path=/trunk/; revision=5003
2002-03-22 10:03:36 +00:00
prs_BUFFER, NULL, &data_list);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
if (data_list)
bd = (struct BUFFER_DATA *)data_list[0];
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
if (bd && bd->tree) {
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_item_append_text(bd->item, ", PRINTER_INFO_%d", level);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
switch (level) {
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
case 0:
prs_PRINTER_INFO_0(bd->tvb, bd->offset, pinfo,
bd->tree, &dp_list, NULL);
break;
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
Decode PRINTER_INFO_1 and PRINTER_INFO_3 structures. svn path=/trunk/; revision=5092
2002-04-03 23:32:23 +00:00
case 1:
prs_PRINTER_INFO_1(bd->tvb, bd->offset, pinfo,
bd->tree, &dp_list, NULL);
break;
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
case 2:
prs_PRINTER_INFO_2(bd->tvb, bd->offset, pinfo,
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
bd->tree, bd->size, &dp_list, NULL);
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
break;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Decode PRINTER_INFO_1 and PRINTER_INFO_3 structures. svn path=/trunk/; revision=5092
2002-04-03 23:32:23 +00:00
case 3:
prs_PRINTER_INFO_3(bd->tvb, bd->offset, pinfo,
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
bd->tree, bd->size, &dp_list, NULL);
Decode PRINTER_INFO_1 and PRINTER_INFO_3 structures. svn path=/trunk/; revision=5092
2002-04-03 23:32:23 +00:00
break;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
default:
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
proto_tree_add_text(bd->tree, tvb, offset, 0,
"[Unknown info level %d]", level);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
break;
}
}
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Needed");
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
Start of support for setprinter calls. Currently on setprinter level 3 is decoded properly. Add printer name to COL_INFO field in ClosePrinter request. svn path=/trunk/; revision=5322
2002-05-01 05:28:56 +00:00
/*
* SEC_DESC_BUF
*/
static gint ett_SEC_DESC_BUF = -1;
static int prs_SEC_DESC_BUF(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **Data)
{
proto_item *item;
proto_tree *subtree;
guint32 len;
item = proto_tree_add_text(tree, tvb, offset, 0, "SEC_DESC_BUF");
subtree = proto_item_add_subtree(item, ett_SEC_DESC_BUF);
offset = prs_uint32(tvb, offset, pinfo, subtree, &len, "Max length");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Undocumented");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Length");
Add a "remove an argument" change, from Joerg Mayer, that I'd missed. Put in a comment noting a problem in the code. svn path=/trunk/; revision=5341
2002-05-01 21:22:06 +00:00
dissect_nt_sec_desc(tvb, offset, subtree, len);
Start of support for setprinter calls. Currently on setprinter level 3 is decoded properly. Add printer name to COL_INFO field in ClosePrinter request. svn path=/trunk/; revision=5322
2002-05-01 05:28:56 +00:00
offset += len;
return offset;
}
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/*
* SPOOL_PRINTER_INFO_LEVEL
*/
static gint ett_SPOOL_PRINTER_INFO_LEVEL = -1;
static int prs_SPOOL_PRINTER_INFO_LEVEL(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
GList **dp_list, void **data)
{
proto_item *item;
proto_tree *subtree;
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
guint32 level;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
item = proto_tree_add_text(tree, tvb, offset, 0,
"SPOOL_PRINTER_INFO_LEVEL");
subtree = proto_item_add_subtree(item, ett_SPOOL_PRINTER_INFO_LEVEL);
offset = prs_uint32(tvb, offset, pinfo, subtree, &level, "Level");
switch(level) {
Start of support for setprinter calls. Currently on setprinter level 3 is decoded properly. Add printer name to COL_INFO field in ClosePrinter request. svn path=/trunk/; revision=5322
2002-05-01 05:28:56 +00:00
case 3: {
guint32 ptr;
offset = prs_ptr(tvb, offset, pinfo, subtree, &ptr,
"Devicemode container");
if (ptr)
defer_ptr(dp_list, prs_DEVMODE_CTR, subtree);
offset = prs_ptr(tvb, offset, pinfo, subtree, &ptr,
"Security descriptor");
if (ptr)
defer_ptr(dp_list, prs_SEC_DESC_BUF, subtree);
break;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
}
Start of support for setprinter calls. Currently on setprinter level 3 is decoded properly. Add printer name to COL_INFO field in ClosePrinter request. svn path=/trunk/; revision=5322
2002-05-01 05:28:56 +00:00
case 2: {
guint32 ptr;
offset = prs_ptr(tvb, offset, pinfo, subtree, &ptr, "Info");
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Start of support for setprinter calls. Currently on setprinter level 3 is decoded properly. Add printer name to COL_INFO field in ClosePrinter request. svn path=/trunk/; revision=5322
2002-05-01 05:28:56 +00:00
if (ptr)
defer_ptr(dp_list, prs_PRINTER_INFO_2, subtree);
break;
}
default:
proto_tree_add_text(subtree, tvb, offset, 0,
"[Unknown info level %d]", level);
break;
}
done:
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/*
* SpoolssSetPrinter
*/
static int SpoolssSetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
guint32 level;
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
const guint8 *policy_hnd;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
display_pol(tree, tvb, offset - 20, policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, &level, "Level");
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", level %d", level);
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_SPOOL_PRINTER_INFO_LEVEL,
NULL, NULL);
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Command");
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
static int SpoolssSetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
/*
* FORM_REL
*/
Decode FORM_1 and FORM_REL flag values as value_strings. svn path=/trunk/; revision=5132
2002-04-09 04:41:40 +00:00
static const value_string form_type_vals[] =
{
{ FORM_USER, "FORM_USER" },
{ FORM_BUILTIN, "FORM_BUILTIN" },
{ FORM_PRINTER, "FORM_PRINTER" },
{ 0, NULL }
};
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
static gint ett_FORM_REL = -1;
static int prs_FORM_REL(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, int struct_start, GList **dp_list,
void **data)
{
proto_item *item;
proto_tree *subtree;
Decode FORM_1 and FORM_REL flag values as value_strings. svn path=/trunk/; revision=5132
2002-04-09 04:41:40 +00:00
guint32 flags;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
item = proto_tree_add_text(tree, tvb, offset, 0, "FORM_REL");
subtree = proto_item_add_subtree(item, ett_FORM_REL);
Decode FORM_1 and FORM_REL flag values as value_strings. svn path=/trunk/; revision=5132
2002-04-09 04:41:40 +00:00
offset = prs_uint32(tvb, offset, pinfo, subtree, &flags, NULL);
proto_tree_add_text(subtree, tvb, offset - 4, 4, "Flags: %s",
val_to_str(flags, form_type_vals, "Unknown type"));
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
offset = prs_relstr(tvb, offset, pinfo, subtree, dp_list,
struct_start, NULL, "Name");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Width");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Height");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL,
"Left margin");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL,
"Top margin");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL,
"Horizontal imageable length");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL,
"Vertical imageable length");
return offset;
}
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/*
* SpoolssEnumForms
*/
static int SpoolssEnumForms_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
guint32 level;
const guint8 *policy_hnd;
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
display_pol(tree, tvb, offset - 20, policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, &level, "Level");
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcv->private_data = (void *)level;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", level %d", level);
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_BUFFER, NULL, NULL);
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Offered");
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
static int SpoolssEnumForms_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 count;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
struct BUFFER_DATA *bd = NULL;
void **data_list;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
prs_BUFFER, NULL, &data_list);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Needed");
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, &count, "Num entries");
if (data_list)
bd = (struct BUFFER_DATA *)data_list[0];
CLEANUP_PUSH(g_free, bd);
if (bd && bd->tree) {
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
guint32 level = (guint32)dcv->private_data, i;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
GList *child_dp_list = NULL;
if (check_col(pinfo->cinfo, COL_INFO))
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
col_append_fstr(pinfo->cinfo, COL_INFO, ", level %d", level);
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_item_append_text(bd->item, ", FORM_%d", level);
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
/* Unfortunately this array isn't in NDR format so we can't
use prs_array(). The other weird thing is the
struct_start being inside the loop rather than outside.
Very strange. */
for (i = 0; i < count; i++) {
int struct_start = bd->offset;
bd->offset = prs_FORM_REL(
bd->tvb, bd->offset, pinfo, bd->tree,
struct_start, &child_dp_list, NULL);
}
}
CLEANUP_CALL_AND_POP;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/*
* SpoolssDeletePrinter
*/
static int SpoolssDeletePrinter_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
const guint8 *policy_hnd;
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
display_pol(tree, tvb, offset - 20, policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
static int SpoolssDeletePrinter_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
const guint8 *policy_hnd;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
display_pol(tree, tvb, offset - 20, policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/*
* AddPrinterEx
*/
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
#if 0
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
static int SpoolssAddPrinterEx_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
guint32 ptr;
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
/* Parse packet */
offset = prs_ptr(tvb, offset, pinfo, tree, &ptr, "Server name");
if (ptr) {
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
char *printer_name;
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_UNISTR2_dp,
(void *)&printer_name, NULL);
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
if (printer_name)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcv->private_data = printer_name;
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
}
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Level");
/* TODO: PRINTER INFO LEVEL */
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Unknown");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "User switch");
/* TODO: USER LEVEL */
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
return offset;
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
}
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
#endif
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
static int SpoolssAddPrinterEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
guint32 status;
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
const guint8 *policy_hnd;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
display_pol(tree, tvb, offset - 20, policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_werror(tvb, offset, pinfo, tree, &status);
if (status == 0) {
/* Associate the returned printer handle with a name */
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
if (dcv->private_data) {
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(
pinfo->cinfo, COL_INFO, ", %s",
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
(char *)dcv->private_data);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_smb_store_pol(
policy_hnd, dcv->private_data, pinfo->fd->num, 0);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
g_free(dcv->private_data);
dcv->private_data = NULL;
}
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
}
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/*
* SpoolssEnumPrinterData
*/
static int SpoolssEnumPrinterData_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
const guint8 *policy_hnd;
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
display_pol(tree, tvb, offset - 20, policy_hnd);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Index");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Value size");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Data size");
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
static int SpoolssEnumPrinterData_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
guint32 data_size, type, value_size;
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
int uint16s_offset;
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
char *text;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, &value_size,
"Value size");
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
offset = prs_uint16s(tvb, offset, pinfo, tree, value_size,
&uint16s_offset, NULL);
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
text = fake_unicode(tvb, uint16s_offset, value_size);
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
proto_tree_add_text(tree, tvb, uint16s_offset,
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
value_size * 2, "Value: %s", text);
if (text[0] && check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", text);
There is no guarantee that a buffer obtained using "tvb_get_ptr()" is neatly aligned on a 2-byte or a 4-byte boundary, and there is no guarantee that a misaligned pointer can be dereferenced without getting a fault. Furthermore, there is no guarantee that, even if you *can* dereference a pointer to a 2-byte or 4-byte quantity in a packet, the resulting number you get back is in the right byte order; the data in the packet might have a different byte order from the machine on which you're running. Therefore, we change "prs_uint8s()", "prs_uint16s()", and "prs_uint32s()" to return the starting offset, in the tvbuff, of the collection of 8-bit, 16-bit, or 32-bit integral values, rather than a pointer to the raw packet data, and change their callers to fetch the data using "tvb_get_guint8()", "tvb_get_letohs()", and "tvb_get_letohl()" (the stuff in all the NT protocols is presumed to be little-endian here). We also change "fake_unicode()" to take a tvbuff and an offset, rather than a data pointer, as arguments, and to use "tvb_get_letohs()" to fetch the Unicode characters (again, we assume little-endian Unicode). This requires "fake_unicode()" to establish a cleanup handler, so we don't leak memory if it throws an exception. We also make "fake_unicode()" use "g_malloc()" to allocate its buffer (we weren't checking for allocation failures in any case; with "g_malloc()", we'll abort on an allocation failure - if we can come up with a cleverer way of handling them, fine), and the matching frees to use "g_free()". (We also insert some missing frees....) Fix some formats to print unsigned quantities with "%u", not "%d". Don't append text to items in the tree for non-string values in "dissect_ndr_nt_STRING_string()". svn path=/trunk/; revision=4986
2002-03-19 22:09:23 +00:00
g_free(text);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Real value size");
offset = prs_uint32(tvb, offset, pinfo, tree, &type, NULL);
proto_tree_add_text(tree, tvb, offset - 4, 4, "Type: %s",
val_to_str(type, reg_datatypes, "Unknown type"));
offset = prs_uint32(tvb, offset, pinfo, tree, &data_size, "Data size");
offset = prs_uint8s(tvb, offset, pinfo, tree, data_size, NULL,
"Data");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Real data size");
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
/*
* SpoolssEnumPrinters
*/
static int SpoolssEnumPrinters_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
guint32 ptr, level;
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Flags");
offset = prs_ptr(tvb, offset, pinfo, tree, &ptr, "Devicemode");
if (ptr)
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_UNISTR2_dp, NULL, NULL);
offset = prs_uint32(tvb, offset, pinfo, tree, &level, "Level");
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", level, %d", level);
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_BUFFER, NULL, NULL);
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Offered");
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
static int SpoolssEnumPrinters_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_BUFFER, NULL, NULL);
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Needed");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Returned");
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
/*
* AddPrinterDriver
*/
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
#if 0
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
static int SpoolssAddPrinterDriver_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
return offset;
}
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
#endif
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
static int SpoolssAddPrinterDriver_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
/* Parse packet */
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
return offset;
}
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
/*
* FORM_1
*/
static gint ett_FORM_1 = -1;
static int prs_FORM_1(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **data)
{
proto_item *item;
proto_tree *subtree;
Decode FORM_1 and FORM_REL flag values as value_strings. svn path=/trunk/; revision=5132
2002-04-09 04:41:40 +00:00
guint32 ptr = 0, flags;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
item = proto_tree_add_text(tree, tvb, offset, 0, "FORM_1");
subtree = proto_item_add_subtree(item, ett_FORM_1);
offset = prs_ptr(tvb, offset, pinfo, subtree, &ptr, "Name");
if (ptr)
defer_ptr(dp_list, prs_UNISTR2_dp, subtree);
Decode FORM_1 and FORM_REL flag values as value_strings. svn path=/trunk/; revision=5132
2002-04-09 04:41:40 +00:00
offset = prs_uint32(tvb, offset, pinfo, subtree, &flags, NULL);
proto_tree_add_text(subtree, tvb, offset - 4, 4, "Flags: %s",
val_to_str(flags, form_type_vals, "Unknown type"));
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Unknown");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Width");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL, "Height");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL,
"Left margin");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL,
"Top margin");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL,
"Horizontal imageable length");
offset = prs_uint32(tvb, offset, pinfo, subtree, NULL,
"Vertical imageable length");
return offset;
}
/*
* FORM_CTR
*/
static gint ett_FORM_CTR = -1;
static int prs_FORM_CTR(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **data)
{
proto_item *item;
proto_tree *subtree;
guint32 level;
item = proto_tree_add_text(tree, tvb, offset, 0, "FORM_CTR");
subtree = proto_item_add_subtree(item, ett_FORM_CTR);
offset = prs_uint32(tvb, offset, pinfo, subtree, &level, "Level");
switch(level) {
case 1:
offset = prs_struct_and_referents(tvb, offset, pinfo, subtree,
prs_FORM_1, NULL, NULL);
break;
default:
proto_tree_add_text(subtree, tvb, offset, 0,
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
"[Unknown info level %d]", level);
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
break;
}
return offset;
}
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
/*
* AddForm
*/
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
static int SpoolssAddForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
const guint8 *policy_hnd;
guint32 level;
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
/* Parse packet */
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
display_pol(tree, tvb, offset - 20, policy_hnd);
offset = prs_uint32(tvb, offset, pinfo, tree, &level, "Level");
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", level %d", level);
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
/* Store info level to match with reply packet */
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcv->private_data = (void *)level;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_FORM_CTR, NULL, NULL);
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
return offset;
}
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
static int SpoolssAddForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
/* Parse packet */
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
return offset;
}
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
/*
* DeleteForm
*/
static int SpoolssDeleteForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
const guint8 *policy_hnd;
char *form_name;
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
/* Parse packet */
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
display_pol(tree, tvb, offset - 20, policy_hnd);
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_UNISTR2_dp, (void **)&form_name,
NULL);
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", form_name);
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
g_free(form_name);
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
return offset;
}
static int SpoolssDeleteForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
/* Parse packet */
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
return offset;
}
/*
* SetForm
*/
static int SpoolssSetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
const guint8 *policy_hnd;
guint32 level;
char *form_name;
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
/* Parse packet */
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
display_pol(tree, tvb, offset - 20, policy_hnd);
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_UNISTR2_dp, (void **)&form_name,
NULL);
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
CLEANUP_PUSH(g_free, form_name);
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, &level, "Level");
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s, level %d",
form_name, level);
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
CLEANUP_CALL_AND_POP;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_FORM_CTR, NULL, NULL);
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
return offset;
}
static int SpoolssSetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
/* Parse packet */
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
return offset;
}
/*
* GetForm
*/
static int SpoolssGetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 level;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
const guint8 *policy_hnd;
char *form_name;
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
/* Parse packet */
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
display_pol(tree, tvb, offset - 20, policy_hnd);
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_UNISTR2_dp, (void **)&form_name,
NULL);
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
CLEANUP_PUSH(g_free, form_name);
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, &level, "Level");
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcv->private_data = (void *)level;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s, level %d",
form_name, level);
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
CLEANUP_CALL_AND_POP;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_BUFFER, NULL, NULL);
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Offered");
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
return offset;
}
static int SpoolssGetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
void **data_list;
struct BUFFER_DATA *bd = NULL;
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
/* Parse packet */
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_BUFFER, NULL, &data_list);
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Needed");
if (data_list)
bd = (struct BUFFER_DATA *)data_list[0];
CLEANUP_PUSH(g_free, bd);
if (bd && bd->tree) {
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
guint32 level = (guint32)dcv->private_data;
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
switch(level) {
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
case 1: {
int struct_start = bd->offset;
GList *dp_list = NULL;
bd->offset = prs_FORM_REL(
bd->tvb, bd->offset, pinfo, bd->tree,
struct_start, &dp_list, NULL);
break;
}
default:
proto_tree_add_text(
bd->tree, bd->tvb, bd->offset, 0,
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
"[Unknown info level %d]", level);
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
break;
}
}
CLEANUP_CALL_AND_POP;
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
return offset;
}
Added a generic reply handler for unimplemented spoolss dissectors. This just parses the error code at the end of the packet and updates COL_INFO if necessary. svn path=/trunk/; revision=5012
2002-03-25 01:09:01 +00:00
/* A generic reply function that just parses the status code. Useful for
unimplemented dissectors so the status code can be inserted into the
INFO column. */
static int SpoolssGeneric_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
Added a generic reply handler for unimplemented spoolss dissectors. This just parses the error code at the end of the packet and updates COL_INFO if necessary. svn path=/trunk/; revision=5012
2002-03-25 01:09:01 +00:00
int len = tvb_length(tvb);
proto_tree_add_text(tree, tvb, offset, 0,
"[Unimplemented dissector: SPOOLSS]");
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
Added a generic reply handler for unimplemented spoolss dissectors. This just parses the error code at the end of the packet and updates COL_INFO if necessary. svn path=/trunk/; revision=5012
2002-03-25 01:09:01 +00:00
prs_werror(tvb, len - 4, pinfo, tree, NULL);
return offset;
}
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
/*
* JOB_INFO_1
*/
static gint ett_JOB_INFO_1;
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
#if 0
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
static int prs_JOB_INFO_1(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **data)
{
proto_item *item;
proto_tree *subtree;
item = proto_tree_add_text(tree, tvb, offset, 0, "JOB_INFO_1");
subtree = proto_item_add_subtree(item, ett_FORM_CTR);
return offset;
}
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
#endif
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
/*
* JOB_INFO_2
*/
static gint ett_JOB_INFO_2;
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
#if 0
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
static int prs_JOB_INFO_2(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, GList **dp_list, void **data)
{
proto_item *item;
proto_tree *subtree;
item = proto_tree_add_text(tree, tvb, offset, 0, "JOB_INFO_2");
subtree = proto_item_add_subtree(item, ett_FORM_CTR);
return offset;
}
Removal (or, at least, #ifdeffing out) of unused variables and functions, from David Frascone. svn path=/trunk/; revision=5288
2002-04-29 08:20:18 +00:00
#endif
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
/*
* EnumJobs
*/
static int SpoolssEnumJobs_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
const guint8 *policy_hnd;
guint32 level;
if (dcv->rep_frame != 0)
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %d", dcv->rep_frame);
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
/* Parse packet */
offset = prs_policy_hnd(tvb, offset, pinfo, NULL, &policy_hnd);
display_pol(tree, tvb, offset - 20, policy_hnd);
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "First job");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Num jobs");
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
offset = prs_uint32(tvb, offset, pinfo, tree, &level, "Level");
dcv->private_data = (void *)level;
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", level %d", level);
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_BUFFER, NULL, NULL);
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Offered");
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
return offset;
}
static int SpoolssEnumJobs_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
void **data_list;
struct BUFFER_DATA *bd = NULL;
gint16 level = (guint32)dcv->private_data;
if (dcv->req_frame != 0)
proto_tree_add_text(tree, tvb, offset, 0,
"Request in frame %d", dcv->req_frame);
/* Parse packet */
offset = prs_struct_and_referents(tvb, offset, pinfo, tree,
prs_BUFFER, NULL, &data_list);
if (data_list)
bd = (struct BUFFER_DATA *)data_list[0];
if (bd && bd->tree) {
proto_item_append_text(bd->item, ", JOB_INFO_%d", level);
switch (level) {
default:
proto_tree_add_text(
bd->tree, tvb, offset, 0,
"[Unknown info level %d]", level);
break;
}
}
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Needed");
offset = prs_uint32(tvb, offset, pinfo, tree, NULL, "Returned");
offset = prs_werror(tvb, offset, pinfo, tree, NULL);
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
return offset;
}
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
#if 0
/* Templates for new subdissectors */
/*
* FOO
*/
static int SpoolssFoo_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->rep_frame != 0)
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
"Reply in frame %u", dcv->rep_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
static int SpoolssFoo_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep)
{
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
if (dcv->req_frame != 0)
Use dcerpc_call_value structure to fetch request/response frame numbers and storage of private data. Fix memory leaks in form dissectors. svn path=/trunk/; revision=5020
2002-03-26 05:20:51 +00:00
proto_tree_add_text(tree, tvb, offset, 0,
Frame numbers are unsigned, and 0 is not a valid frame number; make the frame number arguments, and elements in data structures, unsigned, display them with "%u" rather than "%d", and use 0, rather than -1, as "not known". svn path=/trunk/; revision=5223
2002-04-22 09:43:03 +00:00
"Request in frame %u", dcv->req_frame);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Parse packet */
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
return offset;
}
#endif
/*
* List of subdissectors for this pipe.
*/
Support for DCE RPC atop SMB, and support for several Microsoft DCE RPC services used with SMB, from Tim Potter. svn path=/trunk/; revision=4194
2001-11-12 08:58:45 +00:00
Rename the "packet-msrpc-XXX.[ch]" files to "packet-dcerpc-XXX.[ch]", as per Todd Sabin's suggestion. svn path=/trunk/; revision=4242
2001-11-21 02:08:57 +00:00
static dcerpc_sub_dissector dcerpc_spoolss_dissectors[] = {
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_ENUMPRINTERS, "EnumPrinters",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
SpoolssEnumPrinters_q, SpoolssEnumPrinters_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_OPENPRINTER, "OpenPrinter",
NULL, SpoolssGeneric_r },
{ SPOOLSS_SETJOB, "SetJob",
NULL, SpoolssGeneric_r },
{ SPOOLSS_GETJOB, "GetJob",
NULL, SpoolssGeneric_r },
{ SPOOLSS_ENUMJOBS, "EnumJobs",
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
SpoolssEnumJobs_q, SpoolssEnumJobs_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_ADDPRINTER, "AddPrinter",
NULL, SpoolssGeneric_r },
{ SPOOLSS_DELETEPRINTER, "DeletePrinter",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
SpoolssDeletePrinter_q, SpoolssDeletePrinter_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_SETPRINTER, "SetPrinter",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
SpoolssSetPrinter_q, SpoolssSetPrinter_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_GETPRINTER, "GetPrinter",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
SpoolssGetPrinter_q, SpoolssGetPrinter_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_ADDPRINTERDRIVER, "AddPrinterDriver",
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
NULL, SpoolssAddPrinterDriver_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_ENUMPRINTERDRIVERS, "EnumPrinterDrivers",
NULL, SpoolssGeneric_r },
{ SPOOLSS_GETPRINTERDRIVER, "GetPrinterDriver",
NULL, SpoolssGeneric_r },
{ SPOOLSS_GETPRINTERDRIVERDIRECTORY, "GetPrinterDriverDirectory",
NULL, SpoolssGeneric_r },
{ SPOOLSS_DELETEPRINTERDRIVER, "DeletePrinterDriver",
NULL, SpoolssGeneric_r },
{ SPOOLSS_ADDPRINTPROCESSOR, "AddPrintProcessor",
NULL, SpoolssGeneric_r },
{ SPOOLSS_ENUMPRINTPROCESSORS, "EnumPrintProcessor",
NULL, SpoolssGeneric_r },
{ SPOOLSS_GETPRINTPROCESSORDIRECTORY, "GetPrintProcessorDirectory",
NULL, SpoolssGeneric_r },
{ SPOOLSS_STARTDOCPRINTER, "StartDocPrinter",
NULL, SpoolssGeneric_r },
{ SPOOLSS_STARTPAGEPRINTER, "StartPagePrinter",
NULL, SpoolssGeneric_r },
{ SPOOLSS_WRITEPRINTER, "WritePrinter",
NULL, SpoolssGeneric_r },
{ SPOOLSS_ENDPAGEPRINTER, "EndPagePrinter",
NULL, SpoolssGeneric_r },
{ SPOOLSS_ABORTPRINTER, "AbortPrinter",
NULL, SpoolssGeneric_r },
{ SPOOLSS_READPRINTER, "ReadPrinter",
NULL, SpoolssGeneric_r },
{ SPOOLSS_ENDDOCPRINTER, "EndDocPrinter",
NULL, SpoolssGeneric_r },
{ SPOOLSS_ADDJOB, "AddJob",
NULL, SpoolssGeneric_r },
{ SPOOLSS_SCHEDULEJOB, "ScheduleJob",
NULL, SpoolssGeneric_r },
{ SPOOLSS_GETPRINTERDATA, "GetPrinterData",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
SpoolssGetPrinterData_q, SpoolssGetPrinterData_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_SETPRINTERDATA, "SetPrinterData",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
SpoolssSetPrinterData_q, SpoolssSetPrinterData_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_WAITFORPRINTERCHANGE, "WaitForPrinterChange",
NULL, SpoolssGeneric_r },
{ SPOOLSS_CLOSEPRINTER, "ClosePrinter",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
SpoolssClosePrinter_q, SpoolssClosePrinter_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_ADDFORM, "AddForm",
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
SpoolssAddForm_q, SpoolssAddForm_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_DELETEFORM, "DeleteForm",
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
SpoolssDeleteForm_q, SpoolssDeleteForm_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_GETFORM, "GetForm",
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
SpoolssGetForm_q, SpoolssGetForm_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_SETFORM, "SetForm",
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
SpoolssSetForm_q, SpoolssSetForm_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_ENUMFORMS, "EnumForms",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
SpoolssEnumForms_q, SpoolssEnumForms_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_ENUMPORTS, "EnumPorts",
NULL, SpoolssGeneric_r },
{ SPOOLSS_ENUMMONITORS, "EnumMonitors",
NULL, SpoolssGeneric_r },
{ SPOOLSS_ADDPORT, "AddPort",
NULL, SpoolssGeneric_r },
{ SPOOLSS_CONFIGUREPORT, "ConfigurePort",
NULL, SpoolssGeneric_r },
{ SPOOLSS_DELETEPORT, "DeletePort",
NULL, SpoolssGeneric_r },
{ SPOOLSS_CREATEPRINTERIC, "CreatePrinterIC",
NULL, SpoolssGeneric_r },
{ SPOOLSS_PLAYGDISCRIPTONPRINTERIC, "PlayDiscriptOnPrinterIC",
NULL, SpoolssGeneric_r },
{ SPOOLSS_DELETEPRINTERIC, "DeletePrinterIC",
NULL, SpoolssGeneric_r },
{ SPOOLSS_ADDPRINTERCONNECTION, "AddPrinterConnection",
NULL, SpoolssGeneric_r },
{ SPOOLSS_DELETEPRINTERCONNECTION, "DeletePrinterConnection",
NULL, SpoolssGeneric_r },
{ SPOOLSS_PRINTERMESSAGEBOX, "PrinterMessageBox",
NULL, SpoolssGeneric_r },
{ SPOOLSS_ADDMONITOR, "AddMonitor",
Added a generic reply handler for unimplemented spoolss dissectors. This just parses the error code at the end of the packet and updates COL_INFO if necessary. svn path=/trunk/; revision=5012
2002-03-25 01:09:01 +00:00
NULL, SpoolssGeneric_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_DELETEMONITOR, "DeleteMonitor",
Added a generic reply handler for unimplemented spoolss dissectors. This just parses the error code at the end of the packet and updates COL_INFO if necessary. svn path=/trunk/; revision=5012
2002-03-25 01:09:01 +00:00
NULL, SpoolssGeneric_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_DELETEPRINTPROCESSOR, "DeletePrintProcessor",
Added a generic reply handler for unimplemented spoolss dissectors. This just parses the error code at the end of the packet and updates COL_INFO if necessary. svn path=/trunk/; revision=5012
2002-03-25 01:09:01 +00:00
NULL, SpoolssGeneric_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_ADDPRINTPROVIDER, "AddPrintProvider",
NULL, SpoolssGeneric_r },
{ SPOOLSS_DELETEPRINTPROVIDER, "DeletePrintProvider",
NULL, SpoolssGeneric_r },
{ SPOOLSS_ENUMPRINTPROCDATATYPES, "EnumPrintProcDataTypes",
NULL, SpoolssGeneric_r },
{ SPOOLSS_RESETPRINTER, "ResetPrinter",
NULL, SpoolssGeneric_r },
{ SPOOLSS_GETPRINTERDRIVER2, "GetPrinterDriver2",
NULL, SpoolssGeneric_r },
{ SPOOLSS_FINDFIRSTPRINTERCHANGENOTIFICATION,
"FindFirstPrinterChangeNotification",
NULL, SpoolssGeneric_r },
{ SPOOLSS_FINDNEXTPRINTERCHANGENOTIFICATION,
"FindNextPrinterChangeNotification",
NULL, SpoolssGeneric_r },
{ SPOOLSS_FCPN, "FCPN",
NULL, SpoolssGeneric_r },
{ SPOOLSS_ROUTERFINDFIRSTPRINTERNOTIFICATIONOLD,
"RouterFindFirstPrinterNotificationOld",
NULL, SpoolssGeneric_r },
{ SPOOLSS_REPLYOPENPRINTER, "ReplyOpenPrinter",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
SpoolssReplyOpenPrinter_q, SpoolssReplyOpenPrinter_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_ROUTERREPLYPRINTER, "RouterREplyPrinter",
NULL, SpoolssGeneric_r },
{ SPOOLSS_REPLYCLOSEPRINTER, "ReplyClosePrinter",
NULL, SpoolssGeneric_r },
{ SPOOLSS_ADDPORTEX, "AddPortEx",
NULL, SpoolssGeneric_r },
{ SPOOLSS_REMOTEFINDFIRSTPRINTERCHANGENOTIFICATION,
"RemoteFindFirstPrinterChangeNotification",
NULL, SpoolssGeneric_r },
{ SPOOLSS_SPOOLERINIT, "SpoolerInit",
NULL, SpoolssGeneric_r },
{ SPOOLSS_RESETPRINTEREX, "ResetPrinterEx",
NULL, SpoolssGeneric_r },
{ SPOOLSS_RFFPCNEX, "RFFPCNEX",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
SpoolssRFFPCNEX_q, SpoolssRFFPCNEX_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_RRPCN, "RRPCN",
NULL, SpoolssGeneric_r },
{ SPOOLSS_RFNPCNEX, "RFNPCNEX",
NULL, SpoolssGeneric_r },
{ SPOOLSS_OPENPRINTEREX, "OpenPrinterEx",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
SpoolssOpenPrinterEx_q, SpoolssOpenPrinterEx_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_ADDPRINTEREX, "AddPrinterEx",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
NULL, SpoolssAddPrinterEx_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_ENUMPRINTERDATA, "EnumPrinterData",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
SpoolssEnumPrinterData_q, SpoolssEnumPrinterData_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_DELETEPRINTERDATA, "DeletePrinterData",
NULL, SpoolssGeneric_r },
{ SPOOLSS_GETPRINTERDATAEX, "GetPrinterDataEx",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
SpoolssGetPrinterDataEx_q, SpoolssGetPrinterDataEx_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_SETPRINTERDATAEX, "SetPrinterDataEx",
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
SpoolssSetPrinterDataEx_q, SpoolssSetPrinterDataEx_r },
Use the string in the DCERPC sub-dissector array instead of providing another one in the COL_INFO field. svn path=/trunk/; revision=5300
2002-04-30 01:44:35 +00:00
{ SPOOLSS_ENUMPRINTERDATAEX, "EnumPrinterDataEx",
NULL, SpoolssGeneric_r },
{ SPOOLSS_ENUMPRINTERKEY, "EnumPrinterKey",
NULL, SpoolssGeneric_r },
{ SPOOLSS_DELETEPRINTERDATAEX, "DeletePrinterDataEx",
NULL, SpoolssGeneric_r },
{ SPOOLSS_DELETEPRINTERDRIVEREX, "DeletePrinterDriverEx",
NULL, SpoolssGeneric_r },
{ SPOOLSS_ADDPRINTERDRIVEREX, "AddPrinterDriverEx",
NULL, SpoolssGeneric_r },
Added a generic reply handler for unimplemented spoolss dissectors. This just parses the error code at the end of the packet and updates COL_INFO if necessary. svn path=/trunk/; revision=5012
2002-03-25 01:09:01 +00:00
{ 0, NULL, NULL, NULL },
Support for DCE RPC atop SMB, and support for several Microsoft DCE RPC services used with SMB, from Tim Potter. svn path=/trunk/; revision=4194
2001-11-12 08:58:45 +00:00
};
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/*
* Dissector initialisation function
*/
/* Protocol registration */
static int proto_dcerpc_spoolss = -1;
static gint ett_dcerpc_spoolss = -1;
Support for DCE RPC atop SMB, and support for several Microsoft DCE RPC services used with SMB, from Tim Potter. svn path=/trunk/; revision=4194
2001-11-12 08:58:45 +00:00
void
Rename the "packet-msrpc-XXX.[ch]" files to "packet-dcerpc-XXX.[ch]", as per Todd Sabin's suggestion. svn path=/trunk/; revision=4242
2001-11-21 02:08:57 +00:00
proto_register_dcerpc_spoolss(void)
Support for DCE RPC atop SMB, and support for several Microsoft DCE RPC services used with SMB, from Tim Potter. svn path=/trunk/; revision=4194
2001-11-12 08:58:45 +00:00
{
static gint *ett[] = {
Rename the "packet-msrpc-XXX.[ch]" files to "packet-dcerpc-XXX.[ch]", as per Todd Sabin's suggestion. svn path=/trunk/; revision=4242
2001-11-21 02:08:57 +00:00
&ett_dcerpc_spoolss,
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
&ett_NOTIFY_OPTION_ARRAY,
&ett_NOTIFY_OPTION_CTR,
&ett_NOTIFY_OPTION,
&ett_NOTIFY_OPTION_DATA,
&ett_PRINTER_DEFAULT,
&ett_DEVMODE_CTR,
&ett_DEVMODE,
&ett_USER_LEVEL,
&ett_USER_LEVEL_1,
&ett_BUFFER,
&ett_BUFFER_DATA,
&ett_BUFFER_DATA_BUFFER,
&ett_UNISTR2,
Updates from Tim Potter. svn path=/trunk/; revision=4493
2002-01-07 19:55:48 +00:00
&ett_SPOOL_PRINTER_INFO_LEVEL,
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
&ett_PRINTER_INFO_0,
&ett_PRINTER_INFO_1,
&ett_PRINTER_INFO_2,
&ett_PRINTER_INFO_3,
&ett_RELSTR,
Some refactoring of the spoolss dissector: - rewrote request/response hashing code and moved it into packet-dcerpc-nt.c for use by other dcerpc/smb dissectors - rewrote policy handle hashing code as above, with nifty improvements - moved check for unparsed data and end of frame into a function - fixed matching of printername to handle in addprinterex svn path=/trunk/; revision=5014
2002-03-25 05:42:02 +00:00
&ett_POLICY_HND,
Added dissectors for get/set/delete form. Fixed enumforms dissector. svn path=/trunk/; revision=5019
2002-03-26 04:29:17 +00:00
&ett_FORM_REL,
&ett_FORM_CTR,
&ett_FORM_1,
Pass the correct len field to dissect_nt_sec_desc() when dissecting PRINTER_INFO_2 and PRINTER_INFO_3 structures. Added dissector for EnumJobs rpc - not quite finished yet. svn path=/trunk/; revision=5231
2002-04-24 03:08:49 +00:00
&ett_JOB_INFO_1,
&ett_JOB_INFO_2,
Start of support for setprinter calls. Currently on setprinter level 3 is decoded properly. Add printer name to COL_INFO field in ClosePrinter request. svn path=/trunk/; revision=5322
2002-05-01 05:28:56 +00:00
&ett_SEC_DESC_BUF,
Support for DCE RPC atop SMB, and support for several Microsoft DCE RPC services used with SMB, from Tim Potter. svn path=/trunk/; revision=4194
2001-11-12 08:58:45 +00:00
};
Rename the "packet-msrpc-XXX.[ch]" files to "packet-dcerpc-XXX.[ch]", as per Todd Sabin's suggestion. svn path=/trunk/; revision=4242
2001-11-21 02:08:57 +00:00
proto_dcerpc_spoolss = proto_register_protocol(
Support for DCE RPC atop SMB, and support for several Microsoft DCE RPC services used with SMB, from Tim Potter. svn path=/trunk/; revision=4194
2001-11-12 08:58:45 +00:00
"Microsoft Spool Subsystem", "SPOOLSS", "spoolss");
proto_register_subtree_array(ett, array_length(ett));
}
SPOOLSS RPC dissector, from Tim Potter. This includes adding additional DOS error codes to the table of them, and exporting that table to other dissectors for protocols using DOS error codes. svn path=/trunk/; revision=4470
2002-01-03 20:42:41 +00:00
/* Protocol handoff */
static e_uuid_t uuid_dcerpc_spoolss = {
0x12345678, 0x1234, 0xabcd,
{ 0xef, 0x00, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab }
};
static guint16 ver_dcerpc_spoolss = 1;
Support for DCE RPC atop SMB, and support for several Microsoft DCE RPC services used with SMB, from Tim Potter. svn path=/trunk/; revision=4194
2001-11-12 08:58:45 +00:00
void
Rename the "packet-msrpc-XXX.[ch]" files to "packet-dcerpc-XXX.[ch]", as per Todd Sabin's suggestion. svn path=/trunk/; revision=4242
2001-11-21 02:08:57 +00:00
proto_reg_handoff_dcerpc_spoolss(void)
Support for DCE RPC atop SMB, and support for several Microsoft DCE RPC services used with SMB, from Tim Potter. svn path=/trunk/; revision=4194
2001-11-12 08:58:45 +00:00
{
/* Register protocol as dcerpc */
Rename the "packet-msrpc-XXX.[ch]" files to "packet-dcerpc-XXX.[ch]", as per Todd Sabin's suggestion. svn path=/trunk/; revision=4242
2001-11-21 02:08:57 +00:00
dcerpc_init_uuid(proto_dcerpc_spoolss, ett_dcerpc_spoolss,
&uuid_dcerpc_spoolss, ver_dcerpc_spoolss,
dcerpc_spoolss_dissectors);
Support for DCE RPC atop SMB, and support for several Microsoft DCE RPC services used with SMB, from Tim Potter. svn path=/trunk/; revision=4194
2001-11-12 08:58:45 +00:00
}