diff options
| author | Guy Harris <gharris@sonic.net> | 2022-09-04 01:21:06 -0700 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2022-09-04 01:21:06 -0700 |
| commit | a960e5fd2ecd6d84529c7d6ce685c237169e32b8 (patch) | |
| tree | 89de2d8138e139d6856c0863370c4cb49745f884 /epan/dissectors/packet-dsi.c | |
| parent | 09785f072930deb2f9b86ab100360233f24fbaa8 (diff) | |
AppleTalk, DSI: fix some names to be more correct.
The "seq" field in several structures is either a transaction ID from
ATP for AppleTalk or a request ID from DSI for AFP-over-TCP. Call it
tid.
The "aspinfo" structure is really information from ATP *and* ASP for
AppleTalk or from DSI for AFP-over-TCP. Call it atp_asp_dsi_info.
Among other things, this prevents confusing "aspinfo.seq" from the ASP
sequence number, which it is *NOT*.
Diffstat (limited to 'epan/dissectors/packet-dsi.c')
| -rw-r--r-- | epan/dissectors/packet-dsi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index d063906641..b355b28189 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -216,7 +216,7 @@ dissect_dsi_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da guint16 dsi_requestid; gint32 dsi_code; guint32 dsi_length; - struct aspinfo aspinfo; + struct atp_asp_dsi_info atp_asp_dsi_info; col_set_str(pinfo->cinfo, COL_PROTOCOL, "DSI"); @@ -288,14 +288,14 @@ dissect_dsi_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* da { tvbuff_t *new_tvb; - aspinfo.reply = (dsi_flags == DSIFL_REPLY); - aspinfo.command = dsi_command; - aspinfo.seq = dsi_requestid; - aspinfo.code = dsi_code; + atp_asp_dsi_info.reply = (dsi_flags == DSIFL_REPLY); + atp_asp_dsi_info.command = dsi_command; + atp_asp_dsi_info.tid = dsi_requestid; + atp_asp_dsi_info.code = dsi_code; proto_item_set_len(dsi_ti, DSI_BLOCKSIZ); new_tvb = tvb_new_subset_remaining(tvb, DSI_BLOCKSIZ); - call_dissector_with_data(afp_handle, new_tvb, pinfo, tree, &aspinfo); + call_dissector_with_data(afp_handle, new_tvb, pinfo, tree, &atp_asp_dsi_info); } break; default: |