diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-06-14 01:02:11 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 01:02:11 +0000 |
| commit | 0f0c111119811cf1c6c9353efdaaef302aca5930 (patch) | |
| tree | 1184b3876ae3b638c401313def0c8172b475b3f0 /epan/dissectors/packet-hsrp.c | |
| parent | af02ac36ac6dd2d6b97c904db7cc26e8395230e0 (diff) | |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49920
Diffstat (limited to 'epan/dissectors/packet-hsrp.c')
| -rw-r--r-- | epan/dissectors/packet-hsrp.c | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c index c455b54674..a3390f862e 100644 --- a/epan/dissectors/packet-hsrp.c +++ b/epan/dissectors/packet-hsrp.c @@ -347,22 +347,17 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ col_set_str(pinfo->cinfo, COL_PROTOCOL, "HSRP"); opcode = tvb_get_guint8(tvb, 1); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_str(pinfo->cinfo, COL_INFO, + col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(opcode, hsrp_opcode_vals, "Unknown")); - } + if (opcode < 3) { state = tvb_get_guint8(tvb, 2); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " (state %s)", + col_append_fstr(pinfo->cinfo, COL_INFO, " (state %s)", val_to_str_const(state, hsrp_state_vals, "Unknown")); - } } else if (opcode == 3) { state = tvb_get_guint8(tvb, 6); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " (state %s)", + col_append_fstr(pinfo->cinfo, COL_INFO, " (state %s)", val_to_str_const(state, hsrp_adv_state_vals, "Unknown")); - } } if (tree) { @@ -463,16 +458,12 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ offset+=2; opcode = tvb_get_guint8(tvb, offset+1); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, "%s", + col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(opcode, hsrp2_opcode_vals, "Unknown")); - } state = tvb_get_guint8(tvb, offset+2); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, " (state %s)", + col_append_fstr(pinfo->cinfo, COL_INFO, " (state %s)", val_to_str_const(state, hsrp2_state_vals, "Unknown")); - } if (tree) { /* Making Group State TLV subtree. */ @@ -525,9 +516,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_ active = tvb_get_ntohs(tvb, offset+2); passive = tvb_get_ntohs(tvb, offset+4); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_add_fstr(pinfo->cinfo, COL_INFO, "Interface State TLV (Act=%d Pass=%d)",active,passive); - } + col_add_fstr(pinfo->cinfo, COL_INFO, "Interface State TLV (Act=%d Pass=%d)",active,passive); if (tree) { proto_tree *interface_state_tlv; |