Get rid of check_col() and use ENC_BIG_ENDIAN.

svn path=/trunk/; revision=39144

1 files changed, 101 insertions, 110 deletions

diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c
index d3fcb7c985..9aa70adab8 100644
--- a/epan/dissectors/packet-aodv.c
+++ b/epan/dissectors/packet-aodv.c
@@ -171,9 +171,9 @@ dissect_aodv_ext(tvbuff_t * tvb, int offset, proto_tree * tree)
 			val_to_str(type, exttype_vals, "Unknown"));
 
     if (len == 0) {
-	proto_tree_add_text(ext_tree, tvb, offset + 1, 1,
-			    "Invalid option length: %u", len);
-	return;			/* we must not try to decode this */
+		proto_tree_add_text(ext_tree, tvb, offset + 1, 1,
+					"Invalid option length: %u", len);
+		return;			/* we must not try to decode this */
     }
     proto_tree_add_text(ext_tree, tvb, offset + 1, 1,
 			"Length: %u bytes", len);
@@ -182,15 +182,15 @@ dissect_aodv_ext(tvbuff_t * tvb, int offset, proto_tree * tree)
 
     switch (type) {
     case AODV_EXT_INT:
-	proto_tree_add_uint(ext_tree, hf_aodv_ext_interval,
-			    tvb, offset, 4, tvb_get_ntohl(tvb, offset));
+		proto_tree_add_uint(ext_tree, hf_aodv_ext_interval,
+					tvb, offset, 4, tvb_get_ntohl(tvb, offset));
 	break;
     case AODV_EXT_NTP:
-	proto_tree_add_item(ext_tree, hf_aodv_ext_timestamp,
-			    tvb, offset, 8, FALSE);
-	break;
-    default:
-	break;
+		proto_tree_add_item(ext_tree, hf_aodv_ext_timestamp,
+					tvb, offset, 8, ENC_BIG_ENDIAN);
+		break;
+	default:
+		break;
     }
     /* If multifield extensions appear, we need more
      * sophisticated handler.  For now, this is okay. */
@@ -252,40 +252,38 @@ dissect_aodv_rreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_tree,
 
     rreq_id = tvb_get_ntohl(tvb, offset);
     if (aodv_tree)
-	proto_tree_add_uint(aodv_tree, hf_aodv_rreq_id, tvb, offset, 4,
-			    rreq_id);
+		proto_tree_add_uint(aodv_tree, hf_aodv_rreq_id, tvb, offset, 4,
+					rreq_id);
     offset += 4;
 
     if (is_ipv6) {
-	tvb_get_ipv6(tvb, offset, &dest_addr_v6);
-	if (aodv_tree) {
-	    proto_tree_add_ipv6(aodv_tree, hf_aodv_dest_ipv6, tvb, offset,
-				INET6_ADDRLEN, (guint8 *)&dest_addr_v6);
-	    proto_item_append_text(ti, ", Dest IP: %s",
-				   ip6_to_str(&dest_addr_v6));
-	}
-	if (check_col(pinfo->cinfo, COL_INFO))
-	    col_append_fstr(pinfo->cinfo, COL_INFO, ", D: %s",
-			    ip6_to_str(&dest_addr_v6));
-	offset += INET6_ADDRLEN;
+		tvb_get_ipv6(tvb, offset, &dest_addr_v6);
+		if (aodv_tree) {
+			proto_tree_add_ipv6(aodv_tree, hf_aodv_dest_ipv6, tvb, offset,
+					INET6_ADDRLEN, (guint8 *)&dest_addr_v6);
+			proto_item_append_text(ti, ", Dest IP: %s",
+					   ip6_to_str(&dest_addr_v6));
+		}
+		col_append_fstr(pinfo->cinfo, COL_INFO, ", D: %s",
+				ip6_to_str(&dest_addr_v6));
+		offset += INET6_ADDRLEN;
     } else {
-	dest_addr_v4 = tvb_get_ipv4(tvb, offset);
-	if (aodv_tree) {
-	    proto_tree_add_ipv4(aodv_tree, hf_aodv_dest_ip, tvb, offset, 4,
-				dest_addr_v4);
-	    proto_item_append_text(ti, ", Dest IP: %s",
-				   ip_to_str((guint8 *)&dest_addr_v4));
-	}
-	if (check_col(pinfo->cinfo, COL_INFO))
-	    col_append_fstr(pinfo->cinfo, COL_INFO, ", D: %s",
-			    ip_to_str((guint8 *)&dest_addr_v4));
-	offset += 4;
+		dest_addr_v4 = tvb_get_ipv4(tvb, offset);
+		if (aodv_tree) {
+			proto_tree_add_ipv4(aodv_tree, hf_aodv_dest_ip, tvb, offset, 4,
+					dest_addr_v4);
+			proto_item_append_text(ti, ", Dest IP: %s",
+					   ip_to_str((guint8 *)&dest_addr_v4));
+		}
+		col_append_fstr(pinfo->cinfo, COL_INFO, ", D: %s",
+				ip_to_str((guint8 *)&dest_addr_v4));
+		offset += 4;
     }
 
     dest_seqno = tvb_get_ntohl(tvb, offset);
     if (aodv_tree)
-	proto_tree_add_uint(aodv_tree, hf_aodv_dest_seqno, tvb, offset, 4,
-			    dest_seqno);
+		proto_tree_add_uint(aodv_tree, hf_aodv_dest_seqno, tvb, offset, 4,
+					dest_seqno);
     offset += 4;
 
     if (is_ipv6) {
@@ -296,9 +294,8 @@ dissect_aodv_rreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_tree,
 	    proto_item_append_text(ti, ", Orig IP: %s",
 				   ip6_to_str(&orig_addr_v6));
 	}
-	if (check_col(pinfo->cinfo, COL_INFO))
-	    col_append_fstr(pinfo->cinfo, COL_INFO, ", O: %s",
-			    ip6_to_str(&orig_addr_v6));
+    col_append_fstr(pinfo->cinfo, COL_INFO, ", O: %s",
+		    ip6_to_str(&orig_addr_v6));
 	offset += INET6_ADDRLEN;
     } else {
 	orig_addr_v4 = tvb_get_ipv4(tvb, offset);
@@ -308,17 +305,15 @@ dissect_aodv_rreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_tree,
 	    proto_item_append_text(ti, ", Orig IP: %s",
 				   ip_to_str((guint8 *)&orig_addr_v4));
 	}
-	if (check_col(pinfo->cinfo, COL_INFO))
-	    col_append_fstr(pinfo->cinfo, COL_INFO, ", O: %s",
-			    ip_to_str((guint8 *)&orig_addr_v4));
+    col_append_fstr(pinfo->cinfo, COL_INFO, ", O: %s",
+		    ip_to_str((guint8 *)&orig_addr_v4));
 	offset += 4;
     }
 
     orig_seqno = tvb_get_ntohl(tvb, offset);
     if (aodv_tree)
-	proto_tree_add_uint(aodv_tree, hf_aodv_orig_seqno, tvb, offset, 4,
-			    orig_seqno);
-    if (check_col(pinfo->cinfo, COL_INFO))
+		proto_tree_add_uint(aodv_tree, hf_aodv_orig_seqno, tvb, offset, 4,
+					orig_seqno);
 	col_append_fstr(pinfo->cinfo, COL_INFO, " Id=%u Hcnt=%u DSN=%u OSN=%u",
 			rreq_id,
 			hop_count,
@@ -327,7 +322,7 @@ dissect_aodv_rreq(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_tree,
     offset += 4;
 
     if (aodv_tree) {
-	extlen = tvb_reported_length_remaining(tvb, offset);
+		extlen = tvb_reported_length_remaining(tvb, offset);
 	if (extlen > 0)
 	    dissect_aodv_ext(tvb, offset, aodv_tree);
     }
@@ -379,70 +374,67 @@ dissect_aodv_rrep(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_tree,
     offset += 1;
 
     if (is_ipv6) {
-	tvb_get_ipv6(tvb, offset, &dest_addr_v6);
-	if (aodv_tree) {
-	    proto_tree_add_ipv6(aodv_tree, hf_aodv_dest_ipv6, tvb, offset,
-				INET6_ADDRLEN, (guint8 *)&dest_addr_v6);
-	    proto_item_append_text(ti, ", Dest IP: %s",
-				   ip6_to_str(&dest_addr_v6));
-	}
-	if (check_col(pinfo->cinfo, COL_INFO))
-	    col_append_fstr(pinfo->cinfo, COL_INFO, ", D: %s",
-			    ip6_to_str(&dest_addr_v6));
-	offset += INET6_ADDRLEN;
+		tvb_get_ipv6(tvb, offset, &dest_addr_v6);
+		if (aodv_tree) {
+			proto_tree_add_ipv6(aodv_tree, hf_aodv_dest_ipv6, tvb, offset,
+					INET6_ADDRLEN, (guint8 *)&dest_addr_v6);
+			proto_item_append_text(ti, ", Dest IP: %s",
+					   ip6_to_str(&dest_addr_v6));
+		}
+
+		col_append_fstr(pinfo->cinfo, COL_INFO, ", D: %s",
+				ip6_to_str(&dest_addr_v6));
+		offset += INET6_ADDRLEN;
     } else {
-	dest_addr_v4 = tvb_get_ipv4(tvb, offset);
-	if (aodv_tree) {
-	    proto_tree_add_ipv4(aodv_tree, hf_aodv_dest_ip, tvb, offset, 4,
-				dest_addr_v4);
-	    proto_item_append_text(ti, ", Dest IP: %s",
-				   ip_to_str((guint8 *)&dest_addr_v4));
-	}
-	if (check_col(pinfo->cinfo, COL_INFO))
-	    col_append_fstr(pinfo->cinfo, COL_INFO, ", D: %s",
-			    ip_to_str((guint8 *)&dest_addr_v4));
-	offset += 4;
+		dest_addr_v4 = tvb_get_ipv4(tvb, offset);
+		if (aodv_tree) {
+			proto_tree_add_ipv4(aodv_tree, hf_aodv_dest_ip, tvb, offset, 4,
+					dest_addr_v4);
+			proto_item_append_text(ti, ", Dest IP: %s",
+					   ip_to_str((guint8 *)&dest_addr_v4));
+		}
+		col_append_fstr(pinfo->cinfo, COL_INFO, ", D: %s",
+				ip_to_str((guint8 *)&dest_addr_v4));
+		offset += 4;
     }
 
     dest_seqno = tvb_get_ntohl(tvb, offset);
     if (aodv_tree)
-	proto_tree_add_uint(aodv_tree, hf_aodv_dest_seqno, tvb, offset, 4,
-			    dest_seqno);
+		proto_tree_add_uint(aodv_tree, hf_aodv_dest_seqno, tvb, offset, 4,
+					dest_seqno);
     offset += 4;
 
     if (is_ipv6) {
-	tvb_get_ipv6(tvb, offset, &orig_addr_v6);
-	if (aodv_tree) {
-	    proto_tree_add_ipv6(aodv_tree, hf_aodv_orig_ipv6, tvb, offset,
-				INET6_ADDRLEN, (guint8 *)&orig_addr_v6);
-	    proto_item_append_text(ti, ", Orig IP: %s",
-				   ip6_to_str(&orig_addr_v6));
-	}
-	if (check_col(pinfo->cinfo, COL_INFO))
-	    col_append_fstr(pinfo->cinfo, COL_INFO, ", O: %s",
-			    ip6_to_str(&orig_addr_v6));
-	offset += INET6_ADDRLEN;
+		tvb_get_ipv6(tvb, offset, &orig_addr_v6);
+		if (aodv_tree) {
+			proto_tree_add_ipv6(aodv_tree, hf_aodv_orig_ipv6, tvb, offset,
+					INET6_ADDRLEN, (guint8 *)&orig_addr_v6);
+			proto_item_append_text(ti, ", Orig IP: %s",
+					   ip6_to_str(&orig_addr_v6));
+		}
+		col_append_fstr(pinfo->cinfo, COL_INFO, ", O: %s",
+				ip6_to_str(&orig_addr_v6));
+		offset += INET6_ADDRLEN;
     } else {
-	orig_addr_v4 = tvb_get_ipv4(tvb, offset);
-	if (aodv_tree) {
-	    proto_tree_add_ipv4(aodv_tree, hf_aodv_orig_ip, tvb, offset, 4,
-				orig_addr_v4);
-	    proto_item_append_text(ti, ", Orig IP: %s",
-				   ip_to_str((guint8 *)&orig_addr_v4));
-	}
-	if (check_col(pinfo->cinfo, COL_INFO))
-	    col_append_fstr(pinfo->cinfo, COL_INFO, ", O: %s",
-			    ip_to_str((guint8 *)&orig_addr_v4));
-	offset += 4;
+		orig_addr_v4 = tvb_get_ipv4(tvb, offset);
+		if (aodv_tree) {
+			proto_tree_add_ipv4(aodv_tree, hf_aodv_orig_ip, tvb, offset, 4,
+					orig_addr_v4);
+			proto_item_append_text(ti, ", Orig IP: %s",
+					   ip_to_str((guint8 *)&orig_addr_v4));
+		}
+		col_append_fstr(pinfo->cinfo, COL_INFO, ", O: %s",
+				ip_to_str((guint8 *)&orig_addr_v4));
+		offset += 4;
     }
 
     lifetime = tvb_get_ntohl(tvb, offset);
     if (aodv_tree) {
-	proto_tree_add_uint(aodv_tree, hf_aodv_lifetime, tvb, offset, 4,
-			    lifetime);
-	proto_item_append_text(ti, ", Lifetime=%u", lifetime);
+		proto_tree_add_uint(aodv_tree, hf_aodv_lifetime, tvb, offset, 4,
+					lifetime);
+		proto_item_append_text(ti, ", Lifetime=%u", lifetime);
     }
-    if (check_col(pinfo->cinfo, COL_INFO))
+
 	col_append_fstr(pinfo->cinfo, COL_INFO, " Hcnt=%u DSN=%u Lifetime=%u",
 			hop_count,
 			dest_seqno,
@@ -483,7 +475,6 @@ dissect_aodv_rerr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_tree,
     if (aodv_tree)
 	proto_tree_add_uint(aodv_tree, hf_aodv_destcount, tvb, offset, 1,
 			    dest_count);
-    if (check_col(pinfo->cinfo, COL_INFO))
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Dest Count=%u",
 			dest_count);
     offset += 1;
@@ -496,10 +487,10 @@ dissect_aodv_rerr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_tree,
 	for (i = 0; i < dest_count; i++) {
 	    proto_tree_add_item(aodv_unreach_dest_tree,
 				hf_aodv_unreach_dest_ipv6,
-				tvb, offset, INET6_ADDRLEN, FALSE);
+				tvb, offset, INET6_ADDRLEN, ENC_BIG_ENDIAN);
 	    offset += INET6_ADDRLEN;
 	    proto_tree_add_item(aodv_unreach_dest_tree, hf_aodv_dest_seqno,
-				tvb, offset, 4, FALSE);
+				tvb, offset, 4, ENC_BIG_ENDIAN);
 	    offset += 4;
 	}
     } else {
@@ -508,10 +499,10 @@ dissect_aodv_rerr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *aodv_tree,
 	aodv_unreach_dest_tree = proto_item_add_subtree(tj, ett_aodv_unreach_dest);
 	for (i = 0; i < dest_count; i++) {
 	    proto_tree_add_item(aodv_unreach_dest_tree, hf_aodv_unreach_dest_ip,
-				tvb, offset, 4, FALSE);
+				tvb, offset, 4, ENC_BIG_ENDIAN);
 	    offset += 4;
 	    proto_tree_add_item(aodv_unreach_dest_tree, hf_aodv_dest_seqno,
-				tvb, offset, 4, FALSE);
+				tvb, offset, 4, ENC_BIG_ENDIAN);
 	    offset += 4;
 	}
     }
@@ -591,7 +582,7 @@ dissect_aodv_draft_01_v6_rreq(tvbuff_t *tvb, packet_info *pinfo,
 	proto_item_append_text(ti, ", Dest IP: %s",
 			       ip6_to_str(&dest_addr_v6));
     }
-    if (check_col(pinfo->cinfo, COL_INFO))
+
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", D: %s",
 			ip6_to_str(&dest_addr_v6));
     offset += INET6_ADDRLEN;
@@ -603,7 +594,7 @@ dissect_aodv_draft_01_v6_rreq(tvbuff_t *tvb, packet_info *pinfo,
 	proto_item_append_text(ti, ", Orig IP: %s",
 			       ip6_to_str(&orig_addr_v6));
     }
-    if (check_col(pinfo->cinfo, COL_INFO))
+
 	col_append_fstr(pinfo->cinfo, COL_INFO,
 			", O: %s Id=%u Hcnt=%u DSN=%u OSN=%u",
 			ip6_to_str(&orig_addr_v6),
@@ -676,7 +667,7 @@ dissect_aodv_draft_01_v6_rrep(tvbuff_t *tvb, packet_info *pinfo,
 	proto_item_append_text(ti, ", Dest IP: %s",
 			       ip6_to_str(&dest_addr_v6));
     }
-    if (check_col(pinfo->cinfo, COL_INFO))
+
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", D: %s",
 			ip6_to_str(&dest_addr_v6));
     offset += INET6_ADDRLEN;
@@ -688,7 +679,7 @@ dissect_aodv_draft_01_v6_rrep(tvbuff_t *tvb, packet_info *pinfo,
 	proto_item_append_text(ti, ", Orig IP: %s",
 			       ip6_to_str(&orig_addr_v6));
     }
-    if (check_col(pinfo->cinfo, COL_INFO))
+
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", O: %s",
 			ip6_to_str(&orig_addr_v6));
     offset += INET6_ADDRLEN;
@@ -699,7 +690,7 @@ dissect_aodv_draft_01_v6_rrep(tvbuff_t *tvb, packet_info *pinfo,
 			    lifetime);
 	proto_item_append_text(ti, ", Lifetime=%u", lifetime);
     }
-    if (check_col(pinfo->cinfo, COL_INFO))
+
 	col_append_fstr(pinfo->cinfo, COL_INFO, " Hcnt=%u DSN=%u Lifetime=%u",
 			hop_count,
 			dest_seqno,
@@ -740,7 +731,7 @@ dissect_aodv_draft_01_v6_rerr(tvbuff_t *tvb, packet_info *pinfo,
     if (aodv_tree)
 	proto_tree_add_uint(aodv_tree, hf_aodv_destcount, tvb, offset, 1,
 			    dest_count);
-    if (check_col(pinfo->cinfo, COL_INFO))
+
 	col_append_fstr(pinfo->cinfo, COL_INFO, ", Dest Count=%u",
 			dest_count);
     offset += 1;
@@ -751,11 +742,11 @@ dissect_aodv_draft_01_v6_rerr(tvbuff_t *tvb, packet_info *pinfo,
     aodv_unreach_dest_tree = proto_item_add_subtree(tj, ett_aodv_unreach_dest);
     for (i = 0; i < dest_count; i++) {
 	proto_tree_add_item(aodv_unreach_dest_tree, hf_aodv_dest_seqno,
-			    tvb, offset, 4, FALSE);
+			    tvb, offset, 4, ENC_BIG_ENDIAN);
 	offset += 4;
 	proto_tree_add_item(aodv_unreach_dest_tree,
 			    hf_aodv_unreach_dest_ipv6,
-			    tvb, offset, INET6_ADDRLEN, FALSE);
+			    tvb, offset, INET6_ADDRLEN, ENC_BIG_ENDIAN);
 	offset += INET6_ADDRLEN;
     }
 }
@@ -785,7 +776,7 @@ dissect_aodv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	return 0;
     }
 
-    if (check_col(pinfo->cinfo, COL_INFO))
+ 
 	col_add_str(pinfo->cinfo, COL_INFO,
 		     val_to_str(type, type_vals,
 				"Unknown AODV Packet Type (%u)"));