ti = proto_tree_add_uint(scsi_tree, hf_scsi_status, tvb, 0, 0, scsi_status);
PROTO_ITEM_SET_GENERATED(ti);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "SCSI: Response LUN: 0x%02x (%s) (%s)", itlq->lun,
+ col_add_fstr(pinfo->cinfo, COL_INFO, "SCSI: Response LUN: 0x%02x (%s) (%s)", itlq->lun,
val_to_str(itlq->scsi_opcode, csdata->cdb_vals, "CDB:0x%02x"),
val_to_str(scsi_status, scsi_status_val, "Unknown (0x%08x)"));
- col_set_fence(pinfo->cinfo, COL_INFO);
- }
-
+ col_set_fence(pinfo->cinfo, COL_INFO);
}
void
ti = proto_tree_add_uint(sns_tree, hf_scsi_lun, tvb, 0, 0, itlq->lun);
PROTO_ITEM_SET_GENERATED(ti);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " LUN:0x%02x ", itlq->lun);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " LUN:0x%02x ", itlq->lun);
- col_set_fence(pinfo->cinfo, COL_INFO);
- }
+ col_set_fence(pinfo->cinfo, COL_INFO);
dissect_scsi_sense(tvb, sns_tree, offset);
valstr = try_val_to_str(opcode, csdata->cdb_vals);
}
- if (check_col(pinfo->cinfo, COL_INFO)) {
- if (valstr != NULL) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "SCSI: %s LUN: 0x%02x ", valstr, itlq->lun);
- } else {
- col_add_fstr(pinfo->cinfo, COL_INFO, "SCSI Command: 0x%02x LUN:0x%02x ", opcode, itlq->lun);
- }
- /* make sure no one will overwrite this in the info column */
- col_set_fence(pinfo->cinfo, COL_INFO);
+ if (valstr != NULL) {
+ col_add_fstr(pinfo->cinfo, COL_INFO, "SCSI: %s LUN: 0x%02x ", valstr, itlq->lun);
+ } else {
+ col_add_fstr(pinfo->cinfo, COL_INFO, "SCSI Command: 0x%02x LUN:0x%02x ", opcode, itlq->lun);
}
+ /* make sure no one will overwrite this in the info column */
+ col_set_fence(pinfo->cinfo, COL_INFO);
cdata = ep_new(scsi_task_data_t);
cdata->itl = itl;
scsi_tree = proto_item_add_subtree(ti, ett_scsi);
}
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO,
- "SCSI: Data %s LUN: 0x%02x (%s %s) ",
- isreq ? "Out" : "In",
- itlq->lun,
- val_to_str(opcode, csdata->cdb_vals, "0x%02x"),
- isreq ? "Request Data" : "Response Data");
-
- col_set_fence(pinfo->cinfo, COL_INFO);
- }
+ col_add_fstr(pinfo->cinfo, COL_INFO,
+ "SCSI: Data %s LUN: 0x%02x (%s %s) ",
+ isreq ? "Out" : "In",
+ itlq->lun,
+ val_to_str(opcode, csdata->cdb_vals, "0x%02x"),
+ isreq ? "Request Data" : "Response Data");
+ col_set_fence(pinfo->cinfo, COL_INFO);
ti = proto_tree_add_uint(scsi_tree, hf_scsi_lun, tvb, 0, 0, itlq->lun);
PROTO_ITEM_SET_GENERATED(ti);
next_tvb = process_reassembled_data(tvb, offset, pinfo, "Reassembled SCSI DATA", ipfd_head, &scsi_frag_items, &update_col_info, tree);
if ( ipfd_head && (ipfd_head->reassembled_in != pinfo->fd->num) ) {
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_prepend_fstr(pinfo->cinfo, COL_INFO, "[Reassembled in #%u] ",
+ col_prepend_fstr(pinfo->cinfo, COL_INFO, "[Reassembled in #%u] ",
ipfd_head->reassembled_in);
- }
}
col_set_str(pinfo->cinfo, COL_PROTOCOL, "SEBEK");
- if (check_col(pinfo->cinfo, COL_INFO))
- {
- col_set_str(pinfo->cinfo, COL_INFO, "SEBEK - ");
+ col_set_str(pinfo->cinfo, COL_INFO, "SEBEK - ");
- if (tvb_length(tvb)<6)
- sebek_ver = 0;
- else
- sebek_ver = tvb_get_ntohs(tvb, 4);
+ if (tvb_length(tvb)<6)
+ sebek_ver = 0;
+ else
+ sebek_ver = tvb_get_ntohs(tvb, 4);
- switch (sebek_ver) {
- case 2: col_append_fstr(pinfo->cinfo, COL_INFO, " pid(%d)", tvb_get_ntohl(tvb, 20));
+ switch (sebek_ver) {
+ case 2: col_append_fstr(pinfo->cinfo, COL_INFO, " pid(%d)", tvb_get_ntohl(tvb, 20));
col_append_fstr(pinfo->cinfo, COL_INFO, " uid(%d)", tvb_get_ntohl(tvb, 24));
col_append_fstr(pinfo->cinfo, COL_INFO, " fd(%d)", tvb_get_ntohl(tvb, 28));
col_append_fstr(pinfo->cinfo, COL_INFO, " cmd: %s", tvb_format_text(tvb, 32, 12));
break;
- case 3: col_append_fstr(pinfo->cinfo, COL_INFO, " pid(%d)", tvb_get_ntohl(tvb, 24));
+ case 3: col_append_fstr(pinfo->cinfo, COL_INFO, " pid(%d)", tvb_get_ntohl(tvb, 24));
col_append_fstr(pinfo->cinfo, COL_INFO, " uid(%d)", tvb_get_ntohl(tvb, 28));
col_append_fstr(pinfo->cinfo, COL_INFO, " fd(%d)", tvb_get_ntohl(tvb, 32));
cmd_len = tvb_strnlen(tvb, 40, 12);
cmd_len = 0;
col_append_fstr(pinfo->cinfo, COL_INFO, " cmd: %s", tvb_format_text(tvb, 40, cmd_len));
break;
- default:
- break;
- }
+ default:
+ break;
}
-
if (tree) {
/* Adding Sebek item and subtree */
ti = proto_tree_add_item(tree, proto_sebek, tvb, 0, -1, ENC_NA);
proto_tree_add_item(fastop_tree, hf_selfm_fastop_rb_code, tvb, offset, 1, ENC_BIG_ENDIAN);
/* Append Column Info w/ Control Code Code */
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%s", val_to_str_const(opcode, selfm_fo_rb_vals, "Unknown Control Code"));
- }
-
+ col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%s", val_to_str_const(opcode, selfm_fo_rb_vals, "Unknown Control Code"));
}
else if (msg_type == CMD_FASTOP_BR_CTRL) {
proto_tree_add_item(fastop_tree, hf_selfm_fastop_br_code, tvb, offset, 1, ENC_BIG_ENDIAN);
/* Append Column Info w/ Control Code Code */
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%s", val_to_str_const(opcode, selfm_fo_br_vals, "Unknown Control Code"));
- }
-
+ col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%s", val_to_str_const(opcode, selfm_fo_br_vals, "Unknown Control Code"));
}
offset += 1;
proto_tree_add_item(fastser_tree, hf_selfm_fastser_funccode, tvb, offset, 1, ENC_BIG_ENDIAN);
/* Append Column Info w/ Function Code */
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%s", val_to_str_const(funccode, selfm_fastser_func_code_vals, "Unknown Function Code"));
- }
+ col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%s", val_to_str_const(funccode, selfm_fastser_func_code_vals, "Unknown Function Code"));
offset += 1;
fc_enable = tvb_get_guint8(tvb, offset);
proto_tree_add_item(fastser_tree, hf_selfm_fastser_uns_en_fc, tvb, offset, 1, ENC_BIG_ENDIAN);
- /* Append Column Info w/ "Enable" Function Code */
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "Function to Enable (%#x)", fc_enable);
- }
+ /* Append Column Info w/ "Enable" Function Code */
+ col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "Function to Enable (%#x)", fc_enable);
/* 3-byte Function Code data */
proto_tree_add_item(fastser_tree, hf_selfm_fastser_uns_en_fc_data, tvb, offset+1, 3, ENC_NA);
fc_enable = tvb_get_guint8(tvb, offset);
proto_tree_add_item(fastser_tree, hf_selfm_fastser_uns_dis_fc, tvb, offset, 1, ENC_BIG_ENDIAN);
- /* Append Column Info w/ "Disable" Function Code */
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "Function to Disable (%#x)", fc_enable);
- }
+ /* Append Column Info w/ "Disable" Function Code */
+ col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "Function to Disable (%#x)", fc_enable);
/* 1-byte Function Code data */
proto_tree_add_item(fastser_tree, hf_selfm_fastser_uns_dis_fc_data, tvb, offset+1, 1, ENC_NA);
base_addr = tvb_get_ntohs(tvb, offset); /* unknown - 16-bit field with base address to read? */
/* Append Column Info w/ Base Address */
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%#x", base_addr);
- }
+ col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%#x", base_addr);
proto_tree_add_item(fastser_tree, hf_selfm_fastser_read_baseaddr, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(fastser_tree, hf_selfm_fastser_read_numaddr, tvb, offset+2, 2, ENC_BIG_ENDIAN);
num_addr = tvb_get_ntohs(tvb, offset+2); /* unknown - 16-bit field with number of 16-bit addresses to read? */
/* Append Column Info w/ Base Address */
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%#x", base_addr);
- }
+ col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%#x", base_addr);
proto_tree_add_item(fastser_tree, hf_selfm_fastser_read_baseaddr, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(fastser_tree, hf_selfm_fastser_read_numaddr, tvb, offset+2, 2, ENC_BIG_ENDIAN);
num_reg = tvb_get_ntohs(tvb, offset+4);
/* Append Column Info w/ Address Information */
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%#x, %#x", addr1, addr2);
- }
+ col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%#x, %#x", addr1, addr2);
proto_tree_add_item(fastser_tree, hf_selfm_fastser_unswrite_addr1, tvb, offset, 2, ENC_BIG_ENDIAN);
proto_tree_add_item(fastser_tree, hf_selfm_fastser_unswrite_addr2, tvb, offset+2, 2, ENC_BIG_ENDIAN);
offset += 2;
/* Append Column Info w/ Base Address */
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%#x", base_addr);
- }
+ col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%#x", base_addr);
break;
offset += 2;
/* Append Column Info w/ Base Address */
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%#x", base_addr);
- }
+ col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%#x", base_addr);
/* unknown - 16-bit field with number of tags to follow? */
proto_tree_add_item(fastser_tree, hf_selfm_fastser_datafmt_resp_num_tag, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
/* Append Column Info w/ Base Address */
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%#x", base_addr);
- }
+ col_append_sep_fstr(pinfo->cinfo, COL_INFO, NULL, "%#x", base_addr);
break;
case FAST_SER_BITLABEL_RESP: /* 0xB3 - Bit Label Response - unknown full structure */
selfm_item = proto_tree_add_protocol_format(tree, proto_selfm, selfm_tvb, 0, len, "SEL Fast Message");
selfm_tree = proto_item_add_subtree(selfm_item, ett_selfm);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_clear(pinfo->cinfo, COL_INFO); /* clear out stuff in the info column */
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(msg_type, selfm_msgtype_vals, "Unknown Message Type"));
- }
+ col_clear(pinfo->cinfo, COL_INFO); /* clear out stuff in the info column */
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(msg_type, selfm_msgtype_vals, "Unknown Message Type"));
/* Add Message Type to Protocol Tree */
proto_tree_add_item(selfm_tree, hf_selfm_msgtype, selfm_tvb, offset, 2, ENC_BIG_ENDIAN);
errors2 = pinfo->pseudo_header->sita.sita_errors2;
proto = pinfo->pseudo_header->sita.sita_proto;
- if (check_col(pinfo->cinfo, COL_DEF_SRC)) {
- if ((flags & SITA_FRAME_DIR) == SITA_FRAME_DIR_TXED) {
- col_set_str(pinfo->cinfo, COL_DEF_SRC, IOP); /* set the source (direction) column accordingly */
- } else {
- col_set_str(pinfo->cinfo, COL_DEF_SRC, REMOTE);
- }
+ if ((flags & SITA_FRAME_DIR) == SITA_FRAME_DIR_TXED) {
+ col_set_str(pinfo->cinfo, COL_DEF_SRC, IOP); /* set the source (direction) column accordingly */
+ } else {
+ col_set_str(pinfo->cinfo, COL_DEF_SRC, REMOTE);
}
- if (check_col(pinfo->cinfo, COL_INFO))
- col_set_str(pinfo->cinfo, COL_INFO, "");
+ col_set_str(pinfo->cinfo, COL_INFO, "");
if (tree) {
ti = proto_tree_add_protocol_format(tree, proto_sita, tvb, 0, 0, "Link Layer");
/* try to find and run an applicable dissector */
if (!dissector_try_uint(sita_dissector_table, pinfo->pseudo_header->sita.sita_proto, tvb, pinfo, tree)) {
- if (check_col(pinfo->cinfo, COL_PROTOCOL)) /* if one can't be found... tell them we don't */
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNKNOWN"); /* know how to decode this protocol */
- if (check_col(pinfo->cinfo, COL_INFO)) /* and give them the details then */
- col_add_fstr(pinfo->cinfo, COL_INFO, "IOP protocol number: %u", pinfo->pseudo_header->sita.sita_proto);
+ /* if one can't be found... tell them we don't know how to decode this protocol
+ and give them the details then */
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNKNOWN");
+ col_add_fstr(pinfo->cinfo, COL_INFO, "IOP protocol number: %u", pinfo->pseudo_header->sita.sita_proto);
call_dissector(data_handle, tvb, pinfo, tree); /* call the generic (hex display) decoder instead */
}
}
proto_tree_add_uint(skinny_tree, hf_skinny_hdr_version, tvb, offset+4, 4, hdr_version);
}
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO,"%s ", si->messageName);
- col_set_fence(pinfo->cinfo, COL_INFO);
- }
+ col_add_fstr(pinfo->cinfo, COL_INFO,"%s ", si->messageName);
+ col_set_fence(pinfo->cinfo, COL_INFO);
- if (tree) {
- proto_tree_add_uint(skinny_tree, hf_skinny_messageid, tvb,offset+8, 4, data_messageid );
- }
+ proto_tree_add_uint(skinny_tree, hf_skinny_messageid, tvb,offset+8, 4, data_messageid );
{
switch(data_messageid) {
break;
}
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(pkttype, packet_type_vals, "Unknown (%u)"));
if (tree) {
col_set_str(pinfo->cinfo, COL_INFO, "SoulSeek Message");
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", message_type);
- }
-
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", message_type);
if (tree) {
if (infoflag) {
/* Append the type(s) of the system to the COL_INFO line ... */
- if (check_col(pinfo->cinfo, COL_INFO)) {
- for (i = 0; i < 32; i++) {
- if (flags & (1<<i)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
- val_to_str(i, server_types,
- "Unknown server type:%d"));
- }
+ for (i = 0; i < 32; i++) {
+ if (flags & (1<<i)) {
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
+ val_to_str(i, server_types,
+ "Unknown server type:%d"));
}
}
}
cmd = tvb_get_guint8(tvb, offset);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- /* Put in something, and replace it later */
- col_add_str(pinfo->cinfo, COL_INFO, val_to_str(cmd, commands, "Unknown command:0x%02x"));
- }
+ /* Put in something, and replace it later */
+ col_add_str(pinfo->cinfo, COL_INFO, val_to_str(cmd, commands, "Unknown command:0x%02x"));
- if (parent_tree) {
- item = proto_tree_add_item(parent_tree, proto_smb_browse, tvb, offset, -1, ENC_NA);
-
- tree = proto_item_add_subtree(item, ett_browse);
- }
+ item = proto_tree_add_item(parent_tree, proto_smb_browse, tvb, offset, -1, ENC_NA);
+ tree = proto_item_add_subtree(item, ett_browse);
/* command */
proto_tree_add_uint(tree, hf_command, tvb, offset, 1, cmd);
"UTF-8", "CP437", NULL, NULL, NULL);
if (utf8_host_name == NULL)
utf8_host_name = host_name;
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s", utf8_host_name);
- }
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s", utf8_host_name);
proto_tree_add_string_format(tree, hf_server_name,
tvb, offset, 16,
utf8_host_name,
computer_name = tvb_get_ephemeral_stringz(tvb, offset, &namelen);
proto_tree_add_string(tree, hf_response_computer_name,
tvb, offset, namelen, computer_name);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(
- pinfo->cinfo, COL_INFO, " %s", computer_name);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s", computer_name);
break;
}
cmd = tvb_get_guint8(tvb, offset);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- /* Put in something, and replace it later */
- col_add_str(pinfo->cinfo, COL_INFO, val_to_str(cmd, commands, "Unknown command:0x%02x"));
- }
+ /* Put in something, and replace it later */
+ col_add_str(pinfo->cinfo, COL_INFO, val_to_str(cmd, commands, "Unknown command:0x%02x"));
if (parent_tree) {
/* server name */
host_name = tvb_get_const_stringz(tvb, offset, &namelen);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s", host_name);
- }
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s", host_name);
+
proto_tree_add_item(tree, hf_server_name,
tvb, offset, namelen, ENC_ASCII|ENC_NA);
offset += namelen;
/* computer name */
offset = display_ms_string(tvb, tree, offset, hf_computer_name, &name);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, " from %s", name);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " from %s", name);
/* mailslot name */
offset = display_ms_string(tvb, tree, offset, hf_mailslot_name, NULL);
/* pdc name */
offset = display_unicode_string(tvb, tree, offset, hf_unicode_pdc_name, &name);
- if (name && check_col(pinfo->cinfo, COL_INFO)) {
+ if (name) {
col_append_fstr(pinfo->cinfo, COL_INFO, ": host %s", name);
name = NULL;
}
/* domain name */
offset = display_unicode_string(tvb, tree, offset, hf_domain_name, &name);
- if (name && check_col(pinfo->cinfo, COL_INFO)) {
+ if (name) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", domain %s", name);
name = NULL;
}
/* get the Command field */
cmd = tvb_get_guint8(tvb, offset);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, val_to_str(cmd, commands, "Unknown Command:%02x") );
+ col_add_str(pinfo->cinfo, COL_INFO, val_to_str(cmd, commands, "Unknown Command:%02x") );
- if (tree) {
+ if (tree) {
item = proto_tree_add_item(tree, proto_smb_logon, tvb,
offset, -1, ENC_NA);
/* do the opcode field */
opcode = tvb_get_letohs(setup_tvb, offset);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(opcode, opcode_vals, "Unknown opcode: 0x%04x"));
- }
/* These are in the setup words; use "setup_tvb". */
if (smb_info->request) { /* this is a request */
/* function code */
cmd = tvb_get_letohs(p_tvb, offset);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s Request", val_to_str_ext(cmd, &commands_ext, "Unknown Command (%u)"));
- }
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s Request", val_to_str_ext(cmd, &commands_ext, "Unknown Command (%u)"));
+
proto_tree_add_uint(tree, hf_function_code, p_tvb, offset, 2,
cmd);
offset += 2;
if( ( (p_tvb==NULL) || (tvb_reported_length(p_tvb)==0) )
&& ( (d_tvb==NULL) || (tvb_reported_length(d_tvb)==0) ) ){
/* command */
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s Interim Response",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s Interim Response",
val_to_str_ext(trp->lanman_cmd, &commands_ext, "Unknown Command (%u)"));
- }
+
proto_tree_add_uint(tree, hf_function_code, p_tvb, 0, 0, trp->lanman_cmd);
return TRUE;
}
/* command */
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s Response",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s Response",
val_to_str_ext(trp->lanman_cmd, &commands_ext, "Unknown Command (%u)"));
- }
+
proto_tree_add_uint(tree, hf_function_code, p_tvb, 0, 0,
trp->lanman_cmd);
* Set the columns.
*/
col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB Pipe");
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_set_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
smb_info->request ? "Request" : "Response");
- }
if (smb_info->sip != NULL && smb_info->sip->extra_info_type == SMB_EI_TRI)
tri = (smb_transact_info_t *)smb_info->sip->extra_info;
proto_tree_add_uint(pipe_tree, hf_pipe_function, s_tvb,
offset, 2, function);
offset += 2;
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
val_to_str(function, functions, "Unknown function (0x%04x)"),
smb_info->request ? "Request" : "Response");
- }
+
if (tri != NULL)
tri->function = function;
function = tri->function;
proto_tree_add_uint(pipe_tree, hf_pipe_function, NULL,
0, 0, function);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
val_to_str(function, functions, "Unknown function (0x%04x)"),
smb_info->request ? "Request" : "Response");
- }
+
fid = tri->fid;
if (fid != -1)
dissect_smb_fid(d_tvb, pinfo, pipe_tree, 0, 0, (guint16) fid, FALSE, FALSE, TRUE);
dn);
COUNT_BYTES(dn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Directory: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Directory: %s",
format_text(dn, strlen(dn)));
- }
END_OF_SMB
offset, an_len, an);
COUNT_BYTES(an_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
format_text(an, strlen(an)));
- }
/* buffer format */
CHECK_BYTE_COUNT(1);
fn_len, fn, "Old File Name: %s", format_text(fn, strlen(fn)));
COUNT_BYTES(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Old Name: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Old Name: %s",
format_text(fn, strlen(fn)));
- }
/* buffer format */
CHECK_BYTE_COUNT(1);
fn_len, fn, "New File Name: %s", format_text(fn, strlen(fn)));
COUNT_BYTES(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", New Name: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", New Name: %s",
format_text(fn, strlen(fn)));
- }
END_OF_SMB
fn_len, fn, "Source File Name: %s", format_text(fn, strlen(fn)));
COUNT_BYTES(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Source Name: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Source Name: %s",
format_text(fn, strlen(fn)));
- }
/* buffer format */
CHECK_BYTE_COUNT(1);
format_text(fn, strlen(fn)));
COUNT_BYTES(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Destination Name: %s", format_text(fn, strlen(fn)));
- }
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Destination Name: %s", format_text(fn, strlen(fn)));
END_OF_SMB
si->sip->extra_info = fsi;
}
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
format_text(fn, strlen(fn)));
- }
END_OF_SMB
PROTO_ITEM_SET_GENERATED(it);
}
tr = proto_item_add_subtree(it, ett_smb_fid);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ", FID: 0x%04x", fid);
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", FID: 0x%04x", fid);
if ((!pinfo->fd->flags.visited) && is_created) {
fid_info = (smb_fid_info_t *)se_alloc(sizeof(smb_fid_info_t));
}
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
format_text(fn, strlen(fn)));
- }
END_OF_SMB
fn);
COUNT_BYTES(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
format_text(fn, strlen(fn)));
- }
END_OF_SMB
fn);
COUNT_BYTES(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Old Name: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Old Name: %s",
format_text(fn, strlen(fn)));
- }
/* buffer format */
CHECK_BYTE_COUNT(1);
fn);
COUNT_BYTES(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", New Name: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", New Name: %s",
format_text(fn, strlen(fn)));
- }
END_OF_SMB
fn);
COUNT_BYTES(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Old Name: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Old Name: %s",
format_text(fn, strlen(fn)));
- }
/* buffer format */
CHECK_BYTE_COUNT(1);
fn);
COUNT_BYTES(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", New Name: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", New Name: %s",
format_text(fn, strlen(fn)));
- }
END_OF_SMB
fn);
COUNT_BYTES(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
format_text(fn, strlen(fn)));
- }
END_OF_SMB
fn);
COUNT_BYTES(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
format_text(fn, strlen(fn)));
- }
END_OF_SMB
proto_tree_add_item(tree, hf_smb_offset, tvb, offset, 4, ENC_LITTLE_ENDIAN);
offset += 4;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_fstr(pinfo->cinfo, COL_INFO,
", %u byte%s at offset %u", cnt,
(cnt == 1) ? "" : "s", ofs);
proto_tree_add_item(tree, hf_smb_offset, tvb, offset, 4, ENC_LITTLE_ENDIAN);
offset += 4;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_fstr(pinfo->cinfo, COL_INFO,
", %u byte%s at offset %u", cnt,
(cnt == 1) ? "" : "s", ofs);
proto_tree_add_item(tree, hf_smb_count, tvb, offset, 2, ENC_LITTLE_ENDIAN);
offset += 2;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_fstr(pinfo->cinfo, COL_INFO,
", %u byte%s", cnt, (cnt == 1) ? "" : "s");
if (si->sip && (si->sip->extra_info_type == SMB_EI_RWINFO)) {
fn);
COUNT_BYTES(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
format_text(fn, strlen(fn)));
- }
END_OF_SMB
fn);
COUNT_BYTES(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", File: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", File: %s",
format_text(fn, strlen(fn)));
- }
/* buffer format */
CHECK_BYTE_COUNT(1);
si->sip->extra_info = fsi;
}
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
format_text(fn, strlen(fn)));
- }
END_OF_SMB
ofs = offsethigh;
ofs = (ofs<<32) | offsetlow;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_fstr(pinfo->cinfo, COL_INFO,
", %u byte%s at offset %" G_GINT64_MODIFIER "u",
maxcnt, (maxcnt == 1) ? "" : "s", ofs);
datalen = (datalen<<16) | datalen_low;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_fstr(pinfo->cinfo, COL_INFO,
", %u byte%s", datalen,
(datalen == 1) ? "" : "s");
ofs = offsethigh;
ofs = (ofs<<32) | offsetlow;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_fstr(pinfo->cinfo, COL_INFO,
", %u byte%s at offset %" G_GINT64_MODIFIER "u",
datalen, (datalen == 1) ? "" : "s", ofs);
count = count_high;
count = (count<<16) | count_low;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_fstr(pinfo->cinfo, COL_INFO,
", %u byte%s", count,
(count == 1) ? "" : "s");
offset, dn_len, dn);
COUNT_BYTES(dn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_str(pinfo->cinfo, COL_INFO, ", User: ");
-
- if (!dn[0] && !an[0])
- col_append_str(pinfo->cinfo, COL_INFO,
- "anonymous");
- else
- col_append_fstr(pinfo->cinfo, COL_INFO,
- "%s\\%s",
- format_text(dn, strlen(dn)),
- format_text(an, strlen(an)));
- }
+ col_append_str(pinfo->cinfo, COL_INFO, ", User: ");
+
+ if (!dn[0] && !an[0])
+ col_append_str(pinfo->cinfo, COL_INFO, "anonymous");
+ else
+ col_append_fstr(pinfo->cinfo, COL_INFO,
+ "%s\\%s",
+ format_text(dn, strlen(dn)),
+ format_text(an, strlen(an)));
/* OS */
an = get_unicode_or_ascii_string(tvb, &offset,
si->sip->extra_info = se_strdup(an);
}
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
format_text(an, strlen(an)));
- }
/*
* NOTE: the Service string is always ASCII, even if the
/* primary request */
subcmd = tvb_get_letohs(tvb, offset);
proto_tree_add_uint(tree, hf_smb_nt_trans_subcmd, tvb, offset, 2, subcmd);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
val_to_str_ext_const(subcmd, &nt_cmd_vals_ext, "<unknown>"));
- }
+
ntd.subcmd = subcmd;
if (!si->unidir && sip) {
if (!pinfo->fd->flags.visited) {
/* primary request */
if (nti != NULL) {
proto_tree_add_uint(tree, hf_smb_nt_trans_subcmd, tvb, 0, 0, nti->subcmd);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
val_to_str_ext(nti->subcmd, &nt_cmd_vals_ext, "<unknown (%u)>"));
- }
} else {
proto_tree_add_text(tree, tvb, offset, 0,
"Function: <unknown function - could not find matching request>");
si->sip->extra_info = fsi;
}
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
format_text(fn, strlen(fn)));
- }
END_OF_SMB
fn);
COUNT_BYTES_TRANS(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", File: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", File: %s",
format_text(fn, strlen(fn)));
- }
*bcp = bc;
return offset;
fn);
COUNT_BYTES_TRANS(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
format_text(fn, strlen(fn)));
- }
break;
case 0x0001: /*TRANS2_FIND_FIRST2*/
/* Search Attributes */
fn);
COUNT_BYTES_TRANS(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Pattern: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Pattern: %s",
format_text(fn, strlen(fn)));
- }
break;
case 0x0002: /*TRANS2_FIND_NEXT2*/
fn);
COUNT_BYTES_TRANS(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Continue: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Continue: %s",
format_text(fn, strlen(fn)));
- }
break;
case 0x0003: /*TRANS2_QUERY_FS_INFORMATION*/
proto_tree_add_uint(tree, hf_smb_qfsi_information_level, tvb, offset, 2, si->info_level);
COUNT_BYTES_TRANS(2);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
val_to_str(si->info_level, qfsi_vals,
"Unknown (0x%02x)"));
proto_tree_add_uint(tree, hf_smb_sfsi_information_level, tvb, offset+2, 2, si->info_level);
COUNT_BYTES_TRANS(4);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
val_to_str(si->info_level, sfsi_vals,
"Unknown (0x%02x)"));
proto_tree_add_uint(tree, hf_smb_qpi_loi, tvb, offset, 2, si->info_level);
COUNT_BYTES_TRANS(2);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(
+ col_append_fstr(
pinfo->cinfo, COL_INFO, ", %s",
val_to_str(si->info_level, qpi_loi_vals,
"Unknown (%u)"));
- }
/* 4 reserved bytes */
CHECK_BYTE_COUNT_TRANS(4);
t2i->name = se_strdup(fn);
}
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
format_text(fn, strlen(fn)));
- }
break;
case 0x0006: /*TRANS2_SET_PATH_INFORMATION*/
fn);
COUNT_BYTES_TRANS(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
format_text(fn, strlen(fn)));
- }
break;
case 0x0007: { /*TRANS2_QUERY_FILE_INFORMATION*/
proto_tree_add_uint(tree, hf_smb_qpi_loi, tvb, offset, 2, si->info_level);
COUNT_BYTES_TRANS(2);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(
+ col_append_fstr(
pinfo->cinfo, COL_INFO, ", %s",
val_to_str(si->info_level, qpi_loi_vals,
"Unknown (%u)"));
- }
break;
}
fn);
COUNT_BYTES_TRANS(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Path: %s",
format_text(fn, strlen(fn)));
- }
break;
case 0x000c: /*TRANS2_FIND_NOTIFY_NEXT*/
fn);
COUNT_BYTES_TRANS(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Dir: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Dir: %s",
format_text(fn, strlen(fn)));
- }
break;
case 0x000e: /*TRANS2_SESSION_SETUP*/
/* XXX unknown structure*/
fn);
COUNT_BYTES_TRANS(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", File: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", File: %s",
format_text(fn, strlen(fn)));
- }
-
break;
}
subcmd = tvb_get_letohs(tvb, offset);
proto_tree_add_uint(tree, hf_smb_trans2_subcmd,
tvb, offset, 2, subcmd);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
val_to_str_ext(subcmd, &trans2_cmd_vals_ext,
"Unknown (0x%02x)"));
- }
+
if (!si->unidir) {
if (!pinfo->fd->flags.visited && si->sip) {
/*
fn);
COUNT_BYTES_SUBR(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
format_text(fn, strlen(fn)));
- }
proto_item_append_text(item, " File: %s", format_text(fn, strlen(fn)));
proto_item_set_len(item, offset-old_offset);
fn);
COUNT_BYTES_SUBR(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
format_text(fn, strlen(fn)));
- }
proto_item_append_text(item, " File: %s", format_text(fn, strlen(fn)));
proto_item_set_len(item, offset-old_offset);
fn);
COUNT_BYTES_SUBR(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
format_text(fn, strlen(fn)));
- }
proto_item_append_text(item, " File: %s", format_text(fn, strlen(fn)));
proto_item_set_len(item, offset-old_offset);
fn);
COUNT_BYTES_SUBR(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
format_text(fn, strlen(fn)));
- }
/* skip to next structure */
if (neo) {
fn);
COUNT_BYTES_SUBR(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
format_text(fn, strlen(fn)));
- }
/* skip to next structure */
if (neo) {
fn);
COUNT_BYTES_SUBR(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
format_text(fn, strlen(fn)));
- }
/* skip to next structure */
if (neo) {
fn);
COUNT_BYTES_SUBR(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
format_text(fn, strlen(fn)));
- }
/* skip to next structure */
if (neo) {
fn);
COUNT_BYTES_SUBR(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
format_text(fn, strlen(fn)));
- }
/* skip to next structure */
if (neo) {
fn);
COUNT_BYTES_SUBR(fn_len);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
format_text(fn, strlen(fn)));
- }
/* skip to next structure */
if (neo) {
break;
}
- if (count && check_col(pinfo->cinfo, COL_INFO)) {
+ if (count) {
col_append_str(pinfo->cinfo, COL_INFO,
", Files:");
}
if (count == -1) {
break;
}
- if (count && check_col(pinfo->cinfo, COL_INFO)) {
+ if (count) {
col_append_str(pinfo->cinfo, COL_INFO,
", Files:");
}
break;
}
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
val_to_str_ext(t2i->subcmd,
&trans2_cmd_vals_ext,
"<unknown (0x%02x)>"));
- }
}
}
break;
proto_tree *cmd_tree;
int (*dissector)(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, proto_tree *smb_tree);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- if (first_pdu) {
- col_append_fstr(pinfo->cinfo, COL_INFO,
- "%s %s",
- decode_smb_name(cmd),
- (si->request)? "Request" : "Response");
- } else {
- col_append_fstr(pinfo->cinfo, COL_INFO,
- "; %s",
- decode_smb_name(cmd));
- }
-
+ if (first_pdu) {
+ col_append_fstr(pinfo->cinfo, COL_INFO,
+ "%s %s",
+ decode_smb_name(cmd),
+ (si->request)? "Request" : "Response");
+ } else {
+ col_append_fstr(pinfo->cinfo, COL_INFO,
+ "; %s",
+ decode_smb_name(cmd));
}
cmd_item = proto_tree_add_text(smb_tree, tvb, offset, -1,
dissect_smb_command(tvb, pinfo, offset, tree, si->cmd, TRUE);
/* Append error info from this packet to info string. */
- if (!si->request && check_col(pinfo->cinfo, COL_INFO)) {
+ if (!si->request) {
if (flags2 & 0x4000) {
/*
* The status is an NT status code; was there
ioctl_name = NULL;
}
- if (check_col(pinfo->cinfo, COL_INFO) && ioctl_name != NULL) {
+ if (ioctl_name != NULL) {
col_append_fstr(
pinfo->cinfo, COL_INFO, " %s", ioctl_name);
}
/* device */
proto_tree_add_item(tree, hf_smb2_ioctl_function_device, tvb, offset, 4, ENC_LITTLE_ENDIAN);
- if (check_col(pinfo->cinfo, COL_INFO) && ioctl_name == NULL) {
+ if (ioctl_name == NULL) {
col_append_fstr(
pinfo->cinfo, COL_INFO, " %s",
val_to_str((ioctl_function>>16)&0xffff, smb2_ioctl_device_vals,
/* function */
proto_tree_add_item(tree, hf_smb2_ioctl_function_function, tvb, offset, 4, ENC_LITTLE_ENDIAN);
- if (check_col(pinfo->cinfo, COL_INFO) && ioctl_name == NULL) {
+ if (ioctl_name == NULL) {
col_append_fstr(
pinfo->cinfo, COL_INFO, " Function:0x%04x",
(ioctl_function>>2)&0x0fff);
if (hnd_item) {
proto_item_append_text(hnd_item, " %s", fid_name);
}
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s", fid_name);
- }
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s", fid_name);
}
/* look for the eo_file_info */
offset, length, name);
}
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " NewName:%s",
- name);
- }
+ col_append_fstr(pinfo->cinfo, COL_INFO, " NewName:%s", name);
}
offset += length;
g_snprintf((char *)si->saved->extra_info,olb.len+1,"%s",buf);
}
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " Tree: %s", buf);
- }
-
+ col_append_fstr(pinfo->cinfo, COL_INFO, " Tree: %s", buf);
return offset;
}
g_snprintf((char *)si->saved->extra_info,olb.len+1,"%s",buf);
}
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s Pattern: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s Pattern: %s",
val_to_str(il, smb2_find_info_levels, "(Level:0x%02x)"),
buf);
- }
return offset;
}
}
if (!pinfo->fd->flags.visited && si->saved && si->saved->extra_info_type == SMB2_EI_FINDPATTERN) {
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s Pattern: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s Pattern: %s",
val_to_str(si->saved->infolevel, smb2_find_info_levels, "(Level:0x%02x)"),
(const char *)si->saved->extra_info);
- }
g_free(si->saved->extra_info);
si->saved->extra_info_type = SMB2_EI_NONE;
* display ab bit too much if we do it for replies
* as well.
*/
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s/%s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s/%s",
val_to_str(cl, smb2_class_vals, "(Class:0x%02x)"),
val_to_str(il, vs, "(Level:0x%02x)"));
- }
}
return offset;
proto_tree_add_item(tree, hf_smb2_file_offset, tvb, offset, 8, ENC_LITTLE_ENDIAN);
offset += 8;
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " Len:%d Off:%" G_GINT64_MODIFIER "u", length, off);
- }
+ col_append_fstr(pinfo->cinfo, COL_INFO, " Len:%d Off:%" G_GINT64_MODIFIER "u", length, off);
/* fid */
offset = dissect_smb2_fid(tvb, pinfo, tree, offset, si, FID_MODE_USE);
proto_tree_add_item(tree, hf_smb2_file_offset, tvb, offset, 8, ENC_LITTLE_ENDIAN);
offset += 8;
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " Len:%d Off:%" G_GINT64_MODIFIER "u", len, off);
- }
+ col_append_fstr(pinfo->cinfo, COL_INFO, " Len:%d Off:%" G_GINT64_MODIFIER "u", len, off);
/* fid */
offset = dissect_smb2_fid(tvb, pinfo, tree, offset, si, FID_MODE_USE);
/* filename string */
fname = dissect_smb2_olb_string(pinfo, tree, tvb, &f_olb, OLB_TYPE_UNICODE_STRING);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " File: %s", fname);
- }
+ col_append_fstr(pinfo->cinfo, COL_INFO, " File: %s", fname);
/* save the name if it looks sane */
if (!pinfo->fd->flags.visited) {
sti->conv = si->conv;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMB2");
- if (check_col(pinfo->cinfo, COL_INFO)) {
- if (first_in_chain) {
- /* first packet */
- col_clear(pinfo->cinfo, COL_INFO);
- } else {
- col_append_str(pinfo->cinfo, COL_INFO, ";");
- }
+ if (first_in_chain) {
+ /* first packet */
+ col_clear(pinfo->cinfo, COL_INFO);
+ } else {
+ col_append_str(pinfo->cinfo, COL_INFO, ";");
}
if (parent_tree) {
proto_item_set_len(header_item, offset);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, "%s %s",
decode_smb2_name(si->opcode),
(si->flags & SMB2_FLAGS_RESPONSE)?"Response":"Request");
- if (si->status) {
- col_append_fstr(
+ if (si->status) {
+ col_append_fstr(
pinfo->cinfo, COL_INFO, ", Error: %s",
val_to_str(si->status, NT_errors,
"Unknown (0x%08X)"));
- }
}
/*
* Make entries in the Info column on the summary display
*/
- if (check_col(pinfo->cinfo, COL_INFO)) {
- if (first == TRUE) {
- /*
- * First PDU - We already computed the fixed header
- */
- col_clear(pinfo->cinfo, COL_INFO);
- col_add_fstr(pinfo->cinfo, COL_INFO, "SMPP %s", command_str);
- first = FALSE;
- } else {
- /*
- * Subsequent PDUs
- */
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", command_str);
- }
+ if (first == TRUE) {
/*
- * Display command status of responses in Info column
- */
- if (command_id & 0x80000000) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ": \"%s\"",
- command_status_str);
- }
+ * First PDU - We already computed the fixed header
+ */
+ col_clear(pinfo->cinfo, COL_INFO);
+ col_add_fstr(pinfo->cinfo, COL_INFO, "SMPP %s", command_str);
+ first = FALSE;
+ } else {
+ /*
+ * Subsequent PDUs
+ */
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", command_str);
+ }
+ /*
+ * Display command status of responses in Info column
+ */
+ if (command_id & 0x80000000) {
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": \"%s\"",
+ command_status_str);
}
/*
}
col_set_str(pinfo->cinfo, COL_PROTOCOL, "SMRSE");
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, val_to_str(tag, tag_vals,"Unknown Tag:0x%02x"));
+ col_add_str(pinfo->cinfo, COL_INFO, val_to_str(tag, tag_vals,"Unknown Tag:0x%02x"));
proto_tree_add_item(tree, hf_smrse_reserved, tvb, 0, 1, ENC_BIG_ENDIAN);
proto_tree_add_item(tree, hf_smrse_length, tvb, 1, 2, ENC_BIG_ENDIAN);
format = hi_nibble(type);
/* Summary information */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO,
+ col_add_fstr(pinfo->cinfo, COL_INFO,
"SNA XID Format:%d Type:%s", format,
val_to_str_const(lo_nibble(type), sna_xid_type_vals,
"Unknown Type"));
th_fid = hi_nibble(tvb_get_guint8(tvb, 0));
/* Summary information */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(th_fid, sna_th_fid_vals, "Unknown FID: %01x"));
if (tree) {
*/
if (!unack) {
npdu = npdu_field1 = tvb_get_guint8(tvb,offset);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "SN-DATA N-PDU %d", npdu_field1);
+ col_add_fstr(pinfo->cinfo, COL_INFO, "SN-DATA N-PDU %d", npdu_field1);
if (tree) {
npdu_field_item = proto_tree_add_text(sndcp_tree, tvb, offset,1, "Acknowledged mode, N-PDU %d", npdu_field1 );
npdu_field_tree = proto_item_add_subtree(npdu_field_item, ett_sndcp_npdu_field);
npdu_field2 = tvb_get_ntohs(tvb, offset);
segment = (npdu_field2 & 0xF000) >> 12;
npdu = (npdu_field2 & 0x0FFF);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "SN-UNITDATA N-PDU %d (segment %d)", npdu, segment);
+ col_add_fstr(pinfo->cinfo, COL_INFO, "SN-UNITDATA N-PDU %d (segment %d)", npdu, segment);
if (tree) {
npdu_field_item = proto_tree_add_text(sndcp_tree, tvb, offset,2, "Unacknowledged mode, N-PDU %d (segment %d)", npdu, segment );
npdu_field_tree = proto_item_add_subtree(npdu_field_item, ett_sndcp_npdu_field);
else {
/* Not reassembled in this packet
*/
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_fstr(pinfo->cinfo, COL_INFO,
" (N-PDU payload reassembled in packet %u)",
fd_npdu->reassembled_in);
- }
if (tree) {
proto_tree_add_text(sndcp_tree, tvb, offset, -1, "Payload");
}
} else {
/* Not reassembled yet, or not reassembled at all
*/
- if (check_col(pinfo->cinfo, COL_INFO)) {
- if (unack)
- col_append_fstr(pinfo->cinfo, COL_INFO, " (Unreassembled fragment %u)", segment);
- else
- col_append_str(pinfo->cinfo, COL_INFO, " (Unreassembled fragment)");
- }
+ if (unack)
+ col_append_fstr(pinfo->cinfo, COL_INFO, " (Unreassembled fragment %u)", segment);
+ else
+ col_append_str(pinfo->cinfo, COL_INFO, " (Unreassembled fragment)");
+
if (tree) {
proto_tree_add_text(sndcp_tree, tvb, offset, -1, "Payload");
}
conn_ctrl = tvb_get_guint8(tvb, 0);
spp_msg_string = spp_conn_ctrl(conn_ctrl);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s", spp_msg_string);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s", spp_msg_string);
if (tree) {
ti = proto_tree_add_uint_format(spp_tree, hf_spp_connection_control, tvb,
0, 1, conn_ctrl,
datastream_type = tvb_get_guint8(tvb, 1);
datastream_type_string = spp_datastream(datastream_type);
if (datastream_type_string != NULL) {
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)",
- datastream_type_string);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " (%s)", datastream_type_string);
}
if (tree) {
if (datastream_type_string != NULL) {
version = tvb_get_guint8(tvb, offset);
function = tvb_get_guint8(tvb, offset + 1);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO,
- val_to_str(function, srvloc_functions, "Unknown Function (%u)"));
+ col_add_str(pinfo->cinfo, COL_INFO,
+ val_to_str(function, srvloc_functions, "Unknown Function (%u)"));
ti = proto_tree_add_item(tree, proto_srvloc, tvb, offset, -1, ENC_NA);
srvloc_tree = proto_item_add_subtree(ti, ett_srvloc);
proto_tree_add_text(srvloc_tree, tvb, offset + 10, 2, "Transaction ID: %u",
tvb_get_ntohs(tvb, offset + 10));
/* added echo of XID to info colomn by Greg Morris 0ct 14, 2005 */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ", V1 Transaction ID - %u", tvb_get_ntohs(tvb, offset + 10));
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", V1 Transaction ID - %u", tvb_get_ntohs(tvb, offset + 10));
offset += 12;
next_ext_off);
proto_tree_add_uint(srvloc_tree, hf_srvloc_xid, tvb, offset + 10, 2,
tvb_get_ntohs(tvb, offset + 10));
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ", V2 XID - %u", tvb_get_ntohs(tvb, offset + 10));
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", V2 XID - %u", tvb_get_ntohs(tvb, offset + 10));
lang_tag_len = tvb_get_ntohs(tvb, offset + 12);
proto_tree_add_uint(srvloc_tree, hf_srvloc_langtaglen, tvb, offset + 12, 2, lang_tag_len);
proto_tree_add_item(srvloc_tree, hf_srvloc_langtag, tvb, offset + 14, lang_tag_len, ENC_ASCII|ENC_NA);
sscf_status = tvb_get_guint8(tvb, SSCF_STATUS_OFFSET);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "SSCF-NNI");
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "STATUS (%s) ",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "STATUS (%s) ",
val_to_str_const(sscf_status, sscf_status_vals, "Unknown"));
sscop_info.type = sscop_pdu_type & SSCOP_TYPE_MASK;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "SSCOP");
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, val_to_str(sscop_info.type, sscop_type_vals,
+ col_add_str(pinfo->cinfo, COL_INFO, val_to_str(sscop_info.type, sscop_type_vals,
"Unknown PDU type (0x%02x)"));
/*
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 */
- if(iPreviousFrameNumber != (gint) pinfo->fd->num){
- col_clear(pinfo->cinfo, COL_INFO);
- } else {
- col_append_str(pinfo->cinfo, COL_INFO, " | ");
- }
+ /* This is a trick to know whether this is the first PDU in this packet or not */
+ if(iPreviousFrameNumber != (gint) pinfo->fd->num){
+ col_clear(pinfo->cinfo, COL_INFO);
+ } else {
+ col_append_str(pinfo->cinfo, COL_INFO, " | ");
}
+
iPreviousFrameNumber = pinfo->fd->num;
if(tvb_length(tvb) >= 16){
guint32 iCommand = 0;
if(tvb_length_remaining(tvb, offset) >= 66){
iCommand = tvb_get_letohl(tvb, offset + 62);
}
- if(check_col(pinfo->cinfo, COL_INFO)){
- col_append_str(pinfo->cinfo, COL_INFO,
+ col_append_str(pinfo->cinfo, COL_INFO,
val_to_str_ext(iCommand, &starteam_opcode_vals_ext, "Unknown (0x%02x)"));
- }
}
if(tree){
return;
/* write the protocol name to the info column */
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTOCOL_SHORT_NAME);
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTOCOL_SHORT_NAME);
frame_type = tvb_get_guint8(tvb, 1) >> 4;
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_clear(pinfo->cinfo, COL_INFO); /* clear out stuff in the info column */
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(frame_type, typenames, "invalid packet type"));
- }
+ col_clear(pinfo->cinfo, COL_INFO); /* clear out stuff in the info column */
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_const(frame_type, typenames, "invalid packet type"));
/* CFG-2 and DATA frames need special treatment during the first run:
* For CFG-2 frames, a 'config_frame' struct is created to hold the
{
proto_tree *command_tree = NULL;
guint tvbsize = tvb_length(tvb);
+ const char *s;
proto_item_set_text(command_item, "Command data");
command_tree = proto_item_add_subtree(command_item, ett_command);
/* CMD */
proto_tree_add_item(command_tree, hf_command, tvb, 0, 2, ENC_BIG_ENDIAN);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- const char *s = val_to_str_const(tvb_get_ntohs(tvb, 0), command_names, "invalid command");
- col_append_str(pinfo->cinfo, COL_INFO, ", ");
- col_append_str(pinfo->cinfo, COL_INFO, s);
- }
+
+ s = val_to_str_const(tvb_get_ntohs(tvb, 0), command_names, "invalid command");
+ col_append_str(pinfo->cinfo, COL_INFO, ", ");
+ col_append_str(pinfo->cinfo, COL_INFO, s);
if (tvbsize > 2) {
if (tvb_get_ntohs(tvb, 0) == 0x0008) {
mtp3_tvb = mtp3_msu_present(tvb, pinfo, fac, lev, msg_str,
(reported_msg_len - msg_len));
- if (mtp3_tvb == NULL && check_col(pinfo->cinfo, COL_INFO)) {
+ if (mtp3_tvb == NULL) {
if (pri >= 0) {
col_add_fstr(pinfo->cinfo, COL_INFO, "%s.%s: %s",
val_to_str_const(fac, short_fac, "UNKNOWN"),
/* Make entries in Protocol column on summary display */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "TALI");
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_set_str(pinfo->cinfo, COL_INFO, "");
- col_append_fstr(pinfo->cinfo, COL_INFO, "[%s] packet, [%u] bytes in payload", opcode, length);
- }
+ col_set_str(pinfo->cinfo, COL_INFO, "");
+ col_append_fstr(pinfo->cinfo, COL_INFO, "[%s] packet, [%u] bytes in payload", opcode, length);
if (tree) {
/* create display subtree for the protocol */
proto_tree_add_item(tapa_discover_tree, hf_tapa_discover_reply_switchip, tvb, offset, 4,
ENC_BIG_ENDIAN);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Switch: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Switch: %s",
tvb_ip_to_str(tvb, offset));
offset += 4;
DISSECTOR_ASSERT(item_length > 0);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %s: %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s: %s",
item_type_text, item_text);
- item = proto_tree_add_text(tapa_discover_tree, tvb, offset, 4 + item_length,
+ item = proto_tree_add_text(tapa_discover_tree, tvb, offset, 4 + item_length,
"Type %d = %s, length %d, value %s",
item_type, item_type_text, item_length, item_text);
else
item_text = "BINARY-DATA";
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ", T=%d L=%d",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", T=%d L=%d",
item_type, item_length);
- item = proto_tree_add_text(tapa_discover_tree, tvb, offset, 4 + item_length,
+ item = proto_tree_add_text(tapa_discover_tree, tvb, offset, 4 + item_length,
"Type %d, length %d, value %s",
item_type, item_length, item_text);
DISSECTOR_ASSERT(remaining > 4);
col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_SHORT_NAME);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Discover - %s",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Discover - %s",
val_to_str(packet_type, tapa_discover_type_vals, "Unknown (%d)"));
if (tree) {
remaining = tvb_reported_length(tvb);
col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_SHORT_NAME);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Tunnel - V=%d, T=%s", version >> 4,
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Tunnel - V=%d, T=%s", version >> 4,
val_to_str(type, tapa_tunnel_type_vals, "Unknown (%d)"));
if (tree) {
proto_item_append_text(pitem, ", CSH IP: %s", ip_to_str((guint8 *)&ip));
- if (check_col(pinfo->cinfo, COL_INFO)) {
+ {
/* Small look-ahead hack to distinguish S+ from S+* */
#define PROBE_V1_QUERY_LEN 10
const guint8 qinfo_hdr[] = { 0x4c, 0x04, 0x0c };
4, ENC_BIG_ENDIAN);
if (type != PROBE_QUERY_INFO_SID &&
- check_col(pinfo->cinfo, COL_INFO) &&
(tvb_get_guint8(tvb, 13) & (TH_SYN|TH_ACK)) == (TH_SYN|TH_ACK) &&
(flags & RVBD_FLAGS_PROBE_LAST)) {
col_prepend_fstr(pinfo->cinfo, COL_INFO, "SA++, ");
} else
tcph->th_have_seglen = FALSE;
- if (check_col(pinfo->cinfo, COL_INFO) || tree) {
+ if (tree) {
gboolean first_flag = TRUE;
for (i = 0; i < 9; i++) {
bpos = 1 << i;
}
else
{ /* Not last packet of reassembled Short Message */
- if (check_col(pinfo->cinfo, COL_INFO))col_append_fstr(pinfo->cinfo, COL_INFO," (Message fragment %u)", frag->frag_num);
+ col_append_fstr(pinfo->cinfo, COL_INFO," (Message fragment %u)", frag->frag_num);
}
if (new_tvb)
next_tvb = new_tvb;
}
message = tvb_get_guint8(tvb, 3);
- if (check_col(pinfo->cinfo, COL_INFO))
col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(message, tei_msg_vals, "Unknown message type (0x%04x)"));
if (tree) {
col_clear(pinfo->cinfo, COL_INFO);
type = (telkonet_type_t)tvb_get_guint8(tvb, offset);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "Telkonet type: %s",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Telkonet type: %s",
val_to_str(type, telkonet_type_vals, "Unknown (0x%02x)"));
- }
-
- telkonet_tree = NULL;
ti = proto_tree_add_item(tree, proto_telkonet, tvb, 0, 8, ENC_NA);
telkonet_tree = proto_item_add_subtree(ti, ett_telkonet);
{
guint idlen, aulen;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_sep_str (pinfo->cinfo, COL_INFO, ", ",
+ col_append_sep_str (pinfo->cinfo, COL_INFO, ", ",
"Authentication header");
teredoh->th_indtyp = 1;
{
proto_item *ti = NULL;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_sep_str (pinfo->cinfo, COL_INFO, ", ",
+ col_append_sep_str (pinfo->cinfo, COL_INFO, ", ",
"Origin indication");
if (tree) {
}
}
- if (data_name && check_col(pinfo->cinfo, COL_INFO))
+ if (data_name)
col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ", "(%s)",
data_name);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "TIME");
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "TIME %s",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "TIME %s",
pinfo->srcport == pinfo->match_uint ? "Response":"Request");
- }
if (tree) {
/* Adjust "Info" column and top of tree into more useful info */
if (packet_machine) {
proto_item_append_text(ti, ", %s", packet_machine);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
proto_name, packet_machine);
}
if (packet_identity) {
packet_machine ? " (%s)" : ", ID:%s",
packet_identity);
if (packet_machine) {
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s (%s)",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s (%s)",
proto_name, packet_machine, packet_identity);
}
else {
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s ID:%s",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s ID:%s",
proto_name, packet_identity);
}
}
}
offset += 2;
- if ( check_col(pinfo->cinfo, COL_INFO) )
+ if ( is_sns )
{
- if ( is_sns )
- {
- col_append_str(pinfo->cinfo, COL_INFO, ", SNS");
- }
- else
- {
- col_append_str(pinfo->cinfo, COL_INFO, ", Data");
- }
+ col_append_str(pinfo->cinfo, COL_INFO, ", SNS");
}
-
- if ( data_tree )
+ else
{
- call_dissector(data_handle,
- tvb_new_subset_remaining(tvb, offset), pinfo, data_tree);
+ col_append_str(pinfo->cinfo, COL_INFO, ", Data");
}
+ call_dissector(data_handle,
+ tvb_new_subset_remaining(tvb, offset), pinfo, data_tree);
+
return;
}
PROTO_ITEM_SET_HIDDEN(hidden_item);
}
- if ( check_col(pinfo->cinfo, COL_INFO) )
+ if ( is_attention )
{
- if ( is_attention )
- {
- col_append_str(pinfo->cinfo, COL_INFO, ", Marker");
- }
- else
- {
- col_append_str(pinfo->cinfo, COL_INFO, ", Attention");
- }
+ col_append_str(pinfo->cinfo, COL_INFO, ", Marker");
+ }
+ else
+ {
+ col_append_str(pinfo->cinfo, COL_INFO, ", Attention");
}
if ( marker_tree )
col_set_str(pinfo->cinfo, COL_PROTOCOL, "TNS");
- if (check_col(pinfo->cinfo, COL_INFO))
- {
- col_set_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
(pinfo->match_uint == pinfo->destport) ? "Request" : "Response");
- }
if (tree)
{
}
offset += 1;
- if ( check_col(pinfo->cinfo, COL_INFO))
- {
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %s (%u)",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s (%u)",
val_to_str_const(type, tns_type_vals, "Unknown"), type);
- }
if ( tree )
{
col_set_str(pinfo->cinfo, COL_PROTOCOL, "TPNCP");
- if (check_col(pinfo->cinfo, COL_INFO)) {
- if (pinfo->srcport == UDP_PORT_TPNCP_TRUNKPACK) {
- col_add_fstr(pinfo->cinfo, COL_INFO,
- "EvID=%s(%d), SeqNo=%d, ChID=%d, Len=%d, Ver=%d",
- val_to_str_const(id, tpncp_events_id_vals, "Unknown"),
- id, seq_number, cid, len, ver);
- } else {
- col_add_fstr(pinfo->cinfo, COL_INFO,
- "CmdID=%s(%d), SeqNo=%d, Len=%d, Ver=%d",
- val_to_str_const(id, tpncp_commands_id_vals, "Unknown"),
- id, seq_number, len, ver);
- }
+ if (pinfo->srcport == UDP_PORT_TPNCP_TRUNKPACK) {
+ col_add_fstr(pinfo->cinfo, COL_INFO,
+ "EvID=%s(%d), SeqNo=%d, ChID=%d, Len=%d, Ver=%d",
+ val_to_str_const(id, tpncp_events_id_vals, "Unknown"),
+ id, seq_number, cid, len, ver);
+ } else {
+ col_add_fstr(pinfo->cinfo, COL_INFO,
+ "CmdID=%s(%d), SeqNo=%d, Len=%d, Ver=%d",
+ val_to_str_const(id, tpncp_commands_id_vals, "Unknown"),
+ id, seq_number, len, ver);
}
if (tree) {
mv_val = tvb_get_guint8(tvb, 3);
/* Interpret the major vector */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(mv_val, major_vector_vs, "Unknown Major Vector: %u"));
if (tree) {
col_clear(pinfo->cinfo, COL_INFO);
tsp_type = tvb_get_guint8(tvb, 0);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO,
+ col_add_str(pinfo->cinfo, COL_INFO,
val_to_str(tsp_type, names_tsp_type, "Unknown message type (%u)"));
if (tree) {
network_tree = proto_item_add_subtree(name_item, ett_network);
str_name=tvb_get_ephemeral_stringz(tvb, 0x14, &str_len);
- if (check_col (pinfo->cinfo, COL_INFO) && str_len > 0)
- col_append_fstr(pinfo->cinfo, COL_INFO, ", Network=\"%s\"",format_text(str_name, str_len-1));
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", Network=\"%s\"",format_text(str_name, str_len-1));
while(tvb_get_guint8(tvb, 0x34 + 8*i)==0x00 && (tvb_length_remaining(tvb,0x34 + 8*i) > 6) && (i<32)) {
proto_tree_add_item(network_tree, hf_turbocell_station[i], tvb, 0x34+8*i, 6, ENC_NA);
/* Seems to be a decent TURN channel message */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "TURN CHANNEL");
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Channel Id 0x%x", channel_id);
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Channel Id 0x%x", channel_id);
ti = proto_tree_add_item(tree, proto_turnchannel, tvb, 0, -1, ENC_NA);
{
opcode = tvb_get_ntohl(tvb, 4);
- if (check_col(pinfo->cinfo, COL_INFO))
- {
- col_add_str(pinfo->cinfo, COL_INFO, val_to_str(opcode, tuxedo_opcode_vals, "Unknown (0x%02x)"));
- }
+ col_add_str(pinfo->cinfo, COL_INFO, val_to_str(opcode, tuxedo_opcode_vals, "Unknown (0x%02x)"));
if (tree)
{
next_tvb, pinfo, tree))) {
col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNKNOWN");
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "TZSP_ENCAP = %u",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "TZSP_ENCAP = %u",
encapsulation);
call_dissector(data_handle, next_tvb, pinfo, tree);
}
default:
{
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, " - UA3G Message ERR: Opcode Unknown");
+ col_append_fstr(pinfo->cinfo, COL_INFO, " - UA3G Message ERR: Opcode Unknown");
proto_tree_add_text(tree,
tvb,
command = tvb_get_guint8(tvb, offset);
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
val_to_str_ext_const(command, &str_command_ext, "Unknown"));
if (!ua3g_body_item)
command = tvb_get_guint8(tvb, offset);
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
val_to_str_ext_const(command, &str_command_ext, "Unknown"));
if (!ua3g_body_item)
column_n = tvb_get_guint8(tvb, offset + 1);
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s %d",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s %d",
val_to_str_const(command, str_command, "Unknown"),
column_n);
mode = tvb_get_guint8(tvb, offset);
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
val_to_str_ext_const(mode, &str_voice_mode_ext, "Unknown"));
if (!ua3g_body_item)
command = tvb_get_guint8(tvb, offset);
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
val_to_str_const(command, str_command, "Unknown"));
if (!ua3g_body_item)
command = tvb_get_guint8(tvb, offset);
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
val_to_str_const(command, str_ext_ring_cmd, "Unknown"));
if (!ua3g_body_item)
str_on_off_val = tvb_get_guint8(tvb, offset + 1) & 0x02;
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
- STR_ON_OFF(str_on_off_val));
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ STR_ON_OFF(str_on_off_val));
if (!ua3g_body_item)
return;
command = tvb_get_guint8(tvb, offset);
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
- val_to_str_const(command, str_command, "Unknown"));
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ val_to_str_const(command, str_command, "Unknown"));
if (!ua3g_body_item)
return;
}
} else { /* Classical Beep */
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": Classical Beep");
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": Classical Beep");
if (!ua3g_body_item)
return;
command = tvb_get_guint8(tvb, offset);
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
- STR_ON_OFF(command));
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ STR_ON_OFF(command));
if (!ua3g_body_item)
return;
command = tvb_get_guint8(tvb, offset);
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
- val_to_str_const(command, str_mute, "Unknown"));
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ val_to_str_const(command, str_mute, "Unknown"));
if (!ua3g_body_item)
return;
command = tvb_get_guint8(tvb, offset);
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
- STR_ON_OFF(command));
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ STR_ON_OFF(command));
if (!ua3g_body_item)
return;
command = tvb_get_guint8(tvb, offset);
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
- val_to_str_ext_const(command, &str_command_ext, "Unknown"));
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ val_to_str_ext_const(command, &str_command_ext, "Unknown"));
if (!ua3g_body_item)
return;
command = tvb_get_guint8(tvb, offset);
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
- STR_ON_OFF(command));
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ STR_ON_OFF(command));
if (!ua3g_body_item)
return;
command = tvb_get_guint8(tvb, offset);
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
- STR_ON_OFF(command));
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ STR_ON_OFF(command));
if (!ua3g_body_item)
return;
command = tvb_get_guint8(tvb, offset);
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
- val_to_str_ext_const(command, &str_command_ext, "Unknown"));
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ val_to_str_ext_const(command, &str_command_ext, "Unknown"));
if (!ua3g_body_item)
return;
command = tvb_get_guint8(tvb, offset);
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
- val_to_str_const(command, str_command, "Unknown"));
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ val_to_str_const(command, str_command, "Unknown"));
if (!ua3g_body_item)
return;
if (opcode != 0x21) {
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
- val_to_str_ext_const(command, &str_command_ext, "Unknown"));
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ val_to_str_ext_const(command, &str_command_ext, "Unknown"));
if (!ua3g_body_item)
return;
length--;
/* add text to the frame "INFO" column */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
- val_to_str_ext_const(opcode, opcodes_vals_ext_p, "Unknown"));
+ col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
+ val_to_str_ext_const(opcode, opcodes_vals_ext_p, "Unknown"));
proto_item_append_text(ua3g_item, ", %s", val_to_str_ext_const(opcode, opcodes_vals_ext_p, "Unknown"));
ua_tap_info.expseq = 0;
ua_tap_info.sntseq = 0;
- if (check_col(pinfo->cinfo, COL_INFO))
- {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(opcode, &uaudp_opcode_str_ext, "unknown (0x%02x)"));
- }
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str_ext(opcode, &uaudp_opcode_str_ext, "unknown (0x%02x)"));
uasip_item = proto_tree_add_protocol_format(tree, proto_uasip, tvb, 0, 5,
"SIP/NOE Protocol, %s",
{
if (datalen > 0)
{
- if (check_col(pinfo->cinfo, COL_INFO))
- {
- col_add_fstr(pinfo->cinfo, COL_INFO, "DATA exp:%d", ua_tap_info.expseq);
- col_append_fstr(pinfo->cinfo, COL_INFO, " snt:%d", ua_tap_info.sntseq);
- }
+ col_add_fstr(pinfo->cinfo, COL_INFO, "DATA exp:%d", ua_tap_info.expseq);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " snt:%d", ua_tap_info.sntseq);
}
else
{
- if (check_col(pinfo->cinfo, COL_INFO))
- {
- col_add_fstr(pinfo->cinfo, COL_INFO, "ACK exp:%d", ua_tap_info.expseq);
- col_append_fstr(pinfo->cinfo, COL_INFO, " snt:%d", ua_tap_info.sntseq);
- }
+ col_add_fstr(pinfo->cinfo, COL_INFO, "ACK exp:%d", ua_tap_info.expseq);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " snt:%d", ua_tap_info.sntseq);
}
}
}
ua_tap_info.sntseq = 0;
/* print in "INFO" column the type of UAUDP message */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo,
- COL_INFO,
- "%s",
- val_to_str_ext(opcode, &uaudp_opcode_str_ext, "unknown (0x%02x)"));
+ col_add_fstr(pinfo->cinfo,
+ COL_INFO,
+ "%s",
+ val_to_str_ext(opcode, &uaudp_opcode_str_ext, "unknown (0x%02x)"));
uaudp_item = proto_tree_add_protocol_format(tree, proto_uaudp, tvb, 0, 5,
"Universal Alcatel/UDP Encapsulation Protocol, %s",
tree);
else {
/* XXX: expert ?? */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo,
+ col_add_str(pinfo->cinfo,
COL_INFO,
"Data - Couldn't resolve direction. Check UAUDP Preferences.");
}
tap_rec->operation = OT;
/* Make entries in Info column on summary display */
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s (%s)",
- val_to_str_const(OT, vals_hdr_OT, "unknown operation"),
- val_to_str(O_R, vals_hdr_O_R, "Unknown (%d)"));
- if (result == UCP_INV_CHK)
- col_append_str(pinfo->cinfo, COL_INFO, " [checksum invalid]");
- }
+ col_append_fstr(pinfo->cinfo, COL_INFO, "%s (%s)",
+ val_to_str_const(OT, vals_hdr_OT, "unknown operation"),
+ val_to_str(O_R, vals_hdr_O_R, "Unknown (%d)"));
+ if (result == UCP_INV_CHK)
+ col_append_str(pinfo->cinfo, COL_INFO, " [checksum invalid]");
/* In the interest of speed, if "tree" is NULL, don't do any work not
necessary to generate protocol tree items. */
case TYPE_DEVICE_ID:
/* Device ID */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_fstr(pinfo->cinfo, COL_INFO,
"Device ID: %s ",
tvb_format_stringzpad(tvb, offset + 4,
length - 4));
real_length = length + 3;
}
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO,
+ col_append_fstr(pinfo->cinfo, COL_INFO,
"Port ID: %s ",
tvb_format_stringzpad(tvb, offset + 4, length - 4));
col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBHID");
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
- val_to_str(usb_trans_info->setup.request, setup_request_names_vals, "Unknown type %x"),
- is_request ? "Request" : "Response");
- }
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
+ val_to_str(usb_trans_info->setup.request, setup_request_names_vals, "Unknown type %x"),
+ is_request ? "Request" : "Response");
if (is_request) {
proto_tree_add_item(tree, hf_usb_hid_request, tvb, offset, 1, ENC_LITTLE_ENDIAN);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBMS");
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
- val_to_str(usb_trans_info->setup.request, setup_request_names_vals, "Unknown type %x"),
- is_request?"Request":"Response");
- }
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
+ val_to_str(usb_trans_info->setup.request, setup_request_names_vals, "Unknown type %x"),
+ is_request?"Request":"Response");
if(is_request){
proto_tree_add_item(tree, hf_usb_ms_request, tvb, offset, 1, ENC_LITTLE_ENDIAN);
set_addr(packet_info *pinfo _U_ , int field, gchar rid, gchar sid, gchar did)
{
if (field == SRC) {
- if (check_col(pinfo->cinfo, COL_DEF_SRC))
- col_append_fstr(pinfo->cinfo, COL_DEF_SRC, " %2.2X:%2.2X:%2.2X", rid, sid, did);
+ col_append_fstr(pinfo->cinfo, COL_DEF_SRC, " %2.2X:%2.2X:%2.2X", rid, sid, did);
} else {
- if (check_col(pinfo->cinfo, COL_DEF_DST))
- col_append_fstr(pinfo->cinfo, COL_DEF_DST, " %2.2X:%2.2X:%2.2X", rid, sid, did);
+ col_append_fstr(pinfo->cinfo, COL_DEF_DST, " %2.2X:%2.2X:%2.2X", rid, sid, did);
}
}
byte0 = tvb_get_guint8(tvb, 0);
- if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
- col_add_fstr(pinfo->cinfo, COL_RES_DL_SRC, "0x%02X", byte0);
+ col_add_fstr(pinfo->cinfo, COL_RES_DL_SRC, "0x%02X", byte0);
byte1 = tvb_get_guint8(tvb, 1);
/* Check IP header length */
if(ihl < IP_HDR_LEN) {
- if(check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "VJ uncompressed TCP (IP header length (%u) < %u)",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "VJ uncompressed TCP (IP header length (%u) < %u)",
ihl, IP_HDR_LEN);
- }
if(cs != NULL)
cs->flags |= SLF_TOSS;
return;
/* Check TCP header length */
if(thl < TCP_HDR_LEN) {
- if(check_col(pinfo->cinfo, COL_INFO)) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "VJ uncompressed TCP (TCP header length (%u) < %u)",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "VJ uncompressed TCP (TCP header length (%u) < %u)",
thl, TCP_HDR_LEN);
- }
if(cs != NULL)
cs->flags |= SLF_TOSS;
cs = NULL; /* disable state updates */
g_ascii_strtod((char *)tvb_get_ephemeral_string(tvb, 4, 7), NULL);
per_conversation_info->server_port = pinfo->srcport;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO,
+ col_add_fstr(pinfo->cinfo, COL_INFO,
"Server protocol version: %s",
tvb_format_text(tvb, 4, 7));
per_conversation_info->client_proto_ver =
g_ascii_strtod((char *)tvb_get_ephemeral_string(tvb, 4, 7), NULL);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO,
+ col_add_fstr(pinfo->cinfo, COL_INFO,
"Client protocol version: %s",
tvb_format_text(tvb, 4, 7));
/* Put some information here, so that the user knows what's going on. */
/* Add summary to INFO column if it is enabled */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, " (Unknown WBXML version 0x%02x)", version);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " (Unknown WBXML version 0x%02x)", version);
ti = proto_tree_add_item (tree, proto_wbxml, tvb, 0, -1, ENC_NA);
proto_item_append_text(ti, ", Unknown version 0x%02x", version);
return;
}
/* Add summary to INFO column if it is enabled */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, " (WBXML %s)", summary);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " (WBXML %s)", summary);
/* create display subtree for the protocol */
ti = proto_tree_add_item (tree, proto_wbxml, tvb, 0, -1, ENC_NA);
col_clear(pinfo->cinfo, COL_INFO);
- if(check_col(pinfo->cinfo, COL_INFO)) {
- col_add_str(pinfo->cinfo, COL_INFO, val_to_str(wccp_message_type,
+ col_add_str(pinfo->cinfo, COL_INFO, val_to_str(wccp_message_type,
wccp_type_vals, "Unknown WCCP message (%u)"));
- }
if(tree != NULL) {
wccp_tree_item = proto_tree_add_item(tree, proto_wccp, tvb, offset,
/*XXX should test seq to be sure it the last + 1 !! */
- if (check_col(pinfo->cinfo, COL_INFO)){
- col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(cmd, cmd_string, "Unknown"));
- if ( cmd == 0xf)
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
+ col_add_str(pinfo->cinfo, COL_INFO, val_to_str_const(cmd, cmd_string, "Unknown"));
+ if ( cmd == 0xf)
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
val_to_str_const(ext_cmd, ext_cmd_string, "Unknown"));
- }
if (tree) {
ti = proto_tree_add_item(tree, proto_wcp, tvb, 0, wcp_header_len, ENC_NA);
offset += 4;
/* Summary information */
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %.02f %.02f %.02f",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %.02f %.02f %.02f",
server_name, loadav_5, loadav_10, loadav_15);
if (tree) {
/* Make entries in Protocol column and Info column on summary display */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "WLCCP");
- if (check_col(pinfo->cinfo, COL_INFO))
+ if(tvb_get_guint8(tvb, 0) == 0xC1) /* Get the version number */
{
- if(tvb_get_guint8(tvb, 0) == 0xC1) /* Get the version number */
- {
- sap_id = tvb_get_guint8(tvb,1) & SAP_VALUE_MASK;
- base_message_type=(tvb_get_guint8(tvb,6)) & MT_BASE_MSG_TYPE;
- message_sub_type=(tvb_get_guint8(tvb, 6) & MT_SUBTYPE ) >> 6;
+ sap_id = tvb_get_guint8(tvb,1) & SAP_VALUE_MASK;
+ base_message_type=(tvb_get_guint8(tvb,6)) & MT_BASE_MSG_TYPE;
+ message_sub_type=(tvb_get_guint8(tvb, 6) & MT_SUBTYPE ) >> 6;
- switch (sap_id)
- {
+ switch (sap_id)
+ {
- case WLCCP_SAP_CCM:
- {
+ case WLCCP_SAP_CCM:
+ {
- col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s",
val_to_str_const(base_message_type, wlccp_msg_type_vs_0, "Unknown"),
- val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown")
- );
- break;
+ val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown"));
+ break;
- } /* case WLCCP_SAP_CCM */
+ } /* case WLCCP_SAP_CCM */
- case WLCCP_SAP_SEC:
- {
+ case WLCCP_SAP_SEC:
+ {
- col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s",
val_to_str_const(base_message_type, wlccp_msg_type_vs_1, "Unknown"),
- val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown")
- );
- break;
- } /* case WLCCP_SAP_SEC */
+ val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown"));
+ break;
+ } /* case WLCCP_SAP_SEC */
- case WLCCP_SAP_RRM:
- {
- col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s",
+ case WLCCP_SAP_RRM:
+ {
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s",
val_to_str_const(base_message_type, wlccp_msg_type_vs_2, "Unknown"),
- val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown")
- );
- break;
+ val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown"));
+ break;
- } /* case WLCCP_SAP_RRM */
+ } /* case WLCCP_SAP_RRM */
- case WLCCP_SAP_QOS:
- {
- col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s",
+ case WLCCP_SAP_QOS:
+ {
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s",
val_to_str_const(base_message_type, wlccp_msg_type_vs_3, "Unknown"),
- val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown")
- );
- break;
- } /* case WLCCP_SAP_QOS */
+ val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown"));
+ break;
+ } /* case WLCCP_SAP_QOS */
- case WLCCP_SAP_NM:
- {
- col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s",
+ case WLCCP_SAP_NM:
+ {
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s",
val_to_str_const(base_message_type, wlccp_msg_type_vs_4, "Unknown"),
- val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown")
- );
- break;
+ val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown"));
+ break;
- } /* case WLCCP_SAP_NM */
+ } /* case WLCCP_SAP_NM */
- case WLCCP_SAP_MIP:
- {
- col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s",
+ case WLCCP_SAP_MIP:
+ {
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s",
val_to_str_const(base_message_type, wlccp_msg_type_vs_5, "Unknown"),
- val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown")
- );
- break;
- } /* case WLCCP_SAP_MIP */
-
- default:
- {
- col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s",
- "Unknown",
- val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown")
- );
- break;
- } /* default for switch sap */
+ val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown"));
+ break;
+ } /* case WLCCP_SAP_MIP */
+ default:
+ {
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Message Type: %-27s SubType: %s", "Unknown",
+ val_to_str_const(message_sub_type, wlccp_subtype_vs, "Unknown"));
+ break;
+ } /* default for switch sap */
- } /* switch sap */
- } /* if version=0xC1 (tvb_get_guint8(tvb, 0) == 0xC1)*/
+ } /* switch sap */
- } /* if check_col */
+ } /* if version=0xC1 (tvb_get_guint8(tvb, 0) == 0xC1)*/
if (tree) {
/* create display subtree for the protocol */
cmd = tvb_get_guint8(tvb, offset);
- if(check_col(pinfo->cinfo, COL_INFO)) {
- col_set_str(pinfo->cinfo, COL_INFO,
+ col_set_str(pinfo->cinfo, COL_INFO,
val_to_str_const(cmd, cmd_vs,
"Unrecognized packet type"));
- }
if(tree) {
ti = proto_tree_add_item(tree, proto_wow, tvb, 0, -1, ENC_NA);
case WPS_TLV_TYPE_MESSAGE_TYPE:
tmp_item = proto_tree_add_item(tlv_root, hf_eapwps_tlv_message_type, tvb, offset+4, 1, ENC_BIG_ENDIAN);
hfindex = hf_eapwps_tlv_message_type;
- if ((pinfo != NULL) && check_col(pinfo->cinfo, COL_INFO))
+ if ((pinfo != NULL))
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", val_to_str(tvb_get_guint8(tvb, offset+4),
eapwps_tlv_message_type_vals,
"Unknown (0x%02x)"));
pi = proto_item_get_parent(pi);
if (pi != NULL)
proto_item_append_text(pi, " (Wifi Alliance, WifiProtectedSetup)");
- if ((pinfo != NULL) && (check_col(pinfo->cinfo, COL_INFO)))
+ if (pinfo != NULL)
col_append_fstr(pinfo->cinfo, COL_INFO, ", WPS");
proto_tree *wtls_rec_tree;
proto_tree *wtls_msg_type_tree;
- if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ switch ( pinfo->match_uint )
{
- switch ( pinfo->match_uint )
- {
- case UDP_PORT_WTLS_WSP:
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "WTLS+WSP" );
- break;
- case UDP_PORT_WTLS_WTP_WSP:
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "WTLS+WTP+WSP" );
- break;
- }
+ case UDP_PORT_WTLS_WSP:
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "WTLS+WSP" );
+ break;
+ case UDP_PORT_WTLS_WTP_WSP:
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "WTLS+WTP+WSP" );
+ break;
}
/* Develop the string to put in the Info column */
git.samba.org / metze / wireshark / wip.git / commitdiff