diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-12-28 23:39:14 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-12-28 23:39:14 +0000 |
| commit | cb9725ce2beefe34c08dc954ff2a9c51c6a7e3bd (patch) | |
| tree | 0fa7ae9fc06a62e7fb6793b1ea1693b2f89ada25 /epan/dissectors/packet-sita.c | |
| parent | 10dfe948422a48963b611a07b1193ddb5b655d95 (diff) | |
Prepend the sita_phdr fields with "sita_" to make them less
collision-prone.
svn path=/trunk/; revision=40320
Diffstat (limited to 'epan/dissectors/packet-sita.c')
| -rw-r--r-- | epan/dissectors/packet-sita.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/epan/dissectors/packet-sita.c b/epan/dissectors/packet-sita.c index f15dd5cfad..f5964e988c 100644 --- a/epan/dissectors/packet-sita.c +++ b/epan/dissectors/packet-sita.c @@ -77,7 +77,7 @@ static int hf_dcd = -1; #define REMOTE "Remote" static gchar * -format_flags_string(guchar value, const gchar *array[]) +format_flags_string(guchar value, const gchar *array[]) { int i; guint bpos; @@ -120,11 +120,11 @@ dissect_sita(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_PROTOCOL); /* erase the protocol */ col_clear(pinfo->cinfo, COL_INFO); /* and info columns so that the next decoder can fill them in */ - flags = pinfo->pseudo_header->sita.flags; - signals = pinfo->pseudo_header->sita.signals; - errors1 = pinfo->pseudo_header->sita.errors1; - errors2 = pinfo->pseudo_header->sita.errors2; - proto = pinfo->pseudo_header->sita.proto; + flags = pinfo->pseudo_header->sita.sita_flags; + signals = pinfo->pseudo_header->sita.sita_signals; + errors1 = pinfo->pseudo_header->sita.sita_errors1; + errors2 = pinfo->pseudo_header->sita.sita_errors2; + proto = pinfo->pseudo_header->sita.sita_proto; if (check_col(pinfo->cinfo, COL_DEF_SRC)) { if ((flags & SITA_FRAME_DIR) == SITA_FRAME_DIR_TXED) { @@ -194,16 +194,16 @@ dissect_sita(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - if (!dissector_try_uint(sita_dissector_table, pinfo->pseudo_header->sita.proto, tvb, pinfo, tree)) { /* try to find and run an applicable dissector */ + if (!dissector_try_uint(sita_dissector_table, pinfo->pseudo_header->sita.sita_proto, tvb, pinfo, tree)) { /* try to find and run an applicable dissector */ if (check_col(pinfo->cinfo, COL_PROTOCOL)) /* if one can't be found... tell them we don't */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNKNOWN"); /* know how to decode this protocol */ if (check_col(pinfo->cinfo, COL_INFO)) - col_add_fstr(pinfo->cinfo, COL_INFO, "IOP protocol number: %u", pinfo->pseudo_header->sita.proto); /* and give them the details then */ + col_add_fstr(pinfo->cinfo, COL_INFO, "IOP protocol number: %u", pinfo->pseudo_header->sita.sita_proto); /* and give them the details then */ call_dissector(data_handle, tvb, pinfo, tree); /* call the generic (hex display) decoder instead */ } } -static const true_false_string tfs_sita_flags = { "From Remote", "From Local" }; +static const true_false_string tfs_sita_flags = { "From Remote", "From Local" }; static const true_false_string tfs_sita_error = { "Error", "" }; static const true_false_string tfs_sita_violation = { "Violation", "" }; static const true_false_string tfs_sita_received = { "Received", "" }; @@ -301,4 +301,3 @@ proto_reg_handoff_sita(void) dissector_add_uint("sita.proto", SITA_PROTO_ALC, ipars_handle); dissector_add_uint("wtap_encap", WTAP_ENCAP_SITA, sita_handle); } - |