Fix for bug 2902:

Make sure to check the right column before writing to it, and vice versa.

svn path=/trunk/; revision=27191

3 files changed, 17 insertions, 17 deletions

diff --git a/epan/dissectors/packet-ms-mms.c b/epan/dissectors/packet-ms-mms.c
index c84a7e1e75..9026a19574 100644
--- a/epan/dissectors/packet-ms-mms.c
+++ b/epan/dissectors/packet-ms-mms.c
@@ -487,7 +487,7 @@ static gint dissect_msmms_command(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 
 
     /* Show summary in info column */
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_fstr(pinfo->cinfo, COL_INFO,
                         "seq=%03u: %s %s",
diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c
index b25fa6c289..fd9b6a2caa 100644
--- a/epan/dissectors/packet-rdt.c
+++ b/epan/dissectors/packet-rdt.c
@@ -530,7 +530,7 @@ guint dissect_rdt_data_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
         offset += 2;
     }
 
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_fstr(pinfo->cinfo, COL_INFO,
                         "DATA: stream-id=%02u asm-rule=%02u seq=%05u ts=%05u  ",
@@ -615,7 +615,7 @@ guint dissect_rdt_asm_action_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre
         offset += 2;
     }
 
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_fstr(pinfo->cinfo, COL_INFO,
                         "ASM-ACTION: stream-id=%02u rel-seqno=%05u  ",
@@ -688,7 +688,7 @@ guint dissect_rdt_bandwidth_report_packet(tvbuff_t *tvb, packet_info *pinfo, pro
     proto_tree_add_item(tree, hf_rdt_brpt_sequence, tvb, offset, 1, FALSE);
     offset += 1;
 
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_str(pinfo->cinfo, COL_INFO, "BANDWIDTH-REPORT:  ");
     }
@@ -756,7 +756,7 @@ guint dissect_rdt_ack_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
     /* XXX: The remaining data is unparsed. */
     proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, FALSE);
 
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_fstr(pinfo->cinfo, COL_INFO, "ACK: lh=%u  ", lost_high_flag);
     }
@@ -784,7 +784,7 @@ guint dissect_rdt_rtt_request_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tr
     proto_tree_add_item(tree, hf_rdt_packet_type, tvb, offset, 2, FALSE);
     offset += 2;
 
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_str(pinfo->cinfo, COL_INFO, "RTT-REQUEST:  ");
     }
@@ -810,7 +810,7 @@ guint dissect_rdt_rtt_response_packet(tvbuff_t *tvb, packet_info *pinfo, proto_t
     proto_tree_add_item(tree, hf_rdt_rtrp_ts_usec, tvb, offset, 4, FALSE);
     offset += 4;
 
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_str(pinfo->cinfo, COL_INFO, "RTT-RESPONSE:  ");
     }
@@ -836,7 +836,7 @@ guint dissect_rdt_congestion_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre
     proto_tree_add_item(tree, hf_rdt_cong_recv_mult, tvb, offset, 4, FALSE);
     offset += 4;
 
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_str(pinfo->cinfo, COL_INFO, "CONGESTION:  ");
     }
@@ -917,7 +917,7 @@ guint dissect_rdt_stream_end_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre
         offset += tvb_length_remaining(tvb, offset);
     }
 
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_fstr(pinfo->cinfo, COL_INFO, "STREAM-END: stream-id=%02u  ", stream_id);
     }
@@ -971,7 +971,7 @@ guint dissect_rdt_report_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
         packet_length = tvb_length_remaining(tvb, start_offset);
     }
 
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_str(pinfo->cinfo, COL_INFO, "REPORT:  ");
     }
@@ -1040,7 +1040,7 @@ guint dissect_rdt_latency_report_packet(tvbuff_t *tvb, packet_info *pinfo, proto
     proto_tree_add_item(tree, hf_rdt_lrpt_server_out_time, tvb, offset, 4, FALSE);
     offset += 4;
 
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_fstr(pinfo->cinfo, COL_INFO, "LATENCY-REPORT: t=%u  ", server_out_time);
     }
@@ -1096,7 +1096,7 @@ guint dissect_rdt_transport_info_request_packet(tvbuff_t *tvb, packet_info *pinf
         offset += 4;
     }
 
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_str(pinfo->cinfo, COL_INFO, "TRANSPORT-INFO-REQUEST:  ");
     }
@@ -1195,7 +1195,7 @@ guint dissect_rdt_transport_info_response_packet(tvbuff_t *tvb, packet_info *pin
     /* Report what is left */
     offset += tvb_length_remaining(tvb, offset);
 
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_str(pinfo->cinfo, COL_INFO, "RESPONSE:  ");
     }
@@ -1254,7 +1254,7 @@ guint dissect_rdt_bw_probing_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tre
     proto_tree_add_item(tree, hf_rdt_timestamp, tvb, offset, 1, FALSE);
     offset += 4;
 
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_str(pinfo->cinfo, COL_INFO, "BW-PROBING:  ");
     }
@@ -1287,7 +1287,7 @@ guint dissect_rdt_unknown_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree
     proto_tree_add_item(tree, hf_rdt_data, tvb, offset, -1, FALSE);
     offset += tvb_length_remaining(tvb, offset);
 
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    if (check_col(pinfo->cinfo, COL_INFO))
     {
         col_append_str(pinfo->cinfo, COL_INFO, "UNKNOWN-CTL:  ");
     }
diff --git a/epan/dissectors/packet-vj.c b/epan/dissectors/packet-vj.c
index 9e600a6067..957829af62 100644
--- a/epan/dissectors/packet-vj.c
+++ b/epan/dissectors/packet-vj.c
@@ -225,7 +225,7 @@ dissect_vjuc(tvbuff_t *tvb, packet_info *pinfo, proto_tree * tree)
   gint        ipsize;
 
   if(check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_INFO, "PPP VJ");
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP VJ");
 
   if(tree != NULL) {
     ti = proto_tree_add_protocol_format(tree, proto_vj, tvb, 0, -1,
@@ -407,7 +407,7 @@ dissect_vjc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   gint        err      = VJ_ERROR;
 
   if(check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_INFO, "PPP VJ");
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP VJ");
 
   if(tree != NULL) {
     ti = proto_tree_add_protocol_format(tree, proto_vj, tvb, 0, -1,