forked from osmocom/wireshark
Don't guard col_set_str (COL_RES_DL_SRC/COL_RES_DL_DST) with col_check
svn path=/trunk/; revision=29343
This commit is contained in:
parent
4b6090e576
commit
5d5a5442d6
|
@ -57,10 +57,8 @@ dissect_ascend(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
/* load the top pane info. This should be overwritten by
|
||||
the next protocol in the stack */
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A" );
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" );
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_INFO, "Lucent/Ascend packet trace");
|
||||
|
||||
|
|
|
@ -1815,18 +1815,14 @@ dissect_atm_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
|
||||
case 0:
|
||||
/* Traffic from DTE to DCE. */
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
|
||||
break;
|
||||
|
||||
case 1:
|
||||
/* Traffic from DCE to DTE. */
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4204,8 +4204,7 @@ dissect_ber(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "BER");
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_DEF_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_DEF_SRC, "BER encoded file");
|
||||
col_set_str(pinfo->cinfo, COL_DEF_SRC, "BER encoded file");
|
||||
|
||||
if(!decode_as_syntax) {
|
||||
|
||||
|
|
|
@ -170,24 +170,18 @@ dissect_chdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
switch (pinfo->p2p_dir) {
|
||||
|
||||
case P2P_DIR_SENT:
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
|
||||
break;
|
||||
|
||||
case P2P_DIR_RECV:
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
|
||||
break;
|
||||
|
||||
default:
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -54,10 +54,8 @@ dissect_clip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
/* load the top pane info. This should be overwritten by
|
||||
the next protocol in the stack */
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A" );
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" );
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "CLIP");
|
||||
col_set_str(pinfo->cinfo, COL_INFO, "Classical IP frame");
|
||||
|
||||
|
|
|
@ -62,10 +62,8 @@ dissect_cosine(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
/* load the top pane info. This should be overwritten by
|
||||
the next protocol in the stack */
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A" );
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" );
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_INFO, "CoSine IPNOS L2 debug output");
|
||||
|
||||
|
|
|
@ -417,15 +417,11 @@ dissect_fr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
|
|||
|
||||
if (has_direction) {
|
||||
if (pinfo->pseudo_header->x25.flags & FROM_DCE) {
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
|
||||
} else {
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -120,10 +120,8 @@ dissect_gsm_um(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM Um");
|
||||
|
||||
if (pinfo->pseudo_header->gsm_um.uplink) {
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "BTS");
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "MS");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "BTS");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "MS");
|
||||
}
|
||||
else {
|
||||
switch (pinfo->pseudo_header->gsm_um.channel) {
|
||||
|
@ -131,16 +129,13 @@ dissect_gsm_um(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
case GSM_UM_CHANNEL_CCCH:
|
||||
case GSM_UM_CHANNEL_PCH:
|
||||
case GSM_UM_CHANNEL_AGCH:
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "Broadcast");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "Broadcast");
|
||||
break;
|
||||
default:
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "MS");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "MS");
|
||||
break;
|
||||
}
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "BTS");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "BTS");
|
||||
}
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -88,15 +88,11 @@ dissect_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISDN");
|
||||
|
||||
if (pinfo->pseudo_header->isdn.uton) {
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "Network");
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "User");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "Network");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "User");
|
||||
} else {
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "User");
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "Network");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "User");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "Network");
|
||||
}
|
||||
|
||||
pinfo->ctype = CT_ISDN;
|
||||
|
|
|
@ -79,24 +79,18 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
switch (pinfo->p2p_dir) {
|
||||
|
||||
case P2P_DIR_SENT:
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
|
||||
break;
|
||||
|
||||
case P2P_DIR_RECV:
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
|
||||
break;
|
||||
|
||||
default:
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -367,10 +367,8 @@ dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
/* load the top pane info. This should be overwritten by
|
||||
the next protocol in the stack */
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A" );
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" );
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_INFO, "Null/Loopback");
|
||||
|
||||
|
|
|
@ -3640,24 +3640,18 @@ dissect_ppp_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
|
|||
switch (pinfo->p2p_dir) {
|
||||
|
||||
case P2P_DIR_SENT:
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
|
||||
break;
|
||||
|
||||
case P2P_DIR_RECV:
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
|
||||
break;
|
||||
|
||||
default:
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -107,10 +107,8 @@ dissect_raw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
/* load the top pane info. This should be overwritten by
|
||||
the next protocol in the stack */
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A" );
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" );
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_INFO, "Raw packet data");
|
||||
|
||||
|
|
|
@ -94,18 +94,14 @@ dissect_sdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
*/
|
||||
if (pinfo->p2p_dir == P2P_DIR_SENT) {
|
||||
is_response = FALSE;
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
|
||||
}
|
||||
else {
|
||||
/* XXX - what if the direction is unknown? */
|
||||
is_response = TRUE;
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
|
||||
}
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -122,17 +122,13 @@ dissect_v120(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
|
||||
if (pinfo->p2p_dir == P2P_DIR_SENT) {
|
||||
is_response = (byte0 & 0x02) ? FALSE: TRUE;
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
|
||||
} else {
|
||||
/* XXX - what if the direction is unknown? */
|
||||
is_response = (byte0 & 0x02) ? TRUE : FALSE;
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
|
||||
if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
|
||||
}
|
||||
|
||||
if (tree) {
|
||||
|
|
|
@ -56,10 +56,8 @@ dissect_wfleet_hdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|||
guint8 addr;
|
||||
guint8 cmd;
|
||||
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
|
||||
if (check_col(pinfo->cinfo, COL_RES_DL_DST))
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
|
||||
col_set_str(pinfo->cinfo, COL_PROTOCOL, "WHDLC");
|
||||
if (check_col(pinfo->cinfo, COL_INFO))
|
||||
col_clear(pinfo->cinfo, COL_INFO);
|
||||
|
|
Loading…
Reference in New Issue