dissect_uleb128 -> tvb_get_varint/proto_tree_add_item_ret_length

Also update ENC_VARINT_PROTOBUF documentation while we're at it

Change-Id: I72e1f9175adc0c6a8bb03ceddba04ffd4844a12e
Reviewed-on: https://code.wireshark.org/review/24485
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 13 insertions, 24 deletions

diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c
index 33dc93256f..39374424d8 100644
--- a/epan/dissectors/packet-netsync.c
+++ b/epan/dissectors/packet-netsync.c
@@ -158,7 +158,7 @@ static gint dissect_netsync_cmd_error( tvbuff_t *tvb,  gint offset, proto_tree *
 {
 	guint64 len = 0;
 
-	offset += dissect_uleb128( tvb, offset, &len );
+	offset += tvb_get_varint( tvb, offset, FT_VARINT_MAX_LEN, &len );
 
 	proto_tree_add_item(tree, hf_netsync_cmd_error_msg, tvb,
 				offset, (gint)len, ENC_ASCII|ENC_NA );
@@ -177,15 +177,13 @@ static gint dissect_netsync_cmd_hello(tvbuff_t *tvb,  gint offset, proto_tree *t
 {
 	guint64 len = 0;
 
-	offset += dissect_uleb128( tvb, offset, &len );
-
+	offset += tvb_get_varint( tvb, offset, FT_VARINT_MAX_LEN, &len );
 	proto_tree_add_item(tree, hf_netsync_cmd_hello_keyname, tvb,
 				offset, (gint)len, ENC_ASCII|ENC_NA );
 	offset += (gint)len;
 
 
-	offset += dissect_uleb128( tvb, offset, &len );
-
+	offset += tvb_get_varint( tvb, offset, FT_VARINT_MAX_LEN, &len );
 	proto_tree_add_item(tree, hf_netsync_cmd_hello_key, tvb,
 				offset, (gint)len, ENC_NA );
 	offset += (gint)len;
@@ -206,8 +204,7 @@ static gint dissect_netsync_cmd_anonymous(tvbuff_t *tvb,  gint offset, proto_tre
 				offset, 1, ENC_BIG_ENDIAN );
 	offset += 1;
 
-	offset += dissect_uleb128( tvb, offset, &len );
-
+	offset += tvb_get_varint( tvb, offset, FT_VARINT_MAX_LEN, &len );
 	proto_tree_add_item(tree, hf_netsync_cmd_anonymous_collection, tvb,
 				offset, (gint)len, ENC_ASCII|ENC_NA );
 	offset += (gint)len;
@@ -229,8 +226,7 @@ static gint dissect_netsync_cmd_auth(tvbuff_t *tvb,  gint offset, proto_tree *tr
 	offset += 1;
 
 
-	offset += dissect_uleb128( tvb, offset, &len );
-
+	offset += tvb_get_varint( tvb, offset, FT_VARINT_MAX_LEN, &len );
 	proto_tree_add_item(tree, hf_netsync_cmd_auth_collection, tvb,
 				offset, (gint)len, ENC_ASCII|ENC_NA );
 	offset += (gint)len;
@@ -251,8 +247,7 @@ static gint dissect_netsync_cmd_auth(tvbuff_t *tvb,  gint offset, proto_tree *tr
 				offset, NETSNYC_MERKLE_HASH_LENGTH, ENC_NA );
 	offset += NETSNYC_MERKLE_HASH_LENGTH;
 
-	offset += dissect_uleb128( tvb, offset, &len );
-
+	offset += tvb_get_varint( tvb, offset, FT_VARINT_MAX_LEN, &len );
 	proto_tree_add_item(tree, hf_netsync_cmd_auth_sig, tvb,
 				offset, (gint)len, ENC_NA );
 	offset += (gint)len;
@@ -265,8 +260,7 @@ static gint dissect_netsync_cmd_confirm(tvbuff_t *tvb,  gint offset, proto_tree
 {
 	guint64 len = 0;
 
-	offset += dissect_uleb128( tvb, offset, &len );
-
+	offset += tvb_get_varint( tvb, offset, FT_VARINT_MAX_LEN, &len );
 	proto_tree_add_item(tree, hf_netsync_cmd_confirm_sig, tvb,
 				offset, (gint)len, ENC_NA );
 	offset += (gint)len;
@@ -288,13 +282,10 @@ static gint dissect_netsync_cmd_refine(tvbuff_t *tvb,  gint offset, proto_tree *
 
 static gint dissect_netsync_cmd_done(tvbuff_t *tvb,  gint offset, proto_tree *tree, guint size _U_)
 {
-	guint64 len = 0;
-	guint bytes = 0;
-
-	bytes = dissect_uleb128( tvb, offset, &len );
+	gint bytes = 0;
 
-	proto_tree_add_uint(tree, hf_netsync_cmd_done_level, tvb,
-					offset, bytes, (guint32)len );
+	proto_tree_add_item_ret_length(tree, hf_netsync_cmd_done_level, tvb,
+					offset, -1, ENC_LITTLE_ENDIAN|ENC_VARINT_PROTOBUF, &bytes);
 	offset += bytes;
 
 	proto_tree_add_item(tree, hf_netsync_cmd_done_type, tvb,
@@ -354,8 +345,7 @@ static gint dissect_netsync_cmd_data(tvbuff_t *tvb,  gint offset, proto_tree *tr
 				offset, 1, ENC_BIG_ENDIAN );
 	offset += 1;
 
-	offset += dissect_uleb128( tvb, offset, &len );
-
+	offset += tvb_get_varint( tvb, offset, FT_VARINT_MAX_LEN, &len );
 	proto_tree_add_item(tree, hf_netsync_cmd_data_payload, tvb,
 				offset, (gint)len, ENC_NA );
 	offset += (gint)len;
@@ -384,8 +374,7 @@ static gint dissect_netsync_cmd_delta(tvbuff_t *tvb,  gint offset, proto_tree *t
 				offset, 1, ENC_BIG_ENDIAN );
 	offset += 1;
 
-	offset += dissect_uleb128( tvb, offset, &len );
-
+	offset += tvb_get_varint( tvb, offset, FT_VARINT_MAX_LEN, &len );
 	proto_tree_add_item(tree, hf_netsync_cmd_delta_payload, tvb,
 				offset, (gint)len, ENC_NA );
 	offset += (gint)len;
@@ -416,7 +405,7 @@ get_netsync_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset, void *dat
 	/* skip version and command */
 	offset += 2;
 
-	size_bytes = dissect_uleb128( tvb, offset, &size );
+	size_bytes = tvb_get_varint( tvb, offset, FT_VARINT_MAX_LEN, &size );
 
 	/* the calculated size if for the data only, this doesn't
 	 * include the version (1 byte), command (1 byte),