From 6110a96f689d51c92c5b00b4dfda3a9cd6916a25 Mon Sep 17 00:00:00 2001 From: Kovarththanan Rajaratnam Date: Sun, 9 Aug 2009 07:59:51 +0000 Subject: Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check svn path=/trunk/; revision=29345 --- epan/dissectors/packet-2dparityfec.c | 5 +-- epan/dissectors/packet-acn.c | 4 +- epan/dissectors/packet-afs.c | 4 +- epan/dissectors/packet-aim.c | 16 ++------ epan/dissectors/packet-ansi_map.c | 5 +-- epan/dissectors/packet-ansi_tcap.c | 5 +-- epan/dissectors/packet-artnet.c | 4 +- epan/dissectors/packet-bat.c | 20 +++------- epan/dissectors/packet-bittorrent.c | 20 +++------- epan/dissectors/packet-bssap.c | 5 +-- epan/dissectors/packet-bthci_acl.c | 4 +- epan/dissectors/packet-bthci_cmd.c | 4 +- epan/dissectors/packet-bthci_evt.c | 4 +- epan/dissectors/packet-btl2cap.c | 4 +- epan/dissectors/packet-camel.c | 4 +- epan/dissectors/packet-cast.c | 8 +--- epan/dissectors/packet-cfm.c | 4 +- epan/dissectors/packet-cigi.c | 4 +- epan/dissectors/packet-cisco-wids.c | 4 +- epan/dissectors/packet-ctdb.c | 4 +- epan/dissectors/packet-dcm.c | 4 +- epan/dissectors/packet-dcp-etsi.c | 12 ++---- epan/dissectors/packet-dec-bpdu.c | 4 +- epan/dissectors/packet-dec-dnart.c | 64 +++++++------------------------- epan/dissectors/packet-dect.c | 20 ++-------- epan/dissectors/packet-dtls.c | 15 ++------ epan/dissectors/packet-dvmrp.c | 4 +- epan/dissectors/packet-e100.c | 10 +---- epan/dissectors/packet-echo.c | 4 +- epan/dissectors/packet-egd.c | 5 +-- epan/dissectors/packet-enttec.c | 4 +- epan/dissectors/packet-epl.c | 10 +---- epan/dissectors/packet-epl_v1.c | 4 +- epan/dissectors/packet-evrc.c | 5 +-- epan/dissectors/packet-fc.c | 8 +--- epan/dissectors/packet-fcels.c | 8 +--- epan/dissectors/packet-ff.c | 4 +- epan/dissectors/packet-fix.c | 8 +--- epan/dissectors/packet-giop.c | 5 +-- epan/dissectors/packet-gprs-llc.c | 10 +---- epan/dissectors/packet-gsm_map.c | 5 +-- epan/dissectors/packet-h261.c | 8 +--- epan/dissectors/packet-h263p.c | 4 +- epan/dissectors/packet-hpext.c | 4 +- epan/dissectors/packet-hpsw.c | 8 +--- epan/dissectors/packet-iax2.c | 8 +--- epan/dissectors/packet-icq.c | 28 ++++---------- epan/dissectors/packet-iec104.c | 8 +--- epan/dissectors/packet-ieee802154.c | 8 +--- epan/dissectors/packet-ieee802a.c | 4 +- epan/dissectors/packet-ifcp.c | 4 +- epan/dissectors/packet-igap.c | 4 +- epan/dissectors/packet-igmp.c | 4 +- epan/dissectors/packet-inap.c | 5 +-- epan/dissectors/packet-ipmi.c | 4 +- epan/dissectors/packet-ipsi-ctl.c | 4 +- epan/dissectors/packet-ipvs-syncd.c | 4 +- epan/dissectors/packet-isakmp.c | 4 +- epan/dissectors/packet-iuup.c | 5 +-- epan/dissectors/packet-iwarp-ddp-rdmap.c | 4 +- epan/dissectors/packet-jpeg.c | 8 +--- epan/dissectors/packet-jxta.c | 16 ++------ epan/dissectors/packet-kdp.c | 4 +- epan/dissectors/packet-kerberos.c | 4 +- epan/dissectors/packet-kink.c | 4 +- epan/dissectors/packet-kpasswd.c | 4 +- epan/dissectors/packet-llc.c | 8 +--- epan/dissectors/packet-manolito.c | 5 +-- epan/dissectors/packet-mpeg1.c | 10 +---- epan/dissectors/packet-mpls.c | 8 +--- epan/dissectors/packet-mrdisc.c | 4 +- epan/dissectors/packet-ms-mms.c | 25 +++---------- epan/dissectors/packet-msnip.c | 4 +- epan/dissectors/packet-mstp.c | 4 +- epan/dissectors/packet-mysql.c | 20 +++------- epan/dissectors/packet-nbd.c | 4 +- epan/dissectors/packet-ncp-nmas.c | 8 +--- epan/dissectors/packet-ncp-sss.c | 8 +--- epan/dissectors/packet-ncp.c | 5 +-- epan/dissectors/packet-netdump.c | 4 +- epan/dissectors/packet-netsync.c | 4 +- epan/dissectors/packet-nhrp.c | 4 +- epan/dissectors/packet-omapi.c | 10 +---- epan/dissectors/packet-osi.c | 12 ++---- epan/dissectors/packet-ppp.c | 12 ++---- epan/dissectors/packet-pppoe.c | 10 +---- epan/dissectors/packet-pw-atm.c | 6 +-- epan/dissectors/packet-pw-cesopsn.c | 6 +-- epan/dissectors/packet-pw-fr.c | 16 ++------ epan/dissectors/packet-pw-satop.c | 6 +-- epan/dissectors/packet-quake3.c | 8 +--- epan/dissectors/packet-rdt.c | 5 +-- epan/dissectors/packet-retix-bpdu.c | 4 +- epan/dissectors/packet-rfc2190.c | 4 +- epan/dissectors/packet-rgmp.c | 4 +- epan/dissectors/packet-rlogin.c | 5 +-- epan/dissectors/packet-rmp.c | 4 +- epan/dissectors/packet-rpc.c | 4 +- epan/dissectors/packet-rtcp.c | 4 +- epan/dissectors/packet-rtnet.c | 16 ++------ epan/dissectors/packet-rtp-events.c | 5 +-- epan/dissectors/packet-rtp.c | 14 ++----- epan/dissectors/packet-rtps.c | 4 +- epan/dissectors/packet-rtps2.c | 4 +- epan/dissectors/packet-s5066.c | 4 +- epan/dissectors/packet-skinny.c | 8 +--- epan/dissectors/packet-smb-browse.c | 8 +--- epan/dissectors/packet-smb-mailslot.c | 8 +--- epan/dissectors/packet-smb-pipe.c | 8 +--- epan/dissectors/packet-smb.c | 4 +- epan/dissectors/packet-smb2.c | 4 +- epan/dissectors/packet-ssl.c | 13 ++----- epan/dissectors/packet-starteam.c | 4 +- epan/dissectors/packet-t125.c | 8 +--- epan/dissectors/packet-t38.c | 8 +--- epan/dissectors/packet-tcap.c | 5 +-- epan/dissectors/packet-tcp.c | 8 +--- epan/dissectors/packet-teamspeak2.c | 4 +- epan/dissectors/packet-vnc.c | 5 +-- epan/dissectors/packet-wccp.c | 4 +- epan/dissectors/packet-winsrepl.c | 48 ++++++------------------ epan/dissectors/packet-wtls.c | 4 +- epan/dissectors/packet-x224.c | 4 +- epan/dissectors/packet-zbee-aps.c | 4 +- epan/dissectors/packet-zbee-nwk.c | 4 +- epan/dissectors/packet-zbee-zdp.c | 4 +- 126 files changed, 225 insertions(+), 741 deletions(-) (limited to 'epan/dissectors') diff --git a/epan/dissectors/packet-2dparityfec.c b/epan/dissectors/packet-2dparityfec.c index ffae0268fa..ddb57dd904 100644 --- a/epan/dissectors/packet-2dparityfec.c +++ b/epan/dissectors/packet-2dparityfec.c @@ -118,10 +118,7 @@ static void dissect_2dparityfec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t OffsetField = tvb_get_guint8(tvb, 13); NAField = tvb_get_guint8(tvb, 14); - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "2dFEC"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "2dFEC"); /* Configure the info column */ if(check_col(pinfo->cinfo, COL_INFO)) diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c index d6703f8301..ae9f179205 100644 --- a/epan/dissectors/packet-acn.c +++ b/epan/dissectors/packet-acn.c @@ -2587,9 +2587,7 @@ dissect_acn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* } */ /* Set the protocol column */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACN"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACN"); /* Clear out stuff in the info column */ if(check_col(pinfo->cinfo,COL_INFO)){ diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c index 5dfb0aa8c2..f5d190b059 100644 --- a/epan/dissectors/packet-afs.c +++ b/epan/dissectors/packet-afs.c @@ -1423,9 +1423,7 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) void (*dissector)(tvbuff_t *tvb, struct rxinfo *rxinfo, proto_tree *tree, int offset, int opcode); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "AFS (RX)"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "AFS (RX)"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c index 4446de7a51..9a1516580b 100644 --- a/epan/dissectors/packet-aim.c +++ b/epan/dissectors/packet-aim.c @@ -881,9 +881,7 @@ static void dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, static void dissect_aim_flap_err(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "FLAP error"); - } + col_set_str(pinfo->cinfo, COL_INFO, "FLAP error"); /* Show the undissected payload */ if (tvb_length_remaining(tvb, offset) > 0) @@ -893,9 +891,7 @@ static void dissect_aim_flap_err(tvbuff_t *tvb, packet_info *pinfo, static void dissect_aim_keep_alive(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Keep Alive"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Keep Alive"); /* Show the undissected payload */ if (tvb_length_remaining(tvb, offset) > 0) @@ -905,9 +901,7 @@ static void dissect_aim_keep_alive(tvbuff_t *tvb, packet_info *pinfo, static void dissect_aim_close_conn(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Close Connection"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Close Connection"); offset = dissect_aim_tlv_sequence(tvb, pinfo, offset, tree, client_tlvs); } @@ -915,9 +909,7 @@ static void dissect_aim_close_conn(tvbuff_t *tvb, packet_info *pinfo, static void dissect_aim_unknown_channel(tvbuff_t *tvb, packet_info *pinfo, int offset, proto_tree *tree) { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Unknown Channel"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Unknown Channel"); /* Show the undissected payload */ if (tvb_length_remaining(tvb, offset) > 0) diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index 72684acae6..d5803e02f4 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -16155,10 +16155,7 @@ dissect_ansi_map(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, "ANSI MAP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ANSI MAP"); /* Data from the TCAP dissector */ if (pinfo->private_data == NULL){ diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index f3d6816c33..b1ea0d0dd9 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -1325,10 +1325,7 @@ dissect_ansi_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) ansi_tcap_ctx_init(&ansi_tcap_private); tcap_top_tree = parent_tree; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ANSI TCAP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ANSI TCAP"); /* create display subtree for the protocol */ if(parent_tree){ diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c index 2ae1becf11..c76fa241a7 100644 --- a/epan/dissectors/packet-artnet.c +++ b/epan/dissectors/packet-artnet.c @@ -1364,9 +1364,7 @@ dissect_artnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_tree *ti,*hi,*si,*artnet_tree=NULL,*artnet_header_tree=NULL; /* Set the protocol column */ - if(check_col(pinfo->cinfo,COL_PROTOCOL)){ - col_set_str(pinfo->cinfo,COL_PROTOCOL,"ARTNET"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ARTNET"); /* Clear out stuff in the info column */ if(check_col(pinfo->cinfo,COL_INFO)){ diff --git a/epan/dissectors/packet-bat.c b/epan/dissectors/packet-bat.c index 5ea8831159..e9f3a468f4 100644 --- a/epan/dissectors/packet-bat.c +++ b/epan/dissectors/packet-bat.c @@ -132,9 +132,7 @@ static void dissect_bat_batman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr guint8 version; /* set protocol name */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_BATMAN"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_BATMAN"); version = tvb_get_guint8(tvb, 0); switch (version) { @@ -336,9 +334,7 @@ static void dissect_bat_gw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ip_addr = tvb_get_ptr(tvb, ip_pos, 4); /* set protocol name */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_GW"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_GW"); /* Set info column */ if (check_col(pinfo->cinfo, COL_INFO)) { @@ -396,9 +392,7 @@ static void dissect_bat_vis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 version; /* set protocol name */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_VIS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_VIS"); version = tvb_get_guint8(tvb, 4); switch (version) { @@ -439,9 +433,7 @@ static void dissect_bat_vis_v22(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t vis_packeth->tq_max = tvb_get_ntohs(tvb, 6); /* set protocol name */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_VIS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_VIS"); /* Set info column */ if (check_col(pinfo->cinfo, COL_INFO)) { @@ -574,9 +566,7 @@ static void dissect_bat_vis_v23(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t vis_packeth->tq_max = tvb_get_guint8(tvb, 6); /* set protocol name */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_VIS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BAT_VIS"); /* Set info column */ if (check_col(pinfo->cinfo, COL_INFO)) { diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c index 0e17a910fe..fe537a2250 100644 --- a/epan/dissectors/packet-bittorrent.c +++ b/epan/dissectors/packet-bittorrent.c @@ -555,9 +555,7 @@ static void dissect_bittorrent_message (tvbuff_t *tvb, packet_info *pinfo, proto } */ if (msgtype == NULL) { proto_tree_add_text(tree, tvb, offset, -1, "Continuation data"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Continuation data"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Continuation data"); return; } } else { @@ -575,9 +573,7 @@ static void dissect_bittorrent_message (tvbuff_t *tvb, packet_info *pinfo, proto /* Keepalive message */ if (length == 0) { proto_tree_add_item(mtree, hf_bittorrent_msg_len, tvb, offset, BITTORRENT_HEADER_LENGTH, FALSE); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "KeepAlive"); - } + col_set_str(pinfo->cinfo, COL_INFO, "KeepAlive"); return; } @@ -686,9 +682,7 @@ static void dissect_bittorrent_welcome (tvbuff_t *tvb, packet_info *pinfo _U_, p int i; char *version; - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Handshake"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Handshake"); proto_tree_add_item(tree, hf_bittorrent_prot_name_len, tvb, offset, 1, FALSE); offset+=1; proto_tree_add_item(tree, hf_bittorrent_prot_name, tvb, offset, 19, FALSE); offset += 19; @@ -721,13 +715,9 @@ static void dissect_bittorrent_tcp_pdu (tvbuff_t *tvb, packet_info *pinfo, proto { proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BitTorrent"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BitTorrent"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "BitTorrent "); - } + col_set_str(pinfo->cinfo, COL_INFO, "BitTorrent "); ti = proto_tree_add_item (tree, proto_bittorrent, tvb, 0, -1, FALSE); tree = proto_item_add_subtree(ti, ett_bittorrent); diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c index fd64e256cf..0928e6d512 100644 --- a/epan/dissectors/packet-bssap.c +++ b/epan/dissectors/packet-bssap.c @@ -1652,10 +1652,7 @@ static void dissect_bssap_plus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr /* * Make entry in the Protocol column on summary display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BSSAP+"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BSSAP+"); if (pinfo->sccp_info && pinfo->sccp_info->data.co.assoc) pinfo->sccp_info->data.co.assoc->payload = SCCP_PLOAD_BSSAP; diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c index fb231a67b5..df4878802b 100644 --- a/epan/dissectors/packet-bthci_acl.c +++ b/epan/dissectors/packet-bthci_acl.c @@ -102,9 +102,7 @@ dissect_btacl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) chandle_data_t *chandle_data; void* pd_save; - if(check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI_ACL"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI_ACL"); if(tree){ ti=proto_tree_add_item(tree, proto_btacl, tvb, offset, -1, FALSE); diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c index 41a2259ebe..79101d6fbf 100644 --- a/epan/dissectors/packet-bthci_cmd.c +++ b/epan/dissectors/packet-bthci_cmd.c @@ -1889,9 +1889,7 @@ dissect_bthci_cmd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item_append_text(ti_cmd," - %s", val_to_str(opcode, bthci_cmd_opcode_vals, "Unknown 0x%04x")); - if(check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI_CMD"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI_CMD"); if((check_col(pinfo->cinfo, COL_INFO))){ col_append_fstr(pinfo->cinfo, COL_INFO, " %s", val_to_str(opcode, bthci_cmd_opcode_vals, "Unknown 0x%04x")); diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c index fae9d03c71..60437d3ce1 100644 --- a/epan/dissectors/packet-bthci_evt.c +++ b/epan/dissectors/packet-bthci_evt.c @@ -2317,9 +2317,7 @@ dissect_bthci_evt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) offset++; - if(check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI_EVT"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI_EVT"); if((check_col(pinfo->cinfo, COL_INFO))){ col_append_fstr(pinfo->cinfo, COL_INFO, " %s", val_to_str(evt_code, evt_code_vals, "Unknown 0x%08x")); diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c index 6863e58ad9..95aeee9c4e 100644 --- a/epan/dissectors/packet-btl2cap.c +++ b/epan/dissectors/packet-btl2cap.c @@ -1018,9 +1018,7 @@ static void dissect_btl2cap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) config_data_t *config_data; void* pd_save; - if(check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "L2CAP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "L2CAP"); 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-camel.c b/epan/dissectors/packet-camel.c index e2457bb499..393f40c7d8 100644 --- a/epan/dissectors/packet-camel.c +++ b/epan/dissectors/packet-camel.c @@ -7194,9 +7194,7 @@ dissect_camel(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, "Camel"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Camel"); /* create display subtree for the protocol */ if(parent_tree){ diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c index a1ad238374..1ab56702fa 100644 --- a/epan/dissectors/packet-cast.c +++ b/epan/dissectors/packet-cast.c @@ -1078,13 +1078,9 @@ static void dissect_cast(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, "CAST"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CAST"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Cast Client Control Protocol"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Cast Client Control Protocol"); tcp_dissect_pdus(tvb, pinfo, tree, cast_desegment, 4, get_cast_pdu_len, dissect_cast_pdu); } diff --git a/epan/dissectors/packet-cfm.c b/epan/dissectors/packet-cfm.c index 6a05d8dbf1..709d5be567 100644 --- a/epan/dissectors/packet-cfm.c +++ b/epan/dissectors/packet-cfm.c @@ -1471,9 +1471,7 @@ static void dissect_cfm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *cfm_tlv_tree = NULL; /* display the CFM protol name */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CFM"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CFM"); /* Clear out stuff in the info column */ if (check_col(pinfo->cinfo,COL_INFO)) { diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c index 5bf14f0f1b..700f6b235f 100644 --- a/epan/dissectors/packet-cigi.c +++ b/epan/dissectors/packet-cigi.c @@ -2629,9 +2629,7 @@ dissect_cigi_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, "CIGI"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIGI"); /* If we have the start of frame or IG Control packet set the version * XXX - If another version of cigi is added to this dissector be sure to diff --git a/epan/dissectors/packet-cisco-wids.c b/epan/dissectors/packet-cisco-wids.c index 80e106941a..97dc80190f 100644 --- a/epan/dissectors/packet-cisco-wids.c +++ b/epan/dissectors/packet-cisco-wids.c @@ -82,9 +82,7 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "CWIDS"); col_clear(pinfo->cinfo, COL_INFO); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Cwids: "); - } + col_set_str(pinfo->cinfo, COL_INFO, "Cwids: "); /* FIXME: col_set_fence(pinfo->cinfo, all-cols, only addr-cols?); */ cwids_tree = NULL; diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c index ef966fde6c..98ab58e9e3 100644 --- a/epan/dissectors/packet-ctdb.c +++ b/epan/dissectors/packet-ctdb.c @@ -1004,9 +1004,7 @@ dissect_ctdb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } - if(check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "CTDB"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "CTDB"); if(check_col(pinfo->cinfo, COL_INFO)){ col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c index 9e99b4311d..0572b97b60 100644 --- a/epan/dissectors/packet-dcm.c +++ b/epan/dissectors/packet-dcm.c @@ -6263,9 +6263,7 @@ dissect_dcm_main(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean i /* Mark it. This is a DICOM packet */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DICOM"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DICOM"); /* Process all PDUs in the buffer */ while (pdu_start < tlen) { diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c index d614c2a47b..2e2c111027 100644 --- a/epan/dissectors/packet-dcp-etsi.c +++ b/epan/dissectors/packet-dcp-etsi.c @@ -450,9 +450,7 @@ dissect_pft(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) guint16 rsk=0, rsz=0; pinfo->current_proto = "DCP-PFT"; - if (check_col (pinfo->cinfo, COL_PROTOCOL)) { - col_set_str (pinfo->cinfo, COL_PROTOCOL, "DCP-PFT"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCP-PFT"); if (tree) { /* we are being asked for details */ ti = proto_tree_add_item (tree, proto_pft, tvb, 0, -1, FALSE); @@ -555,9 +553,7 @@ dissect_af (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) tvbuff_t *next_tvb = NULL; pinfo->current_proto = "DCP-AF"; - if (check_col (pinfo->cinfo, COL_PROTOCOL)) { - col_set_str (pinfo->cinfo, COL_PROTOCOL, "DCP-AF"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCP-AF"); if (tree) { /* we are being asked for details */ ti = proto_tree_add_item (tree, proto_af, tvb, 0, -1, FALSE); @@ -630,9 +626,7 @@ dissect_tpl(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) guint16 maj, min; pinfo->current_proto = "DCP-TPL"; - if (check_col (pinfo->cinfo, COL_PROTOCOL)) { - col_set_str (pinfo->cinfo, COL_PROTOCOL, "DCP-TPL"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCP-TPL"); if(tree) { proto_item *ti = NULL; diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c index fdb0ebfbd5..2a1388c881 100644 --- a/epan/dissectors/packet-dec-bpdu.c +++ b/epan/dissectors/packet-dec-bpdu.c @@ -118,9 +118,7 @@ dissect_dec_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; const char *sep; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DEC_STP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DEC_STP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c index 7e6e83745c..b1905076e4 100644 --- a/epan/dissectors/packet-dec-dnart.c +++ b/epan/dissectors/packet-dec-dnart.c @@ -381,9 +381,7 @@ dissect_dec_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_PROTOCOL)) { col_clear(pinfo->cinfo, COL_PROTOCOL); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DEC DNA"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DEC DNA"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } @@ -592,10 +590,7 @@ do_initialization_msg( guint8 version, eco_nr, user_eco; guint8 remainder_count; - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, - "Routing control, initialization message"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Routing control, initialization message"); proto_tree_add_item(tree, hf_dec_rt_src_node, tvb, my_offset, 2, TRUE); offset += 2; @@ -635,10 +630,7 @@ do_verification_msg( guint my_offset = offset; guint8 remainder_count; - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, - "Routing control, verification message"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Routing control, verification message"); proto_tree_add_item(tree, hf_dec_rt_src_node, tvb, my_offset, 2, TRUE); offset += 2; @@ -662,10 +654,7 @@ do_hello_test_msg( guint my_offset = offset; guint remainder_count; - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, - "Routing control, hello/test message"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Routing control, hello/test message"); proto_tree_add_item(tree, hf_dec_rt_src_node, tvb, my_offset, 2, TRUE); my_offset += 2; @@ -704,19 +693,13 @@ do_routing_msg( startid = tvb_get_letohs(tvb, my_offset + 2); rtginfo = tvb_get_letohs(tvb, my_offset + 4); if (msg == 3) { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, - "Routing control, Level 1 routing message"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Routing control, Level 1 routing message"); proto_tree_add_none_format(tree, hf_dec_rt_segment, tvb, my_offset, 6, "Segment: count:%d, start Id: %d, hops:%d, cost: %d", count, startid, (rtginfo & 0x7c00) >> 10, rtginfo & 0x3ff); } else { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, - "Routing control, Level 2 routing message"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Routing control, Level 2 routing message"); proto_tree_add_none_format(tree, hf_dec_rt_segment, tvb, my_offset, 6, "Segment: count:%d, start area: %d, hops:%d, cost: %d", @@ -798,10 +781,7 @@ do_hello_msg( if (msg == 5) { /* Ethernet router hello message Has a 'priority' field in this position */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, - "Routing control, Ethernet Router Hello message"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Routing control, Ethernet Router Hello message"); priority = tvb_get_guint8(tvb, my_offset); proto_tree_add_uint( tree, hf_dec_rt_iprio, tvb, my_offset, 1, priority); @@ -813,10 +793,7 @@ do_hello_msg( /* The endnode hello message has 'seed' and 'neighbor' fields */ guint8 seed; - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, - "Routing control, Endnode Hello message"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Routing control, Endnode Hello message"); seed = tvb_get_guint8(tvb, my_offset); proto_tree_add_item(tree, hf_dec_rt_seed, tvb, my_offset, 8, seed); @@ -983,10 +960,7 @@ handle_nsp_msg( /* We are done, return my_offset */ break; case INTERRUPT_MSG: /* "Interrupt message" */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, - "NSP interrupt message"); - } + col_set_str(pinfo->cinfo, COL_INFO, "NSP interrupt message"); ack_num = tvb_get_letohs(tvb, my_offset); if (ack_num & 0x8000) { proto_tree_add_none_format(tree, hf_dec_rt_acknum, @@ -1026,10 +1000,7 @@ handle_nsp_msg( /* We are done, return my_offset */ break; case LINK_SERVICE_MSG: /* "Link service message" */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, - "NSP link control message"); - } + col_set_str(pinfo->cinfo, COL_INFO, "NSP link control message"); ack_num = tvb_get_letohs(tvb, my_offset); if (ack_num & 0x8000) { proto_tree_add_none_format(tree, hf_dec_rt_acknum, @@ -1126,10 +1097,7 @@ handle_nsp_msg( /* We are done, return my_offset */ break; case OTHER_DATA_ACK_MSG: /* "Other data acknowledgement message" */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, - "NSP other data ACK message"); - } + col_set_str(pinfo->cinfo, COL_INFO, "NSP other data ACK message"); ack_num = tvb_get_letohs(tvb, my_offset); proto_tree_add_none_format(tree, hf_dec_rt_acknum, tvb, my_offset, 2, @@ -1154,10 +1122,7 @@ handle_nsp_msg( break; case CONN_CONFIRM_MSG: /* "Connect confirm" */ case CONN_INITIATE_MSG: /* "Connect initiate" */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, - "NSP connect confirm/initiate message"); - } + col_set_str(pinfo->cinfo, COL_INFO, "NSP connect confirm/initiate message"); services = tvb_get_guint8(tvb, my_offset); proto_tree_add_uint(tree, hf_dec_rt_services, tvb, my_offset, 1, services); @@ -1176,10 +1141,7 @@ handle_nsp_msg( break; case DISCONN_INITIATE_MSG: /* "Disconnect initiate" */ case DISCONN_CONFIRM_MSG: /* "Disconnect confirm" */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, - "NSP disconnect initiate/confirm message"); - } + col_set_str(pinfo->cinfo, COL_INFO, "NSP disconnect initiate/confirm message"); reason = tvb_get_letohs(tvb, my_offset); proto_tree_add_item(tree, hf_dec_disc_reason, tvb, my_offset, 2, TRUE); diff --git a/epan/dissectors/packet-dect.c b/epan/dissectors/packet-dect.c index 9488785e5c..391dc48d7d 100644 --- a/epan/dissectors/packet-dect.c +++ b/epan/dissectors/packet-dect.c @@ -1864,10 +1864,7 @@ dissect_dect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(pkt_len<13) { - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "No Data"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "No Data"); return; } @@ -1928,26 +1925,17 @@ dissect_dect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) switch(type) { case 0x1675: - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT PP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT PP"); proto_item_append_text(typeti, " Phone Packet"); dissect_decttype(DECT_PACKET_PP, &pkt_afield, &pkt_bfield, pinfo, pkt_ptr, tvb, ti, DectTree); break; case 0xe98a: - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT RFP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT RFP"); proto_item_append_text(typeti, " Station Packet"); dissect_decttype(DECT_PACKET_FP, &pkt_afield, &pkt_bfield, pinfo, pkt_ptr, tvb, ti, DectTree); break; default: - if(check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT Unk"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DECT Unk"); proto_item_append_text(typeti, " Unknown Packet"); break; } diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c index f07e568e1a..8f47e45a9f 100644 --- a/epan/dissectors/packet-dtls.c +++ b/epan/dissectors/packet-dtls.c @@ -398,10 +398,7 @@ dissect_dtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Initialize the protocol column; we'll set it later when we * figure out what flavor of DTLS it is (actually only one version exists). */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTLS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTLS"); /* clear the the info column */ col_clear(pinfo->cinfo, COL_INFO); @@ -457,10 +454,7 @@ dissect_dtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Continuation Data"); /* Set the protocol column */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL,"DTLS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTLS"); } break; } @@ -614,10 +608,7 @@ dissect_dtls_record(tvbuff_t *tvb, packet_info *pinfo, col_append_str(pinfo->cinfo, COL_INFO, "Continuation Data"); /* Set the protocol column */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL,"DTLS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTLS"); return offset + 13 + record_length; } diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c index 5ed6a8934a..cfd2e72870 100644 --- a/epan/dissectors/packet-dvmrp.c +++ b/epan/dissectors/packet-dvmrp.c @@ -703,9 +703,7 @@ dissect_dvmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int of tree = proto_item_add_subtree(item, ett_dvmrp); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DVMRP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DVMRP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-e100.c b/epan/dissectors/packet-e100.c index 6f966e473a..48f9a221a5 100644 --- a/epan/dissectors/packet-e100.c +++ b/epan/dissectors/packet-e100.c @@ -80,14 +80,8 @@ dissect_e100(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_get_ntohl(tvb, e100_bytes_cap.offset) == tvb_length(tvb)-e100_encap_len) { guint32 bytes_captured=0; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "e100"); - } - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_set_str(pinfo->cinfo, COL_INFO, "E100 Encapsulated Packet"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "e100"); + col_set_str(pinfo->cinfo, COL_INFO, "E100 Encapsulated Packet"); if (tree) { /* pick apart protocol for display */ diff --git a/epan/dissectors/packet-echo.c b/epan/dissectors/packet-echo.c index f715b468ca..4b0c3ffbd3 100644 --- a/epan/dissectors/packet-echo.c +++ b/epan/dissectors/packet-echo.c @@ -59,9 +59,7 @@ static void dissect_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) request = TRUE; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ECHO"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ECHO"); if (check_col(pinfo->cinfo, COL_INFO)) { col_set_str(pinfo->cinfo, COL_INFO, diff --git a/epan/dissectors/packet-egd.c b/epan/dissectors/packet-egd.c index e4f238c306..7c7054309f 100644 --- a/epan/dissectors/packet-egd.c +++ b/epan/dissectors/packet-egd.c @@ -92,10 +92,7 @@ static gint ett_status_item = -1; static void dissect_egd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { /* replace UDP with EGD in display */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "EGD"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "EGD"); /* Clear out stuff in the info column */ if (check_col(pinfo->cinfo,COL_INFO)) diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c index 92475b3e22..137dc956b7 100644 --- a/epan/dissectors/packet-enttec.c +++ b/epan/dissectors/packet-enttec.c @@ -349,9 +349,7 @@ dissect_enttec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ti,*enttec_tree=NULL; /* Set the protocol column */ - if (check_col(pinfo->cinfo,COL_PROTOCOL)) { - col_set_str(pinfo->cinfo,COL_PROTOCOL,"ENTTEC"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ENTTEC"); head = tvb_get_ntohl(tvb, offset); diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index f326d877ba..dd34ec4020 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -253,18 +253,12 @@ dissect_epl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Make entries in Protocol column and Info column on summary display */ if (pinfo->ethertype == ETHERTYPE_EPL_V2) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "EPL"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "EPL"); udpencap = FALSE; } else { /* guess that this is an EPL frame encapsulated into an UDP datagram */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "EPL/UDP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "EPL/UDP"); udpencap = TRUE; } diff --git a/epan/dissectors/packet-epl_v1.c b/epan/dissectors/packet-epl_v1.c index c58445166a..5d21b3c0bd 100644 --- a/epan/dissectors/packet-epl_v1.c +++ b/epan/dissectors/packet-epl_v1.c @@ -256,9 +256,7 @@ dissect_epl_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) info_str[0] = 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, "EPL_V1"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "EPL_V1"); /* get service type */ diff --git a/epan/dissectors/packet-evrc.c b/epan/dissectors/packet-evrc.c index 5573fab19f..785dfca195 100644 --- a/epan/dissectors/packet-evrc.c +++ b/epan/dissectors/packet-evrc.c @@ -212,10 +212,7 @@ dissect_evrc_aux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, evrc_varia guint8 speech_data_len[0x20]; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "EVRC"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "EVRC"); if (!tree) return; diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c index ec1d23cef7..981f77f4e4 100644 --- a/epan/dissectors/packet-fc.c +++ b/epan/dissectors/packet-fc.c @@ -1173,12 +1173,8 @@ dissect_fc_helper (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean } else if ((fchdr.r_ctl & 0x0F) == FC_BLS_BARJT) { dissect_fc_ba_rjt (next_tvb, pinfo, tree); } else if ((fchdr.r_ctl & 0x0F) == FC_BLS_ABTS) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BLS"); - } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "ABTS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BLS"); + col_set_str(pinfo->cinfo, COL_INFO, "ABTS"); } } tap_queue_packet(fc_tap, pinfo, &fchdr); diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index d6b53a8170..0ac89817ce 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -1731,9 +1731,7 @@ dissect_fcels_cbind (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item (cbind_tree, hf_fcels_opcode, tvb, offset, 1, FALSE); } - if (check_col (pinfo->cinfo, COL_INFO)) { - col_set_str (pinfo->cinfo, COL_INFO, "CBIND "); - } + col_set_str(pinfo->cinfo, COL_INFO, "CBIND "); proto_tree_add_item (cbind_tree, hf_fcels_cbind_liveness, tvb, offset+4, 2, FALSE); proto_tree_add_item (cbind_tree, hf_fcels_cbind_addr_mode, tvb, offset+6, 1, FALSE); @@ -1774,9 +1772,7 @@ dissect_fcels_unbind (tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, proto_tree_add_item (cbind_tree, hf_fcels_opcode, tvb, offset, 1, FALSE); } - if (check_col (pinfo->cinfo, COL_INFO)) { - col_set_str (pinfo->cinfo, COL_INFO, "UNBIND "); - } + col_set_str(pinfo->cinfo, COL_INFO, "UNBIND "); proto_tree_add_item (cbind_tree, hf_fcels_cbind_userinfo, tvb, offset+4, 4, FALSE); proto_tree_add_item (cbind_tree, hf_fcels_chandle, tvb, offset+10, 2, FALSE); diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c index 789b12d307..b19bace4c1 100644 --- a/epan/dissectors/packet-ff.c +++ b/epan/dissectors/packet-ff.c @@ -13448,9 +13448,7 @@ dissect_ff(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 trailer_len = 0; - if(check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FF"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FF"); Options = tvb_get_guint8(tvb, 1); ProtocolAndType = tvb_get_guint8(tvb, 2); diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c index d9a5f66b47..3e0c367ee4 100644 --- a/epan/dissectors/packet-fix.c +++ b/epan/dissectors/packet-fix.c @@ -234,9 +234,7 @@ dissect_fix_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) int check_sum = 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, "FIX"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FIX"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } @@ -244,9 +242,7 @@ dissect_fix_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* get at least the fix version: 8=FIX.x.x */ if (fix_marker(tvb, 0) != 0) { /* not a fix packet start but it's a fix packet */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "[FIX continuation]"); - } + col_set_str(pinfo->cinfo, COL_INFO, "[FIX continuation]"); ti = proto_tree_add_item(tree, proto_fix, tvb, 0, -1, FALSE); fix_tree = proto_item_add_subtree(ti, ett_fix); proto_tree_add_item(fix_tree, hf_fix_data, tvb, 0, -1, FALSE); diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 6017cb9149..830fcbfdc7 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -3846,10 +3846,7 @@ static void dissect_giop_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree tvb_memcpy (giop_header_tvb, (guint8 *)&header, 0, GIOP_HEADER_SIZE ); - if (check_col (pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str (pinfo->cinfo, COL_PROTOCOL, "GIOP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GIOP"); if (header.GIOP_version.major != GIOP_MAJOR || ((minor_version = header.GIOP_version.minor) > GIOP_MINOR)) diff --git a/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c index d132447b1b..e7e61a6274 100644 --- a/epan/dissectors/packet-gprs-llc.c +++ b/epan/dissectors/packet-gprs-llc.c @@ -484,20 +484,14 @@ dissect_llcgprs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *uinfo_tree = NULL; /* END MLT CHANGES */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "GPRS-LLC"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GPRS-LLC"); addr_fld = tvb_get_guint8(tvb,offset); offset++; if (addr_fld > 128 ) { - if (check_col(pinfo->cinfo,COL_INFO)) - { - col_set_str(pinfo->cinfo,COL_INFO,"Invalid packet - Protocol Discriminator bit is set to 1"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Invalid packet - Protocol Discriminator bit is set to 1"); return; } diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c index 100252679b..8a0a373788 100644 --- a/epan/dissectors/packet-gsm_map.c +++ b/epan/dissectors/packet-gsm_map.c @@ -17595,10 +17595,7 @@ dissect_gsm_map(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, "GSM MAP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM MAP"); top_tree = parent_tree; diff --git a/epan/dissectors/packet-h261.c b/epan/dissectors/packet-h261.c index 59da18ca61..5c3135bd32 100644 --- a/epan/dissectors/packet-h261.c +++ b/epan/dissectors/packet-h261.c @@ -68,13 +68,9 @@ dissect_h261( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) proto_tree *h261_tree = NULL; unsigned int offset = 0; - if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) { - col_set_str( pinfo->cinfo, COL_PROTOCOL, "H.261" ); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.261"); - if ( check_col( pinfo->cinfo, COL_INFO) ) { - col_set_str( pinfo->cinfo, COL_INFO, "H.261 message"); - } + col_set_str(pinfo->cinfo, COL_INFO, "H.261 message"); if ( tree ) { ti = proto_tree_add_item( tree, proto_h261, tvb, offset, -1, FALSE ); diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c index dd4f8bbc53..410002a23f 100644 --- a/epan/dissectors/packet-h263p.c +++ b/epan/dissectors/packet-h263p.c @@ -88,9 +88,7 @@ dissect_h263P( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) tvbuff_t *next_tvb; */ - if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) { - col_set_str( pinfo->cinfo, COL_PROTOCOL, "H.263 RFC4629 " ); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.263 RFC4629 "); if ( tree ) { ti = proto_tree_add_item( tree, proto_h263P, tvb, offset, -1, FALSE ); diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c index 6cb5d1e364..c5bf4760c5 100644 --- a/epan/dissectors/packet-hpext.c +++ b/epan/dissectors/packet-hpext.c @@ -61,9 +61,7 @@ dissect_hpext(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 dxsap, sxsap; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "HPEXT"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "HPEXT"); dxsap = tvb_get_ntohs(tvb, 3); sxsap = tvb_get_ntohs(tvb, 5); diff --git a/epan/dissectors/packet-hpsw.c b/epan/dissectors/packet-hpsw.c index 9853166fa7..7e430687b9 100644 --- a/epan/dissectors/packet-hpsw.c +++ b/epan/dissectors/packet-hpsw.c @@ -85,13 +85,9 @@ dissect_hpsw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti = NULL; guint8 version; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "HP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "HP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "HP Switch Protocol"); - } + col_set_str(pinfo->cinfo, COL_INFO, "HP Switch Protocol"); version = tvb_get_guint8(tvb, 0); diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index f3ff65b50f..0f5520093e 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -2000,12 +2000,8 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr } if( pinfo->desegment_offset == 0 ) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IAX2"); - } - if (check_col(pinfo->cinfo, COL_INFO)){ - col_set_str(pinfo->cinfo, COL_INFO, "[IAX2 segment of a reassembled PDU]"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IAX2"); + col_set_str(pinfo->cinfo, COL_INFO, "[IAX2 segment of a reassembled PDU]"); } } diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c index f45cf05346..db6f76b850 100644 --- a/epan/dissectors/packet-icq.c +++ b/epan/dissectors/packet-icq.c @@ -451,12 +451,8 @@ dissect_icqv4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti = NULL; /* Not really implemented yet */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICQv4 (UDP)"); - } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "ICQ Version 4 protocol"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICQv4 (UDP)"); + col_set_str(pinfo->cinfo, COL_INFO, "ICQ Version 4 protocol"); if (tree) { ti = proto_tree_add_protocol_format(tree, proto_icq, tvb, 0, -1, "ICQv4"); @@ -474,12 +470,8 @@ dissect_icqv3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti = NULL; /* Not really implemented yet */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICQv3 (UDP)"); - } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "ICQ Version 3 protocol"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICQv3 (UDP)"); + col_set_str(pinfo->cinfo, COL_INFO, "ICQ Version 3 protocol"); if (tree) { ti = proto_tree_add_protocol_format(tree, proto_icq, tvb, 0, -1, "ICQv3"); @@ -497,12 +489,8 @@ dissect_icqv2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti = NULL; /* Not really implemented yet */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICQv2 (UDP)"); - } - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "ICQ Version 2 protocol"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICQv2 (UDP)"); + col_set_str(pinfo->cinfo, COL_INFO, "ICQ Version 2 protocol"); if (tree) { ti = proto_tree_add_protocol_format(tree, proto_icq, tvb, 0, -1, "ICQv2"); @@ -1740,9 +1728,7 @@ dissect_icq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (version < 2 || version > 5) return 0; /* This is not a (recognized) ICQ packet */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICQ"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICQ"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c index 684398c8fc..d00e4f4b08 100644 --- a/epan/dissectors/packet-iec104.c +++ b/epan/dissectors/packet-iec104.c @@ -427,9 +427,7 @@ static void dissect_iec104asdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if (!(check_col(pinfo->cinfo, COL_INFO) || tree)) return; /* Be sure that the function is only called twice */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "104asdu"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "104asdu"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } @@ -522,9 +520,7 @@ static void dissect_iec104apci(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr if (!(check_col(pinfo->cinfo, COL_INFO) || tree)) return; /* Be sure that the function is only called twice */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "104apci"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "104apci"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 7024a4a7af..1ccc32cc0c 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -423,9 +423,7 @@ dissect_ieee802154_nonask_phy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre } /* Add the protocol name. */ - if(check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE 802.15.4 non-ASK PHY"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE 802.15.4 non-ASK PHY"); /* Add the packet length. */ if(check_col(pinfo->cinfo, COL_PACKET_LENGTH)){ col_clear(pinfo->cinfo, COL_PACKET_LENGTH); @@ -585,9 +583,7 @@ dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g ieee802154_tree = proto_item_add_subtree(proto_root, ett_ieee802154); } /* Add the protocol name. */ - if(check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE 802.15.4"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE 802.15.4"); /* Add the packet length. */ if(check_col(pinfo->cinfo, COL_PACKET_LENGTH)){ col_clear(pinfo->cinfo, COL_PACKET_LENGTH); diff --git a/epan/dissectors/packet-ieee802a.c b/epan/dissectors/packet-ieee802a.c index 94408fa8ff..16906c93f8 100644 --- a/epan/dissectors/packet-ieee802a.c +++ b/epan/dissectors/packet-ieee802a.c @@ -91,9 +91,7 @@ dissect_ieee802a(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissector_table_t subdissector_table; int hf; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE802a"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IEEE802a"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c index 8bd7d44b97..0c690dd392 100644 --- a/epan/dissectors/packet-ifcp.c +++ b/epan/dissectors/packet-ifcp.c @@ -335,9 +335,7 @@ dissect_ifcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) return; } - if(check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "iFCP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "iFCP"); frame_len = (tvb_get_ntohs (tvb, offset+12) & 0x03FF)*4; diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c index d30e215027..9565a06da3 100644 --- a/epan/dissectors/packet-igap.c +++ b/epan/dissectors/packet-igap.c @@ -146,9 +146,7 @@ dissect_igap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off item = proto_tree_add_item(parent_tree, proto_igap, tvb, offset, -1, FALSE); tree = proto_item_add_subtree(item, ett_igap); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGAP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGAP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index d96acbd57d..affaf6fae8 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -909,9 +909,7 @@ dissect_igmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) tree = proto_item_add_subtree(item, ett_igmp); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGMP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGMP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c index 68c3302258..98e699ab85 100644 --- a/epan/dissectors/packet-inap.c +++ b/epan/dissectors/packet-inap.c @@ -9137,10 +9137,7 @@ dissect_inap(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, "INAP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "INAP"); /* create display subtree for the protocol */ if(parent_tree){ diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c index 44a0ba014b..3ca33d410a 100644 --- a/epan/dissectors/packet-ipmi.c +++ b/epan/dissectors/packet-ipmi.c @@ -1365,9 +1365,7 @@ dissect_ipmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti; ipmi_dissect_format_t dfmt; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPMI/ATCA"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPMI/ATCA"); current_pinfo = pinfo; diff --git a/epan/dissectors/packet-ipsi-ctl.c b/epan/dissectors/packet-ipsi-ctl.c index 33f24d51a5..1ac965550d 100644 --- a/epan/dissectors/packet-ipsi-ctl.c +++ b/epan/dissectors/packet-ipsi-ctl.c @@ -185,9 +185,7 @@ static void dissect_ipsictl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPSICTL"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPSICTL"); if (haspdus) { diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c index 80eb88737e..c83b8333bd 100644 --- a/epan/dissectors/packet-ipvs-syncd.c +++ b/epan/dissectors/packet-ipvs-syncd.c @@ -107,9 +107,7 @@ dissect_ipvs_syncd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) tree = proto_item_add_subtree(item, ett_ipvs_syncd); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPVS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPVS"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c index 4fb2bbb17b..060ecb6498 100644 --- a/epan/dissectors/packet-isakmp.c +++ b/epan/dissectors/packet-isakmp.c @@ -1016,9 +1016,7 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * 1 byte payload with the value 0xff. */ if( (tvb_length(tvb)==1) && (tvb_get_guint8(tvb, offset)==0xff) ){ - if (check_col(pinfo->cinfo, COL_INFO)){ - col_set_str(pinfo->cinfo, COL_INFO, "NAT Keepalive"); - } + col_set_str(pinfo->cinfo, COL_INFO, "NAT Keepalive"); proto_tree_add_item(isakmp_tree, hf_isakmp_nat_keepalive, tvb, offset, 1, FALSE); return; } diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c index 66f22330c0..b082083087 100644 --- a/epan/dissectors/packet-iuup.c +++ b/epan/dissectors/packet-iuup.c @@ -609,10 +609,7 @@ static void dissect_iuup(tvbuff_t* tvb_in, packet_info* pinfo, proto_tree* tree) guint16 crccheck; tvbuff_t* tvb = tvb_in; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IuUP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IuUP"); if (two_byte_pseudoheader) { int len = tvb_length(tvb_in) - 2; diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c index 589eab470a..b480976274 100644 --- a/epan/dissectors/packet-iwarp-ddp-rdmap.c +++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c @@ -265,9 +265,7 @@ ddp_rdma_packetlist(packet_info *pinfo, gboolean ddp_last_flag, { const gchar *ddp_fragment_state; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "DDP/RDMA"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "DDP/RDMA"); if (ddp_last_flag) { ddp_fragment_state = "[last DDP segment]"; diff --git a/epan/dissectors/packet-jpeg.c b/epan/dissectors/packet-jpeg.c index 56fe225683..87b4d7876f 100644 --- a/epan/dissectors/packet-jpeg.c +++ b/epan/dissectors/packet-jpeg.c @@ -86,13 +86,9 @@ dissect_jpeg( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) unsigned int offset = 0; - if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) { - col_set_str( pinfo->cinfo, COL_PROTOCOL, "JPEG" ); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "JPEG"); - if ( check_col( pinfo->cinfo, COL_INFO) ) { - col_set_str( pinfo->cinfo, COL_INFO, "JPEG message"); - } + col_set_str(pinfo->cinfo, COL_INFO, "JPEG message"); if ( tree ) { ti = proto_tree_add_item( tree, proto_jpeg, tvb, offset, -1, FALSE ); diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 49710f1ccc..9e377c9969 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -475,9 +475,7 @@ static int dissect_jxta_udp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tr return -needed; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "JXTA"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "JXTA"); if (tree) { guint tree_offset = 0; @@ -821,13 +819,9 @@ static int dissect_jxta_welcome(tvbuff_t * tvb, packet_info * pinfo, proto_tree /* Dissect the Welcome Message */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "JXTA"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "JXTA"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Welcome"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Welcome"); { gchar *welcomeline = tvb_get_ephemeral_string(tvb, offset, first_linelen); @@ -1321,9 +1315,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree ep_strbuf_append_printf(dst_addr, ":%d", pinfo->destport); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "JXTA"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "JXTA"); if (check_col(pinfo->cinfo, COL_INFO)) { if( complete_messages > 1 ) { diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c index 23ef5bb7be..e2572575c3 100644 --- a/epan/dissectors/packet-kdp.c +++ b/epan/dissectors/packet-kdp.c @@ -83,9 +83,7 @@ static void dissect_kdp(tvbuff_t *tvb, guint32 src_flowid = G_MAXUINT32; int offset; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "KDP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "KDP"); 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 0a49939182..58b088dcf6 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -4635,9 +4635,7 @@ dissect_kerberos_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * The dissector failed to recognize this as a valid * Kerberos message. Mark it as a continuation packet. */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); } } diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c index 440fa2ff0b..9bdef6179e 100644 --- a/epan/dissectors/packet-kink.c +++ b/epan/dissectors/packet-kink.c @@ -197,9 +197,7 @@ dissect_kink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree){ type = tvb_get_guint8(tvb,offset); - if(check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "KINK"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "KINK"); /* It shows kink type by the type value. */ if(check_col(pinfo->cinfo, COL_INFO)){ diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c index 3a7b57690a..e897eee104 100644 --- a/epan/dissectors/packet-kpasswd.c +++ b/epan/dissectors/packet-kpasswd.c @@ -276,9 +276,7 @@ dissect_kpasswd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) * The dissector failed to recognize this as a valid * Kerberos message. Mark it as a continuation packet. */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Continuation"); } } diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c index 8e743e541e..e994d72d25 100644 --- a/epan/dissectors/packet-llc.c +++ b/epan/dissectors/packet-llc.c @@ -418,9 +418,7 @@ dissect_basicxid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti = NULL; guint8 format, types, wsize; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "XID"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "XID"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } @@ -470,9 +468,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 dsap, ssap, format; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLC"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLC"); 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 9530661cf9..b3626fc0ac 100644 --- a/epan/dissectors/packet-manolito.c +++ b/epan/dissectors/packet-manolito.c @@ -107,10 +107,7 @@ dissect_manolito(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tvb_reported_length(tvb) <= 20) /* no payload, just headers */ { - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_set_str(pinfo->cinfo, COL_INFO, "Ping"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Ping"); } else { offset = 20; /* fields start here */ diff --git a/epan/dissectors/packet-mpeg1.c b/epan/dissectors/packet-mpeg1.c index b707609d68..a1e6b17dba 100644 --- a/epan/dissectors/packet-mpeg1.c +++ b/epan/dissectors/packet-mpeg1.c @@ -125,15 +125,9 @@ dissect_mpeg1( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) guint16 mpg_ffv; guint16 mpg_ffc; - if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) - { - col_set_str( pinfo->cinfo, COL_PROTOCOL, "MPEG-1" ); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG-1"); - if ( check_col( pinfo->cinfo, COL_INFO) ) - { - col_set_str( pinfo->cinfo, COL_INFO, "MPEG-1 message"); - } + col_set_str(pinfo->cinfo, COL_INFO, "MPEG-1 message"); /* Get MPEG-1 fields */ diff --git a/epan/dissectors/packet-mpls.c b/epan/dissectors/packet-mpls.c index 6d77b1e803..308472b656 100644 --- a/epan/dissectors/packet-mpls.c +++ b/epan/dissectors/packet-mpls.c @@ -709,13 +709,9 @@ dissect_mpls(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, "MPLS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPLS"); - if (check_col(pinfo->cinfo,COL_INFO)) { - col_set_str(pinfo->cinfo,COL_INFO,"MPLS Label Switched Packet"); - } + col_set_str(pinfo->cinfo, COL_INFO, "MPLS Label Switched Packet"); /* Start Decoding Here. */ while (tvb_reported_length_remaining(tvb, offset) > 0) { diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c index d4174b6294..05b34d7a4e 100644 --- a/epan/dissectors/packet-mrdisc.c +++ b/epan/dissectors/packet-mrdisc.c @@ -203,9 +203,7 @@ dissect_mrdisc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int o tree = proto_item_add_subtree(item, ett_mrdisc); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MRDISC"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MRDISC"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c index 6fb04cc917..fc6cacc210 100644 --- a/epan/dissectors/packet-ms-mms.c +++ b/epan/dissectors/packet-ms-mms.c @@ -390,14 +390,8 @@ static gint dissect_msmms_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree /* Set columns */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSMMS"); - } - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_set_str(pinfo->cinfo, COL_INFO, "Command: "); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSMMS"); + col_set_str(pinfo->cinfo, COL_INFO, "Command: "); /* Add hidden filter for "msmms.command" */ ti = proto_tree_add_item(tree, hf_msmms_command, tvb, 0, 0, FALSE); @@ -586,10 +580,7 @@ static gint dissect_msmms_data_udp_command(tvbuff_t *tvb, packet_info *pinfo, pr gint offset = 0; /* Set protocol column */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSMMS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSMMS"); /* Create MSMMS data protocol tree */ if (tree) @@ -610,10 +601,7 @@ static gint dissect_msmms_data_udp_command(tvbuff_t *tvb, packet_info *pinfo, pr proto_tree_add_item(msmms_tree, hf_msmms_data_command_id, tvb, offset, 2, TRUE); offset += 4; - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_set_str(pinfo->cinfo, COL_INFO, "Request to resend packet(s):"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Request to resend packet(s):"); /* Show list of packets to resend */ while (tvb_reported_length_remaining(tvb, offset) >= 4) @@ -678,10 +666,7 @@ static gint dissect_msmms_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr } } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSMMS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSMMS"); /* Add hidden filter for "msmms.data" */ proto_tree_add_item(tree, hf_msmms_data, tvb, 0, 0, FALSE); diff --git a/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c index 2df63aed53..6ee5ac4ed3 100644 --- a/epan/dissectors/packet-msnip.c +++ b/epan/dissectors/packet-msnip.c @@ -233,9 +233,7 @@ dissect_msnip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int of tree = proto_item_add_subtree(item, ett_msnip); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSNIP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSNIP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c index 74f20136a3..ce32397400 100644 --- a/epan/dissectors/packet-mstp.c +++ b/epan/dissectors/packet-mstp.c @@ -163,9 +163,7 @@ dissect_mstp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, #endif 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"); - } + col_set_str(pinfo->cinfo, COL_INFO, "BACnet MS/TP"); mstp_frame_type = tvb_get_guint8(tvb, offset); mstp_frame_destination = tvb_get_guint8(tvb, offset+1); mstp_frame_source = tvb_get_guint8(tvb, offset+2); diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index f8a3e53e0a..7dbfa0182e 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -1195,9 +1195,7 @@ dissect_mysql_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } offset+= 3; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "MySQL"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "MySQL"); if (pinfo->destport == pinfo->match_port) { is_response= FALSE; @@ -1232,29 +1230,21 @@ dissect_mysql_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (is_response) { if (packet_number == 0) { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Server Greeting" ); - } + col_set_str(pinfo->cinfo, COL_INFO, "Server Greeting"); offset= mysql_dissect_greeting(tvb, pinfo, offset, mysql_tree, conn_data); } else { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Response" ); - } + col_set_str(pinfo->cinfo, COL_INFO, "Response"); offset= mysql_dissect_response(tvb, pinfo, offset, mysql_tree, conn_data); } } else { if (packet_number == 1) { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Login Request"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Login Request"); offset= mysql_dissect_login(tvb, pinfo, offset, mysql_tree, conn_data); } else { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Request"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Request"); offset= mysql_dissect_request(tvb, pinfo, offset, mysql_tree, conn_data); } diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c index cfefea2203..087a73a163 100644 --- a/epan/dissectors/packet-nbd.c +++ b/epan/dissectors/packet-nbd.c @@ -191,9 +191,7 @@ dissect_nbd_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) nbd_transaction_t *nbd_trans=NULL; emem_tree_key_t hkey[3]; - if(check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBD"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBD"); if(check_col(pinfo->cinfo, COL_INFO)){ col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c index 812e719eec..cc51d32c93 100644 --- a/epan/dissectors/packet-ncp-nmas.c +++ b/epan/dissectors/packet-ncp-nmas.c @@ -299,9 +299,7 @@ dissect_nmas_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, nc foffset += 1; /* Fill in the INFO column. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NMAS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NMAS"); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "C NMAS - %s", val_to_str(subfunc, nmas_func_enum, "Unknown (0x%02x)")); @@ -494,9 +492,7 @@ dissect_nmas_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guin subverb = request_value->req_nds_flags; msgverb = request_value->nds_request_verb; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NMAS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NMAS"); if (tvb_reported_length_remaining(tvb, foffset)<4) { return; } diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c index 964e3b2143..6d9249f498 100644 --- a/epan/dissectors/packet-ncp-sss.c +++ b/epan/dissectors/packet-ncp-sss.c @@ -578,9 +578,7 @@ dissect_sss_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, ncp foffset += 1; /* Fill in the PROTOCOL & INFO columns. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NSSS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NSSS"); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "C SecretStore - %s", val_to_str(subfunc, sss_func_enum, "Unknown (%d)")); } @@ -728,9 +726,7 @@ dissect_sss_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guint subverb = request_value->req_nds_flags; msgverb = request_value->nds_request_verb; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NSSS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NSSS"); if (tvb_length_remaining(tvb, foffset)<4) { return; } diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c index f0b6b04407..df6d493d0d 100644 --- a/epan/dissectors/packet-ncp.c +++ b/epan/dissectors/packet-ncp.c @@ -654,10 +654,7 @@ dissect_ncp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, break; } else { if (tvb_get_guint8(tvb, commhdr + 2) & 0x10) { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, - "End of Burst"); - } + col_set_str(pinfo->cinfo, COL_INFO, "End of Burst"); } } break; diff --git a/epan/dissectors/packet-netdump.c b/epan/dissectors/packet-netdump.c index 834ac19b49..8794970dc2 100644 --- a/epan/dissectors/packet-netdump.c +++ b/epan/dissectors/packet-netdump.c @@ -99,9 +99,7 @@ dissect_netdump(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tvb_reported_length(tvb) == 0) return; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Netdump"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Netdump"); /* 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-netsync.c b/epan/dissectors/packet-netsync.c index a5685eb350..c839280be8 100644 --- a/epan/dissectors/packet-netsync.c +++ b/epan/dissectors/packet-netsync.c @@ -466,9 +466,7 @@ dissect_netsync_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ti,*netsync_tree=NULL; /* Set the protocol column */ - if (check_col(pinfo->cinfo,COL_PROTOCOL)) { - col_set_str(pinfo->cinfo,COL_PROTOCOL,"Netsync"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Netsync"); if (tree == NULL) diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c index 585e76880a..e3ceef7af0 100644 --- a/epan/dissectors/packet-nhrp.c +++ b/epan/dissectors/packet-nhrp.c @@ -840,9 +840,7 @@ void dissect_nhrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *nhrp_tree = NULL; oui_info_t *oui_info; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "NHRP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "NHRP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-omapi.c b/epan/dissectors/packet-omapi.c index c435d4d839..d464fb3515 100644 --- a/epan/dissectors/packet-omapi.c +++ b/epan/dissectors/packet-omapi.c @@ -108,10 +108,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 objlength; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "OMAPI"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "OMAPI"); if (check_col(pinfo->cinfo, COL_INFO)) { @@ -133,10 +130,7 @@ dissect_omapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ptvcursor_add(cursor, hf_omapi_version, 4, FALSE); ptvcursor_add(cursor, hf_omapi_hlength, 4, FALSE); - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_set_str(pinfo->cinfo, COL_INFO, "Status message"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Status message"); proto_item_append_text(ti, ", Status message"); return; diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c index fbc7e29058..872d3dce6e 100644 --- a/epan/dissectors/packet-osi.c +++ b/epan/dissectors/packet-osi.c @@ -264,21 +264,15 @@ static void dissect_osi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* ESIS (X.25) is not currently decoded */ case NLPID_ISO9542X25_ESIS: - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESIS (X.25)"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESIS (X.25)"); call_dissector(data_handle,tvb, pinfo, tree); break; case NLPID_ISO10747_IDRP: - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "IDRP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "IDRP"); call_dissector(data_handle,tvb, pinfo, tree); break; default: - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISO"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISO"); if (check_col(pinfo->cinfo, COL_INFO)) { col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown ISO protocol (%02x)", nlpid); } diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 517e8cab0b..78b44e1ac8 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -3735,9 +3735,7 @@ dissect_ppp_raw_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) * None found - this is presumably continued from an earlier * packet and continued in a later packet. */ - if (check_col(pinfo->cinfo, COL_INFO)){ - col_set_str(pinfo->cinfo, COL_INFO,"PPP Fragment"); - } + col_set_str(pinfo->cinfo, COL_INFO, "PPP Fragment"); if (tree) proto_tree_add_text(bs_tree, tvb, offset, -1, "PPP Fragment"); offset++; @@ -3754,9 +3752,7 @@ dissect_ppp_raw_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) * We have some data preceding the first PPP packet; * mark it as a PPP fragment. */ - if(check_col(pinfo->cinfo, COL_INFO)){ - col_set_str(pinfo->cinfo, COL_INFO,"PPP Fragment"); - } + col_set_str(pinfo->cinfo, COL_INFO, "PPP Fragment"); length = offset; if (tree) proto_tree_add_text(bs_tree, tvb, 0, length, "PPP Fragment"); @@ -3779,9 +3775,7 @@ dissect_ppp_raw_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) * a later packet. */ if (first) { - if(check_col(pinfo->cinfo, COL_INFO)){ - col_set_str(pinfo->cinfo, COL_INFO,"PPP Fragment"); - } + col_set_str(pinfo->cinfo, COL_INFO, "PPP Fragment"); } if (tree) proto_tree_add_text(bs_tree, tvb, offset, -1, "PPP Fragment"); diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c index 2b48293306..b161a80dcf 100644 --- a/epan/dissectors/packet-pppoe.c +++ b/epan/dissectors/packet-pppoe.c @@ -425,10 +425,7 @@ static void dissect_pppoed(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *pppoe_tree = NULL; proto_item *ti; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPPoED"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPPoED"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); @@ -679,10 +676,7 @@ static void dissect_pppoes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti = NULL; tvbuff_t *next_tvb; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo,COL_PROTOCOL, "PPPoES"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPPoES"); if (check_col(pinfo->cinfo,COL_INFO)) { col_clear(pinfo->cinfo,COL_INFO); diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c index b3bb2fca5b..63c920b21d 100644 --- a/epan/dissectors/packet-pw-atm.c +++ b/epan/dissectors/packet-pw-atm.c @@ -488,11 +488,7 @@ gboolean too_small_packet_or_notpw(tvbuff_t * tvb { col_set_str(pinfo->cinfo, COL_PROTOCOL, proto_name_column); } - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_set_str(pinfo->cinfo, COL_INFO, - "Malformed: PW packet is too small"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Malformed: PW packet is too small"); return TRUE; } if (dissect_try_cw_first_nibble(tvb, pinfo, tree)) diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c index be77883010..5a4a39926f 100644 --- a/epan/dissectors/packet-pw-cesopsn.c +++ b/epan/dissectors/packet-pw-cesopsn.c @@ -106,11 +106,7 @@ static void dissect_pw_cesopsn( tvbuff_t * tvb_original, packet_info * pinfo, pr { col_set_str(pinfo->cinfo, COL_PROTOCOL, shortname); } - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_set_str(pinfo->cinfo, COL_INFO, - "Malformed: PW packet is too small"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Malformed: PW packet is too small"); return; } diff --git a/epan/dissectors/packet-pw-fr.c b/epan/dissectors/packet-pw-fr.c index 1952e2d51d..27acb0fe8c 100644 --- a/epan/dissectors/packet-pw-fr.c +++ b/epan/dissectors/packet-pw-fr.c @@ -93,15 +93,8 @@ dissect_pw_fr( tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree ) "PW packet (%d) is smaller than PW encapsulation header (%d)" ,(int)packet_size,(int)encaps_size); } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR PW"); - } - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_set_str(pinfo->cinfo, COL_INFO, - "Malformed: PW packet < PW encapsulation header"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR PW"); + col_set_str(pinfo->cinfo, COL_INFO, "Malformed: PW packet < PW encapsulation header"); return; } @@ -171,10 +164,7 @@ dissect_pw_fr( tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree ) packet_quality |= PQ_PAYLOAD_SIZE_ZERO; } - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR PW"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR PW"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c index 5db068eb1f..f46e3ad832 100644 --- a/epan/dissectors/packet-pw-satop.c +++ b/epan/dissectors/packet-pw-satop.c @@ -102,11 +102,7 @@ static void dissect_pw_satop(tvbuff_t * tvb_original, packet_info * pinfo, proto { col_set_str(pinfo->cinfo, COL_PROTOCOL, shortname); } - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_set_str(pinfo->cinfo, COL_INFO, - "Malformed: PW packet is too small"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Malformed: PW packet is too small"); return; } diff --git a/epan/dissectors/packet-quake3.c b/epan/dissectors/packet-quake3.c index 4fb3f3992e..89c244196e 100644 --- a/epan/dissectors/packet-quake3.c +++ b/epan/dissectors/packet-quake3.c @@ -505,9 +505,7 @@ dissect_quake3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (tvb_get_ntohl(tvb, 0) == 0xffffffff) { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Connectionless "); - } + col_set_str(pinfo->cinfo, COL_INFO, "Connectionless "); if (quake3_tree) proto_tree_add_uint_format(quake3_tree, hf_quake3_connectionless, @@ -517,9 +515,7 @@ dissect_quake3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb, pinfo, quake3_tree, &direction); } else { - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Game "); - } + col_set_str(pinfo->cinfo, COL_INFO, "Game "); if (quake3_tree) proto_tree_add_uint_format(quake3_tree, hf_quake3_game, diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c index cc79adf3e6..9664a5c259 100644 --- a/epan/dissectors/packet-rdt.c +++ b/epan/dissectors/packet-rdt.c @@ -302,10 +302,7 @@ static void dissect_rdt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 packet_type; /* Set/clear columns */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RDT"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RDT"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c index e63ce962cd..0ae81215f8 100644 --- a/epan/dissectors/packet-retix-bpdu.c +++ b/epan/dissectors/packet-retix-bpdu.c @@ -65,9 +65,7 @@ dissect_retix_bpdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree *ti; const guint8 *bridge_mac_str; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "R-STP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "R-STP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c index 1d8e8fe1c1..ea41569335 100644 --- a/epan/dissectors/packet-rfc2190.c +++ b/epan/dissectors/packet-rfc2190.c @@ -91,9 +91,7 @@ dissect_rfc2190( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) rfc2190_version = (tvb_get_guint8( tvb, offset ) & 0xc0 ) >> 6; - if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) { - col_set_str( pinfo->cinfo, COL_PROTOCOL, "H.263 " ); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "H.263 "); if( rfc2190_version == 0x00) { if ( check_col( pinfo->cinfo, COL_INFO) ) { diff --git a/epan/dissectors/packet-rgmp.c b/epan/dissectors/packet-rgmp.c index 49f28563b0..146f087484 100644 --- a/epan/dissectors/packet-rgmp.c +++ b/epan/dissectors/packet-rgmp.c @@ -77,9 +77,7 @@ dissect_rgmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int off item = proto_tree_add_item(parent_tree, proto_rgmp, tvb, offset, -1, FALSE); tree = proto_item_add_subtree(item, ett_rgmp); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RGMP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RGMP"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c index 0ed58d7503..c3008116a4 100644 --- a/epan/dissectors/packet-rlogin.c +++ b/epan/dissectors/packet-rlogin.c @@ -424,10 +424,7 @@ dissect_rlogin(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Set protocol column text */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "Rlogin"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Rlogin"); /* Set info column */ if (check_col(pinfo->cinfo, COL_INFO)) diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c index 62c8e07645..e9088a388c 100644 --- a/epan/dissectors/packet-rmp.c +++ b/epan/dissectors/packet-rmp.c @@ -106,9 +106,7 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *ti = NULL; guint8 type, len; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RMP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RMP"); 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 f725a50c5f..d1d407ea61 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -2619,9 +2619,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * protocol and info fields to indicate that this is * an RPC auth level message, then process the args. */ - 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_clear(pinfo->cinfo, COL_INFO); col_append_fstr(pinfo->cinfo, COL_INFO, diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 629d109ec7..9f047e2209 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -2532,9 +2532,7 @@ dissect_rtcp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) guint32 srtcp_offset = 0; guint32 srtcp_index = 0; - if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) { - col_set_str( pinfo->cinfo, COL_PROTOCOL, "RTCP" ); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTCP"); /* first see if this conversation is encrypted SRTP, and if so do not try to dissect the payload(s) */ p_conv = find_conversation(pinfo->fd->num, &pinfo->net_src, &pinfo->net_dst, diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c index a6661c1c7d..83bbc380b0 100644 --- a/epan/dissectors/packet-rtnet.c +++ b/epan/dissectors/packet-rtnet.c @@ -400,9 +400,7 @@ dissect_rtnet_tdma_v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root) { msg = tvb_get_ntohl(tvb, offset); /* Set the protocol column */ - if (check_col(pinfo->cinfo,COL_PROTOCOL)){ - col_set_str(pinfo->cinfo,COL_PROTOCOL,"TDMA-V1"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TDMA-V1"); /* set the info column */ if (check_col(pinfo->cinfo, COL_INFO)) { @@ -519,9 +517,7 @@ dissect_rtnet_tdma(tvbuff_t *tvb, packet_info *pinfo, proto_tree *root) { msg = tvb_get_ntohs(tvb, 2); /* Set the protocol column */ - if (check_col(pinfo->cinfo,COL_PROTOCOL)){ - col_set_str(pinfo->cinfo,COL_PROTOCOL,"TDMA"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TDMA"); /* Set the info column */ if (check_col(pinfo->cinfo, COL_INFO)) { @@ -596,9 +592,7 @@ dissect_rtmac(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { } /* Set the protocol column */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTmac"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTmac"); /* set the info column */ if (check_col(pinfo->cinfo, COL_INFO)) { @@ -682,9 +676,7 @@ dissect_rtcfg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { const guint8 *haddr; /* Set the protocol column */ - if(check_col(pinfo->cinfo,COL_PROTOCOL)){ - col_set_str(pinfo->cinfo,COL_PROTOCOL,"RTcfg"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTcfg"); /* Clear out stuff in the info column */ if(check_col(pinfo->cinfo,COL_INFO)){ diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c index d14de2cb82..e47b777c31 100644 --- a/epan/dissectors/packet-rtp-events.c +++ b/epan/dissectors/packet-rtp-events.c @@ -92,10 +92,7 @@ dissect_rtp_events( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) guint8 rtp_evt; guint8 octet; - if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) - { - col_set_str( pinfo->cinfo, COL_PROTOCOL, "RTP EVENT" ); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTP EVENT"); col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 82c6d7c6d0..e849f45f1a 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -883,14 +883,8 @@ dissect_rtp_data( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, if( pinfo->desegment_offset == 0 ) { - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTP"); - } - if (check_col(pinfo->cinfo, COL_INFO)) - { - col_set_str(pinfo->cinfo, COL_INFO, "[RTP segment of a reassembled PDU]"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTP"); + col_set_str(pinfo->cinfo, COL_INFO, "[RTP segment of a reassembled PDU]"); } } @@ -1064,9 +1058,7 @@ dissect_rtp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) /* * Unknown or unsupported version. */ - if ( check_col( pinfo->cinfo, COL_PROTOCOL ) ) { - col_set_str( pinfo->cinfo, COL_PROTOCOL, "RTP" ); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTP"); if ( check_col( pinfo->cinfo, COL_INFO) ) { col_add_fstr( pinfo->cinfo, COL_INFO, diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index c009fe0d69..3f84d62102 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -5591,9 +5591,7 @@ static gboolean dissect_rtps(tvbuff_t *tvb, if (tvb_get_guint8(tvb,offset+4) != 1) return FALSE; /* --- Make entries in Protocol column ---*/ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTPS"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTPS"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c index e3529e0f84..c0571abba9 100644 --- a/epan/dissectors/packet-rtps2.c +++ b/epan/dissectors/packet-rtps2.c @@ -8180,9 +8180,7 @@ static gboolean dissect_rtps(tvbuff_t *tvb, } /* --- Make entries in Protocol column ---*/ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTPS2"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTPS2"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c index 8eb82236ee..f2ce069da0 100644 --- a/epan/dissectors/packet-s5066.c +++ b/epan/dissectors/packet-s5066.c @@ -1299,9 +1299,7 @@ dissect_s5066_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Determine PDU type to display in INFO column */ guint8 pdu_type = tvb_get_guint8(tvb, s5066_header_size); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "S5066"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "S5066"); /* Clear out stuff in the info column, the add PDU type */ if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index e1e4f7f4bb..dae12660df 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -2677,13 +2677,9 @@ dissect_skinny(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, "SKINNY"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SKINNY"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Skinny Client Control Protocol"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Skinny Client Control Protocol"); tcp_dissect_pdus(tvb, pinfo, tree, skinny_desegment, 4, get_skinny_pdu_len, dissect_skinny_pdu); diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c index 87328bae18..7bd9a17866 100644 --- a/epan/dissectors/packet-smb-browse.c +++ b/epan/dissectors/packet-smb-browse.c @@ -571,9 +571,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr int i; guint32 uptime; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BROWSER"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BROWSER"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } @@ -816,9 +814,7 @@ dissect_mailslot_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr const guint8 *host_name; guint namelen; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "BROWSER"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "BROWSER"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-smb-mailslot.c b/epan/dissectors/packet-smb-mailslot.c index a6d89ab56f..25cdfe5348 100644 --- a/epan/dissectors/packet-smb-mailslot.c +++ b/epan/dissectors/packet-smb-mailslot.c @@ -99,15 +99,11 @@ dissect_mailslot_smb(tvbuff_t *mshdr_tvb, tvbuff_t *setup_tvb, } pinfo->current_proto = "SMB Mailslot"; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB Mailslot"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB Mailslot"); if ((tvb==NULL) || (tvb_reported_length(tvb)==0)) { /* Interim reply */ - if (check_col (pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Interim reply"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Interim reply"); return TRUE; } diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index 825e9b661a..9826475e6f 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -2651,9 +2651,7 @@ dissect_pipe_lanman(tvbuff_t *pd_tvb, tvbuff_t *p_tvb, tvbuff_t *d_tvb, } pinfo->current_proto = "LANMAN"; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "LANMAN"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "LANMAN"); if (parent_tree) { item = proto_tree_add_item(parent_tree, proto_smb_lanman, @@ -3539,9 +3537,7 @@ dissect_pipe_smb(tvbuff_t *sp_tvb, tvbuff_t *s_tvb, tvbuff_t *pd_tvb, /* * Set the columns. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB Pipe"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB Pipe"); if (check_col(pinfo->cinfo, COL_INFO)) { col_set_str(pinfo->cinfo, COL_INFO, smb_info->request ? "Request" : "Response"); diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c index b6d4395a52..05468fc6d6 100644 --- a/epan/dissectors/packet-smb.c +++ b/epan/dissectors/packet-smb.c @@ -16261,9 +16261,7 @@ dissect_smb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) top_tree=parent_tree; - if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB"); if (check_col(pinfo->cinfo, COL_INFO)){ col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c index 0f78bb3b6f..088b85913f 100644 --- a/epan/dissectors/packet-smb2.c +++ b/epan/dissectors/packet-smb2.c @@ -5263,9 +5263,7 @@ dissect_smb2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, gboolea } - if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB2"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB2"); if (check_col(pinfo->cinfo, COL_INFO)){ if (first_in_chain) { /* first packet */ diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index a088bde709..9797e056e3 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -615,10 +615,7 @@ dissect_ssl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Initialize the protocol column; we'll set it later when we * figure out what flavor of SSL it is (assuming we don't * throw an exception before we get the chance to do so). */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SSL"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SSL"); /* clear the the info column */ col_clear(pinfo->cinfo, COL_INFO); @@ -1171,12 +1168,8 @@ again: * of the payload, and that's 0). * Just mark this as SSL. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "SSL"); - } - if (check_col(pinfo->cinfo, COL_INFO)){ - col_set_str(pinfo->cinfo, COL_INFO, "[SSL segment of a reassembled PDU]"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "SSL"); + col_set_str(pinfo->cinfo, COL_INFO, "[SSL segment of a reassembled PDU]"); } /* diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c index b1753b66b8..cea4d782f8 100644 --- a/epan/dissectors/packet-starteam.c +++ b/epan/dissectors/packet-starteam.c @@ -486,9 +486,7 @@ dissect_starteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gint offset = 0; static gint iPreviousFrameNumber = -1; - if(check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "StarTeam"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "StarTeam"); 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-t125.c b/epan/dissectors/packet-t125.c index c1f61a9549..32e2e67e57 100644 --- a/epan/dissectors/packet-t125.c +++ b/epan/dissectors/packet-t125.c @@ -2134,9 +2134,7 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) gboolean pc; gint32 tag; - if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.125"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.125"); if (check_col(pinfo->cinfo, COL_INFO)){ col_clear(pinfo->cinfo, COL_INFO); } @@ -2149,9 +2147,7 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) if ( (class==BER_CLASS_APP) && (tag>=101) && (tag<=104) ){ dissect_ConnectMCSPDU_PDU(tvb, pinfo, tree); } else { - if (check_col(pinfo->cinfo, COL_INFO)){ - col_set_str(pinfo->cinfo, COL_INFO, "T.125 payload"); - } + col_set_str(pinfo->cinfo, COL_INFO, "T.125 payload"); proto_tree_add_text(tree, tvb, 0, -1, "T.125 payload"); } diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 0b0d44241e..435d104438 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -1093,9 +1093,7 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } - if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38"); if (check_col(pinfo->cinfo, COL_INFO)){ col_clear(pinfo->cinfo, COL_INFO); } @@ -1142,9 +1140,7 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *next_tvb; guint16 ifp_packet_number=1; - if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "T.38"); if (check_col(pinfo->cinfo, COL_INFO)){ col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c index 0c20ea30ba..ab7d20a615 100644 --- a/epan/dissectors/packet-tcap.c +++ b/epan/dissectors/packet-tcap.c @@ -1481,10 +1481,7 @@ dissect_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) tcap_top_tree = parent_tree; tcap_stat_tree = NULL; - if (check_col(pinfo->cinfo, COL_PROTOCOL)) - { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TCAP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TCAP"); /* create display subtree for the protocol */ if(parent_tree){ diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 7a1c1553c6..d76fceba27 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -1890,12 +1890,8 @@ again: * of the payload, and that's 0). * Just mark this as TCP. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TCP"); - } - if (check_col(pinfo->cinfo, COL_INFO)){ - col_set_str(pinfo->cinfo, COL_INFO, "[TCP segment of a reassembled PDU]"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TCP"); + col_set_str(pinfo->cinfo, COL_INFO, "[TCP segment of a reassembled PDU]"); } /* diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c index c99dc6c042..32cdc65a30 100644 --- a/epan/dissectors/packet-teamspeak2.c +++ b/epan/dissectors/packet-teamspeak2.c @@ -706,9 +706,7 @@ static void dissect_ts2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 class = tvb_get_letohs(tvb, 0); conversation_data = ts2_get_conversation(pinfo); - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "TS2"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "TS2"); /* 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-vnc.c b/epan/dissectors/packet-vnc.c index 14207aeed6..1979275317 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -764,10 +764,7 @@ vnc_startup_messages(tvbuff_t *tvb, packet_info *pinfo, gint offset, break; case SECURITY_TYPES : - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, - "Authentication type selected by client"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Authentication type selected by client"); proto_tree_add_item(tree, hf_vnc_client_security_type, tvb, offset, 1, FALSE); per_conversation_info->security_type_selected = diff --git a/epan/dissectors/packet-wccp.c b/epan/dissectors/packet-wccp.c index f771cbdc22..934acf86e4 100644 --- a/epan/dissectors/packet-wccp.c +++ b/epan/dissectors/packet-wccp.c @@ -210,9 +210,7 @@ dissect_wccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (match_strval(wccp_message_type, wccp_type_vals) == NULL) return 0; - if(check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "WCCP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "WCCP"); if(check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-winsrepl.c b/epan/dissectors/packet-winsrepl.c index 66625b9d90..d13e65f83e 100644 --- a/epan/dissectors/packet-winsrepl.c +++ b/epan/dissectors/packet-winsrepl.c @@ -573,72 +573,56 @@ dissect_winsrepl_replication(tvbuff_t *winsrepl_tvb, packet_info *pinfo, switch (command) { case WREPL_REPL_TABLE_QUERY: - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_TABLE_QUERY"); - } + col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_TABLE_QUERY"); proto_item_append_text(winsrepl_item, ", WREPL_REPL_TABLE_QUERY"); proto_item_append_text(repl_item, ", WREPL_REPL_TABLE_QUERY"); winsrepl_offset = dissect_winsrepl_table_query(winsrepl_tvb, pinfo, winsrepl_offset, repl_tree); break; case WREPL_REPL_TABLE_REPLY: - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_TABLE_REPLY"); - } + col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_TABLE_REPLY"); proto_item_append_text(winsrepl_item, ", WREPL_REPL_TABLE_REPLY"); proto_item_append_text(repl_item, ", WREPL_REPL_TABLE_REPLY"); winsrepl_offset = dissect_winsrepl_table_reply(winsrepl_tvb, pinfo, winsrepl_offset, repl_tree); break; case WREPL_REPL_SEND_REQUEST: - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_SEND_REQUEST"); - } + col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_SEND_REQUEST"); proto_item_append_text(winsrepl_item, ", WREPL_REPL_SEND_REQUEST"); proto_item_append_text(repl_item, ", WREPL_REPL_SEND_REQUEST"); winsrepl_offset = dissect_winsrepl_send_request(winsrepl_tvb, pinfo, winsrepl_offset, repl_tree); break; case WREPL_REPL_SEND_REPLY: - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_SEND_REPLY"); - } + col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_SEND_REPLY"); proto_item_append_text(winsrepl_item, ", WREPL_REPL_SEND_REPLY"); proto_item_append_text(repl_item, ", WREPL_REPL_SEND_REPLY"); winsrepl_offset = dissect_winsrepl_send_reply(winsrepl_tvb, pinfo, winsrepl_offset, repl_tree); break; case WREPL_REPL_UPDATE: - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_UPDATE"); - } + col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_UPDATE"); proto_item_append_text(winsrepl_item, ", WREPL_REPL_UPDATE"); proto_item_append_text(repl_item, ", WREPL_REPL_UPDATE"); winsrepl_offset = dissect_winsrepl_update(winsrepl_tvb, pinfo, winsrepl_offset, repl_tree); break; case WREPL_REPL_UPDATE2: - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_UPDATE2"); - } + col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_UPDATE2"); proto_item_append_text(winsrepl_item, ",WREPL_REPL_UPDATE2"); proto_item_append_text(repl_item, ",WREPL_REPL_UPDATE2"); winsrepl_offset = dissect_winsrepl_update2(winsrepl_tvb, pinfo, winsrepl_offset, repl_tree); break; case WREPL_REPL_INFORM: - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_INFORM"); - } + col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_INFORM"); proto_item_append_text(winsrepl_item, ", WREPL_REPL_INFORM"); proto_item_append_text(repl_item, ", WREPL_REPL_INFORM"); winsrepl_offset = dissect_winsrepl_inform(winsrepl_tvb, pinfo, winsrepl_offset, repl_tree); break; case WREPL_REPL_INFORM2: - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_INFORM2"); - } + col_set_str(pinfo->cinfo, COL_INFO, "WREPL_REPL_INFORM2"); proto_item_append_text(winsrepl_item, ", WREPL_REPL_INFORM2"); proto_item_append_text(repl_item, ", WREPL_REPL_INFORM2"); winsrepl_offset = dissect_winsrepl_inform2(winsrepl_tvb, pinfo, @@ -657,9 +641,7 @@ dissect_winsrepl_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) proto_tree *winsrepl_tree = NULL; enum wrepl_mess_type mess_type; - if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "WINS-Replication"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "WINS-Replication"); if (check_col(pinfo->cinfo, COL_INFO)){ col_clear(pinfo->cinfo, COL_INFO); } @@ -688,25 +670,19 @@ dissect_winsrepl_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) switch (mess_type) { case WREPL_START_ASSOCIATION: - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "WREPL_START_ASSOCIATION"); - } + col_set_str(pinfo->cinfo, COL_INFO, "WREPL_START_ASSOCIATION"); proto_item_append_text(winsrepl_item, ", WREPL_START_ASSOCIATION"); dissect_winsrepl_start(tvb, pinfo, offset, winsrepl_tree); break; case WREPL_START_ASSOCIATION_REPLY: - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "WREPL_START_ASSOCIATION_REPLY"); - } + col_set_str(pinfo->cinfo, COL_INFO, "WREPL_START_ASSOCIATION_REPLY"); proto_item_append_text(winsrepl_item, ", WREPL_START_ASSOCIATION_REPLY"); dissect_winsrepl_start(tvb, pinfo, offset, winsrepl_tree); break; case WREPL_STOP_ASSOCIATION: - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "WREPL_STOP_ASSOCIATION"); - } + col_set_str(pinfo->cinfo, COL_INFO, "WREPL_STOP_ASSOCIATION"); proto_item_append_text(winsrepl_item, ", WREPL_STOP_ASSOCIATION"); dissect_winsrepl_stop(tvb, pinfo, offset, winsrepl_tree); diff --git a/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c index c424cd787c..45aa6fd1c9 100644 --- a/epan/dissectors/packet-wtls.c +++ b/epan/dissectors/packet-wtls.c @@ -339,9 +339,7 @@ dissect_wtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Develop the string to put in the Info column */ - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "WTLS" ); - }; + col_set_str(pinfo->cinfo, COL_INFO, "WTLS"); /* 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-x224.c b/epan/dissectors/packet-x224.c index df0a5cafb2..885aed19d8 100644 --- a/epan/dissectors/packet-x224.c +++ b/epan/dissectors/packet-x224.c @@ -179,9 +179,7 @@ dissect_x224(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) conversation_t *conversation; x224_conv_info_t *x224_info; - if (check_col(pinfo->cinfo, COL_PROTOCOL)){ - col_set_str(pinfo->cinfo, COL_PROTOCOL, "X.224"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "X.224"); if (check_col(pinfo->cinfo, COL_INFO)){ col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c index b37fe77209..e45d768f75 100644 --- a/epan/dissectors/packet-zbee-aps.c +++ b/epan/dissectors/packet-zbee-aps.c @@ -567,9 +567,7 @@ dissect_zbee_aps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) aps_tree = proto_item_add_subtree(proto_root, ett_zbee_aps); } /* Set the protocol column, if the NWK layer hasn't already done so. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZigBee"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZigBee"); /* Get the FCF */ fcf = tvb_get_guint8(tvb, offset); diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 48c172b6fc..e2041fd51c 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -367,9 +367,7 @@ dissect_zbee_nwk(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) memset(&packet, 0, sizeof(packet)); /* Add ourself to the protocol column, clear the info column, and create the protocol tree. */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZigBee"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZigBee"); if (check_col(pinfo->cinfo, COL_INFO)) { col_clear(pinfo->cinfo, COL_INFO); } diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c index 3193886437..e87a751a84 100644 --- a/epan/dissectors/packet-zbee-zdp.c +++ b/epan/dissectors/packet-zbee-zdp.c @@ -1098,9 +1098,7 @@ dissect_zbee_zdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } #if 0 /* Overwrite the protocol column */ - if (check_col(pinfo->cinfo, COL_PROTOCOL)) { - col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZigBee ZDP"); - } + col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZigBee ZDP"); #endif /* Get and display the sequence number. */ seqno = tvb_get_guint8(tvb, offset); -- cgit v1.2.3