aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-2dparityfec.c23
-rw-r--r--epan/dissectors/packet-3com-njack.c3
-rw-r--r--epan/dissectors/packet-3g-a11.c48
-rw-r--r--epan/dissectors/packet-9p.c6
-rw-r--r--epan/dissectors/packet-aarp.c34
-rw-r--r--epan/dissectors/packet-acn.c29
-rw-r--r--epan/dissectors/packet-actrace.c50
-rw-r--r--epan/dissectors/packet-afp.c71
-rw-r--r--epan/dissectors/packet-afs.c9
-rw-r--r--epan/dissectors/packet-agentx.c5
-rw-r--r--epan/dissectors/packet-aim-buddylist.c16
-rw-r--r--epan/dissectors/packet-aim-chat.c9
-rw-r--r--epan/dissectors/packet-aim-icq.c3
-rw-r--r--epan/dissectors/packet-aim-messaging.c10
-rw-r--r--epan/dissectors/packet-aim-signon.c6
-rw-r--r--epan/dissectors/packet-aim.c11
16 files changed, 131 insertions, 202 deletions
diff --git a/epan/dissectors/packet-2dparityfec.c b/epan/dissectors/packet-2dparityfec.c
index c200e3efe7..a69b5f90e6 100644
--- a/epan/dissectors/packet-2dparityfec.c
+++ b/epan/dissectors/packet-2dparityfec.c
@@ -121,19 +121,16 @@ static void dissect_2dparityfec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
col_set_str(pinfo->cinfo, COL_PROTOCOL, "2dFEC");
/* Configure the info column */
- if(check_col(pinfo->cinfo, COL_INFO))
- {
- if(D)
- {
- col_add_fstr(pinfo->cinfo, COL_INFO, "Row FEC - SNBase=%u, Offset=%u, NA=%u",
- SNBase, OffsetField, NAField);
- }
- else
- {
- col_add_fstr(pinfo->cinfo, COL_INFO, "Column FEC - SNBase=%u, Offset=%u, NA=%u",
- SNBase, OffsetField, NAField);
- }
- }
+ if(D)
+ {
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Row FEC - SNBase=%u, Offset=%u, NA=%u",
+ SNBase, OffsetField, NAField);
+ }
+ else
+ {
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Column FEC - SNBase=%u, Offset=%u, NA=%u",
+ SNBase, OffsetField, NAField);
+ }
if(tree)
{
diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c
index d8ed35554e..22778ba536 100644
--- a/epan/dissectors/packet-3com-njack.c
+++ b/epan/dissectors/packet-3com-njack.c
@@ -577,8 +577,7 @@ dissect_njack(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
packet_type = tvb_get_guint8(tvb, 5);
col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_SHORT_NAME);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_str(pinfo->cinfo, COL_INFO, val_to_str(packet_type, njack_type_vals, "Type 0x%02x"));
+ col_add_str(pinfo->cinfo, COL_INFO, val_to_str(packet_type, njack_type_vals, "Type 0x%02x"));
if (tree) {
ti = proto_tree_add_item(tree, proto_njack, tvb, offset, -1,
diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index 6c484c0ab2..903265613e 100644
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -1399,10 +1399,9 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
switch (type) {
case REGISTRATION_REQUEST:
- if(check_col(pinfo->cinfo,COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Reg Request: PDSN=%s PCF=%s",
- ip_to_str(tvb_get_ptr(tvb, 8, 4)),
- ip_to_str(tvb_get_ptr(tvb,12,4)));
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Reg Request: PDSN=%s PCF=%s",
+ ip_to_str(tvb_get_ptr(tvb, 8, 4)),
+ ip_to_str(tvb_get_ptr(tvb,12,4)));
if (tree) {
ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE);
@@ -1453,9 +1452,8 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} /* if tree */
break;
case REGISTRATION_REPLY:
- if(check_col(pinfo->cinfo,COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Reg Reply: PDSN=%s, Code=%u",
- ip_to_str(tvb_get_ptr(tvb,8,4)), tvb_get_guint8(tvb,1));
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Reg Reply: PDSN=%s, Code=%u",
+ ip_to_str(tvb_get_ptr(tvb,8,4)), tvb_get_guint8(tvb,1));
if (tree) {
/* Add Subtree */
@@ -1494,9 +1492,8 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case REGISTRATION_UPDATE:
- if(check_col(pinfo->cinfo,COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO,"Reg Update: PDSN=%s",
- ip_to_str(tvb_get_ptr(tvb,8,4)));
+ col_add_fstr(pinfo->cinfo, COL_INFO,"Reg Update: PDSN=%s",
+ ip_to_str(tvb_get_ptr(tvb,8,4)));
if (tree) {
/* Add Subtree */
ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE);
@@ -1529,10 +1526,9 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} /* if tree */
break;
case REGISTRATION_ACK:
- if(check_col(pinfo->cinfo,COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Reg Ack: PCF=%s Status=%u",
- ip_to_str(tvb_get_ptr(tvb, 8, 4)),
- tvb_get_guint8(tvb,3));
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Reg Ack: PCF=%s Status=%u",
+ ip_to_str(tvb_get_ptr(tvb, 8, 4)),
+ tvb_get_guint8(tvb,3));
if (tree) {
/* Add Subtree */
ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE);
@@ -1569,9 +1565,8 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} /* if tree */
break;
case SESSION_UPDATE: /* IOS4.3 */
- if(check_col(pinfo->cinfo,COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO,"Ses Update: PDSN=%s",
- ip_to_str(tvb_get_ptr(tvb,8,4)));
+ col_add_fstr(pinfo->cinfo, COL_INFO,"Ses Update: PDSN=%s",
+ ip_to_str(tvb_get_ptr(tvb,8,4)));
if (tree) {
/* Add Subtree */
ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE);
@@ -1604,10 +1599,9 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} /* if tree */
break;
case SESSION_ACK: /* IOS4.3 */
- if(check_col(pinfo->cinfo,COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Ses Upd Ack: PCF=%s, Status=%u",
- ip_to_str(tvb_get_ptr(tvb, 8, 4)),
- tvb_get_guint8(tvb,3));
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Ses Upd Ack: PCF=%s, Status=%u",
+ ip_to_str(tvb_get_ptr(tvb, 8, 4)),
+ tvb_get_guint8(tvb,3));
if (tree) {
/* Add Subtree */
ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE);
@@ -1644,10 +1638,9 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} /* if tree */
break;
case CAPABILITIES_INFO: /* IOS5.1 */
- if(check_col(pinfo->cinfo,COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Cap Info: PDSN=%s, PCF=%s",
- ip_to_str(tvb_get_ptr(tvb, 8, 4)),
- ip_to_str(tvb_get_ptr(tvb,12,4)));
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Cap Info: PDSN=%s, PCF=%s",
+ ip_to_str(tvb_get_ptr(tvb, 8, 4)),
+ ip_to_str(tvb_get_ptr(tvb,12,4)));
if (tree) {
/* Add Subtree */
ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE);
@@ -1684,9 +1677,8 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
} /* if tree */
break;
case CAPABILITIES_INFO_ACK: /* IOS5.1 */
- if(check_col(pinfo->cinfo,COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Cap Info Ack: PCF=%s",
- ip_to_str(tvb_get_ptr(tvb, 8, 4)));
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Cap Info Ack: PCF=%s",
+ ip_to_str(tvb_get_ptr(tvb, 8, 4)));
if (tree) {
/* Add Subtree */
ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE);
diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c
index 0a50688545..659ba72265 100644
--- a/epan/dissectors/packet-9p.c
+++ b/epan/dissectors/packet-9p.c
@@ -228,14 +228,12 @@ static void dissect_9P(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
mname = val_to_str(ninemsg, ninep_msg_type,"Unknown");
if(strcmp(mname,"Unknown") == 0) {
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "9P Data Continuation(?) (Tag %u)",(guint)ninemsg);
+ col_add_fstr(pinfo->cinfo, COL_INFO, "9P Data Continuation(?) (Tag %u)",(guint)ninemsg);
return;
}
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s Tag=%u",mname,(guint)tvb_get_letohs(tvb,offset+5));
+ col_append_fstr(pinfo->cinfo, COL_INFO, "%s Tag=%u",mname,(guint)tvb_get_letohs(tvb,offset+5));
if (!tree) /*not much more of one line summary interrest yet.. */
return;
diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c
index 815a3d8ebc..8665b75c02 100644
--- a/epan/dissectors/packet-aarp.c
+++ b/epan/dissectors/packet-aarp.c
@@ -183,24 +183,22 @@ dissect_aarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
tpa_val = tvb_get_ptr(tvb, tpa_offset, ar_pln);
tpa_str = aarpproaddr_to_str(tpa_val, ar_pln, ar_pro);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- switch (ar_op) {
- case AARP_REQUEST:
- case AARP_REQUEST_SWAPPED:
- col_add_fstr(pinfo->cinfo, COL_INFO, "Who has %s? Tell %s", tpa_str, spa_str);
- break;
- case AARP_REPLY:
- case AARP_REPLY_SWAPPED:
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s is at %s", spa_str, sha_str);
- break;
- case AARP_PROBE:
- case AARP_PROBE_SWAPPED:
- col_add_fstr(pinfo->cinfo, COL_INFO, "Is there a %s", tpa_str);
- break;
- default:
- col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown AARP opcode 0x%04x", ar_op);
- break;
- }
+ switch (ar_op) {
+ case AARP_REQUEST:
+ case AARP_REQUEST_SWAPPED:
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Who has %s? Tell %s", tpa_str, spa_str);
+ break;
+ case AARP_REPLY:
+ case AARP_REPLY_SWAPPED:
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s is at %s", spa_str, sha_str);
+ break;
+ case AARP_PROBE:
+ case AARP_PROBE_SWAPPED:
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Is there a %s", tpa_str);
+ break;
+ default:
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Unknown AARP opcode 0x%04x", ar_op);
+ break;
}
if (tree) {
diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c
index 72a0db47b9..3b57c36cdb 100644
--- a/epan/dissectors/packet-acn.c
+++ b/epan/dissectors/packet-acn.c
@@ -1917,16 +1917,14 @@ dissect_acn_dmx_data_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in
}
/* add a snippet to info (this may be slow) */
- if(check_col(pinfo->cinfo,COL_INFO)){
- col_append_fstr(pinfo->cinfo,COL_INFO, ", Sc %02x, [%02x %02x %02x %02x %02x %02x...]",
- dmx_start_code,
- tvb_get_guint8(tvb, data_offset),
- tvb_get_guint8(tvb, data_offset+1),
- tvb_get_guint8(tvb, data_offset+2),
- tvb_get_guint8(tvb, data_offset+3),
- tvb_get_guint8(tvb, data_offset+4),
- tvb_get_guint8(tvb, data_offset+5));
- }
+ col_append_fstr(pinfo->cinfo,COL_INFO, ", Sc %02x, [%02x %02x %02x %02x %02x %02x...]",
+ dmx_start_code,
+ tvb_get_guint8(tvb, data_offset),
+ tvb_get_guint8(tvb, data_offset+1),
+ tvb_get_guint8(tvb, data_offset+2),
+ tvb_get_guint8(tvb, data_offset+3),
+ tvb_get_guint8(tvb, data_offset+4),
+ tvb_get_guint8(tvb, data_offset+5));
/* add a header line */
g_snprintf(buffer, BUFFER_SIZE, "%-10s: ", "Data...");
@@ -2123,9 +2121,7 @@ dissect_acn_dmx_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off
data_offset += 2;
/* add universe to info */
- if(check_col(pinfo->cinfo,COL_INFO)){
- col_append_fstr(pinfo->cinfo,COL_INFO, ", Universe %d, Seq %3d", universe, sequence );
- }
+ col_append_fstr(pinfo->cinfo,COL_INFO, ", Universe %d, Seq %3d", universe, sequence );
proto_item_append_text(ti, ", Universe: %d, Priority: %d", universe, priority);
data_offset = dissect_acn_dmx_data_pdu(tvb, pinfo, pdu_tree, data_offset, &pdu_offsets);
@@ -2486,9 +2482,7 @@ dissect_acn_root_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int of
proto_item_append_text(ti, ", Src: %s", guid_to_str(&guid));
/* add cid to info */
- if(check_col(pinfo->cinfo,COL_INFO)){
- col_add_fstr(pinfo->cinfo,COL_INFO, "CID %s", guid_to_str(&guid));
- }
+ col_add_fstr(pinfo->cinfo,COL_INFO, "CID %s", guid_to_str(&guid));
proto_tree_add_item(pdu_tree, hf_acn_cid, tvb, header_offset, 16, FALSE);
header_offset += 16;
@@ -2584,8 +2578,7 @@ dissect_acn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Set the protocol column */
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACN");
- if(check_col(pinfo->cinfo,COL_INFO))
- col_add_fstr(pinfo->cinfo,COL_INFO, "ACN [Src Port: %d, Dst Port: %d]", pinfo->srcport, pinfo->destport );
+ col_add_fstr(pinfo->cinfo,COL_INFO, "ACN [Src Port: %d, Dst Port: %d]", pinfo->srcport, pinfo->destport );
if (tree) { /* we are being asked for details */
ti = proto_tree_add_item(tree, proto_acn, tvb, 0, -1, FALSE);
diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c
index 864892b414..964c131ed4 100644
--- a/epan/dissectors/packet-actrace.c
+++ b/epan/dissectors/packet-actrace.c
@@ -526,13 +526,12 @@ static void dissect_actrace_cas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *a
proto_tree_add_int(actrace_tree, hf_actrace_cas_function, tvb, offset, 4, function);
offset += 4;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s|%d|%s|%d|%s|",
- val_to_str(source, actrace_cas_source_vals_short, "ukn"),
- curr_state,
- val_to_str(event, actrace_cas_event_vals, "%d"),
- next_state,
- val_to_str(function, actrace_cas_function_vals, "%d"));
+ col_append_fstr(pinfo->cinfo, COL_INFO, "%s|%d|%s|%d|%s|",
+ val_to_str(source, actrace_cas_source_vals_short, "ukn"),
+ curr_state,
+ val_to_str(event, actrace_cas_event_vals, "%d"),
+ next_state,
+ val_to_str(function, actrace_cas_function_vals, "%d"));
par0 = tvb_get_ntohl(tvb, offset);
switch (function)
@@ -541,31 +540,27 @@ static void dissect_actrace_cas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *a
proto_tree_add_text(actrace_tree, tvb, offset, 4,
"Parameter 0: %s", val_to_str(par0,
actrace_cas_pstn_event_vals, "Unknown (%d)"));
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s|",
- val_to_str(par0, actrace_cas_pstn_event_vals, "%d"));
+ col_append_fstr(pinfo->cinfo, COL_INFO, "%s|",
+ val_to_str(par0, actrace_cas_pstn_event_vals, "%d"));
break;
case CHANGE_COLLECT_TYPE:
proto_tree_add_text(actrace_tree, tvb, offset, 4,
"Parameter 0: %s", val_to_str(par0,
actrace_cas_collect_type_vals, "Unknown (%d)"));
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s|",
- val_to_str(par0, actrace_cas_collect_type_vals, "%d"));
+ col_append_fstr(pinfo->cinfo, COL_INFO, "%s|",
+ val_to_str(par0, actrace_cas_collect_type_vals, "%d"));
break;
case SEND_MF:
case SEND_DEST_NUM:
proto_tree_add_text(actrace_tree, tvb, offset, 4,
"Parameter 0: %s", val_to_str(par0,
actrace_cas_send_type_vals, "Unknown (%d)"));
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s|",
- val_to_str(par0, actrace_cas_send_type_vals, "%d"));
+ col_append_fstr(pinfo->cinfo, COL_INFO, "%s|",
+ val_to_str(par0, actrace_cas_send_type_vals, "%d"));
break;
default:
proto_tree_add_int(actrace_tree, hf_actrace_cas_par0, tvb, offset, 4, par0);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, "%d|", par0);
+ col_append_fstr(pinfo->cinfo, COL_INFO, "%d|", par0);
}
offset += 4;
@@ -573,20 +568,17 @@ static void dissect_actrace_cas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *a
if (function == SEND_EVENT) {
proto_tree_add_text(actrace_tree, tvb, offset, 4,
"Parameter 1: %s", val_to_str(par1, actrace_cas_cause_vals, "Unknown (%d)"));
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, "%s|",
- val_to_str(par1, actrace_cas_cause_vals, "%d"));
+ col_append_fstr(pinfo->cinfo, COL_INFO, "%s|",
+ val_to_str(par1, actrace_cas_cause_vals, "%d"));
} else {
proto_tree_add_int(actrace_tree, hf_actrace_cas_par1, tvb, offset, 4, par1);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, "%d|", par1);
+ col_append_fstr(pinfo->cinfo, COL_INFO, "%d|", par1);
}
offset += 4;
par2 = tvb_get_ntohl(tvb, offset);
proto_tree_add_int(actrace_tree, hf_actrace_cas_par2, tvb, offset, 4, par2);
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, "%d|", par2);
+ col_append_fstr(pinfo->cinfo, COL_INFO, "%d|", par2);
offset += 4;
trunk = tvb_get_ntohl(tvb, offset);
@@ -597,8 +589,7 @@ static void dissect_actrace_cas(tvbuff_t *tvb, packet_info *pinfo, proto_tree *a
proto_tree_add_int(actrace_tree, hf_actrace_cas_bchannel, tvb, offset, 4, bchannel);
offset += 4;
- if (check_col(pinfo->cinfo, COL_INFO))
- col_prepend_fstr(pinfo->cinfo, COL_INFO, "t%db%d|", trunk, bchannel);
+ col_prepend_fstr(pinfo->cinfo, COL_INFO, "t%db%d|", trunk, bchannel);
value = tvb_get_ntohl(tvb, offset);
proto_tree_add_int(actrace_tree, hf_actrace_cas_connection_id, tvb, offset, 4, value);
@@ -697,9 +688,8 @@ static void dissect_actrace_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
call_dissector(lapd_handle, next_tvb, pinfo, tree);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AC_ISDN");
- if (check_col(pinfo->cinfo, COL_INFO))
- col_prepend_fstr(pinfo->cinfo, COL_INFO, "Trunk:%d Blade %s PSTN "
- , trunk, value==PSTN_TO_BLADE?"<--":"-->");
+ col_prepend_fstr(pinfo->cinfo, COL_INFO, "Trunk:%d Blade %s PSTN "
+ , trunk, value==PSTN_TO_BLADE?"<--":"-->");
}
/*
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index 231d43db22..d8dd6222d2 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -1778,7 +1778,7 @@ decode_name_label (proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, gint off
}
name = get_name(tvb, offset +1, type);
- if (pinfo && check_col(pinfo->cinfo, COL_INFO)) {
+ if (pinfo) {
col_append_fstr(pinfo->cinfo, COL_INFO, ": Vol=%u Did=%u", Vol, Did);
if (len) {
col_append_fstr(pinfo->cinfo, COL_INFO, " Name=%s", name);
@@ -1824,7 +1824,7 @@ add_info_fork(tvbuff_t *tvb, packet_info *pinfo, gint offset)
guint16 ofork;
ofork = tvb_get_ntohs(tvb, offset);
- if (ofork && check_col(pinfo->cinfo, COL_INFO)) {
+ if (ofork) {
col_append_fstr(pinfo->cinfo, COL_INFO, ": Fork=%u", ofork);
}
}
@@ -1836,9 +1836,7 @@ add_info_vol(tvbuff_t *tvb, packet_info *pinfo, gint offset)
guint16 vol;
vol = tvb_get_ntohs(tvb, offset);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ": Vol=%u", vol);
- }
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": Vol=%u", vol);
}
/* ************************** */
@@ -1846,6 +1844,7 @@ static gint
dissect_query_afp_open_vol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gint offset)
{
int len;
+ const gchar *rep;
PAD(1);
@@ -1854,11 +1853,8 @@ dissect_query_afp_open_vol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
len = tvb_get_guint8(tvb, offset);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- const gchar *rep;
- rep = get_name(tvb, offset, 2);
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", rep);
- }
+ rep = get_name(tvb, offset, 2);
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s", rep);
if (!tree)
return offset;
@@ -2508,7 +2504,6 @@ static gint
dissect_query_afp_write(tvbuff_t *tvb, packet_info *pinfo , proto_tree *tree, gint offset)
{
int param;
- gint col_info = check_col(pinfo->cinfo, COL_INFO);
proto_tree_add_item(tree, hf_afp_flag, tvb, offset, 1,FALSE);
@@ -2519,17 +2514,13 @@ dissect_query_afp_write(tvbuff_t *tvb, packet_info *pinfo , proto_tree *tree, gi
offset += 2;
proto_tree_add_item(tree, hf_afp_offset, tvb, offset, 4,FALSE);
- if (col_info) {
- param = tvb_get_ntohl(tvb, offset);
- col_append_fstr(pinfo->cinfo, COL_INFO, " Offset=%d", param);
- }
+ param = tvb_get_ntohl(tvb, offset);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " Offset=%d", param);
offset += 4;
proto_tree_add_item(tree, hf_afp_rw_count, tvb, offset, 4,FALSE);
- if (col_info) {
- param = tvb_get_ntohl(tvb, offset);
- col_append_fstr(pinfo->cinfo, COL_INFO, " Size=%d", param);
- }
+ param = tvb_get_ntohl(tvb, offset);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " Size=%d", param);
offset += 4;
return offset;
@@ -2578,26 +2569,21 @@ static gint
dissect_query_afp_read(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, gint offset)
{
int param;
- gint col_info = check_col(pinfo->cinfo, COL_INFO);
PAD(1);
- add_info_fork(tvb, pinfo, offset);
+ add_info_fork(tvb, pinfo, offset);
proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,FALSE);
offset += 2;
proto_tree_add_item(tree, hf_afp_offset, tvb, offset, 4,FALSE);
- if (col_info) {
- param = tvb_get_ntohl(tvb, offset);
- col_append_fstr(pinfo->cinfo, COL_INFO, " Offset=%d", param);
- }
+ param = tvb_get_ntohl(tvb, offset);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " Offset=%d", param);
offset += 4;
proto_tree_add_item(tree, hf_afp_rw_count, tvb, offset, 4,FALSE);
- if (col_info) {
- param = tvb_get_ntohl(tvb, offset);
- col_append_fstr(pinfo->cinfo, COL_INFO, " Size=%d", param);
- }
+ param = tvb_get_ntohl(tvb, offset);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " Size=%d", param);
offset += 4;
proto_tree_add_item(tree, hf_afp_newline_mask, tvb, offset, 1,FALSE);
@@ -2615,7 +2601,7 @@ dissect_query_afp_read_ext(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tr
{
PAD(1);
- add_info_fork(tvb, pinfo, offset);
+ add_info_fork(tvb, pinfo, offset);
proto_tree_add_item(tree, hf_afp_ofork, tvb, offset, 2,FALSE);
offset += 2;
@@ -2906,10 +2892,8 @@ dissect_query_afp_set_fork_param(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
}
else {
proto_tree_add_item(tree, hf_afp_ofork_len, tvb, offset, 4,FALSE);
- if (check_col(pinfo->cinfo, COL_INFO)) {
- param = tvb_get_ntohl(tvb, offset);
- col_append_fstr(pinfo->cinfo, COL_INFO, " Size=%d", param);
- }
+ param = tvb_get_ntohl(tvb, offset);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " Size=%d", param);
offset += 4;
}
return offset;
@@ -4109,7 +4093,6 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
nstime_t delta_ts;
int len = tvb_reported_length(tvb);
- gint col_info = check_col(pinfo->cinfo, COL_INFO);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AFP");
col_clear(pinfo->cinfo, COL_INFO);
@@ -4150,16 +4133,14 @@ dissect_afp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
afp_command = request_val->command;
- if (col_info) {
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
- val_to_str(afp_command, CommandCode_vals,
- "Unknown command (%u)"),
- aspinfo->reply ? "reply" : "request");
- if (aspinfo->reply && aspinfo->code != 0) {
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s (%d)",
- val_to_str(aspinfo->code, asp_error_vals,
- "Unknown error (%u)"), aspinfo->code);
- }
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
+ val_to_str(afp_command, CommandCode_vals,
+ "Unknown command (%u)"),
+ aspinfo->reply ? "reply" : "request");
+ if (aspinfo->reply && aspinfo->code != 0) {
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s (%d)",
+ val_to_str(aspinfo->code, asp_error_vals,
+ "Unknown error (%u)"), aspinfo->code);
}
if (tree)
diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c
index 3c6ea7a7af..8ca5090f58 100644
--- a/epan/dissectors/packet-afs.c
+++ b/epan/dissectors/packet-afs.c
@@ -1568,23 +1568,20 @@ dissect_afs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if ( VALID_OPCODE(opcode) ) {
if ( vals ) {
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s%s %s: %s (%d)",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s%s %s: %s (%d)",
typenode == hf_afs_ubik ? "UBIK-" : "",
val_to_str(port, port_types_short, "Unknown(%d)"),
reply ? "Reply" : "Request",
val_to_str(opcode, vals, "Unknown(%d)"), opcode);
} else {
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s%s %s: Unknown(%d)",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s%s %s: Unknown(%d)",
typenode == hf_afs_ubik ? "UBIK-" : "",
val_to_str(port, port_types_short, "Unknown(%d)"),
reply ? "Reply" : "Request",
opcode);
}
} else {
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "Encrypted %s %s",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "Encrypted %s %s",
val_to_str(port, port_types_short, "Unknown(%d)"),
reply ? "Reply" : "Request"
);
diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c
index 072fd1a833..d1e5c1c452 100644
--- a/epan/dissectors/packet-agentx.c
+++ b/epan/dissectors/packet-agentx.c
@@ -805,10 +805,9 @@ static void dissect_agentx_pdu(tvbuff_t *tvb, packet_info *pinfo,
NORLEL(flags, packet_id, tvb, 12); offset+=4;
NORLEL(flags, payload_len, tvb, 16); offset+=4;
- col_set_str(pinfo->cinfo, COL_PROTOCOL, "AgentX");
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "AgentX");
- if (check_col(pinfo->cinfo, COL_INFO))
- col_add_fstr(pinfo->cinfo, COL_INFO, "%s: sid=%d, tid=%d, packid=%d, plen=%d",
+ col_add_fstr(pinfo->cinfo, COL_INFO, "%s: sid=%d, tid=%d, packid=%d, plen=%d",
val_to_str(type,type_values,"unknown"),
session_id,trans_id,packet_id,payload_len);
diff --git a/epan/dissectors/packet-aim-buddylist.c b/epan/dissectors/packet-aim-buddylist.c
index 608c352dc5..3ac697229c 100644
--- a/epan/dissectors/packet-aim-buddylist.c
+++ b/epan/dissectors/packet-aim-buddylist.c
@@ -86,11 +86,9 @@ static int dissect_aim_buddylist_oncoming(tvbuff_t *tvb, packet_info *pinfo, pro
int offset = 0;
int buddyname_length = aim_get_buddyname( buddyname, tvb, offset, offset + 1 );
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_set_str(pinfo->cinfo, COL_INFO, "Oncoming Buddy");
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
- format_text(buddyname, buddyname_length));
- }
+ col_set_str(pinfo->cinfo, COL_INFO, "Oncoming Buddy");
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ format_text(buddyname, buddyname_length));
offset += dissect_aim_buddyname(tvb, pinfo, offset, buddy_tree);
@@ -111,11 +109,9 @@ static int dissect_aim_buddylist_offgoing(tvbuff_t *tvb, packet_info *pinfo, pro
int offset = 0;
int buddyname_length = aim_get_buddyname( buddyname, tvb, offset, offset + 1 );
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_set_str(pinfo->cinfo, COL_INFO, "Offgoing Buddy");
- col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
- format_text(buddyname, buddyname_length));
- }
+ col_set_str(pinfo->cinfo, COL_INFO, "Offgoing Buddy");
+ col_append_fstr(pinfo->cinfo, COL_INFO, ": %s",
+ format_text(buddyname, buddyname_length));
offset += dissect_aim_buddyname(tvb, pinfo, offset, buddy_tree);
diff --git a/epan/dissectors/packet-aim-chat.c b/epan/dissectors/packet-aim-chat.c
index 0ba0d97a67..a5ba504db8 100644
--- a/epan/dissectors/packet-aim-chat.c
+++ b/epan/dissectors/packet-aim-chat.c
@@ -97,8 +97,7 @@ static int dissect_aim_chat_outgoing_msg(tvbuff_t *tvb, packet_info *pinfo, prot
aim_get_message( msg, tvb, 40 + buddyname_length, tvb_length(tvb)
- 40 - buddyname_length );
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", msg);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", msg);
return tvb_length(tvb);
}
@@ -118,10 +117,8 @@ static int dissect_aim_chat_incoming_msg(tvbuff_t *tvb, packet_info *pinfo, prot
aim_get_message( msg, tvb, 36 + buddyname_length, tvb_length(tvb)
- 36 - buddyname_length );
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, "from: %s", buddyname);
- col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", msg);
- }
+ col_append_fstr(pinfo->cinfo, COL_INFO, "from: %s", buddyname);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", msg);
if(chat_tree) {
proto_tree_add_text(chat_tree, tvb, 31, buddyname_length,
diff --git a/epan/dissectors/packet-aim-icq.c b/epan/dissectors/packet-aim-icq.c
index ce06a3a97e..6736e67e83 100644
--- a/epan/dissectors/packet-aim-icq.c
+++ b/epan/dissectors/packet-aim-icq.c
@@ -184,8 +184,7 @@ static int dissect_aim_tlv_value_icq(proto_item *ti _U_, guint16 subtype _U_, tv
if(icq_calls[i].subtype == req_subtype) break;
}
- if(check_col(pinfo->cinfo, COL_INFO))
- col_set_str(pinfo->cinfo, COL_INFO, icq_calls[i].name?icq_calls[i].name:"Unknown ICQ Meta Call");
+ col_set_str(pinfo->cinfo, COL_INFO, icq_calls[i].name?icq_calls[i].name:"Unknown ICQ Meta Call");
proto_item_append_text(subtype_item, " (%s)", icq_calls[i].name?icq_calls[i].name:"Unknown");
diff --git a/epan/dissectors/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c
index da81204d35..0734efef4c 100644
--- a/epan/dissectors/packet-aim-messaging.c
+++ b/epan/dissectors/packet-aim-messaging.c
@@ -336,12 +336,10 @@ dissect_aim_msg_outgoing(tvbuff_t *tvb, packet_info *pinfo, proto_tree *msg_tree
offset += 2;
/* Add the outgoing username to the info column */
- if (check_col(pinfo->cinfo, COL_INFO)) {
- buddyname_length = aim_get_buddyname(buddyname, tvb, offset,
- offset + 1);
- col_append_fstr(pinfo->cinfo, COL_INFO, " to: %s",
- format_text(buddyname, buddyname_length));
- }
+ buddyname_length = aim_get_buddyname(buddyname, tvb, offset,
+ offset + 1);
+ col_append_fstr(pinfo->cinfo, COL_INFO, " to: %s",
+ format_text(buddyname, buddyname_length));
offset = dissect_aim_buddyname(tvb, pinfo, offset, msg_tree);
diff --git a/epan/dissectors/packet-aim-signon.c b/epan/dissectors/packet-aim-signon.c
index 25f9f14496..bc07f835af 100644
--- a/epan/dissectors/packet-aim-signon.c
+++ b/epan/dissectors/packet-aim-signon.c
@@ -91,10 +91,8 @@ static int dissect_aim_snac_signon_signon(tvbuff_t *tvb, packet_info *pinfo,
/* Buddy Name */
buddyname_length = aim_get_buddyname( buddyname, tvb, offset, offset + 1 );
- if (check_col(pinfo->cinfo, COL_INFO)) {
- col_append_fstr(pinfo->cinfo, COL_INFO, " Username: %s",
- format_text(buddyname, buddyname_length));
- }
+ col_append_fstr(pinfo->cinfo, COL_INFO, " Username: %s",
+ format_text(buddyname, buddyname_length));
if(tree) {
offset+=dissect_aim_buddyname(tvb, pinfo, offset, tree);
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c
index 4a29da53af..3622578dfc 100644
--- a/epan/dissectors/packet-aim.c
+++ b/epan/dissectors/packet-aim.c
@@ -756,13 +756,11 @@ dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, int offset,
if (family)
col_set_str(pinfo->cinfo, COL_PROTOCOL, family->name);
- if (check_col(pinfo->cinfo, COL_INFO))
- {
- if(subtype && family)
- {
+ if(subtype && family)
+ {
col_set_str(pinfo->cinfo, COL_INFO, family->name);
col_append_fstr(pinfo->cinfo, COL_INFO, ", %s", subtype->name);
- } else {
+ } else {
col_set_str(pinfo->cinfo, COL_INFO, "SNAC data");
if(family)
@@ -771,8 +769,7 @@ dissect_aim_snac(tvbuff_t *tvb, packet_info *pinfo, int offset,
col_append_fstr(pinfo->cinfo, COL_INFO, ", Family: 0x%04x", family_id);
col_append_fstr(pinfo->cinfo, COL_INFO, ", Subtype: 0x%04x", subtype_id);
- }
- }
+ }
if(aim_tree && family)
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 00:37:08 +0000