aboutsummaryrefslogtreecommitdiffstats
path: root/packet-dcerpc-browser.c
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2002-06-16 13:50:51 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2002-06-16 13:50:51 +0000
commitcaad19760a2da5dd3ed8f7b92f5805a1919d7fed (patch)
tree0f30efd6e0c037e583458ac6a2bd992a5341d92a /packet-dcerpc-browser.c
parent7acca5183af1d7863d3f063b59b6204ea24a5f07 (diff)
ALIGN_TO_4_BYTES cleanup
svn path=/trunk/; revision=5683
Diffstat (limited to 'packet-dcerpc-browser.c')
-rw-r--r--packet-dcerpc-browser.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/packet-dcerpc-browser.c b/packet-dcerpc-browser.c
index 2324d7c8c4..37f754601e 100644
--- a/packet-dcerpc-browser.c
+++ b/packet-dcerpc-browser.c
@@ -2,7 +2,7 @@
* Routines for DCERPC Browser packet disassembly
* Copyright 2001, Ronnie Sahlberg
*
- * $Id: packet-dcerpc-browser.c,v 1.5 2002/05/31 00:31:12 tpot Exp $
+ * $Id: packet-dcerpc-browser.c,v 1.6 2002/06/16 13:50:51 sahlberg Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -186,17 +186,11 @@ dissect_browser_TYPE_2(tvbuff_t *tvb, int offset,
char *drep)
{
guint32 level;
- dcerpc_info *di;
-
- di=pinfo->private_data;
- if(di->conformant_run){
- /* ALING_TO_4_BYTES below might eat bytes otherwise */
- return offset;
- }
/* this is really the union switch arm */
offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
hf_browser_unknown_long, &level);
+
ALIGN_TO_4_BYTES;
switch(level){
@@ -795,17 +789,11 @@ dissect_browser_TYPE_8(tvbuff_t *tvb, int offset,
char *drep)
{
guint32 level;
- dcerpc_info *di;
-
- di=pinfo->private_data;
- if(di->conformant_run){
- /* ALING_TO_4_BYTES below might eat bytes otherwise */
- return offset;
- }
/* this is really the union switch arm */
offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
hf_browser_unknown_long, &level);
+
ALIGN_TO_4_BYTES;
switch(level){