 ===================================================================
 --- src/stored/record.c	(révision 8163)
 +++ src/stored/record.c	(copie de travail)
-@@ -210,7 +210,7 @@
- 
- void empty_record(DEV_RECORD *rec)
- {
--   rec->File = rec->Block = 0;
-+   rec->Addr = rec->File = rec->Block = 0;
-    rec->VolSessionId = rec->VolSessionTime = 0;
-    rec->FileIndex = rec->Stream = 0;
-    rec->data_len = rec->remainder = 0;
-@@ -455,8 +455,8 @@
-       rec->Block = ((DEVICE *)block->dev)->EndBlock;
+@@ -422,6 +422,10 @@
+    return true;
+ }
+ 
++uint64_t get_record_address(DEV_RECORD *rec)
++{
++   return ((uint64_t)rec->File)<<32 | rec->Block;
++}
+ 
+ /*
+  * Read a Record from the block
+@@ -456,7 +460,6 @@
        rec->File = ((DEVICE *)block->dev)->EndFile;
     }   
-+   rec->Addr = ((boffset_t)rec->File)<<32 | rec->Block;
  
 -
     /*
      * Get the header. There is always a full header,
      * otherwise we find it in the next block.
-Index: src/stored/record.h
-===================================================================
---- src/stored/record.h	(révision 8163)
-+++ src/stored/record.h	(copie de travail)
-@@ -97,6 +97,7 @@
-     */
-    uint32_t File;                     /* File number */
-    uint32_t Block;                    /* Block number */
-+   uint64_t Addr;                     /* Block address */
-    uint32_t VolSessionId;             /* sequential id within this session */
-    uint32_t VolSessionTime;           /* session start time */
-    int32_t  FileIndex;                /* sequential file number */
 Index: src/stored/bsr.h
 ===================================================================
 --- src/stored/bsr.h	(révision 8163)

-         rec->Block, bsr->volblock->sblock, bsr->volblock->eblock);
+   if (!match_voladdr(bsr, bsr->voladdr, rec, 1)) {
+      Dmsg3(dbglevel, "Fail on Addr=%lld. bsr=%lld,%lld\n", 
+         rec->Addr, bsr->voladdr->saddr, bsr->voladdr->eaddr);
       goto no_match;
    }
-   Dmsg3(dbglevel, "OK bsr Block=%u. bsr=%u,%u\n", 

 
    if (!match_sesstime(bsr, bsr->sesstime, rec, 1)) {
       Dmsg2(dbglevel, "Fail on sesstime. bsr=%u rec=%u\n",
@@ -605,42 +649,35 @@
    return 0;
 }
 
