diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-04-06 16:13:09 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-04-06 16:13:09 +0000 |
| commit | 846eed1d9e69bf6b256c8b2214a4391dd6446d9a (patch) | |
| tree | ee49239d686d336c57a2afa926b02bc432053acb /plugins/wimaxasncp | |
| parent | a2241bf7b84e6a73fa271afea36f6cf8e0656695 (diff) | |
Get rid of check_col
svn path=/trunk/; revision=32401
Diffstat (limited to 'plugins/wimaxasncp')
| -rw-r--r-- | plugins/wimaxasncp/packet-wimaxasncp.c | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/plugins/wimaxasncp/packet-wimaxasncp.c b/plugins/wimaxasncp/packet-wimaxasncp.c index cd6a81cf51..ab6e6141c8 100644 --- a/plugins/wimaxasncp/packet-wimaxasncp.c +++ b/plugins/wimaxasncp/packet-wimaxasncp.c @@ -1522,22 +1522,19 @@ static void wimaxasncp_dissect_tlv_value( } /* Add code and type to info column */ - if (check_col(pinfo->cinfo, COL_INFO)) + col_append_str(pinfo->cinfo, COL_INFO, " ["); + col_append_str(pinfo->cinfo, COL_INFO, + val_to_str(eap_code, eap_code_vals, "Unknown code (0x%02X)")); + + if (eap_code == EAP_REQUEST || eap_code == EAP_RESPONSE) { - col_append_str(pinfo->cinfo, COL_INFO, " ["); + col_append_str(pinfo->cinfo, COL_INFO, ", "); col_append_str(pinfo->cinfo, COL_INFO, - val_to_str(eap_code, eap_code_vals, "Unknown code (0x%02X)")); - - if (eap_code == EAP_REQUEST || eap_code == EAP_RESPONSE) - { - col_append_str(pinfo->cinfo, COL_INFO, ", "); - col_append_str(pinfo->cinfo, COL_INFO, - val_to_str(eap_type, eap_type_vals, "Unknown type (0x%02X)")); - } - - col_append_str(pinfo->cinfo, COL_INFO, "]"); + val_to_str(eap_type, eap_type_vals, "Unknown type (0x%02X)")); } + col_append_str(pinfo->cinfo, COL_INFO, "]"); + { proto_tree *eap_tree; @@ -1989,17 +1986,14 @@ static guint dissect_wimaxasncp_backend( offset += dissect_wimaxasncp_tlvs(tlv_tvb, pinfo, tree); } - if (check_col(pinfo->cinfo, COL_INFO)) + col_append_fstr(pinfo->cinfo, COL_INFO, " - MSID:%s", pmsid); + if (dbit_show) { - col_append_fstr(pinfo->cinfo, COL_INFO, " - MSID:%s", pmsid); - if (dbit_show) - { - col_append_fstr(pinfo->cinfo, COL_INFO, ", TID:D+0x%04x", tid); - } - else - { - col_append_fstr(pinfo->cinfo, COL_INFO, ", TID:0x%04x", tid); - } + col_append_fstr(pinfo->cinfo, COL_INFO, ", TID:D+0x%04x", tid); + } + else + { + col_append_fstr(pinfo->cinfo, COL_INFO, ", TID:0x%04x", tid); } return offset; |