osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Didier Gautheron: 

col_clear.diff 
Remove calls to col_clear :
- called twice.
- before functions which also clear the column
- by replacing col_clear + col_append_xxx with col_add_xxx
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4394

svn path=/trunk/; revision=31517
This commit is contained in:
Anders Broman 2010-01-13 20:25:10 +00:00
parent 37cb4333a4
commit c4dd31cd87
32 changed files with 154 additions and 713 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asn1/ansi_map/packet-ansi_map-template.c
View File

@ -4414,7 +4414,6 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 1:
OperationCode = p_private_tcap->d.OperationCode_private & 0x00ff;
ansi_map_is_invoke = TRUE;
col_clear(pinfo->cinfo, COL_INFO);
col_add_fstr(pinfo->cinfo, COL_INFO,"%s Invoke ", val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
proto_item_append_text(p_private_tcap->d.OperationCode_item," %s",val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
offset = dissect_invokeData(ansi_map_tree, tvb, 0, &asn1_ctx);
@ -4422,17 +4421,14 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case 2:
OperationCode = find_saved_invokedata(&asn1_ctx);
col_clear(pinfo->cinfo, COL_INFO);
col_add_fstr(pinfo->cinfo, COL_INFO,"%s ReturnResult ", val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
proto_item_append_text(p_private_tcap->d.OperationCode_item," %s",val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
offset = dissect_returnData(ansi_map_tree, tvb, 0, &asn1_ctx);
break;
case 3:
col_clear(pinfo->cinfo, COL_INFO);
col_add_fstr(pinfo->cinfo, COL_INFO,"%s ReturnError ", val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
break;
case 4:
col_clear(pinfo->cinfo, COL_INFO);
col_add_fstr(pinfo->cinfo, COL_INFO,"%s Reject ", val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
break;
default:

2
epan/dissectors/packet-2dparityfec.c
View File

@ -123,8 +123,6 @@ static void dissect_2dparityfec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
/* Configure the info column */
if(check_col(pinfo->cinfo, COL_INFO))
{
col_clear(pinfo->cinfo, COL_INFO);
if(D)
{
col_add_fstr(pinfo->cinfo, COL_INFO, "Row FEC - SNBase=%u, Offset=%u, NA=%u",

8
epan/dissectors/packet-ansi_map.c
View File

@ -16285,7 +16285,6 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
case 1:
OperationCode = p_private_tcap->d.OperationCode_private & 0x00ff;
ansi_map_is_invoke = TRUE;
col_clear(pinfo->cinfo, COL_INFO);
col_add_fstr(pinfo->cinfo, COL_INFO,"%s Invoke ", val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
proto_item_append_text(p_private_tcap->d.OperationCode_item," %s",val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
offset = dissect_invokeData(ansi_map_tree, tvb, 0, &asn1_ctx);
@ -16293,17 +16292,14 @@ dissect_ansi_map(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
break;
case 2:
OperationCode = find_saved_invokedata(&asn1_ctx);
col_clear(pinfo->cinfo, COL_INFO);
col_add_fstr(pinfo->cinfo, COL_INFO,"%s ReturnResult ", val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
proto_item_append_text(p_private_tcap->d.OperationCode_item," %s",val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
offset = dissect_returnData(ansi_map_tree, tvb, 0, &asn1_ctx);
break;
case 3:
col_clear(pinfo->cinfo, COL_INFO);
col_add_fstr(pinfo->cinfo, COL_INFO,"%s ReturnError ", val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
break;
case 4:
col_clear(pinfo->cinfo, COL_INFO);
col_add_fstr(pinfo->cinfo, COL_INFO,"%s Reject ", val_to_str(OperationCode, ansi_map_opr_code_strings, "Unknown ANSI-MAP PDU (%u)"));
break;
default:
@ -19347,7 +19343,7 @@ void proto_register_ansi_map(void) {
"ansi_map.QualificationRequest2Res", HFILL }},
/*--- End of included file: packet-ansi_map-hfarr.c ---*/
#line 5287 "packet-ansi_map-template.c"
#line 5283 "packet-ansi_map-template.c"
};
/* List of subtrees */
@ -19608,7 +19604,7 @@ void proto_register_ansi_map(void) {
&ett_ansi_map_ReturnData,
/*--- End of included file: packet-ansi_map-ettarr.c ---*/
#line 5320 "packet-ansi_map-template.c"
#line 5316 "packet-ansi_map-template.c"
};

1
epan/dissectors/packet-bacnet.c
View File

@ -349,7 +349,6 @@ dissect_bacnet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Put the NPDU Type in the info column */
if (check_col(pinfo->cinfo, COL_INFO))
{
col_clear(pinfo->cinfo, COL_INFO);
col_add_str(pinfo->cinfo, COL_INFO,
bacnet_mesgtyp_name(bacnet_mesgtyp));
}

8
epan/dissectors/packet-ber.c
View File

@ -4305,10 +4305,7 @@ dissect_ber(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if(!decode_as_syntax) {
/* if we got here we couldn't find anything better */
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
col_append_str(pinfo->cinfo, COL_INFO, "Unknown BER");
}
col_set_str(pinfo->cinfo, COL_INFO, "Unknown BER");
(void) dissect_unknown_ber(pinfo, tvb, 0, tree);
@ -4321,8 +4318,7 @@ dissect_ber(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* see if we have a better name */
name = get_ber_oid_syntax(decode_as_syntax);
col_clear(pinfo->cinfo, COL_INFO);
col_append_fstr(pinfo->cinfo, COL_INFO, "Decoded as %s", name ? name : decode_as_syntax);
col_add_fstr(pinfo->cinfo, COL_INFO, "Decoded as %s", name ? name : decode_as_syntax);
}
}
}

12
epan/dissectors/packet-dplay.c
View File

@ -1025,10 +1025,7 @@ static void dissect_dplay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if(memcmp(play_id, (guint8 *)&dplay_id, 4) != 0)
{
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY");
/* Clear out stuff in the info column */
col_clear(pinfo->cinfo, COL_INFO);
if(check_col(pinfo->cinfo,COL_INFO))
col_set_str(pinfo->cinfo, COL_INFO, "DPlay data packet");
col_set_str(pinfo->cinfo,COL_INFO, "DPlay data packet");
return;
}
@ -1038,8 +1035,6 @@ 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 */
col_clear(pinfo->cinfo, COL_INFO);
if(check_col(pinfo->cinfo,COL_INFO))
{
@ -1138,10 +1133,7 @@ static void dissect_dplay_player_msg(tvbuff_t *tvb, packet_info *pinfo, proto_tr
guint32 mixed, size, token;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "DPLAY");
/* Clear out stuff in the info column */
col_clear(pinfo->cinfo, COL_INFO);
if(check_col(pinfo->cinfo,COL_INFO))
col_set_str(pinfo->cinfo, COL_INFO, "DPlay player to player message");
col_set_str(pinfo->cinfo,COL_INFO, "DPlay player to player message");
if(tree)
{

1
epan/dissectors/packet-enttec.c
View File

@ -355,7 +355,6 @@ dissect_enttec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* Clear out stuff in the info column */
if (check_col(pinfo->cinfo,COL_INFO)) {
col_clear(pinfo->cinfo,COL_INFO);
col_add_fstr(pinfo->cinfo, COL_INFO, "%s",
val_to_str(head, enttec_head_vals, "Unknown (0x%08x)"));
}

767
epan/dissectors/packet-ff.c
View File

File diff suppressed because it is too large Load Diff

3
epan/dissectors/packet-gift.c
View File

@ -70,9 +70,6 @@ dissect_gift(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE);
line = tvb_get_ptr(tvb, offset, linelen);
/* clear the "Info" column */
col_clear(pinfo->cinfo, COL_INFO);
/* set "Info" column text */
if (check_col(pinfo->cinfo, COL_INFO))
col_add_fstr(pinfo->cinfo, COL_INFO, "%s: %s",

1
epan/dissectors/packet-hpteam.c
View File

@ -73,7 +73,6 @@ dissect_hpteam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
strPtr = ether_to_str(mac_addr);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "HP NIC Team");
/* Clear out stuff in the info column */
col_clear(pinfo->cinfo, COL_INFO);
col_set_str(pinfo->cinfo, COL_INFO, "HP NIC Teaming Heartbeat; ");
col_append_fstr(pinfo->cinfo, COL_INFO, "Port MAC = %s ", strPtr);

2
epan/dissectors/packet-idp.c
View File

@ -89,8 +89,6 @@ dissect_idp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "IDP");
col_clear(pinfo->cinfo, COL_INFO);
col_clear(pinfo->cinfo, COL_INFO);
if (tree) {
ti = proto_tree_add_item(tree, proto_idp, tvb, 0, IDP_HEADER_LEN, FALSE);
idp_tree = proto_item_add_subtree(ti, ett_idp);

1
epan/dissectors/packet-ipmi-session.c
View File

@ -168,7 +168,6 @@ dissect_ipmi_session(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
col_add_fstr(pinfo->cinfo, COL_INFO, "Session ID 0x%x", session_id);
if (authtype == IPMI_AUTH_RMCPP) {
col_append_fstr(pinfo->cinfo, COL_INFO, ", payload type: %s",

5
epan/dissectors/packet-ipmi.c
View File

@ -1368,10 +1368,7 @@ dissect_ipmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
dfmt.flags = IPMI_D_BROADCAST | IPMI_D_TRG_SA;
ipmi_do_dissect(tvb, ipmi_tree, &dfmt);
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
col_add_str(pinfo->cinfo, COL_INFO, dfmt.info);
}
col_add_str(pinfo->cinfo, COL_INFO, dfmt.info);
}

22
epan/dissectors/packet-ismacryp.c
View File

@ -217,15 +217,10 @@ static gint ett_ismacryp_message = -1;
static void dissect_ismacryp_v11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
/* display ISMACryp version */
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_ISMACRYP_11);
col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_ISMACRYP_11);
/* display RTP payload type */
if ( check_col( pinfo->cinfo, COL_INFO) ) {
col_clear(pinfo->cinfo,COL_INFO); /* clear column info */
col_append_str(pinfo->cinfo, COL_INFO, "(PT=enc-mpeg4-generic)");
}
col_set_str(pinfo->cinfo, COL_INFO, "(PT=enc-mpeg4-generic)");
dissect_ismacryp_common( tvb, pinfo, tree, V11);
}
@ -234,24 +229,17 @@ static void dissect_ismacryp_v11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
static void dissect_ismacryp_v20(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
/* display ISMACryp version */
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_ISMACRYP_20);
col_set_str(pinfo->cinfo, COL_PROTOCOL, PROTO_TAG_ISMACRYP_20);
/* display RTP payload type */
if (check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo,COL_INFO); /* clear column info */
col_append_str(pinfo->cinfo, COL_INFO, "(PT=enc-isoff-generic)");
}
col_set_str(pinfo->cinfo, COL_INFO, "(PT=enc-isoff-generic)");
dissect_ismacryp_common( tvb, pinfo, tree, V20);
}
static void dissect_ismacryp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
if (check_col(pinfo->cinfo, COL_INFO)){
col_clear(pinfo->cinfo,COL_INFO); /* clear column info */
col_append_str(pinfo->cinfo, COL_INFO, "Manual version");
}
col_set_str(pinfo->cinfo, COL_INFO, "Manual version");
dissect_ismacryp_common( tvb, pinfo, tree, version_type); /* Unknown version type: Use preference */
}

1
epan/dissectors/packet-iwarp-mpa.c
View File

@ -487,7 +487,6 @@ mpa_packetlist(packet_info *pinfo, gint message_type)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "MPA");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
col_add_fstr(pinfo->cinfo, COL_INFO,
"%d > %d %s", pinfo->srcport, pinfo->destport,
val_to_str(message_type, mpa_messages,

2
epan/dissectors/packet-kingfisher.c
View File

@ -209,7 +209,6 @@ dissect_kingfisher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean
case 0x81:
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Kingfisher");
func_string = val_to_str(tvb_get_guint8(tvb, 0), function_code_vals, "Unknown function");
col_clear(pinfo->cinfo, COL_INFO);
col_add_fstr(pinfo->cinfo, COL_INFO, "(%s)", func_string);
proto_tree_add_protocol_format(tree, proto_kingfisher, tvb, 0, -1, "Kingfisher Protocol, %s", func_string);
return TRUE;
@ -272,7 +271,6 @@ dissect_kingfisher(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean
func_string = val_to_str(kfp->function, function_code_vals, "Unknown function");
col_set_str(pinfo->cinfo, COL_PROTOCOL, "Kingfisher");
col_clear(pinfo->cinfo, COL_INFO);
col_add_fstr(pinfo->cinfo, COL_INFO, "%u > %u (%s)", kfp->from, kfp->target, func_string);

1
epan/dissectors/packet-llt.c
View File

@ -75,7 +75,6 @@ dissect_llt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
message_type = tvb_get_guint8(tvb, 3);
if(check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
col_add_fstr(pinfo->cinfo, COL_INFO, "Message type: %s", val_to_str(message_type, message_type_vs, "Unknown (0x%02x)"));
}

5
epan/dissectors/packet-msnlb.c
View File

@ -57,10 +57,7 @@ dissect_msnlb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "MS NLB");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
col_append_str(pinfo->cinfo, COL_INFO, "MS NLB heartbeat");
}
col_set_str(pinfo->cinfo, COL_INFO, "MS NLB heartbeat");
if (tree) {
ti = proto_tree_add_item(tree, proto_msnlb, tvb, 0, -1, FALSE);

1
epan/dissectors/packet-pana.c
View File

@ -536,7 +536,6 @@ dissect_pana_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PANA");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
col_add_fstr(pinfo->cinfo, COL_INFO, "Type %s-%s",
val_to_str(msg_type, msg_type_names, "Unknown (%d)"),
val_to_str(flags & PANA_FLAG_R, msg_subtype_names, "Unknown (%d)"));

1
epan/dissectors/packet-s5066.c
View File

@ -1301,7 +1301,6 @@ dissect_s5066_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "S5066");
/* Clear out stuff in the info column, the add PDU type */
col_clear(pinfo->cinfo, COL_INFO);
if (check_col(pinfo->cinfo, COL_INFO)) {
col_add_fstr(pinfo->cinfo, COL_INFO, "PDU type %s", val_to_str(pdu_type, s5066_pdu_type, "Unknown (0x%02x)"));
}

3
epan/dissectors/packet-usb-masstorage.c
View File

@ -165,8 +165,7 @@ dissect_usb_ms_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_set_str(pinfo->cinfo, COL_PROTOCOL, "USBMS");
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
col_append_fstr(pinfo->cinfo, COL_INFO, "%s %s",
col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
val_to_str(usb_trans_info->request, setup_request_names_vals, "Unknown type %x"),
is_request?"Request":"Response");
}

6
epan/dissectors/packet-usb.c
View File

@ -1861,8 +1861,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent,
offset += 1;
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
col_append_fstr(pinfo->cinfo, COL_INFO, "%s Request",
col_add_fstr(pinfo->cinfo, COL_INFO, "%s Request",
val_to_str(usb_trans_info->request, setup_request_names_vals, "Unknown type %x"));
}
@ -1987,8 +1986,7 @@ dissect_linux_usb_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent,
* dissector
*/
if (check_col(pinfo->cinfo, COL_INFO)) {
col_clear(pinfo->cinfo, COL_INFO);
col_append_fstr(pinfo->cinfo, COL_INFO, "%s Response",
col_add_fstr(pinfo->cinfo, COL_INFO, "%s Response",
val_to_str(usb_conv_info->usb_trans_info->request, setup_request_names_vals, "Unknown type %x"));
}

1
epan/dissectors/packet-wol.c
View File

@ -186,7 +186,6 @@ dissect_wol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
if ( check_col(pinfo->cinfo, COL_INFO) )
{
col_clear(pinfo->cinfo, COL_INFO);
col_add_fstr(pinfo->cinfo, COL_INFO, "MagicPacket for %s (%s)",
get_ether_name(mac), ether_to_str(mac));

1
plugins/docsis/packet-bpkmreq.c
View File

@ -76,7 +76,6 @@ dissect_bpkmreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (check_col (pinfo->cinfo, COL_INFO))
{
col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO, "BPKM Request (%s)",
val_to_str (code, code_field_vals, "%s"));
}

1
plugins/docsis/packet-bpkmrsp.c
View File

@ -77,7 +77,6 @@ dissect_bpkmrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (check_col (pinfo->cinfo, COL_INFO))
{
col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO, "BPKM Response (%s)",
val_to_str (code, code_field_vals, "%s"));
}

1
plugins/docsis/packet-dsaack.c
View File

@ -58,7 +58,6 @@ dissect_dsaack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (check_col (pinfo->cinfo, COL_INFO))
{
col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"Dynamic Service Add Ack ID = %u (%s)", transid,
val_to_str (response, docsis_conf_code, "%s"));

1
plugins/docsis/packet-dsarsp.c
View File

@ -58,7 +58,6 @@ dissect_dsarsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (check_col (pinfo->cinfo, COL_INFO))
{
col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"Dynamic Service Add Response ID = %u (%s)", transid,
val_to_str (response, docsis_conf_code, "%s"));

1
plugins/docsis/packet-dscack.c
View File

@ -58,7 +58,6 @@ dissect_dscack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (check_col (pinfo->cinfo, COL_INFO))
{
col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"Dynamic Service Change Ack ID = %u (%s)", transid,
val_to_str (response, docsis_conf_code, "%s"));

1
plugins/docsis/packet-dscrsp.c
View File

@ -59,7 +59,6 @@ dissect_dscrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (check_col (pinfo->cinfo, COL_INFO))
{
col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"Dynamic Service Change Response ID = %u (%s)", transid,
val_to_str (response, docsis_conf_code, "%s"));

1
plugins/docsis/packet-dsdrsp.c
View File

@ -56,7 +56,6 @@ dissect_dsdrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (check_col (pinfo->cinfo, COL_INFO))
{
col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"Dynamic Service Delete Response Tran id = %u (%s)",
tranid, val_to_str (confcode, docsis_conf_code, "%s"));

1
plugins/docsis/packet-regack.c
View File

@ -58,7 +58,6 @@ dissect_regack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (check_col (pinfo->cinfo, COL_INFO))
{
col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"Registration Acknowledge SID = %u (%s)", sid,
val_to_str (response, docsis_conf_code, "%s"));

1
plugins/docsis/packet-regrsp.c
View File

@ -59,7 +59,6 @@ dissect_regrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
if (check_col (pinfo->cinfo, COL_INFO))
{
col_clear (pinfo->cinfo, COL_INFO);
col_add_fstr (pinfo->cinfo, COL_INFO,
"Registration Response SID = %u (%s)", sid,
val_to_str (response, docsis_conf_code, "%s"));