Ethereal-dev: Re: [Ethereal-dev] [PATCH] ACN plugin update

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: Erwin Rol <mailinglists@xxxxxxxxxxxx>
Date: Wed, 05 Nov 2003 23:07:23 +0100
On Wed, 2003-11-05 at 21:12, Guy Harris wrote:
> On Nov 5, 2003, at 8:17 AM, Erwin Rol wrote:
> 
> > Attached an update for the ACN plugin.
> 
> Checked in.
> 
> > With this Patch the SDT part of the ACN protocol is "complete".
> 
> ...and some "unused variable" warnings are gone.

..... and it was wrong :-) 

Small patch to fix some switched fields.

- Erwin

-- 
       Erwin Rol Software Engineering - http://www.erwinrol.com/

? acn.diff
? acn.dump
? acn.dump1
Index: packet-acn.c
===================================================================
RCS file: /cvsroot/ethereal/plugins/acn/packet-acn.c,v
retrieving revision 1.3
diff -u -r1.3 packet-acn.c
--- packet-acn.c	5 Nov 2003 20:10:54 -0000	1.3
+++ packet-acn.c	5 Nov 2003 22:05:28 -0000
@@ -299,24 +299,25 @@
 					break;
 					
 				case ACN_SDT_ADDR_IPV4:
-					proto_tree_add_item(tree, hf_acn_sdt_upstream_ipv4_address, tvb,
-								offset, 4, FALSE);
-					offset += 4;
-				
 					proto_tree_add_item(tree, hf_acn_sdt_upstream_port, tvb,
 								offset, 2, FALSE);
 					offset += 2;
 				
+					proto_tree_add_item(tree, hf_acn_sdt_upstream_ipv4_address, tvb,
+								offset, 4, FALSE);
+					offset += 4;
+				
 					break;
 					
 				case ACN_SDT_ADDR_IPV6:
+					proto_tree_add_item(tree, hf_acn_sdt_upstream_port, tvb,
+								offset, 2, FALSE);
+					offset += 2;
+
 					proto_tree_add_item(tree, hf_acn_sdt_upstream_ipv6_address, tvb,
 								offset, 16, FALSE);
 					offset += 16;
 				
-					proto_tree_add_item(tree, hf_acn_sdt_upstream_port, tvb,
-								offset, 2, FALSE);
-					offset += 2;
 					break;		
 			}
 			
@@ -339,24 +340,26 @@
 					break;
 					
 				case ACN_SDT_ADDR_IPV4:
+					proto_tree_add_item(tree, hf_acn_sdt_downstream_port, tvb,
+								offset, 2, FALSE);
+					offset += 2;
+
 					proto_tree_add_item(tree, hf_acn_sdt_downstream_ipv4_address, tvb,
 								offset, 4, FALSE);
 					offset += 4;
 				
-					proto_tree_add_item(tree, hf_acn_sdt_downstream_port, tvb,
-								offset, 2, FALSE);
-					offset += 2;
 				
 					break;
 					
 				case ACN_SDT_ADDR_IPV6:
+					proto_tree_add_item(tree, hf_acn_sdt_downstream_port, tvb,
+								offset, 2, FALSE);
+					offset += 2;
+
 					proto_tree_add_item(tree, hf_acn_sdt_downstream_ipv6_address, tvb,
 								offset, 16, FALSE);
 					offset += 16;
 				
-					proto_tree_add_item(tree, hf_acn_sdt_downstream_port, tvb,
-								offset, 2, FALSE);
-					offset += 2;
 					break;		
 			}