Upon 2nd thought: revert changes I made to remove 'if(checkcol(...)' around col_add_f...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30134 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index 4c2d2081e0b1c8d88dc0d507d8785e3375fde355..9582660b584d7e90a4c76875243d2759225c51a0 100644 (file)
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -1404,9 +1404,10 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     switch (type) {
     case REGISTRATION_REQUEST:
-        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(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)));
 
         if (tree) {
             ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE);
@@ -1457,8 +1458,9 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         } /* if tree */
         break;
     case REGISTRATION_REPLY:
-        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(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));
 
         if (tree) {
             /* Add Subtree */
@@ -1497,8 +1499,9 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
         break;
     case REGISTRATION_UPDATE:
-        col_add_fstr(pinfo->cinfo, COL_INFO,"Reg Update:  PDSN=%s",
-                     ip_to_str(tvb_get_ptr(tvb,8,4)));
+        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)));
         if (tree) {
             /* Add Subtree */
             ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE);
@@ -1531,9 +1534,10 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         } /* if tree */
         break;
     case REGISTRATION_ACK:
-        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(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));
         if (tree) {
             /* Add Subtree */
             ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE);
@@ -1570,8 +1574,9 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         } /* if tree */
         break;
     case SESSION_UPDATE: /* IOS4.3 */
-        col_add_fstr(pinfo->cinfo, COL_INFO,"Ses Update:  PDSN=%s",
-                     ip_to_str(tvb_get_ptr(tvb,8,4)));
+        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)));
         if (tree) {
             /* Add Subtree */
             ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE);
@@ -1604,9 +1609,10 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         } /* if tree */
         break;
     case SESSION_ACK: /* IOS4.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(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));
         if (tree) {
             /* Add Subtree */
             ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE);
@@ -1643,9 +1649,10 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         } /* if tree */
         break;
     case CAPABILITIES_INFO: /* IOS5.1 */
-        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(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)));
         if (tree) {
             /* Add Subtree */
             ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE);
@@ -1682,8 +1689,9 @@ dissect_a11( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         } /* if tree */
         break;
     case CAPABILITIES_INFO_ACK: /* IOS5.1 */
-        col_add_fstr(pinfo->cinfo, COL_INFO, "Cap Info Ack: PCF=%s",
-                     ip_to_str(tvb_get_ptr(tvb, 8, 4)));
+        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)));
         if (tree) {
             /* Add Subtree */
             ti = proto_tree_add_item(tree, proto_a11, tvb, offset, -1, FALSE);

diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c
index 32716ea74b253f64d6ef9743b4cb73a75ccaf56a..5fc777360f1fc57bd0f36ffb6f66af371780283a 100644 (file)
--- a/epan/dissectors/packet-stun.c
+++ b/epan/dissectors/packet-stun.c
@@ -561,8 +561,10 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        if (msg_method_str == NULL)
                msg_method_str = "Unknown";
 
-       col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
-                    msg_method_str, msg_class_str);
+       if(check_col(pinfo->cinfo,COL_INFO)) {
+               col_add_fstr(pinfo->cinfo, COL_INFO, "%s %s",
+                            msg_method_str, msg_class_str);
+       }
 
        if (!tree)
                return tvb_length(tvb);
@@ -704,13 +706,15 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                                ip = tvb_get_ipv4(tvb,offset+4);
                                                ipstr = ip_to_str((guint8*)&ip);
                                                proto_item_append_text(att_tree, ": %s:%d", ipstr,tvb_get_ntohs(tvb,offset+2));
-                                               col_append_fstr(
-                                                       pinfo->cinfo, COL_INFO,
-                                                       " %s: %s:%d",
-                                                       val_to_str(att_type, attributes, "Unknown"),
-                                                       ipstr,
-                                                       tvb_get_ntohs(tvb,offset+2)
-                                                       );
+                                               if(check_col(pinfo->cinfo,COL_INFO)) {
+                                                       col_append_fstr(
+                                                               pinfo->cinfo, COL_INFO,
+                                                               " %s: %s:%d",
+                                                               val_to_str(att_type, attributes, "Unknown"),
+                                                               ipstr,
+                                                               tvb_get_ntohs(tvb,offset+2)
+                                                               );
+                                               }
                                        }
                                        break;
 
@@ -732,11 +736,13 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                        case USERNAME:
                                proto_tree_add_item(att_tree, stun_att_username, tvb, offset, att_length, FALSE);
                                proto_item_append_text(att_tree, ": %s", tvb_get_ephemeral_string(tvb, offset, att_length));
-                               col_append_fstr(
-                                       pinfo->cinfo, COL_INFO,
-                                       " user: %s",
-                                       tvb_get_ephemeral_string(tvb,offset, att_length)
-                                       );
+                               if(check_col(pinfo->cinfo,COL_INFO)) {
+                                       col_append_fstr(
+                                               pinfo->cinfo, COL_INFO,
+                                               " user: %s",
+                                               tvb_get_ephemeral_string(tvb,offset, att_length)
+                                               );
+                               }
                                if (att_length % 4 != 0)
                                        proto_tree_add_uint(att_tree, stun_att_padding, 
                                                            tvb, offset+att_length, 4-(att_length % 4), 4-(att_length % 4));
@@ -766,23 +772,27 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                                human_error_num, /* human readable error code */
                                                val_to_str(human_error_num, error_code, "*Unknown error code*")
                                                );
-                                       col_append_fstr(
-                                               pinfo->cinfo, COL_INFO,
-                                               " error-code: %d (%s)",
-                                               human_error_num,
-                                               val_to_str(human_error_num, error_code, "*Unknown error code*")
-                                               );
+                                       if(check_col(pinfo->cinfo,COL_INFO)) {
+                                               col_append_fstr(
+                                                       pinfo->cinfo, COL_INFO,
+                                                       " error-code: %d (%s)",
+                                                       human_error_num,
+                                                       val_to_str(human_error_num, error_code, "*Unknown error code*")
+                                                       );
+                                       }
                                }
                                if (att_length < 5)
                                        break;
                                proto_tree_add_item(att_tree, stun_att_error_reason, tvb, offset+4, att_length-4, FALSE);
 
                                proto_item_append_text(att_tree, ": %s", tvb_get_ephemeral_string(tvb, offset+4, att_length-4));
-                               col_append_fstr(
-                                       pinfo->cinfo, COL_INFO,
-                                       " %s",
-                                       tvb_get_ephemeral_string(tvb, offset+4, att_length-4)
-                                       );
+                               if(check_col(pinfo->cinfo,COL_INFO)) {
+                                       col_append_fstr(
+                                               pinfo->cinfo, COL_INFO,
+                                               " %s",
+                                               tvb_get_ephemeral_string(tvb, offset+4, att_length-4)
+                                               );
+                               }
 
                                if (att_length % 4 != 0)
                                        proto_tree_add_uint(att_tree, stun_att_padding, tvb, offset+att_length, 4-(att_length % 4), 4-(att_length % 4));
@@ -798,11 +808,13 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                        case REALM:
                                proto_tree_add_item(att_tree, stun_att_realm, tvb, offset, att_length, FALSE);
                                proto_item_append_text(att_tree, ": %s", tvb_get_ephemeral_string(tvb, offset, att_length));
-                               col_append_fstr(
-                                       pinfo->cinfo, COL_INFO,
-                                       " realm: %s",
-                                       tvb_get_ephemeral_string(tvb,offset, att_length)
-                                       );
+                               if(check_col(pinfo->cinfo,COL_INFO)) {
+                                       col_append_fstr(
+                                               pinfo->cinfo, COL_INFO,
+                                               " realm: %s",
+                                               tvb_get_ephemeral_string(tvb,offset, att_length)
+                                               );
+                               }
                                if (att_length % 4 != 0)
                                        proto_tree_add_uint(att_tree, stun_att_padding, tvb, offset+att_length, 4-(att_length % 4), 4-(att_length % 4));
                                break;
@@ -810,10 +822,12 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                        case NONCE:
                                proto_tree_add_item(att_tree, stun_att_nonce, tvb, offset, att_length, FALSE);
                                proto_item_append_text(att_tree, ": %s", tvb_get_ephemeral_string(tvb, offset, att_length));
-                               col_append_fstr(
-                                       pinfo->cinfo, COL_INFO,
-                                       " with nonce"
-                                       );
+                               if(check_col(pinfo->cinfo,COL_INFO)) {
+                                       col_append_fstr(
+                                               pinfo->cinfo, COL_INFO,
+                                               " with nonce"
+                                               );
+                               }
                                if (att_length % 4 != 0)
                                        proto_tree_add_uint(att_tree, stun_att_padding, tvb, offset+att_length, 4-(att_length % 4), 4-(att_length % 4));
                                break;
@@ -865,13 +879,15 @@ dissect_stun_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                                                ipstr = ip_to_str((guint8*)&ip);
                                                port = tvb_get_ntohs(tvb, offset+2) ^ (magic_cookie_first_word >> 16);
                                                proto_item_append_text(att_tree, ": %s:%d", ipstr, port);
-                                               col_append_fstr(
-                                                       pinfo->cinfo, COL_INFO,
-                                                       " %s: %s:%d",
-                                                       val_to_str(att_type, attributes, "Unknown"),
-                                                       ipstr,
-                                                       port
-                                                       );
+                                               if(check_col(pinfo->cinfo,COL_INFO)) {
+                                                       col_append_fstr(
+                                                               pinfo->cinfo, COL_INFO,
+                                                               " %s: %s:%d",
+                                                               val_to_str(att_type, attributes, "Unknown"),
+                                                               ipstr,
+                                                               port
+                                                               );
+                                               }
                                        }
                                        break;
 
@@ -991,11 +1007,13 @@ case EVEN_PORT:
                                {
                                        guint8  protoCode = tvb_get_guint8(tvb, offset);
                                        proto_item_append_text(att_tree, ": %s", val_to_str(protoCode, transportnames, "Unknown (0x%8x)"));
-                                       col_append_fstr(
-                                               pinfo->cinfo, COL_INFO,
-                                               " %s",
-                                               val_to_str(protoCode, transportnames, "Unknown (0x%8x)")
-                                               );
+                                       if(check_col(pinfo->cinfo,COL_INFO)) {
+                                               col_append_fstr(
+                                                       pinfo->cinfo, COL_INFO,
+                                                       " %s",
+                                                       val_to_str(protoCode, transportnames, "Unknown (0x%8x)")
+                                                       );
+                                       }
                                }
                                proto_tree_add_uint(att_tree, stun_att_reserved, tvb, offset+1, 3, 3);
                                break;
@@ -1007,11 +1025,13 @@ case EVEN_PORT:
                                {
                                        guint16 chan = tvb_get_ntohs(tvb, offset);
                                        proto_item_append_text(att_tree, ": 0x%x", chan);
-                                       col_append_fstr(
-                                               pinfo->cinfo, COL_INFO,
-                                               " ChannelNumber=0x%x",
-                                               chan
-                                               );
+                                       if(check_col(pinfo->cinfo,COL_INFO)) {
+                                               col_append_fstr(
+                                                       pinfo->cinfo, COL_INFO,
+                                                       " ChannelNumber=0x%x",
+                                                       chan
+                                                       );
+                                       }
                                }
                                proto_tree_add_uint(att_tree, stun_att_reserved, tvb, offset+2, 2, 2);
                                break;
@@ -1021,22 +1041,26 @@ case EVEN_PORT:
                                        break;
                                proto_tree_add_item(att_tree, stun_att_bandwidth, tvb, offset, 4, FALSE);
                                proto_item_append_text(att_tree, " %d", tvb_get_ntohl(tvb, offset));
-                               col_append_fstr(
-                                       pinfo->cinfo, COL_INFO,
-                                       " bandwidth: %d",
-                                       tvb_get_ntohl(tvb, offset)
-                                       );
+                               if(check_col(pinfo->cinfo,COL_INFO)) {
+                                       col_append_fstr(
+                                               pinfo->cinfo, COL_INFO,
+                                               " bandwidth: %d",
+                                               tvb_get_ntohl(tvb, offset)
+                                               );
+                               }
                                break;
                        case LIFETIME:
                                if (att_length < 4)
                                        break;
                                proto_tree_add_item(att_tree, stun_att_lifetime, tvb, offset, 4, FALSE);
                                proto_item_append_text(att_tree, " %d", tvb_get_ntohl(tvb, offset));
-                               col_append_fstr(
-                                       pinfo->cinfo, COL_INFO,
-                                       " lifetime: %d",
-                                       tvb_get_ntohl(tvb, offset)
-                                       );
+                               if(check_col(pinfo->cinfo,COL_INFO)) {
+                                       col_append_fstr(
+                                               pinfo->cinfo, COL_INFO,
+                                               " lifetime: %d",
+                                               tvb_get_ntohl(tvb, offset)
+                                               );
+                               }
                                break;
 
                        default: