diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 06:26:46 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-08-09 06:26:46 +0000 |
| commit | e971354a546be5efc284c72e49689a2e337bc198 (patch) | |
| tree | 13a89a4bf6146b1bbe2afde85c3544eee651ca78 | |
| parent | fc067ab9104d12f3683c8f112250b8523260b77f (diff) | |
Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
425 files changed, 571 insertions, 1135 deletions
diff --git a/asn1/acse/packet-acse-template.c b/asn1/acse/packet-acse-template.c index 0cfee1fec2..2634cffbb7 100644 --- a/asn1/acse/packet-acse-template.c +++ b/asn1/acse/packet-acse-template.c @@ -222,8 +222,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_acse, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_acse); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACSE"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACSE"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/asn1/cmip/packet-cmip-template.c b/asn1/cmip/packet-cmip-template.c index 977c1c5819..8876f3e012 100644 --- a/asn1/cmip/packet-cmip-template.c +++ b/asn1/cmip/packet-cmip-template.c @@ -128,8 +128,7 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) tree = proto_item_add_subtree(item, ett_cmip); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMIP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMIP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); switch(session->spdu_type){ diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c index ea6735d08c..d579487858 100644 --- a/asn1/disp/packet-disp-template.c +++ b/asn1/disp/packet-disp-template.c @@ -107,8 +107,7 @@ dissect_disp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_disp, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_disp); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DISP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DISP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/asn1/dop/packet-dop-template.c b/asn1/dop/packet-dop-template.c index 40254c9481..8547281b6b 100644 --- a/asn1/dop/packet-dop-template.c +++ b/asn1/dop/packet-dop-template.c @@ -148,8 +148,7 @@ dissect_dop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_dop, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_dop); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DOP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DOP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/asn1/dsp/packet-dsp-template.c b/asn1/dsp/packet-dsp-template.c index cd24dab845..14ad8453f1 100644 --- a/asn1/dsp/packet-dsp-template.c +++ b/asn1/dsp/packet-dsp-template.c @@ -101,8 +101,7 @@ dissect_dsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_dsp, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_dsp); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DAP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/asn1/ftam/packet-ftam-template.c b/asn1/ftam/packet-ftam-template.c index 78d20f4335..f6985656c0 100644 --- a/asn1/ftam/packet-ftam-template.c +++ b/asn1/ftam/packet-ftam-template.c @@ -101,8 +101,7 @@ dissect_ftam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_ftam, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_ftam); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FTAM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FTAM"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c index dafa9c3f88..641ca5201f 100644 --- a/asn1/h248/packet-h248-template.c +++ b/asn1/h248/packet-h248-template.c @@ -1333,8 +1333,7 @@ dissect_h248(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.248"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.248"); if (tree) { h248_item = proto_tree_add_item(tree, proto_h248, tvb, 0, -1, FALSE); diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c index 17cd626702..b53838c32e 100644 --- a/asn1/kerberos/packet-kerberos-template.c +++ b/asn1/kerberos/packet-kerberos-template.c @@ -1367,8 +1367,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return (-1); } if (do_col_protocol) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5"); } if (tree) { item = proto_tree_add_item(tree, proto_kerberos, tvb, 0, -1, FALSE); @@ -1416,8 +1415,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return 0; } if (do_col_protocol) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5"); } if (do_col_info) { if (check_col(pinfo->cinfo, COL_INFO)) diff --git a/asn1/mms/packet-mms-template.c b/asn1/mms/packet-mms-template.c index 9f9078833b..49286e3d12 100644 --- a/asn1/mms/packet-mms-template.c +++ b/asn1/mms/packet-mms-template.c @@ -70,8 +70,7 @@ dissect_mms(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_mms, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_mms); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MMS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MMS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/asn1/mpeg-audio/packet-mpeg-audio-template.c b/asn1/mpeg-audio/packet-mpeg-audio-template.c index 1784e9bd09..7c0c115ae1 100644 --- a/asn1/mpeg-audio/packet-mpeg-audio-template.c +++ b/asn1/mpeg-audio/packet-mpeg-audio-template.c @@ -120,8 +120,7 @@ dissect_id3v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { asn1_ctx_t asn1_ctx; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v1"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); if (tree == NULL) @@ -134,8 +133,7 @@ dissect_id3v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static void dissect_id3v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v2"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v2"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); proto_tree_add_item(tree, hf_id3v2, tvb, diff --git a/asn1/mpeg-pes/packet-mpeg-pes-template.c b/asn1/mpeg-pes/packet-mpeg-pes-template.c index cf84d57e11..23271106fc 100644 --- a/asn1/mpeg-pes/packet-mpeg-pes-template.c +++ b/asn1/mpeg-pes/packet-mpeg-pes-template.c @@ -310,8 +310,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) prefix = tvb_get_ntoh24(tvb, 0); if (prefix != PES_PREFIX) return FALSE; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG PES"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG PES"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -466,8 +465,7 @@ static void dissect_mpeg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (!dissector_try_heuristic(heur_subdissector_list, tvb, pinfo, tree)) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); if (tree) diff --git a/asn1/nbap/packet-nbap-template.c b/asn1/nbap/packet-nbap-template.c index 4e45e34a02..6f396e5899 100644 --- a/asn1/nbap/packet-nbap-template.c +++ b/asn1/nbap/packet-nbap-template.c @@ -119,8 +119,7 @@ dissect_nbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *nbap_tree = NULL; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBAP"); /* create the nbap protocol tree */ nbap_item = proto_tree_add_item(tree, proto_nbap, tvb, 0, -1, FALSE); diff --git a/asn1/ocsp/packet-ocsp-template.c b/asn1/ocsp/packet-ocsp-template.c index 476481056a..1e743dffc1 100644 --- a/asn1/ocsp/packet-ocsp-template.c +++ b/asn1/ocsp/packet-ocsp-template.c @@ -68,8 +68,7 @@ dissect_ocsp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); @@ -95,8 +94,7 @@ dissect_ocsp_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/asn1/pcap/packet-pcap-template.c b/asn1/pcap/packet-pcap-template.c index 5c4ba42ad6..78b178c27b 100644 --- a/asn1/pcap/packet-pcap-template.c +++ b/asn1/pcap/packet-pcap-template.c @@ -134,8 +134,7 @@ dissect_pcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *pcap_tree = NULL; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCAP"); /* create the pcap protocol tree */ pcap_item = proto_tree_add_item(tree, proto_pcap, tvb, 0, -1, FALSE); diff --git a/asn1/pkixcmp/packet-cmp-template.c b/asn1/pkixcmp/packet-cmp-template.c index ca7d126ad5..9f8bd21043 100644 --- a/asn1/pkixcmp/packet-cmp-template.c +++ b/asn1/pkixcmp/packet-cmp-template.c @@ -122,8 +122,7 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); @@ -294,8 +293,7 @@ dissect_cmp_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/asn1/pkixtsp/packet-pkixtsp-template.c b/asn1/pkixtsp/packet-pkixtsp-template.c index 1f3c32b71a..34d4a32e7d 100644 --- a/asn1/pkixtsp/packet-pkixtsp-template.c +++ b/asn1/pkixtsp/packet-pkixtsp-template.c @@ -64,8 +64,7 @@ dissect_timestamp_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); @@ -90,8 +89,7 @@ dissect_timestamp_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/asn1/pres/packet-pres-template.c b/asn1/pres/packet-pres-template.c index 97487b4728..a6fa432333 100644 --- a/asn1/pres/packet-pres-template.c +++ b/asn1/pres/packet-pres-template.c @@ -314,8 +314,7 @@ dissect_pres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* we can't make any additional checking here */ /* postpone it before dissector will have more information */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PRES"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PRES"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); /* save pointers for calling the acse dissector */ diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c index 76bd1f4c7c..68e728513a 100644 --- a/asn1/ranap/packet-ranap-template.c +++ b/asn1/ranap/packet-ranap-template.c @@ -210,8 +210,7 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pdu_type = 0; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RANAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RANAP"); /* create the ranap protocol tree */ ranap_item = proto_tree_add_item(tree, proto_ranap, tvb, 0, -1, FALSE); diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c index c9c4dfb855..da64a9a798 100644 --- a/asn1/rnsap/packet-rnsap-template.c +++ b/asn1/rnsap/packet-rnsap-template.c @@ -123,8 +123,7 @@ dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *rnsap_tree = NULL; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RNSAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RNSAP"); /* create the rnsap protocol tree */ rnsap_item = proto_tree_add_item(tree, proto_rnsap, tvb, 0, -1, FALSE); diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c index 66a7a3db40..3b8c3d24ea 100644 --- a/asn1/ros/packet-ros-template.c +++ b/asn1/ros/packet-ros-template.c @@ -442,8 +442,7 @@ dissect_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_ros, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_ros); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ROS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ROS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/asn1/rrc/packet-rrc-template.c b/asn1/rrc/packet-rrc-template.c index 1fccfa8742..c29075b97c 100644 --- a/asn1/rrc/packet-rrc-template.c +++ b/asn1/rrc/packet-rrc-template.c @@ -110,8 +110,7 @@ dissect_rrc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) top_tree = tree; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RRC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RRC"); /* create the rrc protocol tree */ rrc_item = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, FALSE); diff --git a/asn1/rtse/packet-rtse-template.c b/asn1/rtse/packet-rtse-template.c index 520e116627..23b9205c4e 100644 --- a/asn1/rtse/packet-rtse-template.c +++ b/asn1/rtse/packet-rtse-template.c @@ -216,8 +216,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTSE"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTSE"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/asn1/s1ap/packet-s1ap-template.c b/asn1/s1ap/packet-s1ap-template.c index 9f5fb6a582..3827568b31 100644 --- a/asn1/s1ap/packet-s1ap-template.c +++ b/asn1/s1ap/packet-s1ap-template.c @@ -147,8 +147,7 @@ dissect_s1ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *s1ap_tree = NULL; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "S1AP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "S1AP"); /* create the s1ap protocol tree */ s1ap_item = proto_tree_add_item(tree, proto_s1ap, tvb, 0, -1, FALSE); diff --git a/asn1/s4406/packet-s4406-template.c b/asn1/s4406/packet-s4406-template.c index dcd1593997..1566337672 100644 --- a/asn1/s4406/packet-s4406-template.c +++ b/asn1/s4406/packet-s4406-template.c @@ -75,8 +75,7 @@ dissect_s4406(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) tree = proto_item_add_subtree(item, ett_s4406); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "S4406"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "S4406"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Military"); diff --git a/asn1/smrse/packet-smrse-template.c b/asn1/smrse/packet-smrse-template.c index 8f4089e335..f912692557 100644 --- a/asn1/smrse/packet-smrse-template.c +++ b/asn1/smrse/packet-smrse-template.c @@ -98,8 +98,7 @@ dissect_smrse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) tree = proto_item_add_subtree(item, ett_smrse); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMRSE"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMRSE"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, val_to_str(tag, tag_vals,"Unknown Tag:0x%02x")); diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index af055c9c67..90faa70569 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -1686,8 +1686,7 @@ dissect_smux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) next_tvb_init(&var_list); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMUX"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMUX"); if (tree) { item = proto_tree_add_item(tree, proto_smux, tvb, 0, -1, FALSE); diff --git a/asn1/x2ap/packet-x2ap-template.c b/asn1/x2ap/packet-x2ap-template.c index 1cade44a18..9804ce8e7a 100644 --- a/asn1/x2ap/packet-x2ap-template.c +++ b/asn1/x2ap/packet-x2ap-template.c @@ -120,8 +120,7 @@ dissect_x2ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *x2ap_tree = NULL; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "X2AP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "X2AP"); /* create the x2ap protocol tree */ x2ap_item = proto_tree_add_item(tree, proto_x2ap, tvb, 0, -1, FALSE); diff --git a/asn1/x411/packet-x411-template.c b/asn1/x411/packet-x411-template.c index b170cbda8c..16ef5e59db 100644 --- a/asn1/x411/packet-x411-template.c +++ b/asn1/x411/packet-x411-template.c @@ -140,8 +140,7 @@ dissect_x411_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tre tree = proto_item_add_subtree(item, ett_x411); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Transfer"); @@ -182,8 +181,7 @@ dissect_x411(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_x411, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_x411); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/asn1/x420/packet-x420-template.c b/asn1/x420/packet-x420-template.c index 80352ebb25..83b63c9cfd 100644 --- a/asn1/x420/packet-x420-template.c +++ b/asn1/x420/packet-x420-template.c @@ -110,8 +110,7 @@ dissect_x420(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) tree = proto_item_add_subtree(item, ett_x420); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "P22"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "P22"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "InterPersonal"); diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c index 625a288a99..c450a636e7 100644 --- a/asn1/x509af/packet-x509af-template.c +++ b/asn1/x509af/packet-x509af-template.c @@ -74,8 +74,7 @@ dissect_pkix_crl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIX-CRL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIX-CRL"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-3com-xns.c b/epan/dissectors/packet-3com-xns.c index 3952fbf550..bcc2221afa 100644 --- a/epan/dissectors/packet-3com-xns.c +++ b/epan/dissectors/packet-3com-xns.c @@ -70,8 +70,7 @@ dissect_3com_xns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 type; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "3Com XNS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "3Com XNS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c index 80354a1fee..6a9a6fd832 100644 --- a/epan/dissectors/packet-3g-a11.c +++ b/epan/dissectors/packet-3g-a11.c @@ -1393,8 +1393,7 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "3GPP2 A11"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "3GPP2 A11"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c index 730f9251ac..0a46abb1aa 100644 --- a/epan/dissectors/packet-9p.c +++ b/epan/dissectors/packet-9p.c @@ -219,8 +219,7 @@ static void dissect_9P(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree *ninep_tree,*tmp_tree; nstime_t tv; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "9P"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "9P"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c index 0ea0451e32..63f9534177 100644 --- a/epan/dissectors/packet-aarp.c +++ b/epan/dissectors/packet-aarp.c @@ -155,8 +155,7 @@ dissect_aarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { const guint8 *sha_val, *spa_val, *tha_val, *tpa_val; gchar *sha_str, *spa_str, *tha_str, *tpa_str; - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AARP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AARP"); if(check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-acap.c b/epan/dissectors/packet-acap.c index c788943c46..0464ae0e75 100644 --- a/epan/dissectors/packet-acap.c +++ b/epan/dissectors/packet-acap.c @@ -59,8 +59,7 @@ dissect_acap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int tokenlen; const guchar *next_token; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACAP"); /* * Find the end of the first line. diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c index 4be5cc1114..8a5fc63f21 100644 --- a/epan/dissectors/packet-acse.c +++ b/epan/dissectors/packet-acse.c @@ -1725,8 +1725,7 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_acse, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_acse); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACSE"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACSE"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c index 0eb9ae6c7a..9ac42bd4ab 100644 --- a/epan/dissectors/packet-actrace.c +++ b/epan/dissectors/packet-actrace.c @@ -467,8 +467,7 @@ static int dissect_actrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Set the columns now, so that they'll be set correctly if we throw * an exception. We can set them later as well.... */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AC_TRACE"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AC_TRACE"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -512,8 +511,7 @@ static void dissect_actrace_cas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *a sectionlen = 0; value = 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AC_CAS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AC_CAS"); value = tvb_get_ntohl(tvb, offset); proto_tree_add_int(actrace_tree, hf_actrace_cas_time, tvb, offset, 4, value); @@ -709,8 +707,7 @@ static void dissect_actrace_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree * next_tvb = tvb_new_subset(tvb, offset, len, len); call_dissector(lapd_handle, next_tvb, pinfo, tree); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AC_ISDN"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AC_ISDN"); if (check_col(pinfo->cinfo, COL_INFO)) col_prepend_fstr(pinfo->cinfo, COL_INFO, "Trunk:%d Blade %s PSTN " , trunk, value==PSTN_TO_BLADE?"<--":"-->"); diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c index f0c5406067..6f44c249b4 100644 --- a/epan/dissectors/packet-afp.c +++ b/epan/dissectors/packet-afp.c @@ -4101,8 +4101,7 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int len = tvb_reported_length(tvb); gint col_info = check_col(pinfo->cinfo, COL_INFO); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AFP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AFP"); if (col_info) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c index e4c7e24671..072fd1a833 100644 --- a/epan/dissectors/packet-agentx.c +++ b/epan/dissectors/packet-agentx.c @@ -805,8 +805,7 @@ static void dissect_agentx_pdu(tvbuff_t *tvb, packet_info *pinfo, NORLEL(flags, packet_id, tvb, 12); offset+=4; NORLEL(flags, payload_len, tvb, 16); offset+=4; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AgentX"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AgentX"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "%s: sid=%d, tid=%d, packid=%d, plen=%d", diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index 391d006b95..a51e9787a9 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -525,8 +525,7 @@ static void dissect_aim_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *aim_tree = NULL; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AIM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AIM"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "AOL Instant Messenger"); diff --git a/epan/dissectors/packet-airopeek.c b/epan/dissectors/packet-airopeek.c index ae32a49816..dace13dcda 100644 --- a/epan/dissectors/packet-airopeek.c +++ b/epan/dissectors/packet-airopeek.c @@ -63,8 +63,7 @@ dissect_airopeek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *airopeek_tree = NULL; proto_item *ti = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AIROPEEK"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AIROPEEK"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c index d546476cc0..42b06ccc03 100644 --- a/epan/dissectors/packet-ajp13.c +++ b/epan/dissectors/packet-ajp13.c @@ -707,8 +707,7 @@ dissect_ajp13_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) mag = tvb_get_ntohs(tvb, 0); len = tvb_get_ntohs(tvb, 2); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AJP13"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AJP13"); if (check_col(pinfo->cinfo, COL_INFO)) { if (mag == 0x1234 && !fd->is_request_body) col_append_fstr(pinfo->cinfo, COL_INFO, "%d:REQ:", conv->index); diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index 61c5695854..2c5da98b22 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -1092,8 +1092,7 @@ dissect_amqp_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint length; int offset; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AMQP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AMQP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c index 9f1c0376b4..7eae11cd62 100644 --- a/epan/dissectors/packet-amr.c +++ b/epan/dissectors/packet-amr.c @@ -441,8 +441,7 @@ dissect_amr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *amr_tree, *toc_tree; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AMR"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AMR"); if (tree) { ti = proto_tree_add_item(tree, proto_amr, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-ans.c b/epan/dissectors/packet-ans.c index 4311853829..f43b417b1c 100644 --- a/epan/dissectors/packet-ans.c +++ b/epan/dissectors/packet-ans.c @@ -75,8 +75,7 @@ dissect_ans(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 seq_num; guint8 team_id[6]; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Intel ANS probe"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Intel ANS probe"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c index 8731881fb8..0f921e9581 100644 --- a/epan/dissectors/packet-aodv.c +++ b/epan/dissectors/packet-aodv.c @@ -770,8 +770,7 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 type; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AODV"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AODV"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c index d15a7caa10..06543f5f00 100644 --- a/epan/dissectors/packet-aoe.c +++ b/epan/dissectors/packet-aoe.c @@ -399,8 +399,7 @@ dissect_aoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) proto_tree *tree=NULL; guint8 version; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AoE"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AoE"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c index 9873130c3c..5a8412acdc 100644 --- a/epan/dissectors/packet-ap1394.c +++ b/epan/dissectors/packet-ap1394.c @@ -72,8 +72,7 @@ dissect_ap1394(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 etype; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IP/IEEE1394"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IP/IEEE1394"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c index 2625b89631..5bdb2dd34c 100644 --- a/epan/dissectors/packet-arcnet.c +++ b/epan/dissectors/packet-arcnet.c @@ -142,8 +142,7 @@ dissect_arcnet_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, proto_item *ti = NULL; proto_tree *arcnet_tree = NULL; - if (check_col (pinfo->cinfo, COL_PROTOCOL)) - col_set_str (pinfo->cinfo, COL_PROTOCOL, "ARCNET"); + col_set_str (pinfo->cinfo, COL_PROTOCOL, "ARCNET"); if (check_col (pinfo->cinfo, COL_INFO)) col_set_str (pinfo->cinfo, COL_INFO, "ARCNET"); diff --git a/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c index d7f0d67abe..3483e010b0 100644 --- a/epan/dissectors/packet-armagetronad.c +++ b/epan/dissectors/packet-armagetronad.c @@ -242,8 +242,7 @@ dissect_armagetronad(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) info = check_col(pinfo->cinfo, COL_INFO) ? g_string_new("") : NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Armagetronad"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Armagetronad"); if (info) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-arp.c b/epan/dissectors/packet-arp.c index 9eafb9b4a2..6b6eb17529 100644 --- a/epan/dissectors/packet-arp.c +++ b/epan/dissectors/packet-arp.c @@ -873,8 +873,7 @@ dissect_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) Clear the Info column so that, if we throw an exception, it shows up as a short or malformed ARP frame. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ARP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ARP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c index 63f89a1fed..78a360a725 100644 --- a/epan/dissectors/packet-aruba-adp.c +++ b/epan/dissectors/packet-aruba-adp.c @@ -64,8 +64,7 @@ dissect_aruba_adp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const guint8 *switchip; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ADP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ADP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-asf.c b/epan/dissectors/packet-asf.c index 2897650c82..d478f0bafc 100644 --- a/epan/dissectors/packet-asf.c +++ b/epan/dissectors/packet-asf.c @@ -81,8 +81,7 @@ dissect_asf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 len; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ASF"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ASF"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c index cad278ff01..3535e6404b 100644 --- a/epan/dissectors/packet-atalk.c +++ b/epan/dissectors/packet-atalk.c @@ -579,8 +579,7 @@ dissect_rtmp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ti; guint8 function; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTMP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -608,8 +607,7 @@ dissect_rtmp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint16 node; /* might be more than 8 bits */ int i; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTMP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -695,8 +693,7 @@ dissect_nbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint op, count; guint i; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -778,8 +775,7 @@ dissect_atp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { conversation_t *conversation; asp_request_val *request_val = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATP"); ctrlinfo = tvb_get_guint8(tvb, offset); bitmap = tvb_get_guint8(tvb, offset +1); @@ -1199,8 +1195,7 @@ dissect_pap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; int len; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PAP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1333,8 +1328,7 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 fn; int len; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ASP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ASP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1481,8 +1475,7 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 count; guint8 len; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZIP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZIP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1562,8 +1555,7 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint i; guint count; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZIP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZIP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1690,8 +1682,7 @@ dissect_ddp_short(tvbuff_t *tvb, packet_info *pinfo, guint8 dnode, static struct atalk_ddp_addr src, dst; tvbuff_t *new_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DDP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DDP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1753,8 +1744,7 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static struct atalk_ddp_addr src, dst; tvbuff_t *new_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DDP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DDP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1848,8 +1838,7 @@ dissect_llap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; tvbuff_t *new_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLAP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index cc301de2b0..74d2eca7dc 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -661,8 +661,7 @@ dissect_lane(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; tvbuff_t *next_tvb_le_client; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM LANE"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM LANE"); /* Is it LE Control, 802.3, 802.5, or "none of the above"? */ switch (pinfo->pseudo_header->atm.subtype) { @@ -1679,8 +1678,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, switch (aal) { case AAL_1: - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL1"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); ti = proto_tree_add_item(tree, proto_aal1, tvb, offset, -1, FALSE); @@ -1706,8 +1704,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* * XXX - or should this be the CS PDU? */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL3/4"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL3/4"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); ti = proto_tree_add_item(tree, proto_aal3_4, tvb, offset, -1, FALSE); @@ -1743,8 +1740,7 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case AAL_OAMCELL: if (NULL == pwpd || pwpd->enable_fill_columns_by_atm_dissector) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "OAM AAL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "OAM AAL"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); } @@ -1816,8 +1812,7 @@ dissect_atm_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pinfo->pseudo_header->atm.aal = AAL_SIGNALLING; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM"); if (!pseudowire_mode) { switch (pinfo->pseudo_header->atm.channel) { @@ -1913,8 +1908,7 @@ dissect_atm_oam_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *atm_ti = NULL; gboolean pseudowire_mode = (NULL != pinfo->private_data); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ATM"); if (!pseudowire_mode) { if (tree) { diff --git a/epan/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c index 427569c0fb..12cf1e12c2 100644 --- a/epan/dissectors/packet-auto_rp.c +++ b/epan/dissectors/packet-auto_rp.c @@ -115,8 +115,7 @@ static void dissect_auto_rp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint8 ver_type, rp_count; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Auto-RP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Auto-RP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ax4000.c b/epan/dissectors/packet-ax4000.c index 08430c419b..ec771785a1 100644 --- a/epan/dissectors/packet-ax4000.c +++ b/epan/dissectors/packet-ax4000.c @@ -63,8 +63,7 @@ dissect_ax4000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 ax_timestamp; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AX4000"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AX4000"); ax_port = tvb_get_guint8(tvb, 0); ax_chassis = tvb_get_guint8(tvb, 1); diff --git a/epan/dissectors/packet-ayiya.c b/epan/dissectors/packet-ayiya.c index 8a264234c7..7a000c9a5f 100644 --- a/epan/dissectors/packet-ayiya.c +++ b/epan/dissectors/packet-ayiya.c @@ -106,8 +106,7 @@ dissect_ayiya(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ayiya_len = 8+idlen+siglen; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AYIYA"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AYIYA"); if (tree) { proto_item *ti; diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c index 6371058a4d..e013187a60 100644 --- a/epan/dissectors/packet-bacnet.c +++ b/epan/dissectors/packet-bacnet.c @@ -190,8 +190,7 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 j; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BACnet-NPDU"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BACnet-NPDU"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Building Automation and Control Network NPDU"); diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c index eaec0d8e04..8f5ecc54d9 100644 --- a/epan/dissectors/packet-beep.c +++ b/epan/dissectors/packet-beep.c @@ -893,8 +893,7 @@ dissect_beep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BEEP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BEEP"); if (check_col(pinfo->cinfo, COL_INFO)) { /* Check the type ... */ diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 2dee4c9fca..4eb943e348 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -4202,8 +4202,7 @@ dissect_ber(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { const char *name; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BER"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BER"); if (check_col(pinfo->cinfo, COL_DEF_SRC)) col_set_str(pinfo->cinfo, COL_DEF_SRC, "BER encoded file"); diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c index 7c9fa099e6..899c418d10 100644 --- a/epan/dissectors/packet-bfd.c +++ b/epan/dissectors/packet-bfd.c @@ -365,8 +365,7 @@ static void dissect_bfd_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t const char *sep; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BFD Control"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BFD Control"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c index 6fae1136a3..955cdd3522 100644 --- a/epan/dissectors/packet-bgp.c +++ b/epan/dissectors/packet-bgp.c @@ -2829,8 +2829,7 @@ dissect_bgp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) volatile gboolean first = TRUE; /* TRUE for the first BGP message in packet */ tvbuff_t *volatile next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BGP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BGP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-bofl.c b/epan/dissectors/packet-bofl.c index 20ef24da8b..1bc3412481 100644 --- a/epan/dissectors/packet-bofl.c +++ b/epan/dissectors/packet-bofl.c @@ -68,8 +68,7 @@ dissect_bofl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint len; guint32 pdu, sequence; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BOFL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BOFL"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c index 4035dfafca..261e41c350 100644 --- a/epan/dissectors/packet-bootp.c +++ b/epan/dissectors/packet-bootp.c @@ -3772,8 +3772,7 @@ dissect_bootp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset_delta; guint8 overload = 0; /* DHCP option overload */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BOOTP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BOOTP"); if (check_col(pinfo->cinfo, COL_INFO)) { /* * In case we throw an exception fetching the opcode, etc. @@ -3846,8 +3845,7 @@ dissect_bootp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Yes, this is a DHCP packet, and "dhcp_type" is the * packet type. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DHCP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DHCP"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "DHCP %-8s - Transaction ID 0x%x", dhcp_type, tvb_get_ntohl(tvb, 4)); diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c index 589aef545d..ed28d40bd1 100644 --- a/epan/dissectors/packet-brdwlk.c +++ b/epan/dissectors/packet-brdwlk.c @@ -233,8 +233,7 @@ dissect_brdwlk (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gboolean dropped_packets; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Boardwalk"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Boardwalk"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index e63b9fde2f..bf88e178c0 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -5995,8 +5995,7 @@ dissect_bssgp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "BSSGP"; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BSSGP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BSSGP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c index 18ba73489b..56ac766273 100644 --- a/epan/dissectors/packet-btrfcomm.c +++ b/epan/dissectors/packet-btrfcomm.c @@ -623,8 +623,7 @@ dissect_btrfcomm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ti = proto_tree_add_item(tree, proto_btrfcomm, tvb, offset, -1, TRUE); rfcomm_tree = proto_item_add_subtree(ti, ett_btrfcomm); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RFCOMM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RFCOMM"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); col_set_str(pinfo->cinfo, COL_INFO, pinfo->p2p_dir == P2P_DIR_SENT ? "Sent " : "Rcvd "); diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c index 7ea1eb4e5e..8b6cc79bb1 100644 --- a/epan/dissectors/packet-btsdp.c +++ b/epan/dissectors/packet-btsdp.c @@ -704,8 +704,7 @@ dissect_btsdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const char *pdu_name; int offset=0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SDP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SDP"); ti = proto_tree_add_item(tree, proto_btsdp, tvb, 0, -1, FALSE); st = proto_item_add_subtree(ti, ett_btsdp); diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c index 24ca19ab03..eae519e50d 100644 --- a/epan/dissectors/packet-bvlc.c +++ b/epan/dissectors/packet-bvlc.c @@ -139,8 +139,7 @@ dissect_bvlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (match_strval(bvlc_type, bvlc_types) == NULL) return 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BVLC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BVLC"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "BACnet Virtual Link Control"); diff --git a/epan/dissectors/packet-ccsds.c b/epan/dissectors/packet-ccsds.c index 4e989f1503..e112dd1639 100644 --- a/epan/dissectors/packet-ccsds.c +++ b/epan/dissectors/packet-ccsds.c @@ -341,8 +341,7 @@ dissect_ccsds(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *secondary_header_tree; const char* time_string; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CCSDS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CCSDS"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "CCSDS Packet"); diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c index 7f5b469050..f61c8cec79 100644 --- a/epan/dissectors/packet-cdp.c +++ b/epan/dissectors/packet-cdp.c @@ -184,8 +184,7 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 ip_addr; vec_t cksum_vec[1]; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CDP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CDP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-cgmp.c b/epan/dissectors/packet-cgmp.c index 95786f0588..894cb4015e 100644 --- a/epan/dissectors/packet-cgmp.c +++ b/epan/dissectors/packet-cgmp.c @@ -61,8 +61,7 @@ dissect_cgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset = 0; guint8 count; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CGMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CGMP"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Cisco Group Management Protocol"); diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c index 461333693d..1507305f4e 100644 --- a/epan/dissectors/packet-chdlc.c +++ b/epan/dissectors/packet-chdlc.c @@ -163,8 +163,7 @@ dissect_chdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 addr; guint16 proto; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CHDLC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CHDLC"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -278,8 +277,7 @@ dissect_slarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 mysequence; guint32 yoursequence; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SLARP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SLARP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c index 37aa89717e..65b4e85a36 100644 --- a/epan/dissectors/packet-cimd.c +++ b/epan/dissectors/packet-cimd.c @@ -681,8 +681,7 @@ dissect_cimd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Make entries in Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIMD"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIMD"); if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-cisco-sm.c b/epan/dissectors/packet-cisco-sm.c index cc4b309ed9..85416b8081 100644 --- a/epan/dissectors/packet-cisco-sm.c +++ b/epan/dissectors/packet-cisco-sm.c @@ -151,8 +151,7 @@ dissect_sm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sm_message_type = tvb_get_ntohl(tvb,offset); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SM"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Cisco SM Packet (%s)", diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c index 350438787d..ddebf5272b 100644 --- a/epan/dissectors/packet-cisco-wids.c +++ b/epan/dissectors/packet-cisco-wids.c @@ -79,8 +79,7 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 capturelen; guint remain; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CWIDS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CWIDS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c index 84a5c7b865..1f4560c971 100644 --- a/epan/dissectors/packet-clnp.c +++ b/epan/dissectors/packet-clnp.c @@ -217,8 +217,7 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gboolean update_col_info = TRUE; gboolean save_fragmented; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CLNP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CLNP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c index 1c2e21a861..61c4fad662 100644 --- a/epan/dissectors/packet-cmip.c +++ b/epan/dissectors/packet-cmip.c @@ -4424,8 +4424,7 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) tree = proto_item_add_subtree(item, ett_cmip); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMIP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMIP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); switch(session->spdu_type){ diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c index c22ae6dbc0..a18960facc 100644 --- a/epan/dissectors/packet-cmp.c +++ b/epan/dissectors/packet-cmp.c @@ -1508,8 +1508,7 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); @@ -1680,8 +1679,7 @@ dissect_cmp_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-cmpp.c b/epan/dissectors/packet-cmpp.c index bd80421826..042b25214c 100644 --- a/epan/dissectors/packet-cmpp.c +++ b/epan/dissectors/packet-cmpp.c @@ -578,8 +578,7 @@ dissect_cmpp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMPP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMPP"); if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index 4041a9168c..92392be888 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -896,8 +896,7 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 client_type; int object_len; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "COPS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "COPS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c index dfcee1f478..58d904feb0 100644 --- a/epan/dissectors/packet-cpha.c +++ b/epan/dissectors/packet-cpha.c @@ -218,8 +218,7 @@ dissect_cpha(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return 0; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CPHA"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CPHA"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-csm-encaps.c b/epan/dissectors/packet-csm-encaps.c index dd2a4b9755..56f7f77803 100644 --- a/epan/dissectors/packet-csm-encaps.c +++ b/epan/dissectors/packet-csm-encaps.c @@ -244,8 +244,7 @@ dissect_csm_encaps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CSM_ENCAPS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CSM_ENCAPS"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-daap.c b/epan/dissectors/packet-daap.c index 4b924c094b..7e373b9e99 100644 --- a/epan/dissectors/packet-daap.c +++ b/epan/dissectors/packet-daap.c @@ -147,8 +147,7 @@ dissect_daap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset = 0; gboolean is_request = (pinfo->destport == TCP_PORT_DAAP); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DAAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DAAP"); /* * XXX - what if the body is gzipped? This isn't the only protocol diff --git a/epan/dissectors/packet-daytime.c b/epan/dissectors/packet-daytime.c index a92c8991a4..a5a1fad917 100644 --- a/epan/dissectors/packet-daytime.c +++ b/epan/dissectors/packet-daytime.c @@ -45,8 +45,7 @@ dissect_daytime(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *daytime_tree; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DAYTIME"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DAYTIME"); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "DAYTIME %s", diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c index 56d9bb6f14..41064527c6 100644 --- a/epan/dissectors/packet-dcc.c +++ b/epan/dissectors/packet-dcc.c @@ -230,8 +230,7 @@ dissect_dcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return FALSE; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCC"); offset = 0; is_response = pinfo->srcport == DCC_PORT; diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c index b5ba348f8b..9b6b2f71a0 100644 --- a/epan/dissectors/packet-dccp.c +++ b/epan/dissectors/packet-dccp.c @@ -597,8 +597,7 @@ static void dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) SET_ADDRESS(&dccph->ip_src, pinfo->src.type, pinfo->src.len, pinfo->src.data); SET_ADDRESS(&dccph->ip_dst, pinfo->dst.type, pinfo->dst.len, pinfo->dst.data); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCCP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCCP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c index 63a33bd5bd..66f0fd6b43 100644 --- a/epan/dissectors/packet-dcerpc.c +++ b/epan/dissectors/packet-dcerpc.c @@ -3928,8 +3928,7 @@ dissect_dcerpc_cn (tvbuff_t *tvb, int offset, packet_info *pinfo, return TRUE; } - if (check_col (pinfo->cinfo, COL_PROTOCOL)) - col_set_str (pinfo->cinfo, COL_PROTOCOL, "DCERPC"); + col_set_str (pinfo->cinfo, COL_PROTOCOL, "DCERPC"); if (check_col (pinfo->cinfo, COL_INFO)) { if(pinfo->dcectxid != 0) { @@ -4773,8 +4772,7 @@ dissect_dcerpc_dg (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return FALSE; - if (check_col (pinfo->cinfo, COL_PROTOCOL)) - col_set_str (pinfo->cinfo, COL_PROTOCOL, "DCERPC"); + col_set_str (pinfo->cinfo, COL_PROTOCOL, "DCERPC"); if (check_col (pinfo->cinfo, COL_INFO)) col_add_str (pinfo->cinfo, COL_INFO, pckt_vals[hdr.ptype].strptr); diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index c8743bfd94..03063509b1 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -1891,8 +1891,7 @@ dissect_dect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) memset((char*)(&(pkt_bfield.Data)), 0, 128); pkt_bfield.Length=pkt_len-13; - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT"); /* Clear out stuff in the info column */ if(check_col(pinfo->cinfo, COL_INFO)) diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c index 56eca4da42..a45baca429 100644 --- a/epan/dissectors/packet-dhcp-failover.c +++ b/epan/dissectors/packet-dhcp-failover.c @@ -377,8 +377,7 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 max_unacked_bndupd, receive_timer; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DHCPFO"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DHCPFO"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index bb05209d05..98900be34c 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -1258,8 +1258,7 @@ dissect_dhcpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, static void dissect_dhcpv6_downstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DHCPv6"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DHCPv6"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); dissect_dhcpv6(tvb, pinfo, tree, TRUE, 0, tvb_reported_length(tvb)); @@ -1268,8 +1267,7 @@ dissect_dhcpv6_downstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static void dissect_dhcpv6_upstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DHCPv6"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DHCPv6"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); dissect_dhcpv6(tvb, pinfo, tree, FALSE, 0, tvb_reported_length(tvb)); diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index 1d9e80336b..1ec0250ef3 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -659,8 +659,7 @@ dissect_diameter_common(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree) proto_item *it; nstime_t ns; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DIAMETER"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DIAMETER"); pi = proto_tree_add_item(tree,proto_diameter,tvb,0,-1,FALSE); diam_tree = proto_item_add_subtree(pi,ett_diameter); diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index 142c92bcf0..b68e5480ca 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -1548,8 +1548,7 @@ dissect_disp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_disp, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_disp); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DISP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DISP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c index f39b09e5f0..d166ad7afc 100644 --- a/epan/dissectors/packet-distcc.c +++ b/epan/dissectors/packet-distcc.c @@ -293,8 +293,7 @@ dissect_distcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) guint32 parameter; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DISTCC "); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DISTCC "); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c index 3ecf22916b..262558892f 100644 --- a/epan/dissectors/packet-dlm3.c +++ b/epan/dissectors/packet-dlm3.c @@ -776,8 +776,7 @@ dissect_dlm3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) return 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DLM3"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DLM3"); if (check_col(pinfo->cinfo, COL_INFO)) diff --git a/epan/dissectors/packet-dlsw.c b/epan/dissectors/packet-dlsw.c index 505d101481..6b81f4f2a9 100644 --- a/epan/dissectors/packet-dlsw.c +++ b/epan/dissectors/packet-dlsw.c @@ -224,8 +224,7 @@ dissect_dlsw_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *dlsw_tree = NULL, *ti,*ti2, *dlsw_header_tree = NULL; proto_tree *dlsw_flags_tree,*dlsw_data_tree; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DLSw"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DLSw"); version=tvb_get_guint8(tvb,0); diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c index dd782725d6..4a4f761c8c 100644 --- a/epan/dissectors/packet-dnp.c +++ b/epan/dissectors/packet-dnp.c @@ -2315,8 +2315,7 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DNP 3.0"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DNP 3.0"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c index 3321048045..18b1ccc7a0 100644 --- a/epan/dissectors/packet-dns.c +++ b/epan/dissectors/packet-dns.c @@ -3043,8 +3043,7 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, static void dissect_dns_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DNS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DNS"); dissect_dns_common(tvb, pinfo, tree, FALSE, FALSE, FALSE); } @@ -3052,8 +3051,7 @@ dissect_dns_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static void dissect_mdns_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MDNS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MDNS"); dissect_dns_common(tvb, pinfo, tree, FALSE, TRUE, FALSE); } @@ -3061,8 +3059,7 @@ dissect_mdns_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static void dissect_llmnr_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLMNR"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLMNR"); dissect_dns_common(tvb, pinfo, tree, FALSE, FALSE, TRUE); } @@ -3086,8 +3083,7 @@ get_dns_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset) static void dissect_dns_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DNS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DNS"); dissect_dns_common(tvb, pinfo, tree, TRUE, FALSE, FALSE); } diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c index c3429b73fe..1fdb2d79c9 100644 --- a/epan/dissectors/packet-dop.c +++ b/epan/dissectors/packet-dop.c @@ -2110,8 +2110,7 @@ dissect_dop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_dop, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_dop); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DOP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DOP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c index 4be8409558..342eca720b 100644 --- a/epan/dissectors/packet-dplay.c +++ b/epan/dissectors/packet-dplay.c @@ -1024,8 +1024,7 @@ static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(memcmp(play_id, (guint8 *)&dplay_id, 4) != 0) { - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY"); /* Clear out stuff in the info column */ if(check_col(pinfo->cinfo,COL_INFO)) col_clear(pinfo->cinfo,COL_INFO); @@ -1039,8 +1038,7 @@ static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) second_message_type = tvb_get_letohs(tvb, 72); } - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY"); /* Clear out stuff in the info column */ if(check_col(pinfo->cinfo,COL_INFO)) { @@ -1143,8 +1141,7 @@ static void dissect_dplay_player_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tr { guint32 mixed, size, token; - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY"); /* Clear out stuff in the info column */ if(check_col(pinfo->cinfo,COL_INFO)) col_clear(pinfo->cinfo,COL_INFO); diff --git a/epan/dissectors/packet-dpnss.c b/epan/dissectors/packet-dpnss.c index 514398c2c6..443b535c38 100644 --- a/epan/dissectors/packet-dpnss.c +++ b/epan/dissectors/packet-dpnss.c @@ -1459,8 +1459,7 @@ dissect_dpnss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 octet; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPNSS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPNSS"); item = proto_tree_add_item(tree, proto_dpnss, tvb, 0, -1, FALSE); dpnss_tree = proto_item_add_subtree(item, ett_dpnss); diff --git a/epan/dissectors/packet-drda.c b/epan/dissectors/packet-drda.c index d952876944..c9a2c60d98 100644 --- a/epan/dissectors/packet-drda.c +++ b/epan/dissectors/packet-drda.c @@ -677,7 +677,7 @@ dissect_drda(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *drda_tree_sub; gint iLengthParam; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "DRDA"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DRDA"); if (check_col(pinfo->cinfo, COL_INFO)) { /* This is a trick to know whether this is the first PDU in this packet or not */ diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index 6873f62d38..f9d48d3040 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -496,8 +496,7 @@ dissect_dsi_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint col_info; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DSI"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DSI"); col_info = check_col(pinfo->cinfo, COL_INFO); if (col_info) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c index 70f25fede6..d71b1cc159 100644 --- a/epan/dissectors/packet-dsp.c +++ b/epan/dissectors/packet-dsp.c @@ -1764,8 +1764,7 @@ dissect_dsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_dsp, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_dsp); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DAP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c index 967bcdd9f4..d77e40485c 100644 --- a/epan/dissectors/packet-dtp.c +++ b/epan/dissectors/packet-dtp.c @@ -78,8 +78,7 @@ dissect_dtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *tlv_tree=NULL; int offset = 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTP"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Dynamic Trunking Protocol"); diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c index b9f7c8cc32..72276b5fd6 100644 --- a/epan/dissectors/packet-dtpt.c +++ b/epan/dissectors/packet-dtpt.c @@ -459,8 +459,7 @@ dissect_dtpt_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) queryset_size = tvb_get_letohl(tvb, offset + 4); if (queryset_size != 60) return 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTPT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTPT"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "QuerySet"); @@ -729,8 +728,7 @@ dissect_dtpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return 0; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTPT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTPT"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, val_to_str(message_type, names_message_type, "Unknown (%d)")); diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c index bc602c566f..79c74f1b43 100644 --- a/epan/dissectors/packet-dua.c +++ b/epan/dissectors/packet-dua.c @@ -692,8 +692,7 @@ dissect_dua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) proto_tree *dua_tree; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DUA"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DUA"); /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c index 373e0f5bfb..96723f6478 100644 --- a/epan/dissectors/packet-eap.c +++ b/epan/dissectors/packet-eap.c @@ -621,8 +621,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ti; proto_tree *eap_tree = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "EAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "EAP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c index 5f62ed2bce..f14c873e7b 100644 --- a/epan/dissectors/packet-eapol.c +++ b/epan/dissectors/packet-eapol.c @@ -142,8 +142,7 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *key_index_tree, *keydes_tree; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "EAPOL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "EAPOL"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index be02978df6..628583c3cf 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -2995,8 +2995,7 @@ static void dissect_edonkey_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tre void (*dissector)(guint8, tvbuff_t*, packet_info*, int, int, proto_tree*); tvbuff_t *tvbraw = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "eDonkey"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "eDonkey"); if (tree) { ti = proto_tree_add_item(tree, proto_edonkey, tvb, 0, -1, FALSE); @@ -3119,8 +3118,7 @@ static void dissect_edonkey_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t guint8 protocol, msg_type; const gchar *protocol_name, *message_name; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "eDonkey"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "eDonkey"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "eDonkey UDP Message"); diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c index 0953e14067..573c073e70 100644 --- a/epan/dissectors/packet-eigrp.c +++ b/epan/dissectors/packet-eigrp.c @@ -147,8 +147,7 @@ dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint16 tlv; guint32 ack, size, offset = EIGRP_HEADER_LENGTH; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "EIGRP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "EIGRP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-enc.c b/epan/dissectors/packet-enc.c index 7e81cfe10b..4b54763238 100644 --- a/epan/dissectors/packet-enc.c +++ b/epan/dissectors/packet-enc.c @@ -109,8 +109,7 @@ dissect_enc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *enc_tree; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ENC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ENC"); /* Copy out the enc header to insure alignment */ tvb_memcpy(tvb, (guint8 *)&ench, 0, sizeof(ench)); diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c index 839a00e0a1..710b022284 100644 --- a/epan/dissectors/packet-enip.c +++ b/epan/dissectors/packet-enip.c @@ -1027,8 +1027,7 @@ dissect_enip_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *enip_tree, *header_tree = NULL, *csftree; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ENIP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ENIP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1263,8 +1262,7 @@ dissect_enipio(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) g_tree = tree; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ENIP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ENIP"); /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c index 1e705c406b..9afc898841 100644 --- a/epan/dissectors/packet-epmd.c +++ b/epan/dissectors/packet-epmd.c @@ -229,8 +229,7 @@ dissect_epmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!check_epmd(tvb)) return(0); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "EPMD"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "EPMD"); if (tree) { ti = proto_tree_add_item(tree, proto_epmd, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c index 16e5030cce..c335481a8e 100644 --- a/epan/dissectors/packet-erf.c +++ b/epan/dissectors/packet-erf.c @@ -805,8 +805,7 @@ dissect_erf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) erf_type=pinfo->pseudo_header->erf.phdr.type & 0x7F; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ERF"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ERF"); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "%s", diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c index 7ee8a2a2b3..c07dbfaedf 100644 --- a/epan/dissectors/packet-esis.c +++ b/epan/dissectors/packet-esis.c @@ -282,8 +282,7 @@ dissect_esis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint tmp_uint = 0; const char *cksum_status; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESIS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESIS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-etherip.c b/epan/dissectors/packet-etherip.c index 846039bacf..0a194a8721 100644 --- a/epan/dissectors/packet-etherip.c +++ b/epan/dissectors/packet-etherip.c @@ -67,8 +67,7 @@ dissect_etherip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *etherip_tree; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ETHERIP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ETHERIP"); /* Copy out the etherip header to insure alignment */ tvb_memcpy(tvb, (guint8 *)ðeriph, 0, sizeof(etheriph)); diff --git a/epan/dissectors/packet-exec.c b/epan/dissectors/packet-exec.c index 6f0f8f2980..28eac01384 100644 --- a/epan/dissectors/packet-exec.c +++ b/epan/dissectors/packet-exec.c @@ -209,8 +209,7 @@ dissect_exec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "EXEC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "EXEC"); if(check_col(pinfo->cinfo, COL_INFO)){ /* First, clear the info column */ diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index 24212fe8c4..b4da380097 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -678,8 +678,7 @@ dissect_esrp_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, prot FALSE); offset += 2; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESRP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESRP"); } static void @@ -746,8 +745,7 @@ dissect_eaps_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length _U_, FALSE); offset += 38; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "EAPS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "EAPS"); if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, " ID: %d, MAC: %s", ctrlvlanid, ether_to_str(sysmac)); @@ -863,8 +861,7 @@ dissect_esl_tlv(tvbuff_t *tvb, packet_info *pinfo, int offset, int length, proto offset += length; length = 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESL"); if (check_col(pinfo->cinfo, COL_INFO)) col_append_fstr(pinfo->cinfo, COL_INFO, " ID: %d, MAC: %s", ctrlvlanid, ether_to_str(sysmac)); diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index 75681985fc..8ed44ef079 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -289,8 +289,7 @@ dissect_fc_ba_acc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset = 0; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BLS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BLS"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "BA_ACC"); @@ -321,8 +320,7 @@ dissect_fc_ba_rjt (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset = 0; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BLS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BLS"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "BA_RJT"); @@ -653,8 +651,7 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean fchdr.itlq=NULL; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FC"); fchdr.r_ctl = tvb_get_guint8 (tvb, offset); diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c index 3c60730ad6..0b99688b21 100644 --- a/epan/dissectors/packet-fcct.c +++ b/epan/dissectors/packet-fcct.c @@ -159,8 +159,7 @@ dissect_fcct (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) fc_ct_preamble cthdr; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FC_CT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FC_CT"); /* cthdr.revision = tvb_get_guint8 (tvb, offset++); diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index d958e76bae..d6b53a8170 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -1910,8 +1910,7 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 addrdata[3]; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FC ELS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FC ELS"); /* decoding of this is done by each individual opcode handler */ opcode = tvb_get_guint8 (tvb, 0); diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index 52a7bff750..8b48281fb3 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.c @@ -801,8 +801,7 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) failed_opcode = 0; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FC-FCS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FC-FCS"); if (tree) { ti = proto_tree_add_protocol_format (tree, proto_fcfcs, tvb, 0, diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c index bbf05b88a6..3629ac42e1 100644 --- a/epan/dissectors/packet-fcfzs.c +++ b/epan/dissectors/packet-fcfzs.c @@ -651,8 +651,7 @@ dissect_fcfzs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 isreq = 1; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Zone Server"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Zone Server"); tvb_memcpy (tvb, (guint8 *)&cthdr, offset, FCCT_PRMBL_SIZE); diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c index 71279e5690..9049ff85be 100644 --- a/epan/dissectors/packet-fcip.c +++ b/epan/dissectors/packet-fcip.c @@ -400,8 +400,7 @@ dissect_fcip (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } start = offset; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FCIP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FCIP"); frame_len = (tvb_get_ntohs (tvb, offset+12) & 0x03FF)*4; diff --git a/epan/dissectors/packet-fcoe.c b/epan/dissectors/packet-fcoe.c index 9cd29748e6..11b60ebf58 100644 --- a/epan/dissectors/packet-fcoe.c +++ b/epan/dissectors/packet-fcoe.c @@ -164,8 +164,7 @@ dissect_fcoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (version != 0) ver = ep_strdup_printf(ver, "ver %d ", version); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FCoE"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FCoE"); crc_offset = header_len + frame_len; eof_offset = crc_offset + 4; bytes_remaining = tvb_length_remaining(tvb, header_len); diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c index 69aebf0da4..e8212b1cae 100644 --- a/epan/dissectors/packet-fcp.c +++ b/epan/dissectors/packet-fcp.c @@ -628,8 +628,7 @@ dissect_fcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) fchdr=(fc_hdr *)pinfo->private_data; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FCP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FCP"); r_ctl = pinfo->r_ctl; diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c index eec416f99f..4457ea4e99 100644 --- a/epan/dissectors/packet-fcsb3.c +++ b/epan/dissectors/packet-fcsb3.c @@ -1019,8 +1019,7 @@ static void dissect_fc_sbccs (tvbuff_t *tvb, packet_info *pinfo, void* pd_save; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FC-SB3"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FC-SB3"); /* Decode the basic SB3 and IU header and determine type of frame */ type = get_fc_sbccs_iu_type (tvb, offset); diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c index db31f0414a..daa2f025c9 100644 --- a/epan/dissectors/packet-fcswils.c +++ b/epan/dissectors/packet-fcswils.c @@ -1806,8 +1806,7 @@ dissect_fcswils (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SW_ILS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SW_ILS"); /* decoding of this is done by each individual opcode handler */ opcode = tvb_get_guint8 (tvb, 0); diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c index ac2f9103ea..9cf32e49bd 100644 --- a/epan/dissectors/packet-fddi.c +++ b/epan/dissectors/packet-fddi.c @@ -283,8 +283,7 @@ dissect_fddi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } fddihdr=&fddihdrs[fddihdr_num]; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FDDI"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FDDI"); fddihdr->fc = tvb_get_guint8(tvb, FDDI_P_FC + FDDI_PADDING); fc_str = fddifc_to_str(fddihdr->fc); diff --git a/epan/dissectors/packet-fefd.c b/epan/dissectors/packet-fefd.c index 3f4c6994a7..e3b254bc6b 100644 --- a/epan/dissectors/packet-fefd.c +++ b/epan/dissectors/packet-fefd.c @@ -105,8 +105,7 @@ dissect_fefd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *tlv_tree; int real_length; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FEFD"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FEFD"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index c894a8d312..2871869622 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -264,8 +264,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const char *info; char *text; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FIP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FIP"); if (!tvb_bytes_exist(tvb, 0, FIP_HEADER_LEN)) { if (check_col(pinfo->cinfo, COL_INFO)) diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index b1c7bfc369..21923fd386 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -411,8 +411,7 @@ dissect_fr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 fr_type; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -674,8 +673,7 @@ static void dissect_fr_uncompressed(tvbuff_t *tvb, packet_info *pinfo, proto_item *ti = NULL; proto_tree *fr_tree = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c index b692e4b6b0..08ff47db03 100644 --- a/epan/dissectors/packet-ftam.c +++ b/epan/dissectors/packet-ftam.c @@ -4794,8 +4794,7 @@ dissect_ftam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_ftam, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_ftam); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FTAM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FTAM"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c index 0bcb51750a..2634223bfd 100644 --- a/epan/dissectors/packet-ftp.c +++ b/epan/dissectors/packet-ftp.c @@ -324,8 +324,7 @@ dissect_ftp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else is_request = FALSE; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FTP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FTP"); /* * Find the end of the first line. @@ -633,8 +632,7 @@ dissect_ftpdata(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ti, *ftp_data_tree; int data_length; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FTP-DATA"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FTP-DATA"); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "FTP Data: %u bytes", diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c index b54d9c8ee3..5bc712fa94 100644 --- a/epan/dissectors/packet-fw1.c +++ b/epan/dissectors/packet-fw1.c @@ -147,8 +147,7 @@ dissect_fw1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) header = ep_strbuf_new_label(fw1_header); /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FW1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FW1"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-g723.c b/epan/dissectors/packet-g723.c index a3c3992a4c..6f2a4a445f 100644 --- a/epan/dissectors/packet-g723.c +++ b/epan/dissectors/packet-g723.c @@ -79,8 +79,7 @@ dissect_g723(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *g723_tree; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "G.723.1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "G.723.1"); if (tree) { ti = proto_tree_add_item(tree, proto_g723, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-gdsdb.c b/epan/dissectors/packet-gdsdb.c index f6d57ecbf0..f9bc0aea7a 100644 --- a/epan/dissectors/packet-gdsdb.c +++ b/epan/dissectors/packet-gdsdb.c @@ -1258,8 +1258,7 @@ dissect_gdsdb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(!gdsdb_handle_opcode[opcode](tvb, &nopi, NULL)) return 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "GDS DB"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GDS DB"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, diff --git a/epan/dissectors/packet-gift.c b/epan/dissectors/packet-gift.c index e8dcfb1f1e..747ac24db3 100644 --- a/epan/dissectors/packet-gift.c +++ b/epan/dissectors/packet-gift.c @@ -59,8 +59,7 @@ dissect_gift(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const guchar *next_token; /* set "Protocol" column text */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "giFT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "giFT"); /* determine whether it is a request to or response from the server */ if (pinfo->match_port == pinfo->destport) diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index de27b2c5b5..6017cb9149 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -1743,8 +1743,7 @@ static gboolean try_heuristic_giop_dissector(tvbuff_t *tvb, packet_info *pinfo, } /* protocol_is_enabled */ } /* loop */ - if (check_col (pinfo->cinfo, COL_PROTOCOL)) - col_set_str (pinfo->cinfo, COL_PROTOCOL, "GIOP"); + col_set_str (pinfo->cinfo, COL_PROTOCOL, "GIOP"); pinfo->current_proto = saved_proto; return res; /* result */ diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c index bee63921ae..35b24f96b6 100644 --- a/epan/dissectors/packet-gmrp.c +++ b/epan/dissectors/packet-gmrp.c @@ -120,8 +120,7 @@ dissect_gmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 attribute_type; int msg_index, attr_index, offset = 0, length = tvb_reported_length(tvb); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "GMRP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GMRP"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "GMRP"); diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c index 992fd8a6c0..bb21e1f7fa 100644 --- a/epan/dissectors/packet-gnutella.c +++ b/epan/dissectors/packet-gnutella.c @@ -524,8 +524,7 @@ static void dissect_gnutella(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree proto_tree *gnutella_tree = NULL; guint32 size; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Gnutella"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Gnutella"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-gprs-ns.c b/epan/dissectors/packet-gprs-ns.c index 1e320f84b3..fe35516dcc 100644 --- a/epan/dissectors/packet-gprs-ns.c +++ b/epan/dissectors/packet-gprs-ns.c @@ -260,8 +260,7 @@ dissect_gprs_ns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 bvc; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "GPRS NS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GPRS NS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c index 9d8015478e..17db26a6f1 100644 --- a/epan/dissectors/packet-gre.c +++ b/epan/dissectors/packet-gre.c @@ -255,8 +255,7 @@ dissect_gre(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) flags_and_ver = tvb_get_ntohs(tvb, offset); type = tvb_get_ntohs(tvb, offset + sizeof(flags_and_ver)); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "GRE"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GRE"); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Encapsulated %s", diff --git a/epan/dissectors/packet-gsm_um.c b/epan/dissectors/packet-gsm_um.c index c4c2aee277..0788b1466d 100644 --- a/epan/dissectors/packet-gsm_um.c +++ b/epan/dissectors/packet-gsm_um.c @@ -117,8 +117,7 @@ dissect_gsm_um(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *gsm_um_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM Um"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM Um"); if (pinfo->pseudo_header->gsm_um.uplink) { if (check_col(pinfo->cinfo, COL_RES_DL_DST)) diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 4cbea00c19..c5585c833d 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -6293,8 +6293,7 @@ static void dissect_gtp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) } } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "GTP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GTP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c index fcc2fac5a2..54fdf313d6 100644 --- a/epan/dissectors/packet-gtpv2.c +++ b/epan/dissectors/packet-gtpv2.c @@ -1936,8 +1936,7 @@ dissect_gtpv2(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) /* Currently we get called from the GTP dissector no need to check the version */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "GTPv2"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GTPv2"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-gvrp.c b/epan/dissectors/packet-gvrp.c index d3063a9a10..c89818afb0 100644 --- a/epan/dissectors/packet-gvrp.c +++ b/epan/dissectors/packet-gvrp.c @@ -104,8 +104,7 @@ dissect_gvrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 octet; int msg_index, attr_index, offset = 0, length = tvb_reported_length(tvb); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "GVRP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GVRP"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "GVRP"); diff --git a/epan/dissectors/packet-h1.c b/epan/dissectors/packet-h1.c index c73bad52b4..e60bb380cd 100644 --- a/epan/dissectors/packet-h1.c +++ b/epan/dissectors/packet-h1.c @@ -122,8 +122,7 @@ static gboolean dissect_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return FALSE; } - if (check_col (pinfo->cinfo, COL_PROTOCOL)) - col_set_str (pinfo->cinfo, COL_PROTOCOL, "H1"); + col_set_str (pinfo->cinfo, COL_PROTOCOL, "H1"); if (check_col (pinfo->cinfo, COL_INFO)) col_set_str (pinfo->cinfo, COL_INFO, "S5: "); if (tree) diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index e66feccbfe..bc1a777d3c 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -5118,8 +5118,7 @@ dissect_h248(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.248"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.248"); if (tree) { h248_item = proto_tree_add_item(tree, proto_h248, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c index d46ae0789b..53899ce480 100644 --- a/epan/dissectors/packet-h264.c +++ b/epan/dissectors/packet-h264.c @@ -1778,8 +1778,7 @@ dissect_h264(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "H264"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "H264"); if (tree) { item = proto_tree_add_item(tree, proto_h264, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-hci_h1.c b/epan/dissectors/packet-hci_h1.c index 4ec12f4222..2b8192f0dd 100644 --- a/epan/dissectors/packet-hci_h1.c +++ b/epan/dissectors/packet-hci_h1.c @@ -62,8 +62,7 @@ dissect_hci_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti=NULL; proto_tree *hci_h1_tree=NULL; - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI"); if(check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-hilscher.c b/epan/dissectors/packet-hilscher.c index c4cad775eb..5a87316a26 100644 --- a/epan/dissectors/packet-hilscher.c +++ b/epan/dissectors/packet-hilscher.c @@ -100,8 +100,7 @@ dissect_hilscher_netanalyzer(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree szInfo=ep_alloc(MAX_BUFFER); szInfo[0]=0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "netANALYZER"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "netANALYZER"); if (tree) ti = proto_tree_add_item(tree, hf_information_type, tvb, offset, 1, FALSE); diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c index 43fbda3552..2ab91ca572 100644 --- a/epan/dissectors/packet-homeplug.c +++ b/epan/dissectors/packet-homeplug.c @@ -1406,8 +1406,7 @@ dissect_homeplug(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree * homeplug_tree= NULL; ptvcursor_t * cursor= NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "HomePlug"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "HomePlug"); /* Clear out stuff in the info column */ if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c index 139f69f687..7d6110b58e 100644 --- a/epan/dissectors/packet-hsrp.c +++ b/epan/dissectors/packet-hsrp.c @@ -346,8 +346,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* HSRPv1 */ guint8 opcode, state = 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "HSRP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "HSRP"); opcode = tvb_get_guint8(tvb, 1); if (check_col(pinfo->cinfo, COL_INFO)) { @@ -441,8 +440,7 @@ dissect_hsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *hsrp_tree = NULL; guint8 type,len; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "HSRPv2"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "HSRPv2"); if (tree) { ti = proto_tree_add_item(tree, proto_hsrp, tvb, offset, -1, FALSE); diff --git a/epan/dissectors/packet-hyperscsi.c b/epan/dissectors/packet-hyperscsi.c index eb9bc7c9ed..6f05e01252 100644 --- a/epan/dissectors/packet-hyperscsi.c +++ b/epan/dissectors/packet-hyperscsi.c @@ -93,8 +93,7 @@ dissect_hyperscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; guint8 hs_cmd, hs_ver; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "HyperSCSI"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "HyperSCSI"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c index 9e41bd6a98..cc7e4a3fe6 100644 --- a/epan/dissectors/packet-iapp.c +++ b/epan/dissectors/packet-iapp.c @@ -417,8 +417,7 @@ dissect_iapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int ia_type; const gchar *codestrval; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IAPP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IAPP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-icap.c b/epan/dissectors/packet-icap.c index 8653df54be..d777ce94ac 100644 --- a/epan/dissectors/packet-icap.c +++ b/epan/dissectors/packet-icap.c @@ -72,8 +72,7 @@ dissect_icap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) icap_type_t icap_type; int datalen; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICAP"); if (check_col(pinfo->cinfo, COL_INFO)) { /* diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c index 832121634b..788eb897b4 100644 --- a/epan/dissectors/packet-icep.c +++ b/epan/dissectors/packet-icep.c @@ -1121,8 +1121,7 @@ static void dissect_icep_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree /* Make entries in Protocol column and Info column on summary display */ - if ( check_col(pinfo->cinfo, COL_PROTOCOL) ) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICEP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICEP"); if ( check_col(pinfo->cinfo, COL_INFO) ) { col_add_str(pinfo->cinfo, COL_INFO, diff --git a/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c index 41da1ae27b..5187254bdc 100644 --- a/epan/dissectors/packet-icp.c +++ b/epan/dissectors/packet-icp.c @@ -152,8 +152,7 @@ static void dissect_icp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 options; guint32 option_data; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index 4ab79848b5..6804bc5a3d 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -1719,8 +1719,7 @@ static void dissect_icqv5(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint32 unknown; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICQv5 (UDP)"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICQv5 (UDP)"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "ICQv5 packet"); diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c index 0389ecfbe6..d70f4d044a 100644 --- a/epan/dissectors/packet-idp.c +++ b/epan/dissectors/packet-idp.c @@ -86,8 +86,7 @@ dissect_idp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 type; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IDP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IDP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 1c1138f910..95c6595810 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -6120,8 +6120,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, whdr= &whdrs[0]; - if (check_col (pinfo->cinfo, COL_PROTOCOL)) - col_set_str (pinfo->cinfo, COL_PROTOCOL, "IEEE 802.11"); + col_set_str (pinfo->cinfo, COL_PROTOCOL, "IEEE 802.11"); if (check_col (pinfo->cinfo, COL_INFO)) col_clear (pinfo->cinfo, COL_INFO); @@ -7554,8 +7553,7 @@ dissect_radio (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_item *ti = NULL; proto_tree *radio_tree = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Radio"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Radio"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -7768,8 +7766,7 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_memcpy(tvb, (guint8 *)&hdr, offset, sizeof(hdr)); - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Prism"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Prism"); if(check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -8119,8 +8116,7 @@ dissect_wlancap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 ssi_type; guint32 antnoise; - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "WLAN"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "WLAN"); if(check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); offset = 0; diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c index 666f356cd1..4f1d565bea 100644 --- a/epan/dissectors/packet-ieee8021ah.c +++ b/epan/dissectors/packet-ieee8021ah.c @@ -119,8 +119,7 @@ dissect_ieee8021ad(tvbuff_t *tvb, packet_info *pinfo, proto_tree_index = proto_ieee8021ad; /* add info to column display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "802.1ad"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "802.1ad"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -313,8 +312,7 @@ dissect_ieee8021ah(tvbuff_t *tvb, packet_info *pinfo, proto_tree_index = proto_ieee8021ah; /* add info to column display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "802.1ah"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "802.1ah"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-igrp.c b/epan/dissectors/packet-igrp.c index 5a51a756a2..51d917e9ab 100644 --- a/epan/dissectors/packet-igrp.c +++ b/epan/dissectors/packet-igrp.c @@ -65,8 +65,7 @@ static void dissect_igrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *igrp_tree, *igrp_vektor_tree; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGRP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGRP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-imap.c b/epan/dissectors/packet-imap.c index aa8b1752b3..c8e8b89d75 100644 --- a/epan/dissectors/packet-imap.c +++ b/epan/dissectors/packet-imap.c @@ -60,8 +60,7 @@ dissect_imap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int tokenlen; const guchar *next_token; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IMAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IMAP"); if (pinfo->match_port == pinfo->destport) diff --git a/epan/dissectors/packet-infiniband.c b/epan/dissectors/packet-infiniband.c index 6b6ff74b51..73320c66ba 100644 --- a/epan/dissectors/packet-infiniband.c +++ b/epan/dissectors/packet-infiniband.c @@ -85,8 +85,7 @@ dissect_infiniband(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Clear other columns */ if(pinfo->cinfo) { - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "InfiniBand"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "InfiniBand"); if(check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c index cb95fc5acc..2106400e8f 100644 --- a/epan/dissectors/packet-ipdc.c +++ b/epan/dissectors/packet-ipdc.c @@ -104,8 +104,7 @@ dissect_ipdc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 offset; /* display IPDC protocol ID */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPDC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPDC"); /* short frame... */ if (payload_len < 4) diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c index 1d9429875d..8e133599f0 100644 --- a/epan/dissectors/packet-ipfc.c +++ b/epan/dissectors/packet-ipfc.c @@ -75,8 +75,7 @@ dissect_ipfc (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IP/FC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IP/FC"); if (tree) { ti = proto_tree_add_protocol_format (tree, proto_ipfc, tvb, offset, 16, diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index 3cc52a716f..35a39b63f9 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -189,8 +189,7 @@ dissect_ipp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 status_code; const gchar *status_fmt; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPP"); if (check_col(pinfo->cinfo, COL_INFO)) { if (is_request) col_set_str(pinfo->cinfo, COL_INFO, "IPP request"); diff --git a/epan/dissectors/packet-ipsec-tcp.c b/epan/dissectors/packet-ipsec-tcp.c index b9fa8c7c27..afd67f7d54 100644 --- a/epan/dissectors/packet-ipsec-tcp.c +++ b/epan/dissectors/packet-ipsec-tcp.c @@ -116,8 +116,7 @@ dissect_tcpencap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return 0; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TCPENCAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TCPENCAP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ipsec-udp.c b/epan/dissectors/packet-ipsec-udp.c index 98f78fcbfa..319b91d4d9 100644 --- a/epan/dissectors/packet-ipsec-udp.c +++ b/epan/dissectors/packet-ipsec-udp.c @@ -49,8 +49,7 @@ dissect_udpencap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti = NULL; guint32 spi; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "UDPENCAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "UDPENCAP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c index cbbda333d0..08b5d5edb3 100644 --- a/epan/dissectors/packet-ipsec.c +++ b/epan/dissectors/packet-ipsec.c @@ -1404,8 +1404,7 @@ dissect_ah_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, struct newah ah; int advance; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AH"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AH"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1590,8 +1589,7 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) #endif - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -2613,8 +2611,7 @@ dissect_ipcomp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * load the top pane info. This should be overwritten by * the next protocol in the stack */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPComp"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPComp"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 9d374194df..e26b4d30bc 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -1272,8 +1272,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) struct ip6_hdr ipv6; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPv6"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPv6"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c index edf18aa8ff..265190b499 100644 --- a/epan/dissectors/packet-ipx.c +++ b/epan/dissectors/packet-ipx.c @@ -259,8 +259,7 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ipxh=&ipxh_arr[ipx_current]; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -596,8 +595,7 @@ dissect_spx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) spx_rexmit_info *spx_rexmit_info; spx_info spx_info; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SPX"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SPX"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "SPX"); @@ -847,8 +845,7 @@ dissect_ipxmsg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; guint8 conn_number, sig_char; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX MSG"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX MSG"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -886,8 +883,7 @@ dissect_ipxrip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static const char *rip_type[3] = { "Request", "Response", "Unknown" }; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX RIP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX RIP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -956,8 +952,7 @@ dissect_serialization(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ser_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NW_SERIAL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NW_SERIAL"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1229,8 +1224,7 @@ dissect_ipxsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static const char *sap_type[4] = { "General Query", "General Response", "Nearest Query", "Nearest Response" }; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX SAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX SAP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c index 2bbb9cc628..4f52bd42e1 100644 --- a/epan/dissectors/packet-ipxwan.c +++ b/epan/dissectors/packet-ipxwan.c @@ -135,8 +135,7 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 delta_time; guint8 compression_type; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX WAN"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX WAN"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-irc.c b/epan/dissectors/packet-irc.c index cc66e2b2f2..d39dda6504 100644 --- a/epan/dissectors/packet-irc.c +++ b/epan/dissectors/packet-irc.c @@ -77,8 +77,7 @@ dissect_irc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint next_offset; int linelen; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IRC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IRC"); if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index a0ce019584..dbb8e025f3 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -1004,8 +1004,7 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gboolean pd_changed = FALSE; #endif /* HAVE_LIBGCRYPT */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISAKMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISAKMP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c index 7058d19428..9dbfe80a0e 100644 --- a/epan/dissectors/packet-iscsi.c +++ b/epan/dissectors/packet-iscsi.c @@ -651,8 +651,7 @@ dissect_iscsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint off paddedDataSegmentLength += 4 - (paddedDataSegmentLength & 3); /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "iSCSI"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "iSCSI"); /* XXX we need a way to handle replayed iscsi itt here */ cdata=(iscsi_conv_data_t *)se_tree_lookup32(iscsi_session->itlq, tvb_get_ntohl(tvb, offset+16)); diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c index 82f1d24c10..f81f90482b 100644 --- a/epan/dissectors/packet-isdn.c +++ b/epan/dissectors/packet-isdn.c @@ -85,8 +85,7 @@ dissect_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static const guint8 ppp[2] = { 0xFF, 0x03 }; circuit_t *circuit; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISDN"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISDN"); if (pinfo->pseudo_header->isdn.uton) { if (check_col(pinfo->cinfo, COL_RES_DL_DST)) diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c index a020255078..cab1454f1b 100644 --- a/epan/dissectors/packet-isis.c +++ b/epan/dissectors/packet-isis.c @@ -122,8 +122,7 @@ dissect_isis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 isis_type; guint8 isis_system_id_len; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISIS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISIS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c index 05a6188ecd..04c68ce161 100644 --- a/epan/dissectors/packet-isl.c +++ b/epan/dissectors/packet-isl.c @@ -157,8 +157,7 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len) tvbuff_t *volatile trailer_tvb = NULL; const char *saved_proto; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISL"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index a7bdcfeddf..7b34f83113 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -612,8 +612,7 @@ dissect_isns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *isns_tree = NULL; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "iSNS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "iSNS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 0f7d74b2dc..0b1c19ee31 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -7082,12 +7082,10 @@ dissect_isup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ switch (isup_standard){ case ITU_STANDARD: - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISUP(ITU)"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISUP(ITU)"); break; case ANSI_STANDARD: - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISUP(ANSI)"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISUP(ANSI)"); break; } @@ -7156,8 +7154,7 @@ dissect_bicc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /*circuit_t *circuit;*/ /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BICC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BICC"); /* Extract message type field */ message_type = tvb_get_guint8(tvb, BICC_CIC_OFFSET + BICC_CIC_LENGTH); diff --git a/epan/dissectors/packet-itdm.c b/epan/dissectors/packet-itdm.c index fc7511aa5e..6b404b9316 100644 --- a/epan/dissectors/packet-itdm.c +++ b/epan/dissectors/packet-itdm.c @@ -186,8 +186,7 @@ dissect_itdm_125usec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 ackbit; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ITDM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ITDM"); flowid = tvb_get_ntoh24(tvb, ITDM_FLOWID_OFFSET); chanid = tvb_get_ntoh24(tvb, ITDM_CHANID_OFFSET); @@ -284,8 +283,7 @@ dissect_itdm_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 paired_trans_id; guint32 allocd_flowid; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ITDM-Control"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ITDM-Control"); flowid = tvb_get_ntoh24(tvb, ITDM_FLOWID_OFFSET); command = tvb_get_guint8(tvb, ITDM_CTL_CMD_OFFSET); diff --git a/epan/dissectors/packet-jabber.c b/epan/dissectors/packet-jabber.c index 9973777bfe..58bed87e1a 100644 --- a/epan/dissectors/packet-jabber.c +++ b/epan/dissectors/packet-jabber.c @@ -60,8 +60,7 @@ dissect_jabber(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int linelen; tvbuff_t *xmltvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Jabber"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Jabber"); /* * Find the end of the first line. diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c index a3459ac143..5476888a33 100644 --- a/epan/dissectors/packet-juniper.c +++ b/epan/dissectors/packet-juniper.c @@ -698,8 +698,7 @@ dissect_juniper_mlfr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 mlpic_cookie; guint proto,cookie_len; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper MLFR"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper MLFR"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -804,8 +803,7 @@ dissect_juniper_mlppp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 mlpic_cookie; guint proto,cookie_len; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper MLPPP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper MLPPP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -873,8 +871,7 @@ dissect_juniper_pppoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int bytes_processed; guint8 flags; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper PPPoE"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper PPPoE"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -903,8 +900,7 @@ dissect_juniper_ether(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int bytes_processed; guint8 flags; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Ethernet"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Ethernet"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -933,8 +929,7 @@ dissect_juniper_ppp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int bytes_processed; guint8 flags; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper PPP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper PPP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -963,8 +958,7 @@ dissect_juniper_frelay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int bytes_processed; guint8 flags; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Frame-Relay"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Frame-Relay"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -993,8 +987,7 @@ dissect_juniper_chdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int bytes_processed; guint8 flags; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper C-HDLC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper C-HDLC"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1042,16 +1035,13 @@ dissect_juniper_atm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 switch (atm_pictype) { case JUNIPER_PIC_ATM1: - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper ATM1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper ATM1"); break; case JUNIPER_PIC_ATM2: - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper ATM2"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper ATM2"); break; default: /* should not happen */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper ATM unknown"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper ATM unknown"); return; } @@ -1192,8 +1182,7 @@ static void dissect_juniper_ggsn(tvbuff_t* tvb, packet_info* pinfo, proto_tree* guint8 flags; guint16 proto; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper GGSN"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper GGSN"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1224,8 +1213,7 @@ static void dissect_juniper_vp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tr int bytes_processed; guint8 flags; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Voice PIC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Voice PIC"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index c8ac225891..2f4038ac0f 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -4644,8 +4644,7 @@ dissect_kerberos_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static void dissect_kerberos_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -4705,8 +4704,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return (-1); } if (do_col_protocol) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5"); } if (tree) { item = proto_tree_add_item(tree, proto_kerberos, tvb, 0, -1, FALSE); @@ -4754,8 +4752,7 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return 0; } if (do_col_protocol) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5"); } if (do_col_info) { if (check_col(pinfo->cinfo, COL_INFO)) diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c index d2e3248f66..ddca19f2c8 100644 --- a/epan/dissectors/packet-kerberos4.c +++ b/epan/dissectors/packet-kerberos4.c @@ -317,8 +317,7 @@ dissect_krb4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_krb4, tvb, offset, -1, FALSE); tree = proto_item_add_subtree(item, ett_krb4); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB4"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB4"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-kingfisher.c b/epan/dissectors/packet-kingfisher.c index d1c273ce14..bc0b7bec2e 100644 --- a/epan/dissectors/packet-kingfisher.c +++ b/epan/dissectors/packet-kingfisher.c @@ -207,8 +207,7 @@ dissect_kingfisher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean case 0x01: case 0x80: case 0x81: - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Kingfisher"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Kingfisher"); if(check_col(pinfo->cinfo, COL_INFO)){ func_string = val_to_str(tvb_get_guint8(tvb, 0), function_code_vals, "Unknown function"); col_clear(pinfo->cinfo, COL_INFO); @@ -278,8 +277,7 @@ dissect_kingfisher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean /* Ok this does look like Kingfisher, so lets dissect it */ func_string = val_to_str(kfp->function, function_code_vals, "Unknown function"); - if(check_col(pinfo->cinfo, COL_PROTOCOL) ) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Kingfisher"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Kingfisher"); if(check_col(pinfo->cinfo, COL_INFO )) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-kismet.c b/epan/dissectors/packet-kismet.c index 661a975513..56c0510800 100644 --- a/epan/dissectors/packet-kismet.c +++ b/epan/dissectors/packet-kismet.c @@ -102,8 +102,7 @@ dissect_kismet(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) /* * If it is Kismet traffic set COL_PROTOCOL. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "kismet"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "kismet"); /* * Check if it is request, reply or continuation. diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c index 93f9e39c1b..6e59d17ec6 100644 --- a/epan/dissectors/packet-kpasswd.c +++ b/epan/dissectors/packet-kpasswd.c @@ -202,8 +202,7 @@ dissect_kpasswd_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboo gint krb_reclen = 0; gint krb_rm_size = 0; /* bytes consumed by record mark: 0 or 4 */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "KPASSWD"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "KPASSWD"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -287,8 +286,7 @@ dissect_kpasswd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static void dissect_kpasswd_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "KPASSWD"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "KPASSWD"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-l1-events.c b/epan/dissectors/packet-l1-events.c index 40c15647fd..8bb97df39b 100644 --- a/epan/dissectors/packet-l1-events.c +++ b/epan/dissectors/packet-l1-events.c @@ -74,8 +74,7 @@ dissect_l1_events(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Layer1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Layer1"); if (check_col(pinfo->cinfo, COL_DEF_SRC)) col_set_str(pinfo->cinfo, COL_DEF_SRC, pinfo->pseudo_header->l1event.uton? "TE" : "NT"); diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c index 79f8549359..8553635b20 100644 --- a/epan/dissectors/packet-l2tp.c +++ b/epan/dissectors/packet-l2tp.c @@ -1730,8 +1730,7 @@ dissect_l2tp_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; case 3: - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "L2TPv3"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "L2TPv3"); if (CONTROL_BIT(control)) { /* Call to process l2tp v3 control message */ process_l2tpv3_control(tvb, pinfo, tree, 0); diff --git a/epan/dissectors/packet-lanforge.c b/epan/dissectors/packet-lanforge.c index 8baed81a57..e7aa9f551b 100644 --- a/epan/dissectors/packet-lanforge.c +++ b/epan/dissectors/packet-lanforge.c @@ -91,8 +91,7 @@ static gboolean dissect_lanforge(tvbuff_t *tvb, packet_info *pinfo, proto_tree * /* Make entries in Protocol column and Info column on summary display */ - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LANforge"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LANforge"); if(check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Seq: %u", tvb_get_ntohl(tvb, 16)); diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c index b6beb2d724..e2a4387bed 100644 --- a/epan/dissectors/packet-lapb.c +++ b/epan/dissectors/packet-lapb.c @@ -72,8 +72,7 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 byte0; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPB"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPB"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-lapbether.c b/epan/dissectors/packet-lapbether.c index 3f3bb10659..30a586107a 100644 --- a/epan/dissectors/packet-lapbether.c +++ b/epan/dissectors/packet-lapbether.c @@ -49,8 +49,7 @@ dissect_lapbether(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int len; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPBETHER"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPBETHER"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-lapd.c b/epan/dissectors/packet-lapd.c index 917371cb6f..12a9263b95 100644 --- a/epan/dissectors/packet-lapd.c +++ b/epan/dissectors/packet-lapd.c @@ -393,8 +393,7 @@ dissect_lapd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const char *srcname = "?"; const char *dstname = "?"; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPD"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPD"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c index fa29b162a5..385f7873d3 100644 --- a/epan/dissectors/packet-lapdm.c +++ b/epan/dissectors/packet-lapdm.c @@ -223,8 +223,7 @@ dissect_lapdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tvb_length(tvb) < LAPDM_HEADER_LEN) return; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPDm"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPDm"); address = tvb_get_guint8(tvb, 0); length = tvb_get_guint8(tvb, 2); diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c index 2a4092f8c2..2ec14bb16e 100644 --- a/epan/dissectors/packet-laplink.c +++ b/epan/dissectors/packet-laplink.c @@ -97,8 +97,7 @@ dissect_laplink_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return 0; /* unknown */ /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Laplink"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Laplink"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, udp_ident_string); @@ -126,8 +125,7 @@ dissect_laplink_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 tcp_ident; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Laplink"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Laplink"); tcp_ident = tvb_get_ntohl(tvb, offset); if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c index a100e95c2c..fd66340c1d 100644 --- a/epan/dissectors/packet-ldp.c +++ b/epan/dissectors/packet-ldp.c @@ -2464,8 +2464,7 @@ dissect_ldp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int rem, length; proto_tree *ti=NULL, *pdu_tree = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LDP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LDP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-lge_monitor.c b/epan/dissectors/packet-lge_monitor.c index 98047615e5..dbd7c71edd 100644 --- a/epan/dissectors/packet-lge_monitor.c +++ b/epan/dissectors/packet-lge_monitor.c @@ -84,8 +84,7 @@ dissect_lge_monitor(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *lge_monitor_tree; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LGE Monitor"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LGE Monitor"); ti = proto_tree_add_item(tree, proto_lge_monitor, tvb, 0, LGEMON_PROTO_HEADER_LENGTH, FALSE); lge_monitor_tree = proto_item_add_subtree(ti, ett_lge_monitor); diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c index 04220acd46..c6b6acd76f 100644 --- a/epan/dissectors/packet-linx.c +++ b/epan/dissectors/packet-linx.c @@ -236,8 +236,7 @@ dissect_linx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *linx_tvb; /* Show name in protocol column */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LINX"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LINX"); /* Clear out stuff in the info column */ if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index c85975d6e5..07f6121460 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -2465,8 +2465,7 @@ dissect_lldp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 tempType; gboolean reachedEnd = FALSE; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLDP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLDP"); /* Clear the information column on summary display */ if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-llt.c b/epan/dissectors/packet-llt.c index 6d4feb2fad..74a9f62d01 100644 --- a/epan/dissectors/packet-llt.c +++ b/epan/dissectors/packet-llt.c @@ -70,8 +70,7 @@ dissect_llt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 message_type; /* Make entries in Protocol column and Info column on summary display */ - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLT"); message_type = tvb_get_guint8(tvb, 3); diff --git a/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c index 88f3cc62e3..44bc992c20 100644 --- a/epan/dissectors/packet-lmi.c +++ b/epan/dissectors/packet-lmi.c @@ -145,8 +145,7 @@ dissect_lmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 msg_type; guint8 ele_id; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LMI"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LMI"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index 09a3b68498..9f42a2d617 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -687,8 +687,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return 0; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LMP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-loop.c b/epan/dissectors/packet-loop.c index 4bcb9ea5cd..5cb83e5dfa 100644 --- a/epan/dissectors/packet-loop.c +++ b/epan/dissectors/packet-loop.c @@ -65,8 +65,7 @@ dissect_loop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gboolean more_function; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LOOP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LOOP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-lpd.c b/epan/dissectors/packet-lpd.c index 593bd24096..c5925f25f7 100644 --- a/epan/dissectors/packet-lpd.c +++ b/epan/dissectors/packet-lpd.c @@ -77,8 +77,7 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { 0, NULL } }; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LPD"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LPD"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c index b60a886233..78497696d9 100644 --- a/epan/dissectors/packet-lsc.c +++ b/epan/dissectors/packet-lsc.c @@ -150,8 +150,7 @@ dissect_lsc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint expected_len; /* Protocol is LSC, packet summary is not yet known */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LSC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LSC"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c index 43954daf24..0318b286ba 100644 --- a/epan/dissectors/packet-lwapp.c +++ b/epan/dissectors/packet-lwapp.c @@ -270,8 +270,7 @@ static void dissect_control(tvbuff_t *tvb, packet_info *pinfo, gint offset=0; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); col_set_str(pinfo->cinfo, COL_INFO, @@ -334,8 +333,7 @@ static void dissect_lwapp_l3(tvbuff_t *tvb, packet_info *pinfo, tvbuff_t *next_client; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP-L3"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP-L3"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); col_set_str(pinfo->cinfo, COL_INFO, "802.3 Packets over Layer 3"); @@ -378,8 +376,7 @@ static void dissect_lwapp(tvbuff_t *tvb, packet_info *pinfo, gint offset=0; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LWAPP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); col_set_str(pinfo->cinfo, COL_INFO, diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c index bbea636a37..45bf610eb4 100644 --- a/epan/dissectors/packet-lwres.c +++ b/epan/dissectors/packet-lwres.c @@ -1166,8 +1166,7 @@ dissect_lwres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item* lwres_item; proto_tree* lwres_tree; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "lw_res"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "lw_res"); length = tvb_get_ntohl(tvb, LW_LENGTH_OFFSET); version = tvb_get_ntohs(tvb, LW_VERSION_OFFSET); flags = tvb_get_ntohs(tvb, LW_PKTFLASG_OFFSET); diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c index eb6bfa5609..381b663d31 100644 --- a/epan/dissectors/packet-m2tp.c +++ b/epan/dissectors/packet-m2tp.c @@ -539,8 +539,7 @@ dissect_m2tp(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) proto_tree *m2tp_tree; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "M2TP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "M2TP"); /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c index cfd5b9fba5..2611c22189 100644 --- a/epan/dissectors/packet-m2ua.c +++ b/epan/dissectors/packet-m2ua.c @@ -1056,8 +1056,7 @@ dissect_m2ua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree) proto_tree *m2ua_tree; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "M2UA"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "M2UA"); /* In the interest of speed, if "tree" is NULL, don't do any work not necessary to generate protocol tree items. */ diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c index 44a8bf6121..4ed72cc41a 100644 --- a/epan/dissectors/packet-maccontrol.c +++ b/epan/dissectors/packet-maccontrol.c @@ -50,8 +50,7 @@ dissect_macctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pause = tvb_get_ntohs(tvb, 0); pause_quanta = tvb_get_ntohs(tvb, 2); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CTRL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CTRL"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-manolito.c b/epan/dissectors/packet-manolito.c index 2ad412ad06..9530661cf9 100644 --- a/epan/dissectors/packet-manolito.c +++ b/epan/dissectors/packet-manolito.c @@ -70,8 +70,7 @@ dissect_manolito(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const char* packet_type = 0; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MANOLITO"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MANOLITO"); ti = proto_tree_add_item(tree, proto_manolito, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index 1d41c494fb..a6ba6ca872 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -244,8 +244,7 @@ dissect_mbtcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Modbus/TCP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Modbus/TCP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c index a2f26f316f..43ea355c2e 100644 --- a/epan/dissectors/packet-mdshdr.c +++ b/epan/dissectors/packet-mdshdr.c @@ -169,8 +169,7 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int trailer_start = 0; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MDS Header"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MDS Header"); if (check_col (pinfo->cinfo, COL_INFO)) col_clear (pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index 1099ca4143..9abd120cfa 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -405,8 +405,7 @@ dissect_megaco_text(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Display MEGACO in protocol column */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MEGACO"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MEGACO"); /* Build the info tree if we've been given a root */ /* Create megaco subtree */ diff --git a/epan/dissectors/packet-mesh.c b/epan/dissectors/packet-mesh.c index c02fadd161..4b059f8c55 100644 --- a/epan/dissectors/packet-mesh.c +++ b/epan/dissectors/packet-mesh.c @@ -55,8 +55,7 @@ dissect_mesh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 mesh_e2eseq; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Mesh"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Mesh"); if (tree) { ti = proto_tree_add_item(tree, proto_mesh, tvb, 0, 5, FALSE); diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c index c57164496d..7bfe3d4a65 100644 --- a/epan/dissectors/packet-mip.c +++ b/epan/dissectors/packet-mip.c @@ -572,8 +572,7 @@ dissect_mip( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MobileIP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MobileIP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c index fa6bcedc55..4ca78fe2d3 100644 --- a/epan/dissectors/packet-mip6.c +++ b/epan/dissectors/packet-mip6.c @@ -857,8 +857,7 @@ dissect_mip6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint len, offset = 0, start_offset = offset; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MIPv6"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MIPv6"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -915,15 +914,13 @@ dissect_mip6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case BU: offset = dissect_mip6_bu(tvb, mip6_tree, pinfo); if (proto_nemo == 1) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NEMO"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NEMO"); } break; case BA: offset = dissect_mip6_ba(tvb, mip6_tree, pinfo); if (proto_nemo == 1) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NEMO"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NEMO"); } break; case BE: diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c index 59b7c33bc0..abf2e259fb 100644 --- a/epan/dissectors/packet-mms.c +++ b/epan/dissectors/packet-mms.c @@ -6901,8 +6901,7 @@ dissect_mms(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_mms, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_mms); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MMS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MMS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c index 8e0b06f22e..307edcdd61 100644 --- a/epan/dissectors/packet-mmse.c +++ b/epan/dissectors/packet-mmse.c @@ -668,8 +668,7 @@ dissect_mmse_standalone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) message_type = val_to_str(pdut, vals_message_type, "Unknown type %u"); /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MMSE"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MMSE"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c index d274bbd1fa..241af0d342 100644 --- a/epan/dissectors/packet-mp4ves.c +++ b/epan/dissectors/packet-mp4ves.c @@ -690,8 +690,7 @@ dissect_mp4ves(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 dword; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MP4V-ES"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MP4V-ES"); if (tree) { item = proto_tree_add_item(tree, proto_mp4ves, tvb, 0, -1, FALSE); mp4ves_tree = proto_item_add_subtree(item, ett_mp4ves); diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c index a2e8d19d3f..3bb981dd92 100644 --- a/epan/dissectors/packet-mpeg-audio.c +++ b/epan/dissectors/packet-mpeg-audio.c @@ -532,8 +532,7 @@ dissect_id3v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { asn1_ctx_t asn1_ctx; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v1"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); if (tree == NULL) @@ -546,8 +545,7 @@ dissect_id3v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) static void dissect_id3v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v2"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v2"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); proto_tree_add_item(tree, hf_id3v2, tvb, diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c index d85f3d6ebb..8e95b36ee9 100644 --- a/epan/dissectors/packet-mpeg-pes.c +++ b/epan/dissectors/packet-mpeg-pes.c @@ -751,8 +751,7 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) prefix = tvb_get_ntoh24(tvb, 0); if (prefix != PES_PREFIX) return FALSE; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG PES"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG PES"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -907,8 +906,7 @@ static void dissect_mpeg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (!dissector_try_heuristic(heur_subdissector_list, tvb, pinfo, tree)) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); if (tree) diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c index 9fa3691f74..698bd1304e 100644 --- a/epan/dissectors/packet-mpls-echo.c +++ b/epan/dissectors/packet-mpls-echo.c @@ -986,8 +986,7 @@ dissect_mpls_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; /* Not version 1. */ } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPLS ECHO"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPLS ECHO"); rem = tvb_reported_length_remaining(tvb, offset); diff --git a/epan/dissectors/packet-mq-pcf.c b/epan/dissectors/packet-mq-pcf.c index 449898d5d0..e01cd76cf5 100644 --- a/epan/dissectors/packet-mq-pcf.c +++ b/epan/dissectors/packet-mq-pcf.c @@ -216,7 +216,7 @@ dissect_mqpcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gboolean bLittleEndian; bLittleEndian = ((mqinfo->encoding & MQ_ENC_INTEGER_REVERSED) != 0) ? TRUE : FALSE; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "MQ PCF"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MQ PCF"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); if (tvb_length(tvb) >= 36) { diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index f6116a2b62..c43ca4b2c9 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -1245,7 +1245,7 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) struct mq_msg_properties tMsgProps; static gint iPreviousFrameNumber = -1; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "MQ"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MQ"); if (check_col(pinfo->cinfo, COL_INFO)) { /* This is a trick to know whether this is the first PDU in this packet or not */ @@ -2362,7 +2362,7 @@ reassemble_mq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { /* Reassembly in progress */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "MQ"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MQ"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "%s [Reassembled MQ]", val_to_str(opcode, mq_opcode_vals, "Unknown (0x%02x)")); if (tree) { diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c index d0a76a3440..d6a11d7677 100644 --- a/epan/dissectors/packet-msdp.c +++ b/epan/dissectors/packet-msdp.c @@ -182,8 +182,7 @@ dissect_msdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *msdp_tree; int offset; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSDP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSDP"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(tvb, 0), diff --git a/epan/dissectors/packet-msn-messenger.c b/epan/dissectors/packet-msn-messenger.c index 7545685947..b8cd305a84 100644 --- a/epan/dissectors/packet-msn-messenger.c +++ b/epan/dissectors/packet-msn-messenger.c @@ -76,8 +76,7 @@ dissect_msnms(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* int tokenlen; */ /* const guchar *next_token; */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSNMS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSNMS"); /* * Find the end of the first line. diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c index 49f67a533e..069ade2b52 100644 --- a/epan/dissectors/packet-msnlb.c +++ b/epan/dissectors/packet-msnlb.c @@ -55,8 +55,7 @@ dissect_msnlb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 type = 0; /* Blatent assumption of name and size */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MS NLB"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MS NLB"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index 9d8c386d84..aea729aa51 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -202,8 +202,7 @@ static void msproxy_sub_dissector( tvbuff_t *tvb, packet_info *pinfo, redirect_info = conversation_get_proto_data(conversation, proto_msproxy); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MS Proxy"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MS Proxy"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, @@ -1085,8 +1084,7 @@ static void dissect_msproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) hash_entry_t *hash_info; conversation_t *conversation; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSproxy"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSproxy"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index 4c55d60cc1..1621fa3945 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -548,8 +548,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSRP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSRP"); if (is_msrp_response){ if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Response: %s ", diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c index 400293f9fd..74f20136a3 100644 --- a/epan/dissectors/packet-mstp.c +++ b/epan/dissectors/packet-mstp.c @@ -162,8 +162,7 @@ dissect_mstp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree *checksum_tree; #endif - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BACnet"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BACnet"); if (check_col(pinfo->cinfo, COL_INFO)) { col_set_str(pinfo->cinfo, COL_INFO, "BACnet MS/TP"); } diff --git a/epan/dissectors/packet-mtp2.c b/epan/dissectors/packet-mtp2.c index cac7d49f8b..520dab2402 100644 --- a/epan/dissectors/packet-mtp2.c +++ b/epan/dissectors/packet-mtp2.c @@ -346,8 +346,7 @@ dissect_mtp2_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolea else use_extended_sequence_numbers = (pinfo->annex_a_used == MTP2_ANNEX_A_USED); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP2"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MTP2"); if (tree) { mtp2_item = proto_tree_add_item(tree, proto_mtp2, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-nasdaq-itch.c b/epan/dissectors/packet-nasdaq-itch.c index cbfb3216db..164a7b80f2 100644 --- a/epan/dissectors/packet-nasdaq-itch.c +++ b/epan/dissectors/packet-nasdaq-itch.c @@ -334,8 +334,7 @@ dissect_nasdaq_itch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_info = PINFO_COL(pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Nasdaq-ITCH"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Nasdaq-ITCH"); nasdaq_itch_type = tvb_get_guint8(tvb, offset); if (nasdaq_itch_type >= '0' && nasdaq_itch_type <= '9') { diff --git a/epan/dissectors/packet-nasdaq-soup.c b/epan/dissectors/packet-nasdaq-soup.c index 8ff1baa96e..23d61fcc89 100644 --- a/epan/dissectors/packet-nasdaq-soup.c +++ b/epan/dissectors/packet-nasdaq-soup.c @@ -181,8 +181,7 @@ dissect_nasdaq_soup(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nasdaq_soup_type = tvb_get_guint8(tvb, offset); if (counter == 0) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Nasdaq-SOUP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Nasdaq-SOUP"); if (col_info) col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index 19767960e3..9a9bc61f16 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -47798,8 +47798,7 @@ dissect_nbap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *nbap_tree = NULL; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBAP"); /* create the nbap protocol tree */ nbap_item = proto_tree_add_item(tree, proto_nbap, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-nbipx.c b/epan/dissectors/packet-nbipx.c index 917686bd20..6e80ff5671 100644 --- a/epan/dissectors/packet-nbipx.c +++ b/epan/dissectors/packet-nbipx.c @@ -219,8 +219,7 @@ dissect_nbipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gboolean has_payload; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBIPX"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBIPX"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -674,8 +673,7 @@ dissect_nmpi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int node_name_type = 0; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NMPI"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NMPI"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index 4a07e21644..38976fe564 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -1041,8 +1041,7 @@ dissect_nbns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nbns_data_offset = offset; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBNS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBNS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1210,8 +1209,7 @@ dissect_nbdgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) name=ep_alloc(MAX_NAME_LEN); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBDS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBDS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1636,8 +1634,7 @@ dissect_nbss(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *nbss_tree; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBSS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBSS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index 9d284b82af..7444070c7a 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -323,8 +323,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, conversation_t *conversation; proto_item *expert_item; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NCP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NCP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ncs.c b/epan/dissectors/packet-ncs.c index 4c4959b5c4..a54d76ad81 100644 --- a/epan/dissectors/packet-ncs.c +++ b/epan/dissectors/packet-ncs.c @@ -51,8 +51,7 @@ dissect_ncs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NCS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NCS"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index 8dfc637442..f4fb7c1287 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -3161,8 +3161,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * Update the column info. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDMP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); @@ -3232,8 +3231,7 @@ dissect_ndmp_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) save_writable = col_get_writable(pinfo->cinfo); col_set_writable(pinfo->cinfo, TRUE); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDMP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index f51455f30c..fab525bf84 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -4299,8 +4299,7 @@ dissect_ndps_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ndps_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDPS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDPS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -4494,8 +4493,7 @@ dissect_ndps_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ndps_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDPS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NDPS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c index 465966e7ea..7891dba34f 100644 --- a/epan/dissectors/packet-netbios.c +++ b/epan/dissectors/packet-netbios.c @@ -1099,8 +1099,7 @@ dissect_netbios(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset = 0; /* load the display labels */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NetBIOS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NetBIOS"); /* Find NetBIOS marker EFFF, this is done because I have seen an extra LLC */ diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index def18aeec3..3fe6d02f5c 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -571,8 +571,7 @@ dissect_netflow(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) return 0; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CFLOW"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CFLOW"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-nettl.c b/epan/dissectors/packet-nettl.c index c44e02903f..9f2e727854 100644 --- a/epan/dissectors/packet-nettl.c +++ b/epan/dissectors/packet-nettl.c @@ -291,8 +291,7 @@ dissect_nettl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(data_handle, tvb, pinfo, tree); break; default: - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNKNOWN"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNKNOWN"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Unsupported nettl subsytem: %d (%s)", diff --git a/epan/dissectors/packet-newmail.c b/epan/dissectors/packet-newmail.c index 8bc4c48109..b2119b5171 100644 --- a/epan/dissectors/packet-newmail.c +++ b/epan/dissectors/packet-newmail.c @@ -64,8 +64,7 @@ dissect_newmail(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *newmail_tree; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NEWMAIL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NEWMAIL"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Microsoft Exchange new mail notification"); diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c index 280f2bbeaa..4500055414 100644 --- a/epan/dissectors/packet-nlsp.c +++ b/epan/dissectors/packet-nlsp.c @@ -1422,8 +1422,7 @@ dissect_nlsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 packet_type_flags; guint8 packet_type; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NLSP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NLSP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-nntp.c b/epan/dissectors/packet-nntp.c index 64f3347d14..9c5bcb23b8 100644 --- a/epan/dissectors/packet-nntp.c +++ b/epan/dissectors/packet-nntp.c @@ -57,8 +57,7 @@ dissect_nntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else type = "Response"; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NNTP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NNTP"); if (check_col(pinfo->cinfo, COL_INFO)) { /* diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c index 6a57d77480..f404f936b3 100644 --- a/epan/dissectors/packet-nsip.c +++ b/epan/dissectors/packet-nsip.c @@ -939,8 +939,7 @@ dissect_nsip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { pinfo->current_proto = "NSIP"; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NSIP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NSIP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-nsrp.c b/epan/dissectors/packet-nsrp.c index 6ac8616414..f793e7b858 100644 --- a/epan/dissectors/packet-nsrp.c +++ b/epan/dissectors/packet-nsrp.c @@ -156,8 +156,7 @@ dissect_nsrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint offset = 0; guint8 msgtype = 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NSRP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NSRP"); if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-nt-sonmp.c b/epan/dissectors/packet-nt-sonmp.c index a616e66921..3c4a21c3ab 100644 --- a/epan/dissectors/packet-nt-sonmp.c +++ b/epan/dissectors/packet-nt-sonmp.c @@ -215,8 +215,7 @@ dissect_sonmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *sonmp_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SONMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SONMP"); if (check_col(pinfo->cinfo, COL_INFO)) { hello_type = ""; diff --git a/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c index dd5c71f34a..69e0983d35 100644 --- a/epan/dissectors/packet-nt-tpcp.c +++ b/epan/dissectors/packet-nt-tpcp.c @@ -113,8 +113,7 @@ dissect_tpcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti, *tf; guint8 length = TPCP_VER_1_LENGTH; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPCP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPCP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c index e15af955e2..1e23c83dc9 100644 --- a/epan/dissectors/packet-ntp.c +++ b/epan/dissectors/packet-ntp.c @@ -432,8 +432,7 @@ dissect_ntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 flags; void (*dissector)(tvbuff_t *, proto_item *, guint8); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NTP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NTP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c index 5b9c901531..37321ba184 100644 --- a/epan/dissectors/packet-ocsp.c +++ b/epan/dissectors/packet-ocsp.c @@ -661,8 +661,7 @@ dissect_ocsp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); @@ -688,8 +687,7 @@ dissect_ocsp_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c index 96a87ade1c..0730277e67 100644 --- a/epan/dissectors/packet-oicq.c +++ b/epan/dissectors/packet-oicq.c @@ -128,8 +128,7 @@ dissect_oicq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) (match_strval(tvb_get_ntohs(tvb, 3), oicq_command_vals) == NULL) ) return 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "OICQ"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "OICQ"); if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c index daf93596c0..3d967fb816 100644 --- a/epan/dissectors/packet-olsr.c +++ b/epan/dissectors/packet-olsr.c @@ -563,8 +563,7 @@ static int dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { return 0; } /*-------------Setting the Protocol and Info Columns in the Wireshark Display----------*/ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "OLSR v1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "OLSR v1"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-opsi.c b/epan/dissectors/packet-opsi.c index e317dec949..625a837987 100644 --- a/epan/dissectors/packet-opsi.c +++ b/epan/dissectors/packet-opsi.c @@ -459,8 +459,7 @@ dissect_opsi_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (opsi_first == TRUE) { opsi_first = FALSE; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "OPSI"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "OPSI"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index fc23011e8a..b78a20d610 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -920,8 +920,7 @@ dissect_ospf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 areaid; guint8 address_family = OSPF_AF_6; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "OSPF"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "OSPF"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-paltalk.c b/epan/dissectors/packet-paltalk.c index 3637d439d6..d4212254f5 100644 --- a/epan/dissectors/packet-paltalk.c +++ b/epan/dissectors/packet-paltalk.c @@ -97,8 +97,7 @@ dissect_paltalk_desegmented(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti = NULL; proto_tree *pt_tree = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Paltalk"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Paltalk"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-pana.c b/epan/dissectors/packet-pana.c index 3197ea0c26..ba2f40f544 100644 --- a/epan/dissectors/packet-pana.c +++ b/epan/dissectors/packet-pana.c @@ -533,8 +533,7 @@ dissect_pana_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) avp_length = msg_length-16; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PANA"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PANA"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c index 9cb61b142c..f1ef727fa9 100644 --- a/epan/dissectors/packet-pcap.c +++ b/epan/dissectors/packet-pcap.c @@ -11085,8 +11085,7 @@ dissect_pcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *pcap_tree = NULL; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCAP"); /* create the pcap protocol tree */ pcap_item = proto_tree_add_item(tree, proto_pcap, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c index 91b0fde4c6..95c0547569 100644 --- a/epan/dissectors/packet-pcep.c +++ b/epan/dissectors/packet-pcep.c @@ -2095,8 +2095,7 @@ dissect_pcep_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Set up structures needed to add the protocol subtree and manage it */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCEP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCEP"); /* Clear out stuff in the info column */ if (check_col(pinfo->cinfo,COL_INFO)) diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c index f58a6587c4..5be796c2aa 100644 --- a/epan/dissectors/packet-pflog.c +++ b/epan/dissectors/packet-pflog.c @@ -125,8 +125,7 @@ dissect_pflog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; int hdrlen; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PFLOG"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PFLOG"); /* Copy out the pflog header to insure alignment */ tvb_memcpy(tvb, (guint8 *)&pflogh, 0, sizeof(pflogh)); @@ -282,8 +281,7 @@ dissect_old_pflog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *pflog_tree; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PFLOG-OLD"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PFLOG-OLD"); /* Copy out the pflog header to insure alignment */ tvb_memcpy(tvb, (guint8 *)&pflogh, 0, sizeof(pflogh)); diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c index 95e6db6ce1..7a97e5aa8e 100644 --- a/epan/dissectors/packet-pgm.c +++ b/epan/dissectors/packet-pgm.c @@ -815,8 +815,7 @@ dissect_pgm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gboolean isdata = FALSE; guint pgmlen, reportedlen; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PGM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PGM"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c index 874b02b88c..82bf3fb3be 100644 --- a/epan/dissectors/packet-pgsql.c +++ b/epan/dissectors/packet-pgsql.c @@ -177,8 +177,7 @@ dissect_pgsql(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->srcport, pinfo->destport, 0); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PGSQL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PGSQL"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, (pinfo->match_port == pinfo->destport) ? diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c index ccb6b5a582..6a6591b742 100644 --- a/epan/dissectors/packet-pim.c +++ b/epan/dissectors/packet-pim.c @@ -114,8 +114,7 @@ dissect_pimv1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, return offset+tvb_length_remaining(tvb, offset); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PIMv1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PIMv1"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -610,8 +609,7 @@ dissect_pim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *pimopt_tree = NULL; proto_item *tiopt; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PIM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PIM"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c index be52c040a7..098a267161 100644 --- a/epan/dissectors/packet-pkixtsp.c +++ b/epan/dissectors/packet-pkixtsp.c @@ -375,8 +375,7 @@ dissect_timestamp_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); @@ -401,8 +400,7 @@ dissect_timestamp_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c index 3c537b5a7f..3991fb208b 100644 --- a/epan/dissectors/packet-pktc.c +++ b/epan/dissectors/packet-pktc.c @@ -551,8 +551,7 @@ dissect_pktc_mtafqdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *item = NULL; tvbuff_t *pktc_mtafqdn_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKTC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKTC"); if (tree) { item = proto_tree_add_item(tree, proto_pktc, tvb, 0, 0, FALSE); @@ -585,8 +584,7 @@ dissect_pktc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *pktc_tree = NULL; proto_item *item = NULL, *hidden_item; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKTC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKTC"); if (tree) { item = proto_tree_add_item(tree, proto_pktc, tvb, 0, 3, FALSE); diff --git a/epan/dissectors/packet-pktgen.c b/epan/dissectors/packet-pktgen.c index 9f78499849..0632937561 100644 --- a/epan/dissectors/packet-pktgen.c +++ b/epan/dissectors/packet-pktgen.c @@ -83,8 +83,7 @@ static gboolean dissect_pktgen(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /* Make entries in Protocol column and Info column on summary display */ - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKTGEN"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKTGEN"); if(check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Seq: %u", tvb_get_ntohl(tvb, 4)); diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index f26be9e7cd..ce61e622b5 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -749,8 +749,7 @@ dissect_ppi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint last_frame = 0; gboolean is_ht = FALSE; - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPI"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPI"); if(check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -941,8 +940,7 @@ dissect_ppi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->fragmented=FALSE; } else { next_tvb = tvb_new_subset(tvb, offset, -1, -1); - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE 802.11n"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE 802.11n"); if(check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Unreassembled A-MPDU data"); call_dissector(data_handle, next_tvb, pinfo, tree); diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 7c7420cf2f..b6b248cdd9 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -2901,8 +2901,7 @@ dissect_bcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint captured_length, reported_length, pad_length; tvbuff_t *next_tvb; - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP BCP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP BCP"); if(check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -3043,8 +3042,7 @@ dissect_bap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) id = tvb_get_guint8(tvb, 1); length = tvb_get_ntohs(tvb, 2); - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP BAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP BAP"); if(check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, @@ -3089,8 +3087,7 @@ dissect_comp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; proto_tree *comp_data_tree; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP Comp"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP Comp"); if(check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Compressed data"); @@ -3128,8 +3125,7 @@ dissect_pppmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset = 0, length_remaining; int length_field = 0, pid_field = 0,hdr_length = 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo,COL_PROTOCOL, "PPP PPPMux"); + col_set_str(pinfo->cinfo,COL_PROTOCOL, "PPP PPPMux"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "PPP Multiplexing"); @@ -3265,8 +3261,7 @@ dissect_iphc_crtp_fh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length = tvb_reported_length(tvb); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo,COL_PROTOCOL, "CRTP"); + col_set_str(pinfo->cinfo,COL_PROTOCOL, "CRTP"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Full Header"); @@ -3364,8 +3359,7 @@ dissect_iphc_crtp_cudp16(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint hdr_length; int offset = 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo,COL_PROTOCOL, "CRTP"); + col_set_str(pinfo->cinfo,COL_PROTOCOL, "CRTP"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Compressed UDP 16"); @@ -3401,8 +3395,7 @@ dissect_iphc_crtp_cudp8(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint hdr_length; int offset = 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo,COL_PROTOCOL, "CRTP"); + col_set_str(pinfo->cinfo,COL_PROTOCOL, "CRTP"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Compressed UDP 8"); @@ -3439,8 +3432,7 @@ dissect_iphc_crtp_cs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint length, cid_size; guint offset = 2, hf; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo,COL_PROTOCOL, "CRTP"); + col_set_str(pinfo->cinfo,COL_PROTOCOL, "CRTP"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Context State"); @@ -3529,8 +3521,7 @@ dissect_mp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint hdrlen; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP MP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP MP"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "PPP Multilink"); @@ -3653,8 +3644,7 @@ dissect_ppp_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) * XXX - should we have an exported dissector that always dissects PPP, * for use when we know the packets are PPP, not CHDLC? */ - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP"); switch (pinfo->p2p_dir) { case P2P_DIR_SENT: @@ -3907,8 +3897,7 @@ dissect_pap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { id = tvb_get_guint8(tvb, 1); length = tvb_get_ntohs(tvb, 2); - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP PAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP PAP"); if(check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, @@ -4000,8 +3989,7 @@ dissect_chap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) { int offset; code = tvb_get_guint8(tvb, 0); - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP CHAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP CHAP"); if(check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, diff --git a/epan/dissectors/packet-pptp.c b/epan/dissectors/packet-pptp.c index 841eab9a71..cf8b69e8e0 100644 --- a/epan/dissectors/packet-pptp.c +++ b/epan/dissectors/packet-pptp.c @@ -235,8 +235,7 @@ dissect_pptp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 len; guint16 cntrl_type; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPTP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPTP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c index 8d925e326a..768dad3088 100644 --- a/epan/dissectors/packet-pres.c +++ b/epan/dissectors/packet-pres.c @@ -1419,8 +1419,7 @@ dissect_pres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) /* we can't make any additional checking here */ /* postpone it before dissector will have more information */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PRES"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PRES"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); /* save pointers for calling the acse dissector */ diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c index ba855ab206..2993088693 100644 --- a/epan/dissectors/packet-prp.c +++ b/epan/dissectors/packet-prp.c @@ -134,8 +134,7 @@ dissect_prp_supervision_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre proto_tree *prp_tree; guint16 tlv2; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PRP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PRP"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Supervision Frame"); diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c index 714b9563d3..93c8daa047 100644 --- a/epan/dissectors/packet-ptp.c +++ b/epan/dissectors/packet-ptp.c @@ -1487,8 +1487,7 @@ dissect_ptp_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ptp_tree, *ptp_flags_tree, *ptp_time_tree, *ptp_time2_tree; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PTPv1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PTPv1"); /* Get control field (what kind of message is this? (Sync, DelayReq, ...) */ @@ -2231,8 +2230,7 @@ dissect_ptp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) *ptp_clockType_tree, *ptp_protocolAddress_tree; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PTPv2"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PTPv2"); /* Get control field (what kind of message is this? (Sync, DelayReq, ...) */ diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index 4d439dfd4e..0733b2ff43 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -3115,8 +3115,7 @@ dissect_pvfs_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, guint32 server_op; pvfs2_io_tracking_value_t *val = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PVFS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PVFS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c index 42a5238dee..6f777d77c6 100644 --- a/epan/dissectors/packet-q2931.c +++ b/epan/dissectors/packet-q2931.c @@ -2040,8 +2040,7 @@ dissect_q2931(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int codeset; gboolean non_locking_shift; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Q.2931"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Q.2931"); if (tree) { ti = proto_tree_add_item(tree, proto_q2931, tvb, offset, -1, diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c index 544d5534d8..e6b2968091 100644 --- a/epan/dissectors/packet-q931.c +++ b/epan/dissectors/packet-q931.c @@ -2551,8 +2551,7 @@ dissect_q931_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, reset_q931_packet_info(q931_pi); have_valid_q931_pi=TRUE; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Q.931"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Q.931"); prot_discr = tvb_get_guint8(tvb, offset); if (tree) { diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c index 9a0148ecfc..d3ea49614d 100644 --- a/epan/dissectors/packet-q933.c +++ b/epan/dissectors/packet-q933.c @@ -1902,8 +1902,7 @@ dissect_q933(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int codeset, locked_codeset; gboolean non_locking_shift; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Q.933"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Q.933"); if (tree) { ti = proto_tree_add_item(tree, proto_q933, tvb, offset, -1, diff --git a/epan/dissectors/packet-qllc.c b/epan/dissectors/packet-qllc.c index ac23ba1948..3ee8d8a1a4 100644 --- a/epan/dissectors/packet-qllc.c +++ b/epan/dissectors/packet-qllc.c @@ -91,8 +91,7 @@ dissect_qllc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Summary information */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "QLLC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "QLLC"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c index b670eb96ba..e47489df8c 100644 --- a/epan/dissectors/packet-quake.c +++ b/epan/dissectors/packet-quake.c @@ -441,8 +441,7 @@ dissect_quake(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint rest_length; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "QUAKE"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "QUAKE"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c index 4849fd647c..943a01d338 100644 --- a/epan/dissectors/packet-quake2.c +++ b/epan/dissectors/packet-quake2.c @@ -712,8 +712,7 @@ dissect_quake2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) direction = (pinfo->destport == gbl_quake2ServerPort) ? DIR_C2S : DIR_S2C; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "QUAKE2"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "QUAKE2"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, val_to_str(direction, names_direction, "%u")); diff --git a/epan/dissectors/packet-quake3.c b/epan/dissectors/packet-quake3.c index 0ad6c78e63..4fb3f3992e 100644 --- a/epan/dissectors/packet-quake3.c +++ b/epan/dissectors/packet-quake3.c @@ -485,8 +485,7 @@ dissect_quake3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) direction = DIR_UNKNOWN; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "QUAKE3"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "QUAKE3"); if (tree) { quake3_item = proto_tree_add_item(tree, proto_quake3, diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c index 1fe751f7bc..446c9d5e06 100644 --- a/epan/dissectors/packet-quakeworld.c +++ b/epan/dissectors/packet-quakeworld.c @@ -719,8 +719,7 @@ dissect_quakeworld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) direction = (pinfo->destport == gbl_quakeworldServerPort) ? DIR_C2S : DIR_S2C; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "QUAKEWORLD"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "QUAKEWORLD"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, val_to_str(direction, names_direction, "%u")); diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 7a7383b7f7..82dc4edc09 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -1327,8 +1327,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RADIUS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RADIUS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c index b9b15ea832..7f11c8ea4f 100644 --- a/epan/dissectors/packet-ranap.c +++ b/epan/dissectors/packet-ranap.c @@ -11634,8 +11634,7 @@ dissect_ranap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pdu_type = 0; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RANAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RANAP"); /* create the ranap protocol tree */ ranap_item = proto_tree_add_item(tree, proto_ranap, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c index fb2b1fb972..445882b89c 100644 --- a/epan/dissectors/packet-rdm.c +++ b/epan/dissectors/packet-rdm.c @@ -83,8 +83,7 @@ rdm_checksum(tvbuff_t *tvb, unsigned length) static void dissect_rdm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RDM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RDM"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c index 635d7c03a6..367f449146 100644 --- a/epan/dissectors/packet-rip.c +++ b/epan/dissectors/packet-rip.c @@ -114,8 +114,7 @@ dissect_rip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint trailer_len = 0; gboolean is_md5_auth = FALSE; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RIP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RIP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ripng.c b/epan/dissectors/packet-ripng.c index d4a764673a..c50dea380e 100644 --- a/epan/dissectors/packet-ripng.c +++ b/epan/dissectors/packet-ripng.c @@ -59,8 +59,7 @@ dissect_ripng(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *subtree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RIPng"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RIPng"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-rlm.c b/epan/dissectors/packet-rlm.c index ce64b4af0c..edad7e7b7c 100644 --- a/epan/dissectors/packet-rlm.c +++ b/epan/dissectors/packet-rlm.c @@ -137,8 +137,7 @@ dissect_rlm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return FALSE; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RLM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RLM"); switch (rlm_type) { case RLM_START_REQUEST: diff --git a/epan/dissectors/packet-rmcp.c b/epan/dissectors/packet-rmcp.c index fd612dbab9..283dd76c5e 100644 --- a/epan/dissectors/packet-rmcp.c +++ b/epan/dissectors/packet-rmcp.c @@ -110,8 +110,7 @@ dissect_rmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (class_str == NULL) return 0; /* unknown class value */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RMCP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RMCP"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "%s, Class: %s", val_to_str(type, rmcp_type_vals, "Unknown (0x%02x)"), diff --git a/epan/dissectors/packet-rmi.c b/epan/dissectors/packet-rmi.c index 68382f15fd..c7f675c488 100644 --- a/epan/dissectors/packet-rmi.c +++ b/epan/dissectors/packet-rmi.c @@ -132,8 +132,7 @@ dissect_rmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rmitype = 0; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RMI"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RMI"); datalen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE); data = tvb_get_ptr(tvb, offset, datalen); diff --git a/epan/dissectors/packet-rmt-alc.c b/epan/dissectors/packet-rmt-alc.c index cb30467560..ceb4814027 100644 --- a/epan/dissectors/packet-rmt-alc.c +++ b/epan/dissectors/packet-rmt-alc.c @@ -130,8 +130,7 @@ static void dissect_alc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "ALC"; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ALC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ALC"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-rmt-norm.c b/epan/dissectors/packet-rmt-norm.c index cb93953616..9588794e13 100644 --- a/epan/dissectors/packet-rmt-norm.c +++ b/epan/dissectors/packet-rmt-norm.c @@ -560,8 +560,7 @@ static void dissect_norm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->current_proto = "NORM"; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NORM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NORM"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c index 799284bc23..0786c2be95 100644 --- a/epan/dissectors/packet-rnsap.c +++ b/epan/dissectors/packet-rnsap.c @@ -35628,8 +35628,7 @@ dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *rnsap_tree = NULL; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RNSAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RNSAP"); /* create the rnsap protocol tree */ rnsap_item = proto_tree_add_item(tree, proto_rnsap, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-roofnet.c b/epan/dissectors/packet-roofnet.c index 06f328f8c6..9e461e1400 100644 --- a/epan/dissectors/packet-roofnet.c +++ b/epan/dissectors/packet-roofnet.c @@ -209,8 +209,7 @@ static void dissect_roofnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 roofnet_nlinks= 0; guint8 nlink= 1; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Roofnet"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Roofnet"); roofnet_msg_type = tvb_get_guint8(tvb, ROOFNET_OFFSET_TYPE); /* Clear out stuff in the info column */ diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c index 304e738dc5..27e1d15b2d 100644 --- a/epan/dissectors/packet-ros.c +++ b/epan/dissectors/packet-ros.c @@ -1070,8 +1070,7 @@ dissect_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_ros, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_ros); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ROS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ROS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index c14716654e..051e1a444a 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -1626,8 +1626,7 @@ dissect_rpc_continuation(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *rpc_item; proto_tree *rpc_tree; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RPC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RPC"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); @@ -1929,8 +1928,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RPC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RPC"); if (tree) { rpc_item = proto_tree_add_item(tree, proto_rpc, tvb, 0, -1, diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c index 9fcfaa75dc..a2746d8349 100644 --- a/epan/dissectors/packet-rpl.c +++ b/epan/dissectors/packet-rpl.c @@ -270,8 +270,7 @@ dissect_rpl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *rpl_tree; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RPL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RPL"); rpl_len = tvb_get_ntohs(tvb, 0); rpl_type = tvb_get_ntohs(tvb, 2); diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 53fb34ec17..8baa456502 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -99369,8 +99369,7 @@ dissect_rrc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) top_tree = tree; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RRC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RRC"); /* create the rrc protocol tree */ rrc_item = proto_tree_add_item(tree, proto_rrc, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-rsh.c b/epan/dissectors/packet-rsh.c index f7f6401fc0..acbc10b9b4 100644 --- a/epan/dissectors/packet-rsh.c +++ b/epan/dissectors/packet-rsh.c @@ -49,8 +49,7 @@ dissect_rsh(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint next_offset; int linelen; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RSH"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RSH"); if (check_col(pinfo->cinfo, COL_INFO)) { /* Put the first line from the buffer into the summary. */ tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE); diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c index f235b8d096..48c45118e1 100644 --- a/epan/dissectors/packet-rsl.c +++ b/epan/dissectors/packet-rsl.c @@ -3498,8 +3498,7 @@ dissect_rsl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset = 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RSL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RSL"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c index 4a4a7c8f13..aba2c826d8 100644 --- a/epan/dissectors/packet-rsync.c +++ b/epan/dissectors/packet-rsync.c @@ -101,8 +101,7 @@ dissect_rsync_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gchar magic_string[14]; gchar *version_out; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RSYNC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RSYNC"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c index 80eb7460af..b50c2c2fe0 100644 --- a/epan/dissectors/packet-rtmpt.c +++ b/epan/dissectors/packet-rtmpt.c @@ -357,12 +357,12 @@ dissect_rtmpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (conversation_data->is_rtmpe == 1) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTMPE"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTMPE"); return; } else { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTMP"); } if (conversation_data->previous_frame_number != (guint) pinfo->fd->num) diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c index 13d1d07b03..6f7324cdad 100644 --- a/epan/dissectors/packet-rtse.c +++ b/epan/dissectors/packet-rtse.c @@ -726,8 +726,7 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTSE"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTSE"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index e3a345ad26..ec7870a790 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -615,8 +615,7 @@ dissect_rtspmessage(tvbuff_t *tvb, int offset, packet_info *pinfo, else body_requires_content_len = FALSE; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTSP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTSP"); if (check_col(pinfo->cinfo, COL_INFO)) { /* * Put the first line from the buffer into the summary diff --git a/epan/dissectors/packet-rudp.c b/epan/dissectors/packet-rudp.c index 1f31b1f5e9..829bf63f98 100644 --- a/epan/dissectors/packet-rudp.c +++ b/epan/dissectors/packet-rudp.c @@ -106,8 +106,7 @@ dissect_rudp(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) hlen = tvb_get_guint8(tvb, 1); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RUDP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RUDP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c index 7034d36c9a..6c89907592 100644 --- a/epan/dissectors/packet-rx.c +++ b/epan/dissectors/packet-rx.c @@ -473,8 +473,7 @@ dissect_rx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) if (type == 0 || type == 10 || type == 11 || type == 12 || type > 13) return 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RX"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RX"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index 3302f65fea..e94435d3c4 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -6842,8 +6842,7 @@ dissect_s1ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *s1ap_tree = NULL; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "S1AP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "S1AP"); /* create the s1ap protocol tree */ s1ap_item = proto_tree_add_item(tree, proto_s1ap, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-s4406.c b/epan/dissectors/packet-s4406.c index 9d2608e9e5..d85645371d 100644 --- a/epan/dissectors/packet-s4406.c +++ b/epan/dissectors/packet-s4406.c @@ -893,8 +893,7 @@ dissect_s4406(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) tree = proto_item_add_subtree(item, ett_s4406); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "S4406"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "S4406"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Military"); diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c index 67ecefefb1..2f3224eb60 100644 --- a/epan/dissectors/packet-sap.c +++ b/epan/dissectors/packet-sap.c @@ -129,8 +129,7 @@ dissect_sap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *si, *sif; proto_tree *sap_tree, *sap_flags_tree; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SAP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c index 7125ed6b46..3928becd04 100644 --- a/epan/dissectors/packet-sbus.c +++ b/epan/dissectors/packet-sbus.c @@ -628,8 +628,7 @@ dissect_sbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* End of attaching data to hash table*/ /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "S-Bus"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "S-Bus"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index d1609350ff..c38e0256a3 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -3852,8 +3852,7 @@ dissect_sctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->destport = destination_port; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SCTP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SCTP"); /* Clear entries in Info column on summary display */ if (check_col(pinfo->cinfo, COL_INFO)) diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c index 767fd2933e..ef682abb5c 100644 --- a/epan/dissectors/packet-sdlc.c +++ b/epan/dissectors/packet-sdlc.c @@ -80,8 +80,7 @@ dissect_sdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gboolean is_response; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SDLC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SDLC"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c index f907b5c7dc..5ed845f3cc 100644 --- a/epan/dissectors/packet-sebek.c +++ b/epan/dissectors/packet-sebek.c @@ -132,8 +132,7 @@ dissect_sebek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int sebek_type = 0; int cmd_len = 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SEBEK"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SEBEK"); if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index 3892b2d413..ac3f2bf97e 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -1108,8 +1108,7 @@ dissect_ses(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset = 0; guint8 type; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SES"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SES"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c index 82c9ce0a4e..fb8c67a773 100644 --- a/epan/dissectors/packet-sflow.c +++ b/epan/dissectors/packet-sflow.c @@ -1376,8 +1376,7 @@ dissect_sflow(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } agent_address; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "sFlow"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "sFlow"); /* create display subtree for the protocol */ diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index 47417270c3..c205e6a1f1 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -410,8 +410,7 @@ dissect_sigcomp_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SIGCOMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SIGCOMP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -529,8 +528,7 @@ dissect_sigcomp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return 0; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SIGCOMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SIGCOMP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c index 581c893c5e..f3527b1725 100644 --- a/epan/dissectors/packet-sip.c +++ b/epan/dissectors/packet-sip.c @@ -1878,8 +1878,7 @@ dissect_sip_common(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr stat_info->tap_from_addr = NULL; stat_info->tap_to_addr = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SIP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SIP"); switch (line_type) { diff --git a/epan/dissectors/packet-slimp3.c b/epan/dissectors/packet-slimp3.c index 8e28f85334..1962b6a654 100644 --- a/epan/dissectors/packet-slimp3.c +++ b/epan/dissectors/packet-slimp3.c @@ -250,8 +250,7 @@ dissect_slimp3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (opcode_str == NULL) return 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SliMP3"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SliMP3"); if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c index e5af009e05..49ae821a2b 100644 --- a/epan/dissectors/packet-sll.c +++ b/epan/dissectors/packet-sll.c @@ -156,8 +156,7 @@ dissect_sll(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; proto_tree *fh_tree = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SLL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SLL"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c index 407b4e24be..35d991ef3c 100644 --- a/epan/dissectors/packet-slowprotocols.c +++ b/epan/dissectors/packet-slowprotocols.c @@ -1060,8 +1060,7 @@ dissect_slow_protocols(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; default: { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Slow Protocols"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Slow Protocols"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown Subtype = %u.", subtype); @@ -1120,8 +1119,7 @@ dissect_lacp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const char *sep; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LACP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LACP"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Link Aggregation Control Protocol"); @@ -1468,8 +1466,7 @@ dissect_marker_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *marker_item; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MARKER"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MARKER"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Marker Protocol"); @@ -1865,8 +1862,7 @@ dissect_oampdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const char *sep = initial_sep; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "OAM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "OAM"); oampdu_code = tvb_get_guint8(tvb, OAMPDU_CODE); diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index cc515807f0..a8dec97844 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -329,8 +329,7 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree message_type = get_message_type(tvb); /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "slsk"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "slsk"); /* This field shows up as the "Info" column in the display */ diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c index 0d63286d70..2e70e3cfbb 100644 --- a/epan/dissectors/packet-smb-logon.c +++ b/epan/dissectors/packet-smb-logon.c @@ -922,8 +922,7 @@ dissect_smb_logon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *smb_logon_tree = NULL; proto_item *item = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB_NETLOGON"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB_NETLOGON"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c index a0f088833b..74a0c2a203 100644 --- a/epan/dissectors/packet-smpp.c +++ b/epan/dissectors/packet-smpp.c @@ -2286,8 +2286,7 @@ dissect_smpp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * Update the protocol column. */ if (first == TRUE) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMPP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMPP"); } /* diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c index 0987bfa962..4555ae8627 100644 --- a/epan/dissectors/packet-smrse.c +++ b/epan/dissectors/packet-smrse.c @@ -526,8 +526,7 @@ dissect_smrse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) tree = proto_item_add_subtree(item, ett_smrse); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMRSE"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMRSE"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, val_to_str(tag, tag_vals,"Unknown Tag:0x%02x")); diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c index 238736959a..c7ce72994d 100644 --- a/epan/dissectors/packet-smtp.c +++ b/epan/dissectors/packet-smtp.c @@ -527,8 +527,7 @@ dissect_smtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * fields ... */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMTP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMTP"); if (check_col(pinfo->cinfo, COL_INFO)) { /* Add the appropriate type here */ col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index f0d1899fd5..d28b116740 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -2571,8 +2571,7 @@ dissect_sna(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *sna_tree = NULL; proto_item *sna_ti = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SNA"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SNA"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -2608,8 +2607,7 @@ dissect_sna_xid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *sna_tree = NULL; proto_item *sna_ti = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SNA"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SNA"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-snaeth.c b/epan/dissectors/packet-snaeth.c index 35e022355c..f4c82db5bc 100644 --- a/epan/dissectors/packet-snaeth.c +++ b/epan/dissectors/packet-snaeth.c @@ -51,8 +51,7 @@ dissect_snaeth(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 len; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SNAETH"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SNAETH"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "SNA over Ethernet"); diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c index 67a2cef71a..ebd0d84df2 100644 --- a/epan/dissectors/packet-sndcp.c +++ b/epan/dissectors/packet-sndcp.c @@ -208,8 +208,7 @@ dissect_sndcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and clear Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SNDCP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SNDCP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c index e49c275ca2..a8948c12f5 100644 --- a/epan/dissectors/packet-snmp.c +++ b/epan/dissectors/packet-snmp.c @@ -2878,8 +2878,7 @@ dissect_smux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) next_tvb_init(&var_list); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMUX"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMUX"); if (tree) { item = proto_tree_add_item(tree, proto_smux, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 3cfa75f83b..af4b06bf95 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -391,8 +391,7 @@ socks_udp_dissector(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { hash_info = conversation_get_proto_data(conversation, proto_socks); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Socks"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Socks"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Version: 5, UDP Associated packet"); @@ -1084,8 +1083,7 @@ dissect_socks(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* display summary window information */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Socks"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Socks"); if (check_col(pinfo->cinfo, COL_INFO)){ if (( hash_info->version == 4) || ( hash_info->version == 5)){ diff --git a/epan/dissectors/packet-spp.c b/epan/dissectors/packet-spp.c index a749fb2a4d..6c46886603 100644 --- a/epan/dissectors/packet-spp.c +++ b/epan/dissectors/packet-spp.c @@ -127,8 +127,7 @@ dissect_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const char *spp_msg_string; guint16 low_socket, high_socket; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SPP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SPP"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "SPP"); diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c index 166d70a56c..87ce155446 100644 --- a/epan/dissectors/packet-srvloc.c +++ b/epan/dissectors/packet-srvloc.c @@ -823,8 +823,7 @@ dissect_srvloc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *expert_item; guint16 expert_status; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SRVLOC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SRVLOC"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1420,8 +1419,7 @@ dissect_srvloc_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *srvloc_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SRVLOC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SRVLOC"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-sscf-nni.c b/epan/dissectors/packet-sscf-nni.c index 4da7a59c49..eecd62e489 100644 --- a/epan/dissectors/packet-sscf-nni.c +++ b/epan/dissectors/packet-sscf-nni.c @@ -95,8 +95,7 @@ dissect_sscf_nni(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) sscf_status = tvb_get_guint8(tvb, SSCF_STATUS_OFFSET); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SSCF-NNI"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SSCF-NNI"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "STATUS (%s) ", val_to_str(sscf_status, sscf_status_vals, "Unknown")); diff --git a/epan/dissectors/packet-sscop.c b/epan/dissectors/packet-sscop.c index 0635b19c03..f0f7beaf6f 100644 --- a/epan/dissectors/packet-sscop.c +++ b/epan/dissectors/packet-sscop.c @@ -194,8 +194,7 @@ dissect_sscop_and_payload(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, d sscop_pdu_type = tvb_get_guint8(tvb, SSCOP_PDU_TYPE); sscop_info.type = sscop_pdu_type & SSCOP_TYPE_MASK; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SSCOP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SSCOP"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_str(pinfo->cinfo, COL_INFO, val_to_str(sscop_info.type, sscop_type_vals, "Unknown PDU type (0x%02x)")); diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c index e77ff9249b..6fea9f229b 100644 --- a/epan/dissectors/packet-stun.c +++ b/epan/dissectors/packet-stun.c @@ -335,8 +335,7 @@ dissect_stun(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "STUN"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "STUN"); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Message: %s", diff --git a/epan/dissectors/packet-stun2.c b/epan/dissectors/packet-stun2.c index d9b56304fe..32e7bab97b 100644 --- a/epan/dissectors/packet-stun2.c +++ b/epan/dissectors/packet-stun2.c @@ -437,8 +437,7 @@ dissect_stun2_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* The message seems to be a valid STUN2 message! */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "STUN2"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "STUN2"); /* BEGIN of CHANNEL-DATA specific section */ if (msg_type & 0xC000) diff --git a/epan/dissectors/packet-symantec.c b/epan/dissectors/packet-symantec.c index 91d9b3c53d..1ef7d5e93f 100644 --- a/epan/dissectors/packet-symantec.c +++ b/epan/dissectors/packet-symantec.c @@ -78,8 +78,7 @@ dissect_symantec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if ((etypev2 == 0) == (etypev3 == 0)) return; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Symantec"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Symantec"); if (etypev3 == 0) { /* SEF and SGS v2 processing */ if (check_col(pinfo->cinfo, COL_INFO)) diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c index d19119195e..979f2fdcf7 100644 --- a/epan/dissectors/packet-synergy.c +++ b/epan/dissectors/packet-synergy.c @@ -147,8 +147,7 @@ static void dissect_synergy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "synergy"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "synergy"); if (tree) { gint offset=0; diff --git a/epan/dissectors/packet-syslog.c b/epan/dissectors/packet-syslog.c index 96673b617a..7f1fcf9157 100644 --- a/epan/dissectors/packet-syslog.c +++ b/epan/dissectors/packet-syslog.c @@ -234,8 +234,7 @@ dissect_syslog(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const char *msg_str; tvbuff_t *mtp3_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Syslog"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Syslog"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c index 7db446a5e1..d2356e6842 100644 --- a/epan/dissectors/packet-tacacs.c +++ b/epan/dissectors/packet-tacacs.c @@ -155,15 +155,13 @@ dissect_tacacs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; guint8 txt_buff[255+1],version,type,userlen,passlen; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TACACS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TACACS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); version = tvb_get_guint8(tvb,0); if (version != 0) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "XTACACS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "XTACACS"); } type = tvb_get_guint8(tvb,1); @@ -940,8 +938,7 @@ dissect_tacplus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { key=find_key( &pinfo->src, &pinfo->dst ); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TACACS+"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TACACS+"); if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-tali.c b/epan/dissectors/packet-tali.c index c2e7bd26b7..ab2a254fc6 100644 --- a/epan/dissectors/packet-tali.c +++ b/epan/dissectors/packet-tali.c @@ -105,8 +105,7 @@ dissect_tali_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) length = tvb_get_letohs(tvb, TALI_SYNC_LENGTH + TALI_OPCODE_LENGTH); /* Make entries in Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TALI"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TALI"); if (check_col(pinfo->cinfo, COL_INFO)) { col_set_str(pinfo->cinfo, COL_INFO, ""); diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 2220fcdf61..8278826491 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -3005,8 +3005,7 @@ dissect_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) SET_ADDRESS(&tcph->ip_src, pinfo->src.type, pinfo->src.len, pinfo->src.data); SET_ADDRESS(&tcph->ip_dst, pinfo->dst.type, pinfo->dst.len, pinfo->dst.data); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TCP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TCP"); /* Clear out the Info column. */ if (check_col(pinfo->cinfo, COL_INFO)) diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c index 4a35917eef..04dca9b076 100644 --- a/epan/dissectors/packet-tds.c +++ b/epan/dissectors/packet-tds.c @@ -1809,8 +1809,7 @@ dissect_tds_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (first_time) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TDS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TDS"); /* * Set the packet description based on its TDS packet diff --git a/epan/dissectors/packet-teimanagement.c b/epan/dissectors/packet-teimanagement.c index e182bc50c0..ccbe686e66 100644 --- a/epan/dissectors/packet-teimanagement.c +++ b/epan/dissectors/packet-teimanagement.c @@ -76,8 +76,7 @@ dissect_teimanagement(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *tei_ti; guint8 message; - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TEI"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TEI"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-telkonet.c b/epan/dissectors/packet-telkonet.c index 653660e5f0..33eefb50b3 100644 --- a/epan/dissectors/packet-telkonet.c +++ b/epan/dissectors/packet-telkonet.c @@ -63,8 +63,7 @@ dissect_telkonet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset = 0; telkonet_type_t type; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TELKONET"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TELKONET"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-telnet.c b/epan/dissectors/packet-telnet.c index f6208c3864..fd607e5d05 100644 --- a/epan/dissectors/packet-telnet.c +++ b/epan/dissectors/packet-telnet.c @@ -1845,8 +1845,7 @@ dissect_telnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint len = 0; guint is_tn3270 = 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TELNET"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TELNET"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Telnet Data ..."); diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c index 4a856d9dd0..fbdc7e5ae1 100644 --- a/epan/dissectors/packet-teredo.c +++ b/epan/dissectors/packet-teredo.c @@ -230,8 +230,7 @@ dissect_teredo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } teredoh = &teredohstruct[teredoh_count]; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Teredo"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Teredo"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c index 8439e8c0a6..6183b25073 100644 --- a/epan/dissectors/packet-tftp.c +++ b/epan/dissectors/packet-tftp.c @@ -176,8 +176,7 @@ static void dissect_tftp_message(tftp_conv_info_t *tftp_info, guint i1; guint16 error; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TFTP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TFTP"); opcode = tvb_get_ntohs(tvb, offset); diff --git a/epan/dissectors/packet-time.c b/epan/dissectors/packet-time.c index 076d1bccad..ee3fefe955 100644 --- a/epan/dissectors/packet-time.c +++ b/epan/dissectors/packet-time.c @@ -46,8 +46,7 @@ dissect_time(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *time_tree; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TIME"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TIME"); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "TIME %s", diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c index 45df7c81c1..5e7072f9c0 100644 --- a/epan/dissectors/packet-tipc.c +++ b/epan/dissectors/packet-tipc.c @@ -2045,8 +2045,7 @@ dissect_tipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 msg_type = 0; /* Make entry in Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TIPC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TIPC"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-tivoconnect.c b/epan/dissectors/packet-tivoconnect.c index 6713166483..a960d6fe2d 100644 --- a/epan/dissectors/packet-tivoconnect.c +++ b/epan/dissectors/packet-tivoconnect.c @@ -87,8 +87,7 @@ dissect_tivoconnect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) string = (gchar*)tvb_get_ephemeral_string(tvb, 0, length); /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TiVoConnect"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TiVoConnect"); /* make a distinction between UDP and TCP packets */ proto_name = pinfo->ipproto == IP_PROTO_TCP ? diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c index aee1f08ada..4c75b81027 100644 --- a/epan/dissectors/packet-tns.c +++ b/epan/dissectors/packet-tns.c @@ -905,8 +905,7 @@ dissect_tns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 length; guint16 type; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TNS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TNS"); if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index 731ee01519..5d0f9eb848 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.c @@ -245,8 +245,7 @@ dissect_asciitpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * so don't get the length and don't try to * do reassembly. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); if (tree) { @@ -282,8 +281,7 @@ dissect_asciitpkt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, saved_proto = pinfo->current_proto; pinfo->current_proto = "TPKT"; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); /* * Don't add the TPKT header information if we're * reassembling segmented TPKT PDUs or if this @@ -400,8 +398,7 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * so don't get the length and don't try to * do reassembly. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); if (tree) { @@ -473,8 +470,7 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, saved_proto = pinfo->current_proto; pinfo->current_proto = "TPKT"; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPKT"); /* * Don't add the TPKT header information if we're * reassembling segmented TPKT PDUs or if this diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index a10ebc1421..d24addc53b 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/epan/dissectors/packet-tpncp.c @@ -264,8 +264,7 @@ static void dissect_tpncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if (pinfo->srcport == UDP_PORT_TPNCP_TRUNKPACK) /* Event */ cid = tvb_get_ntohl(tvb, 12 ); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPNCP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPNCP"); if (check_col(pinfo->cinfo, COL_INFO)) { if (pinfo->srcport == UDP_PORT_TPNCP_TRUNKPACK) { diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c index da231037f2..335ec6036c 100644 --- a/epan/dissectors/packet-tr.c +++ b/epan/dissectors/packet-tr.c @@ -356,8 +356,7 @@ dissect_tr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } trh=&trh_arr[trh_current]; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TR"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TR"); if (fix_linux_botches) x = check_for_old_linux_tvb((tvbuff_t*) tvb); diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c index 013351d391..143cb1f579 100644 --- a/epan/dissectors/packet-trmac.c +++ b/epan/dissectors/packet-trmac.c @@ -287,8 +287,7 @@ dissect_trmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int mv_length, sv_offset, sv_additional; guint8 mv_val; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TR MAC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TR MAC"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-tsp.c b/epan/dissectors/packet-tsp.c index 9490490022..678c1a60e6 100644 --- a/epan/dissectors/packet-tsp.c +++ b/epan/dissectors/packet-tsp.c @@ -116,8 +116,7 @@ dissect_tsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 tsp_type; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TSP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TSP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-tte-pcf.c b/epan/dissectors/packet-tte-pcf.c index 950549b373..d7124a053b 100644 --- a/epan/dissectors/packet-tte-pcf.c +++ b/epan/dissectors/packet-tte-pcf.c @@ -83,8 +83,7 @@ dissect_tte_pcf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) TTE_PCF_RES0_LENGTH+TTE_PCF_SP_LENGTH); /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCF"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCF"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, diff --git a/epan/dissectors/packet-tte.c b/epan/dissectors/packet-tte.c index 6e47691579..51313d0e5e 100644 --- a/epan/dissectors/packet-tte.c +++ b/epan/dissectors/packet-tte.c @@ -93,8 +93,7 @@ dissect_tte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TTE "); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TTE "); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Bogus TTEthernet Frame"); diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c index 5c0b23827a..a977f85a4b 100644 --- a/epan/dissectors/packet-turbocell.c +++ b/epan/dissectors/packet-turbocell.c @@ -134,23 +134,19 @@ static void dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre if (!(packet_type & 0x0F)){ if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Turbocell Packet (Beacon)"); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Turbocell"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Turbocell"); } else if ( packet_type == TURBOCELL_TYPE_MANAGEMENT ) { if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Turbocell Packet (Management)"); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Turbocell"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Turbocell"); } else if ( packet_type == TURBOCELL_TYPE_DATA ) { if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Turbocell Packet (Data)"); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Turbocell"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Turbocell"); } else { if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Turbocell Packet (Unknown)"); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Turbocell"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Turbocell"); } if (tree) { diff --git a/epan/dissectors/packet-turnchannel.c b/epan/dissectors/packet-turnchannel.c index 5537352a57..b710536f11 100644 --- a/epan/dissectors/packet-turnchannel.c +++ b/epan/dissectors/packet-turnchannel.c @@ -90,8 +90,7 @@ dissect_turnchannel_message(tvbuff_t *tvb, packet_info *pinfo, } /* Seems to be a decent TURN channel message */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TURN CHANNEL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TURN CHANNEL"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Channel Id 0x%x", channel_id); diff --git a/epan/dissectors/packet-tuxedo.c b/epan/dissectors/packet-tuxedo.c index 58fd655ff8..75589c735b 100644 --- a/epan/dissectors/packet-tuxedo.c +++ b/epan/dissectors/packet-tuxedo.c @@ -108,7 +108,7 @@ dissect_tuxedo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 magic; guint32 opcode; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "TUXEDO"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TUXEDO"); if (tvb_length(tvb) >= 8) { diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c index bd1083ce7a..1ad93d7d4f 100644 --- a/epan/dissectors/packet-tzsp.c +++ b/epan/dissectors/packet-tzsp.c @@ -290,8 +290,7 @@ dissect_tzsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const char *info; guint8 type; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TZSP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TZSP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -345,8 +344,7 @@ dissect_tzsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) || !dissector_try_port(encap_dissector_table, wtap_encap, next_tvb, pinfo, tree))) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNKNOWN"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNKNOWN"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "TZSP_ENCAP = %u", encapsulation); diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c index b20dc4ddce..12ad165415 100644 --- a/epan/dissectors/packet-ucp.c +++ b/epan/dissectors/packet-ucp.c @@ -1781,8 +1781,7 @@ dissect_ucp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *tmp_tvb; /* Make entries in Protocol column */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "UCP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "UCP"); /* This runs atop TCP, so we are guaranteed that there is at least one byte in the tvbuff. */ @@ -1807,8 +1806,7 @@ dissect_ucp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tap_rec->operation = OT; /* Make entries in Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "UCP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "UCP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); col_append_fstr(pinfo->cinfo, COL_INFO, "%s (%s)", diff --git a/epan/dissectors/packet-udld.c b/epan/dissectors/packet-udld.c index 9ddb5cf78e..4254c5401b 100644 --- a/epan/dissectors/packet-udld.c +++ b/epan/dissectors/packet-udld.c @@ -110,8 +110,7 @@ dissect_udld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *tlv_tree; int real_length; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "UDLD"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "UDLD"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c index e9441a4796..3acbfae795 100644 --- a/epan/dissectors/packet-uma.c +++ b/epan/dissectors/packet-uma.c @@ -1670,8 +1670,7 @@ dissect_uma(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *uma_tree; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "UMA"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "UMA"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1753,8 +1752,7 @@ dissect_uma_urlc_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *uma_tree; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "UMA"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "UMA"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c index ca78850c58..6e40d6f28a 100644 --- a/epan/dissectors/packet-umts_fp.c +++ b/epan/dissectors/packet-umts_fp.c @@ -2914,8 +2914,7 @@ void dissect_fp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) struct fp_info *p_fp_info; /* Append this protocol name rather than replace. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FP"); /* Create fp tree. */ ti = proto_tree_add_item(tree, proto_fp, tvb, offset, -1, FALSE); diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c index 6e0ecd251b..3c82ac89dc 100644 --- a/epan/dissectors/packet-usb-masstorage.c +++ b/epan/dissectors/packet-usb-masstorage.c @@ -162,8 +162,7 @@ dissect_usb_ms_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBMS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBMS"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); @@ -208,8 +207,7 @@ dissect_usb_ms_bulk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) is_request=(pinfo->srcport==NO_ENDPOINT); - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBMS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBMS"); if(check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c index c5ddbf70ac..42d771797e 100644 --- a/epan/dissectors/packet-usb.c +++ b/epan/dissectors/packet-usb.c @@ -1671,8 +1671,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent, conversation_t *conversation; usb_tap_data_t *tap_data=NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "USB"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "USB"); /* add usb hdr*/ if (parent) { diff --git a/epan/dissectors/packet-v120.c b/epan/dissectors/packet-v120.c index ec5750134b..38d457ae9b 100644 --- a/epan/dissectors/packet-v120.c +++ b/epan/dissectors/packet-v120.c @@ -100,8 +100,7 @@ dissect_v120(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; info=ep_alloc(80); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "V.120"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "V.120"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-vcdu.c b/epan/dissectors/packet-vcdu.c index 60c0199d9b..915b5a131c 100644 --- a/epan/dissectors/packet-vcdu.c +++ b/epan/dissectors/packet-vcdu.c @@ -296,8 +296,7 @@ dissect_vcdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "VCDU"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "VCDU"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Virtual Channel Data Unit"); diff --git a/epan/dissectors/packet-vicp.c b/epan/dissectors/packet-vicp.c index 259098b97f..493aa2352f 100644 --- a/epan/dissectors/packet-vicp.c +++ b/epan/dissectors/packet-vicp.c @@ -58,8 +58,7 @@ static void dissect_vicp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "VICP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "VICP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c index b5a1377b75..bc33a21262 100644 --- a/epan/dissectors/packet-vines.c +++ b/epan/dissectors/packet-vines.c @@ -109,8 +109,7 @@ dissect_vines_frp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gchar *frp_flags_str=""; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines FRP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines FRP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -208,8 +207,7 @@ dissect_vines_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines LLC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines LLC"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -297,8 +295,7 @@ dissect_vines_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int hops = 0; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines IP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines IP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -443,8 +440,7 @@ dissect_vines_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *vines_echo_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines Echo"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines Echo"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -521,8 +517,7 @@ dissect_vines_ipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "VIPC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "VIPC"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -539,8 +534,7 @@ dissect_vines_ipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) viph.vipc_ack = g_ntohs(viph.vipc_ack); viph.vipc_err_len = g_ntohs(viph.vipc_err_len); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines IPC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines IPC"); if (check_col(pinfo->cinfo, COL_INFO)) { switch (viph.vipc_pkttype) { @@ -722,8 +716,7 @@ dissect_vines_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "VSPP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "VSPP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -740,8 +733,7 @@ dissect_vines_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) viph.vspp_ack = g_ntohs(viph.vspp_ack); viph.vspp_win = g_ntohs(viph.vspp_win); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines SPP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines SPP"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "%s NS=%u NR=%u Window=%u RID=%04x LID=%04x D=%04x S=%04x", @@ -872,8 +864,7 @@ dissect_vines_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 packet_type; guint16 metric; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines ARP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines ARP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -895,8 +886,7 @@ dissect_vines_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * Sequenced ARP. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines SARP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines SARP"); packet_type = tvb_get_guint8(tvb, 1); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_str(pinfo->cinfo, COL_INFO, @@ -1053,8 +1043,7 @@ dissect_vines_rtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 control_flags; guint16 metric; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines RTP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines RTP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); @@ -1152,8 +1141,7 @@ dissect_vines_rtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } } else { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines SRTP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines SRTP"); if (tree) { version = tvb_get_ntohs(tvb, offset); proto_tree_add_text(vines_rtp_tree, tvb, offset, 2, @@ -1561,8 +1549,7 @@ dissect_vines_icp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gboolean save_in_error_pkt; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines ICP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Vines ICP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-vj.c b/epan/dissectors/packet-vj.c index 6d076c1a21..6e670fb08a 100644 --- a/epan/dissectors/packet-vj.c +++ b/epan/dissectors/packet-vj.c @@ -223,8 +223,7 @@ dissect_vjuc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * tree) gint isize = tvb_length(tvb); gint ipsize; - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP VJ"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP VJ"); if(tree != NULL) { ti = proto_tree_add_protocol_format(tree, proto_vj, tvb, 0, -1, @@ -404,8 +403,7 @@ dissect_vjc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) slcompress *comp = NULL; gint err = VJ_ERROR; - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP VJ"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP VJ"); if(tree != NULL) { ti = proto_tree_add_protocol_format(tree, proto_vj, tvb, 0, -1, diff --git a/epan/dissectors/packet-vlan.c b/epan/dissectors/packet-vlan.c index eb1db6db03..96d829e050 100644 --- a/epan/dissectors/packet-vlan.c +++ b/epan/dissectors/packet-vlan.c @@ -79,8 +79,7 @@ dissect_vlan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) volatile gboolean is_802_2; proto_tree *volatile vlan_tree; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "VLAN"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "VLAN"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 87b9e27f4d..512262af74 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -554,8 +554,7 @@ dissect_vnc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "VNC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "VNC"); /* First, clear the info column */ if(check_col(pinfo->cinfo, COL_INFO)) diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c index 4abfb9e534..1e9ff05852 100644 --- a/epan/dissectors/packet-vrrp.c +++ b/epan/dissectors/packet-vrrp.c @@ -92,8 +92,7 @@ dissect_vrrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) vec_t cksum_vec[4]; guint32 phdr[2]; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "VRRP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "VRRP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c index f9e1d444ea..f024583a94 100644 --- a/epan/dissectors/packet-vtp.c +++ b/epan/dissectors/packet-vtp.c @@ -97,8 +97,7 @@ dissect_vtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) const guint8 *upd_timestamp; int vlan_info_len; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "VTP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "VTP"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Virtual Trunking Protocol"); diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c index f833d057fa..e931e84929 100644 --- a/epan/dissectors/packet-wcp.c +++ b/epan/dissectors/packet-wcp.c @@ -301,8 +301,7 @@ static void dissect_wcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { guint16 temp, cmd, ext_cmd, seq; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "WCP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "WCP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c index aa6972f01a..fe432f54fd 100644 --- a/epan/dissectors/packet-wfleet-hdlc.c +++ b/epan/dissectors/packet-wfleet-hdlc.c @@ -60,8 +60,7 @@ dissect_wfleet_hdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A"); if (check_col(pinfo->cinfo, COL_RES_DL_DST)) col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A"); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "WHDLC"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "WHDLC"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c index a8bb9d08b1..e8d3878dc3 100644 --- a/epan/dissectors/packet-who.c +++ b/epan/dissectors/packet-who.c @@ -100,8 +100,7 @@ dissect_who(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nstime_t ts; /* Summary information */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "WHO"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "WHO"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c index 98453d01e6..6f1581ff83 100644 --- a/epan/dissectors/packet-wlccp.c +++ b/epan/dissectors/packet-wlccp.c @@ -711,8 +711,7 @@ dissect_wlccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 base_message_type=0, message_sub_type=0; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "WLCCP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "WLCCP"); if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c index aac6f66c09..380f2b161d 100644 --- a/epan/dissectors/packet-wol.c +++ b/epan/dissectors/packet-wol.c @@ -152,8 +152,7 @@ dissect_wol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "WOL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "WOL"); /* This field shows up as the "Info" column in the display; you should use it, if possible, to summarize what's in the packet, so that a user looking diff --git a/epan/dissectors/packet-wow.c b/epan/dissectors/packet-wow.c index 64b9723268..86b313e281 100644 --- a/epan/dissectors/packet-wow.c +++ b/epan/dissectors/packet-wow.c @@ -205,8 +205,7 @@ dissect_wow_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 offset = 0; gint len, i; - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "WOW"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "WOW"); if(check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-wsmp.c b/epan/dissectors/packet-wsmp.c index b0632a1b3a..f0b4f576da 100644 --- a/epan/dissectors/packet-wsmp.c +++ b/epan/dissectors/packet-wsmp.c @@ -67,8 +67,7 @@ dissect_wsmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) char* acm; /* Make entries in Protocol column and Info column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "WSMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "WSMP"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "WAVE Short Message Protocol IEEE P1609.3"); diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index dfad020747..8fe9599c72 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -5325,8 +5325,7 @@ dissect_x11_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, static void dissect_x11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "X11"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "X11"); if (pinfo->match_port == pinfo->srcport) dissect_x11_replies(tvb, pinfo, tree); diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index b865cf443e..62a3e3b303 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -1672,8 +1672,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 spi; int is_x_264; guint8 prt_id; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "X.25"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "X.25"); bytes0_1 = tvb_get_ntohs(tvb, 0); diff --git a/epan/dissectors/packet-x29.c b/epan/dissectors/packet-x29.c index 6d4ed6979c..fdcbf72876 100644 --- a/epan/dissectors/packet-x29.c +++ b/epan/dissectors/packet-x29.c @@ -91,8 +91,7 @@ dissect_x29(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint next_offset; int linelen; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "X.29"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "X.29"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c index e4a80919b9..d00170a2f3 100644 --- a/epan/dissectors/packet-x2ap.c +++ b/epan/dissectors/packet-x2ap.c @@ -3774,8 +3774,7 @@ dissect_x2ap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *x2ap_tree = NULL; /* make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "X2AP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "X2AP"); /* create the x2ap protocol tree */ x2ap_item = proto_tree_add_item(tree, proto_x2ap, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c index 37d08942fd..ab7cd8ad57 100644 --- a/epan/dissectors/packet-x411.c +++ b/epan/dissectors/packet-x411.c @@ -8371,8 +8371,7 @@ dissect_x411_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tre tree = proto_item_add_subtree(item, ett_x411); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "Transfer"); @@ -8413,8 +8412,7 @@ dissect_x411(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_x411, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(item, ett_x411); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c index a6da123d07..23c23a6e1d 100644 --- a/epan/dissectors/packet-x420.c +++ b/epan/dissectors/packet-x420.c @@ -4298,8 +4298,7 @@ dissect_x420(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) tree = proto_item_add_subtree(item, ett_x420); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "P22"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "P22"); if (check_col(pinfo->cinfo, COL_INFO)) col_set_str(pinfo->cinfo, COL_INFO, "InterPersonal"); diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c index 4027cd6589..323592c31a 100644 --- a/epan/dissectors/packet-x509af.c +++ b/epan/dissectors/packet-x509af.c @@ -907,8 +907,7 @@ dissect_pkix_crl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIX-CRL"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIX-CRL"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-xcsl.c b/epan/dissectors/packet-xcsl.c index dffbf49b76..18ac7bab7a 100644 --- a/epan/dissectors/packet-xcsl.c +++ b/epan/dissectors/packet-xcsl.c @@ -131,8 +131,7 @@ static void dissect_xcsl_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree proto_tree *xcsl_tree = NULL; /* color support */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Xcsl"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Xcsl"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c index 96f41c6ab8..11ec24d31a 100644 --- a/epan/dissectors/packet-xdmcp.c +++ b/epan/dissectors/packet-xdmcp.c @@ -199,8 +199,7 @@ static void dissect_xdmcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "XDMCP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "XDMCP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c index fbec7fb72e..8021d8b86c 100644 --- a/epan/dissectors/packet-xot.c +++ b/epan/dissectors/packet-xot.c @@ -201,8 +201,7 @@ static void dissect_xot_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* * Dissect the X.25-over-TCP packet. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "XOT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "XOT"); version = tvb_get_ntohs(tvb, offset + 0); plen = tvb_get_ntohs(tvb, offset + 2); if (check_col(pinfo->cinfo, COL_INFO)) diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c index 72084428a5..ec5bec8462 100644 --- a/epan/dissectors/packet-xtp.c +++ b/epan/dissectors/packet-xtp.c @@ -811,8 +811,7 @@ dissect_xtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { if ((len = tvb_length(tvb)) < XTP_HEADER_LEN) return 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "XTP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "XTP"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-xyplex.c b/epan/dissectors/packet-xyplex.c index 8379bf331c..b036356a41 100644 --- a/epan/dissectors/packet-xyplex.c +++ b/epan/dissectors/packet-xyplex.c @@ -72,8 +72,7 @@ dissect_xyplex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 reserved; guint16 reply; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "XYPLEX"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "XYPLEX"); if (tree) { ti = proto_tree_add_item(tree, proto_xyplex, tvb, offset, -1, FALSE); diff --git a/epan/dissectors/packet-yhoo.c b/epan/dissectors/packet-yhoo.c index 11468b3e21..9af26d021d 100644 --- a/epan/dissectors/packet-yhoo.c +++ b/epan/dissectors/packet-yhoo.c @@ -198,8 +198,7 @@ dissect_yhoo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return FALSE; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "YHOO"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "YHOO"); offset = 0; if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c index 72bb924575..56cffc4dee 100644 --- a/epan/dissectors/packet-ymsg.c +++ b/epan/dissectors/packet-ymsg.c @@ -385,8 +385,7 @@ dissect_ymsg_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int offset = 0; int content_len = 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "YMSG"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "YMSG"); offset = 0; if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c index aed4cf13f6..26f0fe9202 100644 --- a/epan/dissectors/packet-zebra.c +++ b/epan/dissectors/packet-zebra.c @@ -437,8 +437,7 @@ dissect_zebra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gboolean request; int left, offset; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZEBRA"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZEBRA"); request = (pinfo->destport == pinfo->match_port); left = tvb_reported_length(tvb); diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c index 1bb9e129fd..7d1edff0dd 100644 --- a/epan/dissectors/packet-zrtp.c +++ b/epan/dissectors/packet-zrtp.c @@ -322,8 +322,7 @@ dissect_zrtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) unsigned int msg_offset = 12; guint32 sent_crc, calc_crc; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZRTP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZRTP"); if (check_col(pinfo->cinfo, COL_INFO)) col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown ZRTP Packet"); diff --git a/plugins/docsis/packet-docsis.c b/plugins/docsis/packet-docsis.c index 1876181b92..984bedce77 100644 --- a/plugins/docsis/packet-docsis.c +++ b/plugins/docsis/packet-docsis.c @@ -371,8 +371,7 @@ dissect_docsis (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) } /* Make entries in Protocol column and Info column on summary display */ - if (check_col (pinfo->cinfo, COL_PROTOCOL)) - col_set_str (pinfo->cinfo, COL_PROTOCOL, "DOCSIS"); + col_set_str (pinfo->cinfo, COL_PROTOCOL, "DOCSIS"); if (check_col (pinfo->cinfo, COL_INFO)) { diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c index 1ecb4f2b20..c8afcb42ba 100644 --- a/plugins/docsis/packet-macmgmt.c +++ b/plugins/docsis/packet-macmgmt.c @@ -133,8 +133,7 @@ dissect_macmgmt (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) proto_tree *mgt_hdr_tree; tvbuff_t *payload_tvb; guint8 type; - if (check_col (pinfo->cinfo, COL_PROTOCOL)) - col_set_str (pinfo->cinfo, COL_PROTOCOL, "DOCSIS MGMT"); + col_set_str (pinfo->cinfo, COL_PROTOCOL, "DOCSIS MGMT"); if (check_col (pinfo->cinfo, COL_INFO)) col_clear (pinfo->cinfo, COL_INFO); diff --git a/plugins/ethercat/packet-ams.c b/plugins/ethercat/packet-ams.c index 5dd83278b9..44b8814c10 100644 --- a/plugins/ethercat/packet-ams.c +++ b/plugins/ethercat/packet-ams.c @@ -394,8 +394,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) char szText[200]; int nMax = sizeof(szText)-1; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AMS"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AMS"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c index a737e33fec..02ec0a28cc 100644 --- a/plugins/ethercat/packet-ethercat-datagram.c +++ b/plugins/ethercat/packet-ethercat-datagram.c @@ -462,8 +462,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree guint datagram_padding_bytes = 0; EcParserHDR ecHdr; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ECAT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ECAT"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/plugins/ethercat/packet-ioraw.c b/plugins/ethercat/packet-ioraw.c index a79feea04a..780451181e 100644 --- a/plugins/ethercat/packet-ioraw.c +++ b/plugins/ethercat/packet-ioraw.c @@ -69,8 +69,7 @@ static void dissect_ioraw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint ioraw_length = tvb_reported_length(tvb); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IO-RAW"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IO-RAW"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/plugins/ethercat/packet-nv.c b/plugins/ethercat/packet-nv.c index 6b42bac522..2bd6fed5f7 100644 --- a/plugins/ethercat/packet-nv.c +++ b/plugins/ethercat/packet-nv.c @@ -110,8 +110,7 @@ static void dissect_nv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint i; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TC-NV"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TC-NV"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/plugins/giop/packet-coseventcomm.c b/plugins/giop/packet-coseventcomm.c index a11454c801..882e907072 100644 --- a/plugins/giop/packet-coseventcomm.c +++ b/plugins/giop/packet-coseventcomm.c @@ -605,8 +605,7 @@ static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_item *ti = NULL; proto_tree *tree = NULL; /* init later, inside if(tree) */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "COSEVENTCOMM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "COSEVENTCOMM"); /* * Do not clear COL_INFO, as nothing is being written there by diff --git a/plugins/giop/packet-cosnaming.c b/plugins/giop/packet-cosnaming.c index daff120511..8df1757462 100644 --- a/plugins/giop/packet-cosnaming.c +++ b/plugins/giop/packet-cosnaming.c @@ -1552,8 +1552,7 @@ static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_item *ti = NULL; proto_tree *tree = NULL; /* init later, inside if(tree) */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "COSNAMING"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "COSNAMING"); /* * Do not clear COL_INFO, as nothing is being written there by diff --git a/plugins/giop/packet-parlay.c b/plugins/giop/packet-parlay.c index dad209aab9..a457eb13a6 100644 --- a/plugins/giop/packet-parlay.c +++ b/plugins/giop/packet-parlay.c @@ -101295,8 +101295,7 @@ static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_item *ti = NULL; proto_tree *tree = NULL; /* init later, inside if(tree) */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PARLAY"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PARLAY"); /* * Do not clear COL_INFO, as nothing is being written there by diff --git a/plugins/giop/packet-tango.c b/plugins/giop/packet-tango.c index faebb7e073..54a8920a3f 100644 --- a/plugins/giop/packet-tango.c +++ b/plugins/giop/packet-tango.c @@ -4231,8 +4231,7 @@ static proto_tree *start_dissecting(tvbuff_t *tvb, packet_info *pinfo, proto_tre proto_item *ti = NULL; proto_tree *tree = NULL; /* init later, inside if(tree) */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TANGO"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TANGO"); /* * Do not clear COL_INFO, as nothing is being written there by diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c index 25830dfc06..6152c674f4 100644 --- a/plugins/gryphon/packet-gryphon.c +++ b/plugins/gryphon/packet-gryphon.c @@ -210,8 +210,7 @@ dissect_gryphon_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint8 flags; if (!is_msgresp_add) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Gryphon"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Gryphon"); if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); } diff --git a/plugins/irda/packet-ircomm.c b/plugins/irda/packet-ircomm.c index 8f4790f5f8..a2340f42ba 100644 --- a/plugins/irda/packet-ircomm.c +++ b/plugins/irda/packet-ircomm.c @@ -177,8 +177,7 @@ static void dissect_cooked_ircomm(tvbuff_t* tvb, packet_info* pinfo, proto_tree* return; /* Make entries in Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IrCOMM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IrCOMM"); clen = tvb_get_guint8(tvb, offset); @@ -232,8 +231,7 @@ static void dissect_raw_ircomm(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro return; /* Make entries in Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IrCOMM"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IrCOMM"); if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index 9b16b2219f..2d4a56f1fb 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -469,8 +469,7 @@ static unsigned dissect_ttp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, return 0; /* Make entries in Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TTP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TTP"); head = tvb_get_guint8(tvb, offset); @@ -530,8 +529,7 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r return; /* Make entries in Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IAP"); op = tvb_get_guint8(tvb, offset) & IAP_OP; @@ -696,8 +694,7 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro return; /* Make entries in Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IAP"); op = tvb_get_guint8(tvb, offset) & IAP_OP; retcode = tvb_get_guint8(tvb, offset + 1); @@ -1058,8 +1055,7 @@ static void dissect_irlmp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root) /* Make entries in Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IrLMP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IrLMP"); dlsap = tvb_get_guint8(tvb, offset); cbit = dlsap & CONTROL_BIT; @@ -1672,8 +1668,7 @@ static void dissect_xid(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pro static void dissect_log(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root) { /* Make entries in Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Log"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Log"); /* missed messages? */ if (pinfo->pseudo_header->irda.pkttype == IRDA_MISSED_MSG) @@ -1730,8 +1725,7 @@ static void dissect_irlap(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root) guint8 ca; /* Make entries in Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IrLAP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IrLAP"); /* Clear Info column */ if (check_col(pinfo->cinfo, COL_INFO)) diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/profinet/packet-pn-mrp.c index 92a47c6c1d..0486f92492 100644 --- a/plugins/profinet/packet-pn-mrp.c +++ b/plugins/profinet/packet-pn-mrp.c @@ -391,8 +391,7 @@ dissect_PNMRP(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 offset = 0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PN-MRP"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PN-MRP"); /* Clear the information column on summary display */ if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/plugins/sercosiii/packet-sercosiii_1v1.c b/plugins/sercosiii/packet-sercosiii_1v1.c index 8c65ecf920..df2a9534f9 100644 --- a/plugins/sercosiii/packet-sercosiii_1v1.c +++ b/plugins/sercosiii/packet-sercosiii_1v1.c @@ -56,8 +56,7 @@ dissect_siii(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint tel_no = 0; /* setup columns */ - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SERCOS III V1.1"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SERCOS III V1.1"); if(check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); diff --git a/plugins/sercosiii/packet-sercosiii_1v1_at.c b/plugins/sercosiii/packet-sercosiii_1v1_at.c index eaf28f76bb..81e284d098 100644 --- a/plugins/sercosiii/packet-sercosiii_1v1_at.c +++ b/plugins/sercosiii/packet-sercosiii_1v1_at.c @@ -145,8 +145,7 @@ void dissect_siii_at(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) phase = (tvb_get_guint8(tvb, 1)&0x8F); /* read communication phase out of SERCOS III header*/ telno = (tvb_get_guint8(tvb, 0) & 0xF); /* read number of AT out of SERCOS III header */ - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SIII AT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SIII AT"); if(check_col(pinfo->cinfo, COL_INFO)) { diff --git a/plugins/sercosiii/packet-sercosiii_1v1_mdt.c b/plugins/sercosiii/packet-sercosiii_1v1_mdt.c index 4133df7660..0378aa51a4 100644 --- a/plugins/sercosiii/packet-sercosiii_1v1_mdt.c +++ b/plugins/sercosiii/packet-sercosiii_1v1_mdt.c @@ -141,8 +141,7 @@ void dissect_siii_mdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint t_phase; guint telno; - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SIII MDT"); + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SIII MDT"); t_phase = (tvb_get_guint8(tvb, 1)&0x8F); /* read communication phase out of SERCOS III header */ telno = (tvb_get_guint8(tvb, 0) & 0xF); /* read number of MDT out of SERCOS III header */ |