diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-04-28 21:53:31 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-04-28 21:53:31 +0000 |
| commit | 640a5e494aacb0e2ba91a758c364ae67705ff786 (patch) | |
| tree | 7a2f99e46e63a7c09e625c631265ed01dd885701 /packet-dsi.c | |
| parent | 04687b1e405bdb8b440d3a8cc603ad268837cab2 (diff) | |
Pass even zero-length DSI and ASP "command" messages to the AFP
dissector, so it can show them as replies.
Put the command code into the protocol tree for replies.
Fix some additional AFP function names to match the names in the AFP
spec.
svn path=/trunk/; revision=5275
Diffstat (limited to 'packet-dsi.c')
| -rw-r--r-- | packet-dsi.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/packet-dsi.c b/packet-dsi.c index 6e20624abd..768c9083ba 100644 --- a/packet-dsi.c +++ b/packet-dsi.c @@ -2,7 +2,7 @@ * Routines for dsi packet dissection * Copyright 2001, Randy McEoin <rmceoin@pe.com> * - * $Id: packet-dsi.c,v 1.13 2002/04/28 19:21:39 guy Exp $ + * $Id: packet-dsi.c,v 1.14 2002/04/28 21:53:31 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -183,17 +183,15 @@ dissect_dsi_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *new_tvb; int len = tvb_reported_length_remaining(tvb,DSI_BLOCKSIZ); - if (len) { - aspinfo.reply = dsi_flags & 1; - aspinfo.command = dsi_command; - aspinfo.seq = dsi_requestid; - aspinfo.code = dsi_code; - pinfo->private_data = &aspinfo; - proto_item_set_len(dsi_tree, DSI_BLOCKSIZ); - - new_tvb = tvb_new_subset(tvb, DSI_BLOCKSIZ,-1,len); - call_dissector(afp_handle, new_tvb, pinfo, tree); - } + aspinfo.reply = dsi_flags & 1; + aspinfo.command = dsi_command; + aspinfo.seq = dsi_requestid; + aspinfo.code = dsi_code; + pinfo->private_data = &aspinfo; + proto_item_set_len(dsi_tree, DSI_BLOCKSIZ); + + new_tvb = tvb_new_subset(tvb, DSI_BLOCKSIZ,-1,len); + call_dissector(afp_handle, new_tvb, pinfo, tree); } else if (tree) { call_dissector(data_handle,tvb_new_subset(tvb, DSI_BLOCKSIZ,-1,tvb_reported_length_remaining(tvb,DSI_BLOCKSIZ)), pinfo, dsi_tree); |