diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2002-06-16 13:47:39 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2002-06-16 13:47:39 +0000 |
| commit | 7acca5183af1d7863d3f063b59b6204ea24a5f07 (patch) | |
| tree | aa5c7a740525900fdd2f00c0053c13b64584d94e /packet-dcerpc-nt.h | |
| parent | 5bece57634bed8cf0dd05ef168da3bc94a785985 (diff) | |
| download | wireshark-7acca5183af1d7863d3f063b59b6204ea24a5f07.tar.gz wireshark-7acca5183af1d7863d3f063b59b6204ea24a5f07.tar.bz2 wireshark-7acca5183af1d7863d3f063b59b6204ea24a5f07.zip | |
We must make sure that the ALIGN_TO_4_BYTES macro does not change the offset
when we do the conformance run.
svn path=/trunk/; revision=5682
Diffstat (limited to 'packet-dcerpc-nt.h')
| -rw-r--r-- | packet-dcerpc-nt.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/packet-dcerpc-nt.h b/packet-dcerpc-nt.h index e5fc184b5b..81f80bd879 100644 --- a/packet-dcerpc-nt.h +++ b/packet-dcerpc-nt.h @@ -2,7 +2,7 @@ * Routines for DCERPC over SMB packet disassembly * Copyright 2001, Tim Potter <tpot@samba.org> * - * $Id: packet-dcerpc-nt.h,v 1.25 2002/06/05 04:17:47 tpot Exp $ + * $Id: packet-dcerpc-nt.h,v 1.26 2002/06/16 13:47:39 sahlberg Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -80,7 +80,15 @@ guint32 prs_pop_ptr(GList **ptr_list, char *name); -#define ALIGN_TO_4_BYTES {if(offset&0x03)offset=(offset&0xfffffffc)+4;} +#define ALIGN_TO_4_BYTES \ + { dcerpc_info *xzdi; \ + xzdi=pinfo->private_data; \ + if(!xzdi->conformant_run) { \ + if(offset&0x03) { \ + offset=(offset&0xfffffffc)+4; \ + } \ + } \ + } int dissect_ndr_nt_UNICODE_STRING_str(tvbuff_t *tvb, int offset, |