aboutsummaryrefslogtreecommitdiffstats
path: root/packet-dcerpc-spoolss.c
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-02-05 01:36:54 +0000
committerTim Potter <tpot@samba.org>2003-02-05 01:36:54 +0000
commit7a19ab53239e83542f4eb81ae6193ad7f70a48de (patch)
tree25f6009ea51cb9dcedca06292f0a7453ee0b1ec9 /packet-dcerpc-spoolss.c
parent11c39f58abce3022f05f9a4b766502e9c2438f12 (diff)
Deleted RPC request/response proto items from the spoolss dissector as
it's done better in the dcerpc dissector. svn path=/trunk/; revision=7075
Diffstat (limited to 'packet-dcerpc-spoolss.c')
-rw-r--r--packet-dcerpc-spoolss.c450
1 files changed, 1 insertions, 449 deletions
diff --git a/packet-dcerpc-spoolss.c b/packet-dcerpc-spoolss.c
index f0aff7d16f..318b0b1926 100644
--- a/packet-dcerpc-spoolss.c
+++ b/packet-dcerpc-spoolss.c
@@ -2,7 +2,7 @@
* Routines for SMB \PIPE\spoolss packet disassembly
* Copyright 2001-2003, Tim Potter <tpot@samba.org>
*
- * $Id: packet-dcerpc-spoolss.c,v 1.79 2003/02/05 00:36:35 tpot Exp $
+ * $Id: packet-dcerpc-spoolss.c,v 1.80 2003/02/05 01:36:54 tpot Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -842,14 +842,9 @@ static int SpoolssClosePrinter_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
e_ctx_hnd policy_hnd;
char *pol_name;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
/* Parse packet */
offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -871,13 +866,6 @@ static int SpoolssClosePrinter_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1045,10 +1033,6 @@ static int SpoolssGetPrinterData_q(tvbuff_t *tvb, int offset,
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
char *value_name;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
proto_tree_add_uint_hidden(
tree, hf_printerdata, tvb, offset, 0, 1);
@@ -1085,10 +1069,6 @@ static int SpoolssGetPrinterData_r(tvbuff_t *tvb, int offset,
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 type;
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
proto_tree_add_uint_hidden(
tree, hf_printerdata, tvb, offset, 0, 1);
@@ -1129,10 +1109,6 @@ static int SpoolssGetPrinterDataEx_q(tvbuff_t *tvb, int offset,
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
char *key_name, *value_name;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
proto_tree_add_uint_hidden(
tree, hf_printerdata, tvb, offset, 0, 1);
@@ -1191,10 +1167,6 @@ static int SpoolssGetPrinterDataEx_r(tvbuff_t *tvb, int offset,
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 size, type;
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
proto_tree_add_uint_hidden(
tree, hf_printerdata, tvb, offset, 0, 1);
@@ -1236,15 +1208,9 @@ static int SpoolssSetPrinterData_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
char *value_name = NULL;
guint32 type;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
proto_tree_add_uint_hidden(
tree, hf_printerdata, tvb, offset, 0, 1);
@@ -1281,13 +1247,6 @@ static int SpoolssSetPrinterData_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
proto_tree_add_uint_hidden(
tree, hf_printerdata, tvb, offset, 0, 1);
@@ -1309,15 +1268,9 @@ static int SpoolssSetPrinterDataEx_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
char *key_name, *value_name;
guint32 max_len;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
proto_tree_add_uint_hidden(
tree, hf_printerdata, tvb, offset, 0, 1);
@@ -1368,13 +1321,6 @@ static int SpoolssSetPrinterDataEx_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
proto_tree_add_uint_hidden(
tree, hf_printerdata, tvb, offset, 0, 1);
@@ -2740,13 +2686,6 @@ static int SpoolssOpenPrinterEx_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
-
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_ndr_pointer_cb(
@@ -2783,10 +2722,6 @@ static int SpoolssOpenPrinterEx_r(tvbuff_t *tvb, int offset,
guint32 status;
int start_offset = offset;
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* We need the value of the policy handle and status before we
can retrieve the policy handle name. Then we can insert
the policy handle with the name in the proto tree. */
@@ -3197,16 +3132,10 @@ static int SpoolssRFFPCNEX_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 flags;
proto_item *flags_item;
proto_tree *flags_subtree;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -3341,13 +3270,6 @@ static int SpoolssRFFPCNEX_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_doserror(tvb, offset, pinfo, tree, drep,
@@ -3370,10 +3292,6 @@ static int SpoolssReplyOpenPrinter_q(tvbuff_t *tvb, int offset,
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 printerlocal;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_unistr2(
@@ -3402,14 +3320,8 @@ static int SpoolssReplyOpenPrinter_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
e_ctx_hnd policy_hnd;
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -3437,10 +3349,6 @@ static int SpoolssGetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 level;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(
@@ -3477,10 +3385,6 @@ static int SpoolssGetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_item *item;
proto_tree *subtree = NULL;
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, ", level %d", level);
@@ -3653,14 +3557,8 @@ dissect_SPOOL_PRINTER_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssSetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 level;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(
@@ -3689,13 +3587,6 @@ static int SpoolssSetPrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssSetPrinter_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_doserror(tvb, offset, pinfo, tree, drep,
@@ -3783,10 +3674,6 @@ static int SpoolssEnumForms_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 level;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(
@@ -3822,10 +3709,6 @@ static int SpoolssEnumForms_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
guint32 level = (guint32)dcv->private_data, i, count;
int buffer_offset;
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_spoolss_buffer(
@@ -3872,13 +3755,6 @@ static int SpoolssDeletePrinter_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
-
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(
@@ -3894,13 +3770,6 @@ static int SpoolssDeletePrinter_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(
@@ -3923,10 +3792,6 @@ static int SpoolssAddPrinterEx_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
e_ctx_hnd policy_hnd;
guint32 status;
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(
@@ -3975,14 +3840,8 @@ static int SpoolssEnumPrinterData_q(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 ndx;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
proto_tree_add_uint_hidden(
tree, hf_printerdata, tvb, offset, 0, 1);
@@ -4016,17 +3875,11 @@ static int SpoolssEnumPrinterData_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 value_len, type;
char *value;
proto_item *value_item;
proto_tree *value_subtree;
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
proto_tree_add_uint_hidden(
tree, hf_printerdata, tvb, offset, 0, 1);
@@ -4101,16 +3954,10 @@ static int hf_enumprinters_flags_remote = -1;
static int SpoolssEnumPrinters_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 level, flags;
proto_tree *flags_subtree;
proto_item *flags_item;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_ndr_uint32(
@@ -4176,14 +4023,8 @@ static int SpoolssEnumPrinters_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssEnumPrinters_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 num_drivers;
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_spoolss_buffer(
@@ -4215,10 +4056,6 @@ static int SpoolssAddPrinterDriver_q(tvbuff_t *tvb, int offset,
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_ndr_str_pointer_item(
@@ -4237,13 +4074,6 @@ static int SpoolssAddPrinterDriver_r(tvbuff_t *tvb, int offset,
packet_info *pinfo, proto_tree *tree,
char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_doserror(tvb, offset, pinfo, tree, drep,
@@ -4394,10 +4224,6 @@ static int SpoolssAddForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 level;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(
@@ -4425,13 +4251,6 @@ static int SpoolssAddForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssAddForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_doserror(tvb, offset, pinfo, tree, drep,
@@ -4449,13 +4268,6 @@ static int SpoolssAddForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssDeleteForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
-
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(
@@ -4473,13 +4285,6 @@ static int SpoolssDeleteForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssDeleteForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_doserror(tvb, offset, pinfo, tree, drep,
@@ -4497,14 +4302,8 @@ static int SpoolssDeleteForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssSetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 level;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(
@@ -4531,13 +4330,6 @@ static int SpoolssSetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssSetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_doserror(tvb, offset, pinfo, tree, drep,
@@ -4559,10 +4351,6 @@ static int SpoolssGetForm_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 level;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(
@@ -4601,10 +4389,6 @@ static int SpoolssGetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
BUFFER buffer;
guint32 level = (guint32)dcv->private_data;
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_spoolss_buffer(
@@ -4652,17 +4436,11 @@ static int SpoolssGetForm_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssGeneric_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, char *drep _U_)
{
- dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
- dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
int len = tvb_length(tvb);
proto_tree_add_text(tree, tvb, offset, 0,
"[Unimplemented dissector: SPOOLSS]");
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
offset = dissect_doserror(tvb, len - 4, pinfo, tree, drep,
hf_spoolss_rc, NULL);
@@ -4750,10 +4528,6 @@ static int SpoolssEnumJobs_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 level;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %d", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -4795,10 +4569,6 @@ static int SpoolssEnumJobs_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
guint32 num_jobs, i;
int buffer_offset;
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %d", dcv->req_frame);
-
/* Parse packet */
offset = dissect_spoolss_buffer(tvb, offset, pinfo, tree, drep,
@@ -4862,14 +4632,8 @@ static const value_string setjob_commands[] = {
static int SpoolssSetJob_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;
guint32 jobid, cmd;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -4899,13 +4663,6 @@ static int SpoolssSetJob_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssSetJob_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;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_doserror(tvb, offset, pinfo, tree, drep,
@@ -4927,10 +4684,6 @@ static int SpoolssGetJob_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 level, jobid;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -4968,10 +4721,6 @@ static int SpoolssGetJob_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
gint32 level = (guint32)dcv->private_data;
BUFFER buffer;
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_spoolss_buffer(tvb, offset, pinfo, tree, drep,
@@ -5014,15 +4763,9 @@ static int SpoolssStartPagePrinter_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;
e_ctx_hnd policy_hnd;
char *pol_name;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -5044,13 +4787,6 @@ static int SpoolssStartPagePrinter_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;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_doserror(tvb, offset, pinfo, tree, drep,
@@ -5069,15 +4805,9 @@ static int SpoolssEndPagePrinter_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;
e_ctx_hnd policy_hnd;
char *pol_name;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -5099,13 +4829,6 @@ static int SpoolssEndPagePrinter_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;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_doserror(tvb, offset, pinfo, tree, drep,
@@ -5234,15 +4957,9 @@ static int SpoolssStartDocPrinter_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;
e_ctx_hnd policy_hnd;
char *pol_name;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -5266,13 +4983,6 @@ static int SpoolssStartDocPrinter_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;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
@@ -5294,15 +5004,9 @@ static int SpoolssEndDocPrinter_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;
e_ctx_hnd policy_hnd;
char *pol_name;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -5324,13 +5028,6 @@ static int SpoolssEndDocPrinter_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;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_doserror(tvb, offset, pinfo, tree, drep,
@@ -5350,18 +5047,12 @@ static gint ett_writeprinter_buffer = -1;
static int SpoolssWritePrinter_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;
e_ctx_hnd policy_hnd;
char *pol_name;
guint32 size;
proto_item *item;
proto_tree *subtree;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -5397,13 +5088,6 @@ static int SpoolssWritePrinter_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssWritePrinter_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;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
@@ -5425,14 +5109,8 @@ static int SpoolssDeletePrinterData_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;
char *value_name;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
proto_tree_add_uint_hidden(
tree, hf_printerdata, tvb, offset, 0, 1);
@@ -5460,13 +5138,6 @@ static int SpoolssDeletePrinterData_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;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
proto_tree_add_uint_hidden(
tree, hf_printerdata, tvb, offset, 0, 1);
@@ -5586,10 +5257,6 @@ static int SpoolssEnumPrinterDrivers_q(tvbuff_t *tvb, int offset,
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
guint32 level;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_ndr_str_pointer_item(
@@ -5629,10 +5296,6 @@ static int SpoolssEnumPrinterDrivers_r(tvbuff_t *tvb, int offset,
int buffer_offset;
BUFFER buffer;
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_spoolss_buffer(tvb, offset, pinfo, tree, drep,
@@ -5690,10 +5353,6 @@ static int SpoolssGetPrinterDriver2_q(tvbuff_t *tvb, int offset,
char *pol_name;
guint32 level;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(
@@ -5744,10 +5403,6 @@ static int SpoolssGetPrinterDriver2_r(tvbuff_t *tvb, int offset,
guint32 level = (guint32)dcv->private_data;
BUFFER buffer;
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_spoolss_buffer(tvb, offset, pinfo, tree, drep,
@@ -6089,13 +5744,6 @@ dissect_NOTIFY_INFO(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssRFNPCNEX_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;
-
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(
@@ -6119,13 +5767,6 @@ static int SpoolssRFNPCNEX_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssRFNPCNEX_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;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_ndr_pointer(
@@ -6148,13 +5789,6 @@ static int SpoolssRFNPCNEX_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssRRPCN_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;
-
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(
@@ -6188,13 +5822,6 @@ static int SpoolssRRPCN_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssRRPCN_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;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
@@ -6216,13 +5843,6 @@ static int SpoolssReplyClosePrinter_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;
-
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -6238,13 +5858,6 @@ static int SpoolssReplyClosePrinter_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;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -6266,13 +5879,6 @@ static int SpoolssReplyClosePrinter_r(tvbuff_t *tvb, int offset,
static int SpoolssFCPN_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;
-
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -6287,13 +5893,6 @@ static int SpoolssFCPN_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssFCPN_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;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_doserror(tvb, offset, pinfo, tree, drep,
@@ -6311,13 +5910,6 @@ static int SpoolssFCPN_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
static int SpoolssRouterReplyPrinter_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;
-
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -6344,13 +5936,6 @@ static int SpoolssRouterReplyPrinter_q(tvbuff_t *tvb, int offset, packet_info *p
static int SpoolssRouterReplyPrinter_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;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_doserror(tvb, offset, pinfo, tree, drep,
@@ -6399,14 +5984,8 @@ static int SpoolssEnumPrinterKey_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;
char *key_name;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
offset = dissect_nt_policy_hnd(
@@ -6440,13 +6019,6 @@ static int SpoolssEnumPrinterKey_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;
-
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_spoolss_keybuffer(tvb, offset, pinfo, tree, drep);
@@ -6466,14 +6038,8 @@ static int SpoolssEnumPrinterDataEx_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;
char *key_name;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
proto_tree_add_uint_hidden(
tree, hf_printerdata, tvb, offset, 0, 1);
@@ -6618,14 +6184,8 @@ static int SpoolssEnumPrinterDataEx_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;
guint32 size, num_values;
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
proto_tree_add_uint_hidden(
tree, hf_printerdata, tvb, offset, 0, 1);
@@ -6685,10 +6245,6 @@ static int SpoolssFoo_q(tvbuff_t *tvb, int offset, packet_info *pinfo,
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
- if (dcv->rep_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Reply in frame %u", dcv->rep_frame);
-
/* Parse packet */
dcerpc_smb_check_long_frame(tvb, offset, pinfo, tree);
@@ -6702,10 +6258,6 @@ static int SpoolssFoo_r(tvbuff_t *tvb, int offset, packet_info *pinfo,
dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
dcerpc_call_value *dcv = (dcerpc_call_value *)di->call_data;
- if (dcv->req_frame != 0)
- proto_tree_add_text(tree, tvb, offset, 0,
- "Request in frame %u", dcv->req_frame);
-
/* Parse packet */
offset = dissect_doserror(tvb, offset, pinfo, tree, drep,