From fd32d72b20972023c5db6ef7ef6dc015efc4ed9c Mon Sep 17 00:00:00 2001 From: Brian Warner <warner@allmydata.com> Date: Thu, 9 Oct 2008 18:34:22 -0700 Subject: [PATCH] scripts/debug.py: emit the immutable-share version number, tolerate v2 --- src/allmydata/scripts/debug.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/allmydata/scripts/debug.py b/src/allmydata/scripts/debug.py index 728d7527..eac5ea1d 100644 --- a/src/allmydata/scripts/debug.py +++ b/src/allmydata/scripts/debug.py @@ -53,10 +53,12 @@ def dump_immutable_share(options): f = storage.ShareFile(options['filename']) # use a ReadBucketProxy to parse the bucket and find the uri extension bp = ReadBucketProxy(None) - offsets = bp._parse_offsets(f.read_share_data(0, 0x24)) + offsets = bp._parse_offsets(f.read_share_data(0, 0x44)) + print >>out, "%20s: %d" % ("version", bp._version) seek = offsets['uri_extension'] - length = struct.unpack(">L", f.read_share_data(seek, 4))[0] - seek += 4 + length = struct.unpack(bp._fieldstruct, + f.read_share_data(seek, bp._fieldsize))[0] + seek += bp._fieldsize UEB_data = f.read_share_data(seek, length) unpacked = uri.unpack_extension_readable(UEB_data) -- 2.45.2