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){
/*
* 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){
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){
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;
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){
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);
}
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");
}
}
}
- 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);
}
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);
}
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){
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))
/* } */
/* 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)){
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);
}
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)
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)
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);
}
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)
/*
* 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){
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){
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)){
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) {
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)) {
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) {
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)) {
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)) {
} */
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 {
/* 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;
}
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;
{
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);
/*
* 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;
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);
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"));
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"));
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 ");
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){
}
/* 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);
}
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)) {
/* 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
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;
}
- 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);
}
/* 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) {
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);
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);
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;
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);
}
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);
}
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;
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;
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;
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",
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);
/* 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);
/* 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,
/* 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,
/* 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,
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);
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);
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;
}
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;
}
/* 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);
"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;
}
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;
}
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);
}
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 */
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,
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))
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);
/* 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;
}
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 */
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;
} 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);
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);
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);
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);
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);
}
/* 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);
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))
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;
}
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;
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 );
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 );
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);
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);
}
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]");
}
}
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");
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");
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");
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);
}
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);
}
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);
}
}
/* 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);
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);
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);
}
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;
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);
}
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);
}
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){
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;
}
}
- 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)
{
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);
}
* 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;
}
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;
{
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]";
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 );
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;
/* 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);
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 ) {
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);
}
* 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");
}
}
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)){
* 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");
}
}
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);
}
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);
}
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 */
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 */
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) {
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);
}
/* 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);
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)
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)
}
}
- 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);
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);
}
#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);
}
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;
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);
}
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);
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)"));
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;
}
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)"));
}
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;
}
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;
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);
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)
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);
}
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))
{
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;
/* 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);
}
* 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++;
* 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");
* 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");
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);
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);
{
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))
{
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;
}
"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;
}
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);
{
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;
}
}
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,
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,
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);
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);
}
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) ) {
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);
}
}
/* 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))
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);
* 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,
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,
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)) {
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)) {
}
/* 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)) {
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)){
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);
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]");
}
}
/*
* 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,
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);
}
/* --- 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);
/* 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);
}
/* 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);
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);
}
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);
}
}
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;
}
}
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,
/*
* 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");
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);
}
}
- 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 */
/* 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);
* 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]");
}
/*
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 */
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);
}
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");
}
}
}
- 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);
}
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);
}
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){
* 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]");
}
/*
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);
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 =
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);
}
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,
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);
}
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);
}
/* 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. */
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);
}
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);
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);
}
}
#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);
gint offset = 0;
EtherCATFrameParserHDR hdr;
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- {
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "ECATF");
- }
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "ECATF");
if (check_col(pinfo->cinfo, COL_INFO))
{
int expected_len;
/* display the M2M protocol name */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- {
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "WiMax");
- }
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "WiMax");
/* Clear out stuff in the info column */
if (check_col(pinfo->cinfo, COL_INFO))
FctParse pfctParse = NULL;
enum MessageType msgtype = MSG_INVALID;
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- {
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "OpcUa");
- }
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "OpcUa");
/* parse message type */
if (tvb->real_data[0] == 'H' && tvb->real_data[1] == 'E' && tvb->real_data[2] == 'L')
UNREFERENCED_PARAMETER(tree);
/* display the WiMax protocol name */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- {
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "WiMax");
- }
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "WiMax");
/* Clear out stuff in the info column */
if (check_col(pinfo->cinfo, COL_INFO))
{
*/
/* 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, "WiMAX");
- }
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "WiMAX");
/* We'll fill in the "Info" column after fetch data, so we clear the
column first in case calls to fetch data from the packet throw an