X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Frecord.c;h=e20b4ccd54877d7a07769bc11d70ebb875442069;hb=951707ab41865120fae94aa8528a20228440a840;hp=92a8ea1536eaad6edaebe0ede3bc23c1e85c3a3c;hpb=c3009688855647dbb3e9997fc569963fd320783d;p=bacula%2Fbacula diff --git a/bacula/src/stored/record.c b/bacula/src/stored/record.c index 92a8ea1536..e20b4ccd54 100644 --- a/bacula/src/stored/record.c +++ b/bacula/src/stored/record.c @@ -1,43 +1,54 @@ /* - * - * record.c -- tape record handling functions - * - * Kern Sibbald, April MMI - * - */ -/* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Bacula® - The Network Backup Solution - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. + Copyright (C) 2001-2008 Free Software Foundation Europe e.V. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of + The main author of Bacula is Kern Sibbald, with contributions from + many others, a complete list can be found in the file AUTHORS. + This program is Free Software; you can redistribute it and/or + modify it under the terms of version two of the GNU General Public + License as published by the Free Software Foundation and included + in the file LICENSE. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + Bacula® is a registered trademark of John Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ +/* + * + * record.c -- tape record handling functions + * + * Kern Sibbald, April MMI + * added BB02 format October MMII + * + * Version $Id$ + * */ #include "bacula.h" #include "stored.h" -extern int debug_level; - /* * Convert a FileIndex into a printable - * ASCII string. Not reentrant. + * ASCII string. Not reentrant. + * If the FileIndex is negative, it flags the + * record as a Label, otherwise it is simply + * the FileIndex of the current file. */ -char *FI_to_ascii(int fi) +const char *FI_to_ascii(char *buf, int fi) { - static char buf[20]; if (fi >= 0) { sprintf(buf, "%d", fi); return buf; @@ -53,120 +64,180 @@ char *FI_to_ascii(int fi) return "SOS_LABEL"; case EOS_LABEL: return "EOS_LABEL"; + case EOT_LABEL: + return "EOT_LABEL"; + break; default: - sprintf(buf, "unknown: %d", fi); + sprintf(buf, _("unknown: %d"), fi); return buf; } } -/* +/* * Convert a Stream ID into a printable * ASCII string. Not reentrant. + + * A negative stream number represents + * stream data that is continued from a + * record in the previous block. + * If the FileIndex is negative, we are + * dealing with a Label, hence the + * stream is the JobId. */ -char *stream_to_ascii(int stream) +const char *stream_to_ascii(char *buf, int stream, int fi) { - static char buf[20]; + if (fi < 0) { + sprintf(buf, "%d", stream); + return buf; + } switch (stream) { case STREAM_UNIX_ATTRIBUTES: return "UATTR"; case STREAM_FILE_DATA: return "DATA"; - case STREAM_MD5_SIGNATURE: + case STREAM_WIN32_DATA: + return "WIN32-DATA"; + case STREAM_WIN32_GZIP_DATA: + return "WIN32-GZIP"; + case STREAM_MD5_DIGEST: return "MD5"; + case STREAM_SHA1_DIGEST: + return "SHA1"; case STREAM_GZIP_DATA: return "GZIP"; + case STREAM_UNIX_ATTRIBUTES_EX: + return "UNIX-ATTR-EX"; + case STREAM_SPARSE_DATA: + return "SPARSE-DATA"; + case STREAM_SPARSE_GZIP_DATA: + return "SPARSE-GZIP"; + case STREAM_PROGRAM_NAMES: + return "PROG-NAMES"; + case STREAM_PROGRAM_DATA: + return "PROG-DATA"; + case STREAM_PLUGIN_NAME: + return "PLUGIN-NAME"; + case STREAM_MACOS_FORK_DATA: + return "MACOS-RSRC"; + case STREAM_HFSPLUS_ATTRIBUTES: + return "HFSPLUS-ATTR"; + case STREAM_SHA256_DIGEST: + return "SHA256"; + case STREAM_SHA512_DIGEST: + return "SHA512"; + case STREAM_SIGNED_DIGEST: + return "SIGNED-DIGEST"; + case STREAM_ENCRYPTED_SESSION_DATA: + return "ENCRYPTED-SESSION-DATA"; + case STREAM_ENCRYPTED_FILE_DATA: + return "ENCRYPTED-FILE"; + case STREAM_ENCRYPTED_FILE_GZIP_DATA: + return "ENCRYPTED-GZIP"; + case STREAM_ENCRYPTED_WIN32_DATA: + return "ENCRYPTED-WIN32-DATA"; + case STREAM_ENCRYPTED_WIN32_GZIP_DATA: + return "ENCRYPTED-WIN32-GZIP"; + case STREAM_ENCRYPTED_MACOS_FORK_DATA: + return "ENCRYPTED-MACOS-RSRC"; + case -STREAM_UNIX_ATTRIBUTES: + return "contUATTR"; + case -STREAM_FILE_DATA: + return "contDATA"; + case -STREAM_WIN32_DATA: + return "contWIN32-DATA"; + case -STREAM_WIN32_GZIP_DATA: + return "contWIN32-GZIP"; + case -STREAM_MD5_DIGEST: + return "contMD5"; + case -STREAM_SHA1_DIGEST: + return "contSHA1"; + case -STREAM_GZIP_DATA: + return "contGZIP"; + case -STREAM_UNIX_ATTRIBUTES_EX: + return "contUNIX-ATTR-EX"; + case -STREAM_SPARSE_DATA: + return "contSPARSE-DATA"; + case -STREAM_SPARSE_GZIP_DATA: + return "contSPARSE-GZIP"; + case -STREAM_PROGRAM_NAMES: + return "contPROG-NAMES"; + case -STREAM_PROGRAM_DATA: + return "contPROG-DATA"; + case -STREAM_MACOS_FORK_DATA: + return "contMACOS-RSRC"; + case -STREAM_HFSPLUS_ATTRIBUTES: + return "contHFSPLUS-ATTR"; + case -STREAM_SHA256_DIGEST: + return "contSHA256"; + case -STREAM_SHA512_DIGEST: + return "contSHA512"; + case -STREAM_SIGNED_DIGEST: + return "contSIGNED-DIGEST"; + case -STREAM_ENCRYPTED_SESSION_DATA: + return "contENCRYPTED-SESSION-DATA"; + case -STREAM_ENCRYPTED_FILE_DATA: + return "contENCRYPTED-FILE"; + case -STREAM_ENCRYPTED_FILE_GZIP_DATA: + return "contENCRYPTED-GZIP"; + case -STREAM_ENCRYPTED_WIN32_DATA: + return "contENCRYPTED-WIN32-DATA"; + case -STREAM_ENCRYPTED_WIN32_GZIP_DATA: + return "contENCRYPTED-WIN32-GZIP"; + case -STREAM_ENCRYPTED_MACOS_FORK_DATA: + return "contENCRYPTED-MACOS-RSRC"; + case -STREAM_PLUGIN_NAME: + return "contPLUGIN-NAME"; + default: sprintf(buf, "%d", stream); - return buf; + return buf; } } -/* +/* * Return a new record entity */ DEV_RECORD *new_record(void) { DEV_RECORD *rec; - rec = (DEV_RECORD *) get_memory(sizeof(DEV_RECORD)); + rec = (DEV_RECORD *)get_memory(sizeof(DEV_RECORD)); memset(rec, 0, sizeof(DEV_RECORD)); - rec->data = (char *) get_pool_memory(PM_MESSAGE); + rec->data = get_pool_memory(PM_MESSAGE); return rec; } -/* - * Free the record entity - * - */ -void free_record(DEV_RECORD *rec) -{ - Dmsg0(150, "Enter free_record.\n"); - free_pool_memory(rec->data); - Dmsg0(150, "Data buf is freed.\n"); - free_pool_memory((POOLMEM *)rec); - Dmsg0(150, "Leave free_record.\n"); -} - -/* - * Read a record from a block - * if necessary, read the block from the device without locking - * if necessary, handle getting a new Volume - * - * Returns: 0 on failure - * 1 on success - */ -int read_record(DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *record) +void empty_record(DEV_RECORD *rec) { - Dmsg2(90, "read_record() dev=%x state=%x\n", dev, dev->state); - - while (!read_record_from_block(block, record)) { - Dmsg2(90, "!read_record_from_block data_len=%d rem=%d\n", record->data_len, - record->remainder); - if (!read_block_from_dev(dev, block)) { - /**** ****FIXME**** handle getting a new Volume */ - Dmsg0(200, "===== Got read block I/O error ======\n"); - return 0; - } - } - Dmsg4(90, "read_record FI=%s SessId=%d Strm=%s len=%d\n", - FI_to_ascii(record->FileIndex), record->VolSessionId, - stream_to_ascii(record->Stream), record->data_len); - return 1; + rec->File = rec->Block = 0; + rec->VolSessionId = rec->VolSessionTime = 0; + rec->FileIndex = rec->Stream = 0; + rec->data_len = rec->remainder = 0; + rec->state &= ~(REC_PARTIAL_RECORD|REC_BLOCK_EMPTY|REC_NO_MATCH|REC_CONTINUATION); } - /* - * Write a record to block - * if necessary, write the block to the device with locking - * if necessary, handle getting a new Volume + * Free the record entity * - * Returns: 0 on failure - * 1 on success */ -int write_record_device(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *record) +void free_record(DEV_RECORD *rec) { - Dmsg2(190, "write_device() dev=%x state=%x\n", dev, dev->state); - - while (!write_record_to_block(block, record)) { - Dmsg2(190, "!write_record data_len=%d rem=%d\n", record->data_len, - record->remainder); - if (!write_block_to_device(jcr, dev, block)) { - Dmsg0(90, "Got write_block_to_dev error.\n"); - return 0; - } + Dmsg0(950, "Enter free_record.\n"); + if (rec->data) { + free_pool_memory(rec->data); } - Dmsg4(190, "write_record FI=%s SessId=%d Strm=%s len=%d\n", - FI_to_ascii(record->FileIndex), record->VolSessionId, - stream_to_ascii(record->Stream), record->data_len); - return 1; + Dmsg0(950, "Data buf is freed.\n"); + free_pool_memory((POOLMEM *)rec); + Dmsg0(950, "Leave free_record.\n"); } + /* * Write a Record to the block * - * Returns: 0 on failure (none or partially written) - * 1 on success (all bytes written) + * Returns: false on failure (none or partially written) + * true on success (all bytes written) * * and remainder returned in packet. * @@ -176,193 +247,320 @@ int write_record_device(JCR *jcr, DEVICE *dev, DEV_BLOCK *block, DEV_RECORD *rec * non-zero), and 2. The remaining bytes to write may not * all fit into the block. */ -int write_record_to_block(DEV_BLOCK *block, DEV_RECORD *rec) +bool write_record_to_block(DEV_BLOCK *block, DEV_RECORD *rec) { ser_declare; uint32_t remlen; + char buf1[100], buf2[100]; - sm_check(__FILE__, __LINE__, False); remlen = block->buf_len - block->binbuf; ASSERT(block->binbuf == (uint32_t) (block->bufp - block->buf)); - ASSERT(remlen >= 0); + ASSERT(block->buf_len >= block->binbuf); - Dmsg6(190, "write_record_to_block() FI=%s SessId=%d Strm=%s len=%d\n\ -rem=%d remainder=%d\n", - FI_to_ascii(rec->FileIndex), rec->VolSessionId, - stream_to_ascii(rec->Stream), rec->data_len, + Dmsg6(890, "write_record_to_block() FI=%s SessId=%d Strm=%s len=%d\n" + "rem=%d remainder=%d\n", + FI_to_ascii(buf1, rec->FileIndex), rec->VolSessionId, + stream_to_ascii(buf2, rec->Stream, rec->FileIndex), rec->data_len, remlen, rec->remainder); + /* + * If rec->remainder is non-zero, we have been called a + * second (or subsequent) time to finish writing a record + * that did not previously fit into the block. + */ if (rec->remainder == 0) { /* Require enough room to write a full header */ - if (remlen >= RECHDR_LENGTH) { - ser_begin(block->bufp, RECHDR_LENGTH); - ser_uint32(rec->VolSessionId); - ser_uint32(rec->VolSessionTime); - ser_int32(rec->FileIndex); - ser_int32(rec->Stream); - ser_uint32(rec->data_len); - ASSERT(ser_length(block->bufp) == RECHDR_LENGTH); - - block->bufp += RECHDR_LENGTH; - block->binbuf += RECHDR_LENGTH; - remlen -= RECHDR_LENGTH; - rec->remainder = rec->data_len; + if (remlen >= WRITE_RECHDR_LENGTH) { + ser_begin(block->bufp, WRITE_RECHDR_LENGTH); + if (BLOCK_VER == 1) { + ser_uint32(rec->VolSessionId); + ser_uint32(rec->VolSessionTime); + } else { + block->VolSessionId = rec->VolSessionId; + block->VolSessionTime = rec->VolSessionTime; + } + ser_int32(rec->FileIndex); + ser_int32(rec->Stream); + ser_uint32(rec->data_len); + + block->bufp += WRITE_RECHDR_LENGTH; + block->binbuf += WRITE_RECHDR_LENGTH; + remlen -= WRITE_RECHDR_LENGTH; + rec->remainder = rec->data_len; + if (rec->FileIndex > 0) { + /* If data record, update what we have in this block */ + if (block->FirstIndex == 0) { + block->FirstIndex = rec->FileIndex; + } + block->LastIndex = rec->FileIndex; + } } else { - rec->remainder = rec->data_len + RECHDR_LENGTH; - sm_check(__FILE__, __LINE__, False); - return 0; + rec->remainder = rec->data_len + WRITE_RECHDR_LENGTH; + return false; } } else { - /* + /* * We are here to write unwritten bytes from a previous - * time. Presumably we have a new buffer (possibly - * containing a volume label), so the new header + * time. Presumably we have a new buffer (possibly + * containing a volume label), so the new header * should be able to fit in the block -- otherwise we have - * an error. Note, we may have to continue splitting the - * data record though. - * - * First, write the header, then write as much as + * an error. Note, we have to continue splitting the + * data record if it is longer than the block. + * + * First, write the header, then write as much as * possible of the data record. + * + * Every time we write a header and it is a continuation + * of a previous partially written record, we store the + * Stream as -Stream in the record header. */ - ser_begin(block->bufp, RECHDR_LENGTH); - ser_uint32(rec->VolSessionId); - ser_uint32(rec->VolSessionTime); + ser_begin(block->bufp, WRITE_RECHDR_LENGTH); + if (BLOCK_VER == 1) { + ser_uint32(rec->VolSessionId); + ser_uint32(rec->VolSessionTime); + } else { + block->VolSessionId = rec->VolSessionId; + block->VolSessionTime = rec->VolSessionTime; + } ser_int32(rec->FileIndex); if (rec->remainder > rec->data_len) { - ser_int32(rec->Stream); /* normal full header */ - ser_uint32(rec->data_len); - rec->remainder = rec->data_len; /* must still do data record */ + ser_int32(rec->Stream); /* normal full header */ + ser_uint32(rec->data_len); + rec->remainder = rec->data_len; /* must still do data record */ } else { - ser_int32(-rec->Stream); /* mark this as a continuation record */ - ser_uint32(rec->remainder); /* bytes to do */ + ser_int32(-rec->Stream); /* mark this as a continuation record */ + ser_uint32(rec->remainder); /* bytes to do */ } - ASSERT(ser_length(block->bufp) == RECHDR_LENGTH); /* Require enough room to write a full header */ - ASSERT(remlen >= RECHDR_LENGTH); - - block->bufp += RECHDR_LENGTH; - block->binbuf += RECHDR_LENGTH; - remlen -= RECHDR_LENGTH; + ASSERT(remlen >= WRITE_RECHDR_LENGTH); + + block->bufp += WRITE_RECHDR_LENGTH; + block->binbuf += WRITE_RECHDR_LENGTH; + remlen -= WRITE_RECHDR_LENGTH; + if (rec->FileIndex > 0) { + /* If data record, update what we have in this block */ + if (block->FirstIndex == 0) { + block->FirstIndex = rec->FileIndex; + } + block->LastIndex = rec->FileIndex; + } } if (remlen == 0) { - sm_check(__FILE__, __LINE__, False); - return 0; /* partial transfer */ + return false; /* partial transfer */ } - /* Now deal with data record. - * Part of it may have already been transferred, and we + /* + * Now deal with data record. + * Part of it may have already been transferred, and we * may not have enough room to transfer the whole this time. */ if (rec->remainder > 0) { /* Write as much of data as possible */ if (remlen >= rec->remainder) { - memcpy(block->bufp, rec->data+rec->data_len-rec->remainder, - rec->remainder); - block->bufp += rec->remainder; - block->binbuf += rec->remainder; + memcpy(block->bufp, rec->data+rec->data_len-rec->remainder, + rec->remainder); + block->bufp += rec->remainder; + block->binbuf += rec->remainder; } else { - memcpy(block->bufp, rec->data+rec->data_len-rec->remainder, - remlen); - if (!sm_check_rtn(__FILE__, __LINE__, False)) { - /* We damaged a buffer */ - Dmsg6(0, "Damaged block FI=%s SessId=%d Strm=%s len=%d\n\ -rem=%d remainder=%d\n", - FI_to_ascii(rec->FileIndex), rec->VolSessionId, - stream_to_ascii(rec->Stream), rec->data_len, - remlen, rec->remainder); + memcpy(block->bufp, rec->data+rec->data_len-rec->remainder, + remlen); +#ifdef xxxxxSMCHECK + if (!sm_check_rtn(__FILE__, __LINE__, False)) { + /* We damaged a buffer */ + Dmsg6(0, "Damaged block FI=%s SessId=%d Strm=%s len=%d\n" + "rem=%d remainder=%d\n", + FI_to_ascii(buf1, rec->FileIndex), rec->VolSessionId, + stream_to_ascii(buf2, rec->Stream, rec->FileIndex), rec->data_len, + remlen, rec->remainder); Dmsg5(0, "Damaged block: bufp=%x binbuf=%d buf_len=%d rem=%d moved=%d\n", - block->bufp, block->binbuf, block->buf_len, block->buf_len-block->binbuf, - remlen); + block->bufp, block->binbuf, block->buf_len, block->buf_len-block->binbuf, + remlen); Dmsg2(0, "Damaged block: buf=%x binbuffrombuf=%d \n", - block->buf, block->bufp-block->buf); + block->buf, block->bufp-block->buf); + + Emsg0(M_ABORT, 0, _("Damaged buffer\n")); + } +#endif + + block->bufp += remlen; + block->binbuf += remlen; + rec->remainder -= remlen; + return false; /* did partial transfer */ + } + } + rec->remainder = 0; /* did whole transfer */ + return true; +} + - Emsg0(M_ABORT, 0, "Damaged buffer\n"); - } +/* + * Test if we can write whole record to the block + * + * Returns: false on failure + * true on success (all bytes can be written) + */ +bool can_write_record_to_block(DEV_BLOCK *block, DEV_RECORD *rec) +{ + uint32_t remlen; - block->bufp += remlen; - block->binbuf += remlen; - rec->remainder -= remlen; - return 0; /* did partial transfer */ + remlen = block->buf_len - block->binbuf; + if (rec->remainder == 0) { + if (remlen >= WRITE_RECHDR_LENGTH) { + remlen -= WRITE_RECHDR_LENGTH; + rec->remainder = rec->data_len; + } else { + return false; } + } else { + return false; + } + if (rec->remainder > 0 && remlen < rec->remainder) { + return false; } - rec->remainder = 0; /* did whole transfer */ - sm_check(__FILE__, __LINE__, False); - return 1; + return true; } /* * Read a Record from the block - * Returns: 0 on failure - * 1 on success + * Returns: false if nothing read or if the continuation record does not match. + * In both of these cases, a block read must be done. + * true if at least the record header was read, this + * routine may have to be called again with a new + * block if the entire record was not read. */ -int read_record_from_block(DEV_BLOCK *block, DEV_RECORD *rec) +bool read_record_from_block(DCR *dcr, DEV_BLOCK *block, DEV_RECORD *rec) { ser_declare; - uint32_t data_bytes; - int32_t Stream; uint32_t remlen; + uint32_t VolSessionId; + uint32_t VolSessionTime; + int32_t FileIndex; + int32_t Stream; + uint32_t data_bytes; + uint32_t rhl; + char buf1[100], buf2[100]; remlen = block->binbuf; + rec->Block = block->BlockNumber; + rec->File = ((DEVICE *)block->dev)->file; - /* + /* Clear state flags */ + rec->state = 0; + if (block->dev->is_tape()) { + rec->state |= REC_ISTAPE; + } + + + /* * Get the header. There is always a full header, * otherwise we find it in the next block. */ - if (remlen >= RECHDR_LENGTH) { - Dmsg3(90, "read_record_block: remlen=%d data_len=%d rem=%d\n", - remlen, rec->data_len, rec->remainder); -/* memcpy(rec->ser_buf, block->bufp, RECHDR_LENGTH); */ - - unser_begin(block->bufp, RECHDR_LENGTH); - unser_uint32(rec->VolSessionId); - unser_uint32(rec->VolSessionTime); - unser_int32(rec->FileIndex); + Dmsg3(450, "Block=%d Ver=%d size=%u\n", block->BlockNumber, block->BlockVer, + block->block_len); + if (block->BlockVer == 1) { + rhl = RECHDR1_LENGTH; + } else { + rhl = RECHDR2_LENGTH; + } + if (remlen >= rhl) { + Dmsg4(450, "Enter read_record_block: remlen=%d data_len=%d rem=%d blkver=%d\n", + remlen, rec->data_len, rec->remainder, block->BlockVer); + + unser_begin(block->bufp, WRITE_RECHDR_LENGTH); + if (block->BlockVer == 1) { + unser_uint32(VolSessionId); + unser_uint32(VolSessionTime); + } else { + VolSessionId = block->VolSessionId; + VolSessionTime = block->VolSessionTime; + } + unser_int32(FileIndex); unser_int32(Stream); unser_uint32(data_bytes); - ASSERT(unser_length(block->bufp) == RECHDR_LENGTH); - block->bufp += RECHDR_LENGTH; - block->binbuf -= RECHDR_LENGTH; - remlen -= RECHDR_LENGTH; - - if (Stream < 0) { /* continuation record? */ - Dmsg1(500, "Got negative Stream => continuation. remainder=%d\n", - rec->remainder); - /* ****FIXME**** add code to verify that this - * is the correct continuation of the previous - * record. - */ + block->bufp += rhl; + block->binbuf -= rhl; + remlen -= rhl; + + /* If we are looking for more (remainder!=0), we reject anything + * where the VolSessionId and VolSessionTime don't agree + */ + if (rec->remainder && (rec->VolSessionId != VolSessionId || + rec->VolSessionTime != VolSessionTime)) { + rec->state |= REC_NO_MATCH; + Dmsg0(450, "remainder and VolSession doesn't match\n"); + return false; /* This is from some other Session */ + } + + /* if Stream is negative, it means that this is a continuation + * of a previous partially written record. + */ + if (Stream < 0) { /* continuation record? */ + Dmsg1(500, "Got negative Stream => continuation. remainder=%d\n", + rec->remainder); + rec->state |= REC_CONTINUATION; if (!rec->remainder) { /* if we didn't read previously */ - rec->data_len = 0; /* simply return data */ - } - rec->Stream = -Stream; /* set correct Stream */ - } else { /* Regular record */ - rec->Stream = Stream; - rec->data_len = 0; /* transfer to beginning of data */ + rec->data_len = 0; /* return data as if no continuation */ + } else if (rec->Stream != -Stream) { + rec->state |= REC_NO_MATCH; + return false; /* This is from some other Session */ + } + rec->Stream = -Stream; /* set correct Stream */ + } else { /* Regular record */ + rec->Stream = Stream; + rec->data_len = 0; /* transfer to beginning of data */ } - Dmsg6(90, "rd_rec_blk() got FI=%s SessId=%d Strm=%s len=%d\n\ -remlen=%d data_len=%d\n", - FI_to_ascii(rec->FileIndex), rec->VolSessionId, - stream_to_ascii(rec->Stream), data_bytes, remlen, rec->data_len); - } else { - Dmsg0(90, "read_record_block: nothing\n"); - if (!rec->remainder) { - rec->remainder = 1; /* set to expect continuation */ - rec->data_len = 0; /* no data transferred */ + rec->VolSessionId = VolSessionId; + rec->VolSessionTime = VolSessionTime; + rec->FileIndex = FileIndex; + if (FileIndex > 0) { + if (block->FirstIndex == 0) { + block->FirstIndex = FileIndex; + } + block->LastIndex = FileIndex; } - return 0; + + Dmsg6(450, "rd_rec_blk() got FI=%s SessId=%d Strm=%s len=%u\n" + "remlen=%d data_len=%d\n", + FI_to_ascii(buf1, rec->FileIndex), rec->VolSessionId, + stream_to_ascii(buf2, rec->Stream, rec->FileIndex), data_bytes, remlen, + rec->data_len); + } else { + /* + * No more records in this block because the number + * of remaining bytes are less than a record header + * length, so return empty handed, but indicate that + * he must read again. By returning, we allow the + * higher level routine to fetch the next block and + * then reread. + */ + Dmsg0(450, "read_record_block: nothing\n"); + rec->state |= (REC_NO_HEADER | REC_BLOCK_EMPTY); + empty_block(block); /* mark block empty */ + return false; + } + + /* Sanity check */ + if (data_bytes >= MAX_BLOCK_LENGTH) { + /* + * Something is wrong, force read of next block, abort + * continuing with this block. + */ + rec->state |= (REC_NO_HEADER | REC_BLOCK_EMPTY); + empty_block(block); + Jmsg2(dcr->jcr, M_WARNING, 0, _("Sanity check failed. maxlen=%d datalen=%d. Block discarded.\n"), + MAX_BLOCK_LENGTH, data_bytes); + return false; } - ASSERT(data_bytes < MAX_BLOCK_LENGTH); /* temp sanity check */ + rec->data = check_pool_memory_size(rec->data, rec->data_len+data_bytes); - rec->data = (char *) check_pool_memory_size(rec->data, rec->data_len+data_bytes); - /* * At this point, we have read the header, now we - * must transfer as much of the data record as + * must transfer as much of the data record as * possible taking into account: 1. A partial * data record may have previously been transferred, * 2. The current block may not contain the whole data @@ -380,13 +578,14 @@ remlen=%d data_len=%d\n", block->bufp += remlen; block->binbuf -= remlen; rec->data_len += remlen; - rec->remainder = 1; /* partial record transferred */ - Dmsg1(90, "read_record_block: partial xfered=%d\n", rec->data_len); - return 0; + rec->remainder = 1; /* partial record transferred */ + Dmsg1(450, "read_record_block: partial xfered=%d\n", rec->data_len); + rec->state |= (REC_PARTIAL_RECORD | REC_BLOCK_EMPTY); + return true; } rec->remainder = 0; - Dmsg4(90, "Rtn full rd_rec_blk FI=%s SessId=%d Strm=%s len=%d\n", - FI_to_ascii(rec->FileIndex), rec->VolSessionId, - stream_to_ascii(rec->Stream), rec->data_len); - return 1; /* transferred full record */ + Dmsg4(450, "Rtn full rd_rec_blk FI=%s SessId=%d Strm=%s len=%d\n", + FI_to_ascii(buf1, rec->FileIndex), rec->VolSessionId, + stream_to_ascii(buf2, rec->Stream, rec->FileIndex), rec->data_len); + return true; /* transferred full record */ }