diff options
author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2010-02-04 23:17:17 +0000 |
---|---|---|
committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2010-02-04 23:17:17 +0000 |
commit | 890bec2425073c9ee7fda266283258c86055eb43 (patch) | |
tree | 1ce570d855e4b4ff67f1c8c26ad7924c1311fb4e /epan/dissectors/packet-winsrepl.c | |
parent | ad66a89c3a074be1f256cb57a9e680b243fca4c5 (diff) |
From: Stefan Metzmacher <metze@samba.org>
Subject: [PATCH 4/7] packet-winsrepl.c: handle the strange alignment after
names
metze
svn path=/trunk/; revision=31795
Diffstat (limited to 'epan/dissectors/packet-winsrepl.c')
-rw-r--r-- | epan/dissectors/packet-winsrepl.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c index 4191b7d18e..57044f67d8 100644 --- a/epan/dissectors/packet-winsrepl.c +++ b/epan/dissectors/packet-winsrepl.c @@ -434,7 +434,11 @@ dissect_winsrepl_wins_name(tvbuff_t *winsrepl_tvb, packet_info *pinfo, winsrepl_offset += name_len; /* ALIGN to 4 Byte */ - winsrepl_offset += ((winsrepl_offset & (4-1)) == 0 ? 0 : (4 - (winsrepl_offset & (4-1)))); + /* winsrepl_offset += ((winsrepl_offset & (4-1)) == 0 ? 0 : (4 - (winsrepl_offset & (4-1)))); */ + /* Windows including w2k8 add 4 padding bytes, when it's already 4 byte + * alligned... This happens when the name has a "scope" part + */ + winsrepl_offset += 4 - (winsrepl_offset & (4-1)); /* FLAGS */ /* |