/* Global variables */
-static STORES *me;
+STORES *me;
+
+/* Local variables */
static DEVICE *dev = NULL;
static B_DB *db;
static JCR *bjcr; /* jcr for bscan */
}
/* Reset some JCR variables */
for (mjcr=NULL; (mjcr=next_attached_jcr(dev, mjcr)); ) {
- mjcr->VolFirstFile = mjcr->FileIndex = 0;
+ mjcr->VolFirstIndex = mjcr->FileIndex = 0;
mjcr->StartBlock = mjcr->EndBlock = 0;
mjcr->StartFile = mjcr->EndFile = 0;
}
mjcr->JobBytes += rec->data_len - sizeof(uint64_t); /* No correct, we should expand it */
free_jcr(mjcr); /* done using JCR */
+ /* Win32 Data stream */
+ } else if (rec->Stream == STREAM_WIN32_DATA) {
+ mjcr = get_jcr_by_session(rec->VolSessionId, rec->VolSessionTime);
+ if (!mjcr) {
+ if (mr.VolJobs > 0) {
+ Pmsg2(000, _("Could not find Job SessId=%d SessTime=%d for Win32 Data record.\n"),
+ rec->VolSessionId, rec->VolSessionTime);
+ } else {
+ ignored_msgs++;
+ }
+ return;
+ }
+ mjcr->JobBytes += rec->data_len;
+ free_jcr(mjcr); /* done using JCR */
+
+ /* Win32 GZIP stream */
+ } else if (rec->Stream == STREAM_WIN32_GZIP_DATA) {
+ mjcr = get_jcr_by_session(rec->VolSessionId, rec->VolSessionTime);
+ if (!mjcr) {
+ if (mr.VolJobs > 0) {
+ Pmsg2(000, _("Could not find Job SessId=%d SessTime=%d for Win32 GZIP Data record.\n"),
+ rec->VolSessionId, rec->VolSessionTime);
+ } else {
+ ignored_msgs++;
+ }
+ return;
+ }
+ mjcr->JobBytes += rec->data_len;
+ free_jcr(mjcr); /* done using JCR */
} else if (rec->Stream == STREAM_MD5_SIGNATURE) {
char MD5buf[50];
ar.Stream = rec->Stream;
ar.FileIndex = rec->FileIndex;
ar.attr = ap;
- if (mjcr->VolFirstFile == 0) {
- mjcr->VolFirstFile = rec->FileIndex;
+ if (mjcr->VolFirstIndex == 0) {
+ mjcr->VolFirstIndex = rec->FileIndex;
}
mjcr->FileIndex = rec->FileIndex;
mjcr->JobFiles++;
memset(&jmr, 0, sizeof(jmr));
jmr.JobId = mjcr->JobId;
jmr.MediaId = mr.MediaId;
- jmr.FirstIndex = mjcr->VolFirstFile;
+ jmr.FirstIndex = mjcr->VolFirstIndex;
jmr.LastIndex = mjcr->FileIndex;
jmr.StartFile = mjcr->StartFile;
jmr.EndFile = mjcr->EndFile;