diff options
author | Michael Mann <mmann78@netscape.net> | 2013-06-14 02:50:46 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-06-14 02:50:46 +0000 |
commit | dfa2156e301539929a12dda54752c778c3ee7a39 (patch) | |
tree | 8257c41ad55ad71cd0fe15d0464fb82ba2c0f509 /epan/dissectors/packet-wlccp.c | |
parent | e9a5b16a09484d0b3ba5401ef23402c022b82de6 (diff) |
Remove check_col() and the occasional tree.
svn path=/trunk/; revision=49923
Diffstat (limited to 'epan/dissectors/packet-wlccp.c')
-rw-r--r-- | epan/dissectors/packet-wlccp.c | 112 |
1 files changed, 50 insertions, 62 deletions
diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index 759b0588e8..8f5af6844b 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -707,93 +707,81 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "WLCCP"); - if (check_col(pinfo->cinfo, COL_INFO)) + if(tvb_get_guint8(tvb, 0) == 0xC1) /* Get the version number */ { - if(tvb_get_guint8(tvb, 0) == 0xC1) /* Get the version number */ - { - sap_id = tvb_get_guint8(tvb,1) & SAP_VALUE_MASK; - base_message_type=(tvb_get_guint8(tvb,6)) & MT_BASE_MSG_TYPE; - message_sub_type=(tvb_get_guint8(tvb, 6) & MT_SUBTYPE ) >> 6; + sap_id = tvb_get_guint8(tvb,1) & SAP_VALUE_MASK; + base_message_type=(tvb_get_guint8(tvb,6)) & MT_BASE_MSG_TYPE; + message_sub_type=(tvb_get_guint8(tvb, 6) & MT_SUBTYPE ) >> 6; - switch (sap_id) - { + switch (sap_id) + { - case WLCCP_SAP_CCM: - { + case WLCCP_SAP_CCM: + { - col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", + col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", val_to_str_const(base_message_type, wlccp_msg_type_vs_0, "Unknown"), - val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown") - ); - break; + val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown")); + break; - } /* case WLCCP_SAP_CCM */ + } /* case WLCCP_SAP_CCM */ - case WLCCP_SAP_SEC: - { + case WLCCP_SAP_SEC: + { - col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", + col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", val_to_str_const(base_message_type, wlccp_msg_type_vs_1, "Unknown"), - val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown") - ); - break; - } /* case WLCCP_SAP_SEC */ + val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown")); + break; + } /* case WLCCP_SAP_SEC */ - case WLCCP_SAP_RRM: - { - col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", + case WLCCP_SAP_RRM: + { + col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", val_to_str_const(base_message_type, wlccp_msg_type_vs_2, "Unknown"), - val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown") - ); - break; + val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown")); + break; - } /* case WLCCP_SAP_RRM */ + } /* case WLCCP_SAP_RRM */ - case WLCCP_SAP_QOS: - { - col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", + case WLCCP_SAP_QOS: + { + col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", val_to_str_const(base_message_type, wlccp_msg_type_vs_3, "Unknown"), - val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown") - ); - break; - } /* case WLCCP_SAP_QOS */ + val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown")); + break; + } /* case WLCCP_SAP_QOS */ - case WLCCP_SAP_NM: - { - col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", + case WLCCP_SAP_NM: + { + col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", val_to_str_const(base_message_type, wlccp_msg_type_vs_4, "Unknown"), - val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown") - ); - break; + val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown")); + break; - } /* case WLCCP_SAP_NM */ + } /* case WLCCP_SAP_NM */ - case WLCCP_SAP_MIP: - { - col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", + case WLCCP_SAP_MIP: + { + col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", val_to_str_const(base_message_type, wlccp_msg_type_vs_5, "Unknown"), - val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown") - ); - break; - } /* case WLCCP_SAP_MIP */ - - default: - { - col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", - "Unknown", - val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown") - ); - break; - } /* default for switch sap */ + val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown")); + break; + } /* case WLCCP_SAP_MIP */ + default: + { + col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", "Unknown", + val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown")); + break; + } /* default for switch sap */ - } /* switch sap */ - } /* if version=0xC1 (tvb_get_guint8(tvb, 0) == 0xC1)*/ + } /* switch sap */ - } /* if check_col */ + } /* if version=0xC1 (tvb_get_guint8(tvb, 0) == 0xC1)*/ if (tree) { /* create display subtree for the protocol */ |