diff options
author | Guy Harris <guy@alum.mit.edu> | 2007-04-25 23:31:22 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2007-04-25 23:31:22 +0000 |
commit | 17b1c57ec9932dc4ff3afdfc4a8ea876ec69fbcd (patch) | |
tree | f6967c2ef73cf023f1ba8a4e55da5c74aa497f55 /epan/dissectors/packet-fcels.c | |
parent | f5bd20cacf7451b2a76861c6d36c93a564ac27bd (diff) |
Fix the previous fix.
svn path=/trunk/; revision=21571
Diffstat (limited to 'epan/dissectors/packet-fcels.c')
-rw-r--r-- | epan/dissectors/packet-fcels.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index 15f056bd23..dbf5a6485c 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -1924,12 +1924,12 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Register conversation in case this is not a response */ if ((opcode != FC_ELS_LSRJT) && (opcode != FC_ELS_ACC)) { if (opcode == FC_ELS_FLOGI) { - const guint8 *srcaddr; + const guint8 *srcfc; /* Check that the source address is, in fact, an FC address */ DISSECTOR_ASSERT(pinfo->src.type == AT_FC); - srcaddr = pinfo->src.data; - if (srcaddr[2]) { + srcfc = pinfo->src.data; + if (srcfc[2]) { /* If it is a loop port, we'll need to remember the ALPA */ options = NO_PORT2; } @@ -1982,14 +1982,14 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* FLOGI has two ways to save state: without the src and using just * the port (ALPA) part of the address. Try both. */ - const guint8 *dstaddr; + const guint8 *dstfc; /* Check that the source address is, in fact, an FC address */ DISSECTOR_ASSERT(pinfo->dst.type == AT_FC); - dstaddr = pinfo->dst.data; + dstfc = pinfo->dst.data; addrdata[0] = addrdata[1] = 0; - addrdata[2] = dstaddr[2]; + addrdata[2] = dstfc[2]; SET_ADDRESS (&dstaddr, AT_FC, 3, addrdata); conversation = find_conversation (pinfo->fd->num, &dstaddr, &pinfo->src, pinfo->ptype, pinfo->oxid, |