Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
This commit is contained in:
parent
5d5a5442d6
commit
0a5b014cec
|
@ -223,7 +223,6 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
tree = proto_item_add_subtree(item, ett_acse);
|
||||
}
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACSE");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
|
||||
|
|
|
@ -129,7 +129,6 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
}
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMIP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
switch(session->spdu_type){
|
||||
case SES_CONNECTION_REQUEST:
|
||||
|
|
|
@ -108,7 +108,6 @@ dissect_disp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
tree = proto_item_add_subtree(item, ett_disp);
|
||||
}
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DISP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
switch(session->ros_op & ROS_OP_MASK) {
|
||||
|
|
|
@ -149,7 +149,6 @@ dissect_dop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
tree = proto_item_add_subtree(item, ett_dop);
|
||||
}
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DOP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
switch(session->ros_op & ROS_OP_MASK) {
|
||||
|
|
|
@ -102,7 +102,6 @@ dissect_dsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
tree = proto_item_add_subtree(item, ett_dsp);
|
||||
}
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DAP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
switch(session->ros_op & ROS_OP_MASK) {
|
||||
|
|
|
@ -102,7 +102,6 @@ dissect_ftam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
tree = proto_item_add_subtree(item, ett_ftam);
|
||||
}
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "FTAM");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
while (tvb_reported_length_remaining(tvb, offset) > 0){
|
||||
|
|
|
@ -78,7 +78,6 @@ dissect_goose(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
}
|
||||
if (check_col(pinfo->cinfo, COL_PROTOCOL))
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME);
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/* APPID */
|
||||
|
|
|
@ -1418,7 +1418,6 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5");
|
||||
}
|
||||
if (do_col_info) {
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
}
|
||||
if (tree) {
|
||||
|
|
|
@ -71,7 +71,6 @@ dissect_mms(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
tree = proto_item_add_subtree(item, ett_mms);
|
||||
}
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "MMS");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
while (tvb_reported_length_remaining(tvb, offset) > 0){
|
||||
|
|
|
@ -121,7 +121,6 @@ dissect_id3v1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
asn1_ctx_t asn1_ctx;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v1");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
if (tree == NULL)
|
||||
return;
|
||||
|
@ -134,7 +133,6 @@ static void
|
|||
dissect_id3v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ID3v2");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
proto_tree_add_item(tree, hf_id3v2, tvb,
|
||||
0, -1, FALSE);
|
||||
|
|
|
@ -311,7 +311,6 @@ dissect_mpeg_pes(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
if (prefix != PES_PREFIX)
|
||||
return FALSE;
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG PES");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
stream = tvb_get_guint8(tvb, 3);
|
||||
|
@ -466,7 +465,6 @@ dissect_mpeg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
{
|
||||
if (!dissector_try_heuristic(heur_subdissector_list, tvb, pinfo, tree)) {
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPEG");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
if (tree)
|
||||
proto_tree_add_item(tree, proto_mpeg, tvb, 0, -1, FALSE);
|
||||
|
|
|
@ -315,7 +315,6 @@ dissect_pres(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
/* postpone it before dissector will have more information */
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PRES");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
/* save pointers for calling the acse dissector */
|
||||
global_tree = parent_tree;
|
||||
|
|
|
@ -443,7 +443,6 @@ dissect_ros(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
tree = proto_item_add_subtree(item, ett_ros);
|
||||
}
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ROS");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
while (tvb_reported_length_remaining(tvb, offset) > 0){
|
||||
|
|
|
@ -217,7 +217,6 @@ dissect_rtse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
}
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTSE");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (rtse_reassemble &&
|
||||
|
|
|
@ -181,7 +181,6 @@ dissect_x411(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
tree = proto_item_add_subtree(item, ett_x411);
|
||||
}
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "P1");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
switch(session->ros_op & ROS_OP_MASK) {
|
||||
|
|
|
@ -71,7 +71,6 @@ dissect_3com_xns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
tvbuff_t *next_tvb;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "3Com XNS");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -1394,7 +1394,6 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
/* Make entries in Protocol column and Info column on summary display */
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "3GPP2 A11");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
switch (type) {
|
||||
|
|
|
@ -220,7 +220,6 @@ static void dissect_9P(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
|
|||
nstime_t tv;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "9P");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
ninesz = tvb_get_letohl(tvb, offset);
|
||||
|
|
|
@ -156,7 +156,6 @@ dissect_aarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
|
|||
gchar *sha_str, *spa_str, *tha_str, *tpa_str;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AARP");
|
||||
if(check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
ar_hrd = tvb_get_ntohs(tvb, AR_HRD);
|
||||
|
|
|
@ -1726,7 +1726,6 @@ dissect_acse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
tree = proto_item_add_subtree(item, ett_acse);
|
||||
}
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ACSE");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
|
||||
|
|
|
@ -468,7 +468,6 @@ static int dissect_actrace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
* an exception. We can set them later as well....
|
||||
*/
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AC_TRACE");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree)
|
||||
|
|
|
@ -64,7 +64,6 @@ dissect_airopeek(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
proto_item *ti = NULL;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AIROPEEK");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -701,7 +701,6 @@ dissect_ajp13_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
}
|
||||
}
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
mag = tvb_get_ntohs(tvb, 0);
|
||||
|
|
|
@ -772,7 +772,6 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
/* Make entries in Protocol column and Info column on summary display */
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AODV");
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/* Is this running over IPv6? */
|
||||
|
|
|
@ -400,7 +400,6 @@ dissect_aoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
guint8 version;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AoE");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (parent_tree) {
|
||||
|
|
|
@ -73,7 +73,6 @@ dissect_ap1394(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
tvbuff_t *next_tvb;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IP/IEEE1394");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
src_addr=tvb_get_ptr(tvb, 8, 8);
|
||||
|
|
|
@ -874,7 +874,6 @@ dissect_arp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
Clear the Info column so that, if we throw an exception, it
|
||||
shows up as a short or malformed ARP frame. */
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ARP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/* Hardware Address Type */
|
||||
|
|
|
@ -65,7 +65,6 @@ dissect_aruba_adp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ADP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
|
||||
|
|
|
@ -83,7 +83,6 @@ dissect_asf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ASF");
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
type = tvb_get_guint8(tvb, 4);
|
||||
|
|
|
@ -580,7 +580,6 @@ dissect_rtmp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
|
|||
guint8 function;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTMP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
function = tvb_get_guint8(tvb, 0);
|
||||
|
@ -608,7 +607,6 @@ dissect_rtmp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
|
|||
int i;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RTMP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
net = tvb_get_ntohs(tvb, offset);
|
||||
|
@ -694,7 +692,6 @@ dissect_nbp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
|
|||
guint i;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NBP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
info = tvb_get_guint8(tvb, offset);
|
||||
|
@ -1196,7 +1193,6 @@ dissect_pap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
int len;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PAP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
@ -1329,7 +1325,6 @@ dissect_asp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
int len;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ASP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
aspinfo = get_transaction(tvb, pinfo);
|
||||
|
@ -1476,7 +1471,6 @@ dissect_atp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint8 len;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZIP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
aspinfo = get_transaction(tvb, pinfo);
|
||||
|
@ -1556,7 +1550,6 @@ dissect_ddp_zip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint count;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZIP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
fn = tvb_get_guint8(tvb, 0);
|
||||
|
@ -1683,7 +1676,6 @@ dissect_ddp_short(tvbuff_t *tvb, packet_info *pinfo, guint8 dnode,
|
|||
tvbuff_t *new_tvb;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DDP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
@ -1745,7 +1737,6 @@ dissect_ddp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
tvbuff_t *new_tvb;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DDP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
tvb_memcpy(tvb, (guint8 *)&ddp, 0, sizeof(e_ddp));
|
||||
|
@ -1839,7 +1830,6 @@ dissect_llap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
tvbuff_t *new_tvb;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "LLAP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -1675,7 +1675,6 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
|
||||
case AAL_1:
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL1");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
ti = proto_tree_add_item(tree, proto_aal1, tvb, offset, -1, FALSE);
|
||||
aal_tree = proto_item_add_subtree(ti, ett_aal1);
|
||||
|
@ -1701,7 +1700,6 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
* XXX - or should this be the CS PDU?
|
||||
*/
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AAL3/4");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
ti = proto_tree_add_item(tree, proto_aal3_4, tvb, offset, -1, FALSE);
|
||||
aal_tree = proto_item_add_subtree(ti, ett_aal3_4);
|
||||
|
@ -1737,7 +1735,6 @@ dissect_atm_cell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
if (NULL == pwpd || pwpd->enable_fill_columns_by_atm_dissector)
|
||||
{
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "OAM AAL");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
}
|
||||
ti = proto_tree_add_item(tree, proto_oamaal, tvb, offset, -1, FALSE);
|
||||
|
|
|
@ -116,7 +116,6 @@ static void dissect_auto_rp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint8 ver_type, rp_count;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Auto-RP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
ver_type = tvb_get_guint8(tvb, 0);
|
||||
|
|
|
@ -366,7 +366,6 @@ static void dissect_bfd_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
|
|||
const char *sep;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "BFD Control");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
bfd_version = ((tvb_get_guint8(tvb, 0) & 0xe0) >> 5);
|
||||
|
|
|
@ -2830,7 +2830,6 @@ dissect_bgp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
tvbuff_t *volatile next_tvb;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "BGP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/*
|
||||
|
|
|
@ -70,7 +70,6 @@ dissect_bofl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "BOFL");
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -235,7 +235,6 @@ dissect_brdwlk (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
/* Make entries in Protocol column and Info column on summary display */
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Boardwalk");
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
pinfo->vsan = (tvb_get_ntohs (tvb, offset) & 0xFFF);
|
||||
|
|
|
@ -5997,7 +5997,6 @@ dissect_bssgp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "BSSGP");
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
bi.pdutype = tvb_get_guint8(tvb, 0);
|
||||
|
|
|
@ -185,7 +185,6 @@ dissect_cdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
vec_t cksum_vec[1];
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CDP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -164,7 +164,6 @@ dissect_chdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint16 proto;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CHDLC");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
switch (pinfo->p2p_dir) {
|
||||
|
@ -272,7 +271,6 @@ dissect_slarp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint32 yoursequence;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "SLARP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
code = tvb_get_ntohl(tvb, 0);
|
||||
|
|
|
@ -2757,8 +2757,7 @@ dissect_cip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
/* Make entries in Protocol column and Info column on summary display */
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIP");
|
||||
|
||||
if (check_col( pinfo->cinfo, COL_INFO ) )
|
||||
col_clear( pinfo->cinfo, COL_INFO );
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/* Each CIP request received by ENIP gets a unique ID */
|
||||
enip_info = (enip_request_info_t*)p_get_proto_data(pinfo->fd, proto_enip);
|
||||
|
|
|
@ -80,7 +80,6 @@ dissect_cwids(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint remain;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CWIDS");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO)) {
|
||||
|
|
|
@ -218,7 +218,6 @@ static void dissect_clnp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
gboolean save_fragmented;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CLNP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
cnf_proto_id = tvb_get_guint8(tvb, P_CLNP_PROTO_ID);
|
||||
|
|
|
@ -4425,7 +4425,6 @@ dissect_cmip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
}
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMIP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
switch(session->spdu_type){
|
||||
case SES_CONNECTION_REQUEST:
|
||||
|
|
|
@ -659,7 +659,6 @@ dissect_cmpp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
if (match_strval(command_id, vals_command_Id) == NULL)
|
||||
return 0;
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
tcp_dissect_pdus(tvb, pinfo, tree, cmpp_desegment, CMPP_FIX_HEADER_LENGTH,
|
||||
|
|
|
@ -897,7 +897,6 @@ dissect_cops_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
int object_len;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "COPS");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
op_code = tvb_get_guint8(tvb, 1);
|
||||
|
|
|
@ -219,7 +219,6 @@ dissect_cpha(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
}
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CPHA");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
tvb_memcpy(tvb, (guint8 *)&hdr, offset, sizeof(hdr));
|
||||
|
|
|
@ -162,7 +162,6 @@ dissect_cups(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
if (check_col(pinfo->cinfo, COL_PROTOCOL))
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_CUPS);
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -597,7 +597,6 @@ static void dissect_dccp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
SET_ADDRESS(&dccph->ip_dst, pinfo->dst.type, pinfo->dst.len, pinfo->dst.data);
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DCCP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/* Extract generic header */
|
||||
|
|
|
@ -378,7 +378,6 @@ dissect_dhcpfo_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
/* Make entries in Protocol column and Info column on summary display */
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DHCPFO");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
length = tvb_get_ntohs(tvb, offset);
|
||||
|
|
|
@ -1259,7 +1259,6 @@ static void
|
|||
dissect_dhcpv6_downstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DHCPv6");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
dissect_dhcpv6(tvb, pinfo, tree, TRUE, 0, tvb_reported_length(tvb));
|
||||
}
|
||||
|
@ -1268,7 +1267,6 @@ static void
|
|||
dissect_dhcpv6_upstream(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DHCPv6");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
dissect_dhcpv6(tvb, pinfo, tree, FALSE, 0, tvb_reported_length(tvb));
|
||||
}
|
||||
|
|
|
@ -1549,7 +1549,6 @@ dissect_disp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
tree = proto_item_add_subtree(item, ett_disp);
|
||||
}
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DISP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
switch(session->ros_op & ROS_OP_MASK) {
|
||||
|
|
|
@ -295,7 +295,6 @@ dissect_distcc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DISTCC ");
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (parent_tree) {
|
||||
|
|
|
@ -779,7 +779,6 @@ dissect_dlm3(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DLM3");
|
||||
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
col_set_str(pinfo->cinfo, COL_INFO, "DLM3");
|
||||
|
||||
|
|
|
@ -2317,7 +2317,6 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
/* Make entries in Protocol column and Info column on summary display */
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DNP 3.0");
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/* Skip "0x0564" header bytes */
|
||||
|
@ -2575,8 +2574,7 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
/* No reassembly required */
|
||||
next_tvb = al_tvb;
|
||||
add_new_data_source(pinfo, next_tvb, "DNP 3.0 Application Layer message");
|
||||
if (check_col (pinfo->cinfo, COL_INFO))
|
||||
col_clear (pinfo->cinfo, COL_INFO);
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
}
|
||||
pinfo->fragmented = save_fragmented;
|
||||
}
|
||||
|
|
|
@ -2769,7 +2769,6 @@ dissect_dns_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
|
||||
dns_data_offset = offset;
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
#define MAX_BUF_SIZE (128+1)
|
||||
|
|
|
@ -2111,7 +2111,6 @@ dissect_dop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
tree = proto_item_add_subtree(item, ett_dop);
|
||||
}
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DOP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
switch(session->ros_op & ROS_OP_MASK) {
|
||||
|
|
|
@ -1026,8 +1026,7 @@ static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
{
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY");
|
||||
/* Clear out stuff in the info column */
|
||||
if(check_col(pinfo->cinfo,COL_INFO))
|
||||
col_clear(pinfo->cinfo,COL_INFO);
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
if(check_col(pinfo->cinfo,COL_INFO))
|
||||
col_add_fstr(pinfo->cinfo,COL_INFO, "DPlay data packet");
|
||||
return;
|
||||
|
@ -1143,8 +1142,7 @@ static void dissect_dplay_player_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tr
|
|||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY");
|
||||
/* Clear out stuff in the info column */
|
||||
if(check_col(pinfo->cinfo,COL_INFO))
|
||||
col_clear(pinfo->cinfo,COL_INFO);
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
if(check_col(pinfo->cinfo,COL_INFO))
|
||||
col_add_fstr(pinfo->cinfo,COL_INFO, "DPlay player to player message");
|
||||
|
||||
|
|
|
@ -1765,7 +1765,6 @@ dissect_dsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
tree = proto_item_add_subtree(item, ett_dsp);
|
||||
}
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DAP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
switch(session->ros_op & ROS_OP_MASK) {
|
||||
|
|
|
@ -404,7 +404,6 @@ dissect_dtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
}
|
||||
|
||||
/* clear the the info column */
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/* Create display subtree for SSL as a whole */
|
||||
|
|
|
@ -622,7 +622,6 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
proto_tree *eap_tree = NULL;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "EAP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
eap_code = tvb_get_guint8(tvb, 0);
|
||||
|
|
|
@ -143,7 +143,6 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
tvbuff_t *next_tvb;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "EAPOL");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -3101,7 +3101,6 @@ static void dissect_edonkey_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tre
|
|||
|
||||
static void dissect_edonkey_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
tcp_dissect_pdus(tvb, pinfo, tree, edonkey_desegment,
|
||||
|
|
|
@ -148,7 +148,6 @@ dissect_eigrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
|
|||
guint32 ack, size, offset = EIGRP_HEADER_LENGTH;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "EIGRP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
opcode_tmp=opcode=tvb_get_guint8(tvb,1);
|
||||
|
|
|
@ -1028,7 +1028,6 @@ dissect_enip_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
/* Make entries in Protocol column and Info column on summary display */
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ENIP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
encap_cmd = tvb_get_letohs( tvb, 0 );
|
||||
|
@ -1291,8 +1290,7 @@ dissect_dlr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
/* Make entries in Protocol column and Info column on summary display */
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DLR");
|
||||
|
||||
if (check_col( pinfo->cinfo, COL_INFO ) )
|
||||
col_clear( pinfo->cinfo, COL_INFO );
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if( tree )
|
||||
{
|
||||
|
|
|
@ -283,7 +283,6 @@ dissect_esis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
|
|||
const char *cksum_status;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESIS");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
tvb_memcpy(tvb, (guint8 *)&ehdr, 0, sizeof ehdr);
|
||||
|
|
|
@ -106,7 +106,6 @@ dissect_fefd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
int real_length;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "FEFD");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -412,7 +412,6 @@ dissect_fr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
tvbuff_t *next_tvb;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (has_direction) {
|
||||
|
@ -670,7 +669,6 @@ static void dissect_fr_uncompressed(tvbuff_t *tvb, packet_info *pinfo,
|
|||
proto_tree *fr_tree = NULL;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "FR");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -4795,7 +4795,6 @@ dissect_ftam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
tree = proto_item_add_subtree(item, ett_ftam);
|
||||
}
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "FTAM");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
while (tvb_reported_length_remaining(tvb, offset) > 0){
|
||||
|
|
|
@ -148,7 +148,6 @@ dissect_fw1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
/* Make entries in Protocol column and Info column on summary display */
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "FW1");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
|
||||
|
|
|
@ -71,7 +71,6 @@ dissect_gift(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
line = tvb_get_ptr(tvb, offset, linelen);
|
||||
|
||||
/* clear the "Info" column */
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/* set "Info" column text */
|
||||
|
|
|
@ -526,7 +526,6 @@ static void dissect_gnutella(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
|
|||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Gnutella");
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/*
|
||||
|
|
|
@ -666,7 +666,6 @@ dissect_goose(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
}
|
||||
if (check_col(pinfo->cinfo, COL_PROTOCOL))
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, PNAME);
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/* APPID */
|
||||
|
|
|
@ -261,7 +261,6 @@ dissect_gprs_ns(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
tvbuff_t *next_tvb;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "GPRS NS");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
nspdu = tvb_get_guint8(tvb,offset);
|
||||
|
|
|
@ -6294,7 +6294,6 @@ static void dissect_gtp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
|
|||
}
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "GTP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/*
|
||||
|
|
|
@ -1937,7 +1937,6 @@ dissect_gtpv2(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
|
|||
|
||||
/* Currently we get called from the GTP dissector no need to check the version */
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "GTPv2");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/* message type is in octet 2 */
|
||||
|
|
|
@ -1273,8 +1273,7 @@ static void dissect_h223 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree
|
|||
if (check_col (pinfo->cinfo, COL_PROTOCOL))
|
||||
col_set_str (pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_H223);
|
||||
|
||||
if (check_col (pinfo->cinfo, COL_INFO))
|
||||
col_clear (pinfo->cinfo, COL_INFO);
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/* find or create the call_info for this call */
|
||||
call_info = find_or_create_call_info(pinfo);
|
||||
|
|
|
@ -64,7 +64,6 @@ dissect_hci_h1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "HCI");
|
||||
|
||||
if(check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
type = pinfo->pseudo_header->bthci.channel;
|
||||
|
|
|
@ -94,7 +94,6 @@ dissect_hyperscsi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint8 hs_cmd, hs_ver;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "HyperSCSI");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -419,7 +419,6 @@ dissect_iapp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IAPP");
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
tvb_memcpy(tvb, (guint8 *)&ih, 0, sizeof(e_iapphdr));
|
||||
|
|
|
@ -153,7 +153,6 @@ static void dissect_icp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint32 option_data;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
opcode=tvb_get_guint8(tvb, 0);
|
||||
|
|
|
@ -87,10 +87,8 @@ dissect_idp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
tvbuff_t *next_tvb;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IDP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -6121,8 +6121,7 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo,
|
|||
whdr= &whdrs[0];
|
||||
|
||||
col_set_str (pinfo->cinfo, COL_PROTOCOL, "IEEE 802.11");
|
||||
if (check_col (pinfo->cinfo, COL_INFO))
|
||||
col_clear (pinfo->cinfo, COL_INFO);
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
fcf = FETCH_FCF(0);
|
||||
frame_type_subtype = COMPOSE_FRAME_TYPE(fcf);
|
||||
|
@ -7553,7 +7552,6 @@ dissect_radio (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
|
|||
proto_tree *radio_tree = NULL;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Radio");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/* Add the radio information to the column information */
|
||||
|
@ -7766,7 +7764,6 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
tvb_memcpy(tvb, (guint8 *)&hdr, offset, sizeof(hdr));
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Prism");
|
||||
if(check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if(check_col(pinfo->cinfo, COL_INFO))
|
||||
|
@ -8116,7 +8113,6 @@ dissect_wlancap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint32 antnoise;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "WLAN");
|
||||
if(check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
offset = 0;
|
||||
|
||||
|
|
|
@ -120,7 +120,6 @@ dissect_ieee8021ad(tvbuff_t *tvb, packet_info *pinfo,
|
|||
|
||||
/* add info to column display */
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "802.1ad");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
tci = tvb_get_ntohs( tvb, 0 );
|
||||
|
@ -313,7 +312,6 @@ dissect_ieee8021ah(tvbuff_t *tvb, packet_info *pinfo,
|
|||
|
||||
/* add info to column display */
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "802.1ah");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
tci = tvb_get_ntohl( tvb, 0 );
|
||||
|
|
|
@ -66,7 +66,6 @@ static void dissect_igrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
tvbuff_t *next_tvb;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IGRP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
ver_and_opcode = tvb_get_guint8(tvb,0);
|
||||
|
|
|
@ -488,7 +488,6 @@ static void dissect_imf(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
if (check_col(pinfo->cinfo, COL_PROTOCOL))
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, PSNAME);
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if(tree){
|
||||
|
|
|
@ -86,7 +86,6 @@ dissect_infiniband(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
if(pinfo->cinfo)
|
||||
{
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "InfiniBand");
|
||||
if(check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
}
|
||||
|
||||
|
|
|
@ -65,7 +65,6 @@ dissect_ipars(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree)
|
|||
eom_msg = ep_alloc(MAX_EOM_MSG_SIZE);
|
||||
eom_msg[0] = 0;
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_PROTOCOL)) /* set the protocol column on summary display */
|
||||
|
|
|
@ -117,7 +117,6 @@ dissect_tcpencap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
}
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "TCPENCAP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/* If the first 4 bytes are 0x01f401f4 (udp src and dst port = 500)
|
||||
|
|
|
@ -50,7 +50,6 @@ dissect_udpencap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint32 spi;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "UDPENCAP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -1405,7 +1405,6 @@ dissect_ah_header(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
int advance;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "AH");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
tvb_memcpy(tvb, (guint8 *)&ah, 0, sizeof(ah));
|
||||
|
@ -1590,7 +1589,6 @@ dissect_esp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
#endif
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ESP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
tvb_memcpy(tvb, (guint8 *)&esp, 0, sizeof(esp));
|
||||
|
@ -2612,7 +2610,6 @@ dissect_ipcomp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
* the next protocol in the stack
|
||||
*/
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPComp");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
tvb_memcpy(tvb, (guint8 *)&ipcomp, 0, sizeof(ipcomp));
|
||||
|
|
|
@ -1273,7 +1273,6 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
struct ip6_hdr ipv6;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPv6");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
offset = 0;
|
||||
|
|
|
@ -260,7 +260,6 @@ dissect_ipx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/* Calculate here for use in pinfo and in tree */
|
||||
|
@ -845,7 +844,6 @@ dissect_ipxmsg(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint8 conn_number, sig_char;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX MSG");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
conn_number = tvb_get_guint8(tvb, 0);
|
||||
|
@ -883,7 +881,6 @@ dissect_ipxrip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
static const char *rip_type[3] = { "Request", "Response", "Unknown" };
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX RIP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
operation = tvb_get_ntohs(tvb, 0) - 1;
|
||||
|
@ -952,7 +949,6 @@ dissect_serialization(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
proto_item *ti;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "NW_SERIAL");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
@ -1224,7 +1220,6 @@ dissect_ipxsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
"Nearest Query", "Nearest Response" };
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX SAP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
query.query_type = tvb_get_ntohs(tvb, 0);
|
||||
|
|
|
@ -136,7 +136,6 @@ dissect_ipxwan(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint8 compression_type;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IPX WAN");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -1005,7 +1005,6 @@ dissect_isakmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
#endif /* HAVE_LIBGCRYPT */
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISAKMP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -123,7 +123,6 @@ dissect_isis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint8 isis_system_id_len;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISIS");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
isis_version = tvb_get_guint8(tvb, 2);
|
||||
|
|
|
@ -158,7 +158,6 @@ dissect_isl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int fcs_len)
|
|||
const char *saved_proto;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISL");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
type = (tvb_get_guint8(tvb, 5) >> 4)&0x0F;
|
||||
|
|
|
@ -613,7 +613,6 @@ dissect_isns_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
/* Make entries in Protocol column and Info column on summary display */
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "iSNS");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/* Get the protocol version - only version one at the moment*/
|
||||
|
|
|
@ -699,7 +699,6 @@ dissect_juniper_mlfr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint proto,cookie_len;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper MLFR");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
offset = 0;
|
||||
|
@ -804,7 +803,6 @@ dissect_juniper_mlppp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint proto,cookie_len;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper MLPPP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
offset = 0;
|
||||
|
@ -872,7 +870,6 @@ dissect_juniper_pppoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint8 flags;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper PPPoE");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
offset = 0;
|
||||
|
@ -901,7 +898,6 @@ dissect_juniper_ether(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint8 flags;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Ethernet");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
offset = 0;
|
||||
|
@ -930,7 +926,6 @@ dissect_juniper_ppp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint8 flags;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper PPP");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
offset = 0;
|
||||
|
@ -959,7 +954,6 @@ dissect_juniper_frelay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint8 flags;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Frame-Relay");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
offset = 0;
|
||||
|
@ -988,7 +982,6 @@ dissect_juniper_chdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint8 flags;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper C-HDLC");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
ti = proto_tree_add_text (tree, tvb, offset, 4, "Juniper C-HDLC");
|
||||
|
@ -1046,7 +1039,6 @@ dissect_juniper_atm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16
|
|||
|
||||
}
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
switch (atm_pictype) {
|
||||
|
@ -1183,7 +1175,6 @@ static void dissect_juniper_ggsn(tvbuff_t* tvb, packet_info* pinfo, proto_tree*
|
|||
guint16 proto;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper GGSN");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
ti = proto_tree_add_text (tree, tvb, offset, 4, "Juniper GGSN");
|
||||
|
@ -1214,7 +1205,6 @@ static void dissect_juniper_vp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tr
|
|||
guint8 flags;
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Voice PIC");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
ti = proto_tree_add_text (tree, tvb, offset, 4, "Juniper Voice PIC");
|
||||
|
|
|
@ -4645,7 +4645,6 @@ static void
|
|||
dissect_kerberos_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
||||
{
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
tcp_dissect_pdus(tvb, pinfo, tree, krb_desegment, 4, get_krb_pdu_len,
|
||||
|
@ -4755,7 +4754,6 @@ dissect_kerberos_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB5");
|
||||
}
|
||||
if (do_col_info) {
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
}
|
||||
if (tree) {
|
||||
|
|
|
@ -318,7 +318,6 @@ dissect_krb4(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
|
|||
tree = proto_item_add_subtree(item, ett_krb4);
|
||||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "KRB4");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
||||
/* version */
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue