diff options
author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2009-01-08 07:36:11 +0000 |
---|---|---|
committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2009-01-08 07:36:11 +0000 |
commit | 4b6b4b672c77862108295f1cb798147b4ce42e89 (patch) | |
tree | 9dc4553eae797fea5a0c989698acb797ee3ff89c /plugins/wimax | |
parent | 269b45f48ae15bd0132fb5612c931cad228297fe (diff) |
Fix for bug 2902:
Actually check column status before writing to it.
svn path=/trunk/; revision=27192
Diffstat (limited to 'plugins/wimax')
-rw-r--r-- | plugins/wimax/msg_dcd.c | 6 | ||||
-rw-r--r-- | plugins/wimax/msg_dreg.c | 4 | ||||
-rw-r--r-- | plugins/wimax/msg_dsd.c | 4 | ||||
-rw-r--r-- | plugins/wimax/msg_reg_req.c | 4 | ||||
-rw-r--r-- | plugins/wimax/msg_reg_rsp.c | 4 | ||||
-rw-r--r-- | plugins/wimax/msg_rep.c | 18 | ||||
-rw-r--r-- | plugins/wimax/msg_res_cmd.c | 2 | ||||
-rw-r--r-- | plugins/wimax/msg_rng_req.c | 4 | ||||
-rw-r--r-- | plugins/wimax/msg_rng_rsp.c | 4 | ||||
-rw-r--r-- | plugins/wimax/msg_sbc.c | 8 | ||||
-rw-r--r-- | plugins/wimax/msg_ucd.c | 4 | ||||
-rw-r--r-- | plugins/wimax/wimax_utils.c | 54 |
12 files changed, 58 insertions, 58 deletions
diff --git a/plugins/wimax/msg_dcd.c b/plugins/wimax/msg_dcd.c index 16d0a5a524..aee5cae4c5 100644 --- a/plugins/wimax/msg_dcd.c +++ b/plugins/wimax/msg_dcd.c @@ -917,7 +917,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DCD TLV error"); } @@ -954,7 +954,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t length = get_tlv_length(&tlv_info); if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DL Burst Profile TLV error"); } @@ -1242,7 +1242,7 @@ void dissect_mac_mgmt_msg_dcd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t length = get_tlv_length(&tlv_info); if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Trigger TLV error"); } diff --git a/plugins/wimax/msg_dreg.c b/plugins/wimax/msg_dreg.c index 456c19f4b7..72c0518e9f 100644 --- a/plugins/wimax/msg_dreg.c +++ b/plugins/wimax/msg_dreg.c @@ -443,7 +443,7 @@ void dissect_mac_mgmt_msg_dreg_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pr tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if (pinfo->cinfo) + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DREG-REQ TLV error"); } @@ -532,7 +532,7 @@ void dissect_mac_mgmt_msg_dreg_cmd_decoder(tvbuff_t *tvb, packet_info *pinfo, pr tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if (pinfo->cinfo) + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DREG-CMD TLV error"); } diff --git a/plugins/wimax/msg_dsd.c b/plugins/wimax/msg_dsd.c index c38f1e78e4..cd599352aa 100644 --- a/plugins/wimax/msg_dsd.c +++ b/plugins/wimax/msg_dsd.c @@ -181,7 +181,7 @@ void dissect_mac_mgmt_msg_dsd_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DSD-REQ TLV error"); } @@ -269,7 +269,7 @@ void dissect_mac_mgmt_msg_dsd_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "DSD RSP TLV error"); } diff --git a/plugins/wimax/msg_reg_req.c b/plugins/wimax/msg_reg_req.c index 91d4519019..7208a3c2b7 100644 --- a/plugins/wimax/msg_reg_req.c +++ b/plugins/wimax/msg_reg_req.c @@ -1117,7 +1117,7 @@ void dissect_extended_tlv(proto_tree *reg_req_tree, gint tlv_type, tvbuff_t *tvb length = get_tlv_length(&tlv_info); if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1) { /* invalid tlv info */ - if (pinfo->cinfo) + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REG-REQ TLV error"); } @@ -1320,7 +1320,7 @@ void dissect_mac_mgmt_msg_reg_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if (pinfo->cinfo) + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REG-REQ TLV error"); } diff --git a/plugins/wimax/msg_reg_rsp.c b/plugins/wimax/msg_reg_rsp.c index bdf8ba2670..c77773611f 100644 --- a/plugins/wimax/msg_reg_rsp.c +++ b/plugins/wimax/msg_reg_rsp.c @@ -229,7 +229,7 @@ void dissect_mac_mgmt_msg_reg_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_len = get_tlv_length(&tlv_info); if (tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if (pinfo->cinfo) + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REG-RSP TLV error"); } @@ -296,7 +296,7 @@ void dissect_mac_mgmt_msg_reg_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro sub_tlv_len = get_tlv_length(&sub_tlv_info); if (tlv_type == -1 || sub_tlv_len > MAX_TLV_LEN || sub_tlv_len < 1) { /* invalid tlv info */ - if (pinfo->cinfo) + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REG-RSP TLV error"); } diff --git a/plugins/wimax/msg_rep.c b/plugins/wimax/msg_rep.c index 96639b673b..d0bba5d47f 100644 --- a/plugins/wimax/msg_rep.c +++ b/plugins/wimax/msg_rep.c @@ -1026,7 +1026,7 @@ void dissect_mac_mgmt_msg_rep_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-REQ TLV error"); } @@ -1055,7 +1055,7 @@ void dissect_mac_mgmt_msg_rep_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro length = get_tlv_length(&tlv_info); if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-REQ Report Request TLV error"); } @@ -1200,7 +1200,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP TLV error"); } @@ -1229,7 +1229,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro length = get_tlv_length(&tlv_info); if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP report subtype TLV error"); } @@ -1307,7 +1307,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro length = get_tlv_length(&tlv_info); if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP channel subtype TLV error"); } @@ -1359,7 +1359,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro length = get_tlv_length(&tlv_info); if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP zone-specific phy CINR report subtype TLV error"); } @@ -1450,7 +1450,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro length = get_tlv_length(&tlv_info); if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP preamble physical CINR report subtype TLV error"); } @@ -1498,7 +1498,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro length = get_tlv_length(&tlv_info); if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP zone-specific effective CINR report subtype TLV error"); } @@ -1560,7 +1560,7 @@ void dissect_mac_mgmt_msg_rep_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro length = get_tlv_length(&tlv_info); if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "REP-RSP preamble effective CINR report subtype TLV error"); } diff --git a/plugins/wimax/msg_res_cmd.c b/plugins/wimax/msg_res_cmd.c index 5eaa975880..31a207a29f 100644 --- a/plugins/wimax/msg_res_cmd.c +++ b/plugins/wimax/msg_res_cmd.c @@ -137,7 +137,7 @@ void dissect_mac_mgmt_msg_res_cmd_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RES-CMD TLV error"); } diff --git a/plugins/wimax/msg_rng_req.c b/plugins/wimax/msg_rng_req.c index c51dea59d3..712c1a46e9 100644 --- a/plugins/wimax/msg_rng_req.c +++ b/plugins/wimax/msg_rng_req.c @@ -404,7 +404,7 @@ void dissect_power_saving_class(proto_tree *rng_req_tree, gint tlv_type, tvbuff_ tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-REQ TLV error"); } @@ -534,7 +534,7 @@ void dissect_mac_mgmt_msg_rng_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-REQ TLV error"); } diff --git a/plugins/wimax/msg_rng_rsp.c b/plugins/wimax/msg_rng_rsp.c index 8b072560cc..0a6452eb36 100644 --- a/plugins/wimax/msg_rng_rsp.c +++ b/plugins/wimax/msg_rng_rsp.c @@ -750,7 +750,7 @@ void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-RSP TLV error"); } @@ -909,7 +909,7 @@ void dissect_mac_mgmt_msg_rng_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro sub_tlv_len = get_tlv_length(&sub_tlv_info); if(tlv_type == -1 || sub_tlv_len > MAX_TLV_LEN || sub_tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "RNG-RSP TLV error"); } diff --git a/plugins/wimax/msg_sbc.c b/plugins/wimax/msg_sbc.c index ef47f11148..b2ef888c6d 100644 --- a/plugins/wimax/msg_sbc.c +++ b/plugins/wimax/msg_sbc.c @@ -2248,7 +2248,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_len = get_tlv_length(&tlv_info); if (tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if (pinfo->cinfo) + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "SBC-REQ TLV error"); } @@ -2257,7 +2257,7 @@ void dissect_mac_mgmt_msg_sbc_req_decoder(tvbuff_t *tvb, packet_info *pinfo, pro } if (tlv_type == 0) { /* invalid tlv type */ - if (pinfo->cinfo) + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid SBC TLV type"); } @@ -2809,7 +2809,7 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_len = get_tlv_length(&tlv_info); if (tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if (pinfo->cinfo) + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "SBC-RSP TLV error"); } @@ -2818,7 +2818,7 @@ void dissect_mac_mgmt_msg_sbc_rsp_decoder(tvbuff_t *tvb, packet_info *pinfo, pro } if (tlv_type == 0) { /* invalid tlv type */ - if (pinfo->cinfo) + if (check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid SBC TLV type"); } diff --git a/plugins/wimax/msg_ucd.c b/plugins/wimax/msg_ucd.c index 884c71f6d4..a1b4829423 100644 --- a/plugins/wimax/msg_ucd.c +++ b/plugins/wimax/msg_ucd.c @@ -754,7 +754,7 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "UCD TLV error"); } @@ -840,7 +840,7 @@ void dissect_mac_mgmt_msg_ucd_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_t tlv_type = get_tlv_type(&tlv_info); if(tlv_type == -1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "UL Burst Profile error"); } diff --git a/plugins/wimax/wimax_utils.c b/plugins/wimax/wimax_utils.c index 294eb53bf6..3fc680fe44 100644 --- a/plugins/wimax/wimax_utils.c +++ b/plugins/wimax/wimax_utils.c @@ -1727,7 +1727,7 @@ void wimax_error_parameter_set_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_ /* report error if the packet size is less than 2 bytes (type+length) */ if(tvb_len < 2) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Error Parameter Set"); } @@ -1743,7 +1743,7 @@ void wimax_error_parameter_set_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_ tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "EPS TLV error"); } @@ -1815,7 +1815,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type, /* report error if the packet size is less than 2 bytes (type+length) */ if(tvb_len < 2) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Convergence Service Parameter Encoding Rules"); } @@ -1831,7 +1831,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type, tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "CSPER TLV error"); } @@ -1866,7 +1866,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type, length = get_tlv_length(&tlv_info); if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "ATM Classifier TLV error"); } @@ -1943,7 +1943,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type, length = get_tlv_length(&tlv_info); if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Packet Classification Rule TLV error"); } @@ -2103,7 +2103,7 @@ void wimax_convengence_service_parameter_encoding_rules_decoder(guint sfe_type, length = get_tlv_length(&tlv_info); if(tlv_type == -1 || length > MAX_TLV_LEN || length < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "PHS n Rule TLV error"); } @@ -2189,7 +2189,7 @@ void wimax_service_flow_encodings_decoder(tvbuff_t *tvb, packet_info *pinfo, pro /* report error if the packet size is less than 2 bytes (type+length) */ if(tvb_len < 2) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Service Flow Encodings"); } @@ -2204,7 +2204,7 @@ void wimax_service_flow_encodings_decoder(tvbuff_t *tvb, packet_info *pinfo, pro tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Service Flow Encodings TLV error"); } @@ -2629,7 +2629,7 @@ void wimax_security_negotiation_parameters_decoder(tvbuff_t *tvb, packet_info *p /* report error if the packet size is less than 2 bytes (type+length) */ if(tvb_len < 2) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Security Negotiation Parameters"); } @@ -2646,7 +2646,7 @@ void wimax_security_negotiation_parameters_decoder(tvbuff_t *tvb, packet_info *p tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Security Negotiation Params TLV error"); } @@ -2752,7 +2752,7 @@ void wimax_cryptographic_suite_list_decoder(tvbuff_t *tvb, packet_info *pinfo, p /* report error if the packet size is less than 2 bytes (type+length) */ if(tvb_len < 2) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Crypto Suite List"); } @@ -2768,7 +2768,7 @@ void wimax_cryptographic_suite_list_decoder(tvbuff_t *tvb, packet_info *pinfo, p tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Crypto Suite List TLV error"); } @@ -2825,7 +2825,7 @@ void wimax_pkm_tlv_encoded_attributes_decoder(tvbuff_t *tvb, packet_info *pinfo, /* report error if the packet size is less than 2 bytes (type+length) */ if(tvb_len < 2) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid PKM TLV"); } @@ -2842,7 +2842,7 @@ void wimax_pkm_tlv_encoded_attributes_decoder(tvbuff_t *tvb, packet_info *pinfo, tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "PKM TLV error"); } @@ -3055,7 +3055,7 @@ void wimax_tek_parameters_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* report error if the packet size is less than 2 bytes (type+length) */ if(tvb_len < 2) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid TEK Params"); } @@ -3072,7 +3072,7 @@ void wimax_tek_parameters_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "TEK Param TLV error"); } @@ -3142,7 +3142,7 @@ void wimax_pkm_configuration_settings_decoder(tvbuff_t *tvb, packet_info *pinfo, /* report error if the packet size is less than 2 bytes (type+length) */ if(tvb_len < 2) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid PKM Config Settings"); } @@ -3159,7 +3159,7 @@ void wimax_pkm_configuration_settings_decoder(tvbuff_t *tvb, packet_info *pinfo, tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "PKM Config Settings TLV error"); } @@ -3237,7 +3237,7 @@ void wimax_sa_descriptor_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree * /* report error if the packet size is less than 2 bytes (type+length) */ if(tvb_len < 2) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid SA-Descriptor"); } @@ -3254,7 +3254,7 @@ void wimax_sa_descriptor_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree * tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "SA-Descriptor TLV error"); } @@ -3323,7 +3323,7 @@ void wimax_security_capabilities_decoder(tvbuff_t *tvb, packet_info *pinfo, prot /* report error if the packet size is less than 2 bytes (type+length) */ if(tvb_len < 2) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Security Capabilities"); } @@ -3340,7 +3340,7 @@ void wimax_security_capabilities_decoder(tvbuff_t *tvb, packet_info *pinfo, prot tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Security Capabilities TLV error"); } @@ -3395,7 +3395,7 @@ void wimax_vendor_specific_information_decoder(tvbuff_t *tvb, packet_info *pinfo /* report error if the packet size is less than 2 bytes (type+length) */ if(tvb_len < 2) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Vendor Specific Info"); } @@ -3413,7 +3413,7 @@ void wimax_vendor_specific_information_decoder(tvbuff_t *tvb, packet_info *pinfo tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Vendor Specific Info TLV error"); } @@ -3485,7 +3485,7 @@ guint wimax_common_tlv_encoding_decoder(tvbuff_t *tvb, packet_info *pinfo, proto /* report error if the packet size is less than 2 bytes (type+length) */ if(tvb_len < 2) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Invalid Common TLV encoding"); } @@ -3503,7 +3503,7 @@ guint wimax_common_tlv_encoding_decoder(tvbuff_t *tvb, packet_info *pinfo, proto tlv_len = get_tlv_length(&tlv_info); if(tlv_type == -1 || tlv_len > MAX_TLV_LEN || tlv_len < 1) { /* invalid tlv info */ - if(pinfo->cinfo) + if(check_col(pinfo->cinfo, COL_INFO)) { col_append_sep_str(pinfo->cinfo, COL_INFO, NULL, "Common TLV encoding TLV error"); } |