X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fstored%2Frecord.c;h=1fd96ca2dd9a3fb3fd4cbd866a884e5903998678;hb=37190d54ceff7f2b45a58a1c6241688cc5cba1c2;hp=1ed09332e8cf240a4628946f603064d61aa0d715;hpb=f7cf131a2ae4ebbb82c129cd9d3190932e1f70de;p=bacula%2Fbacula diff --git a/bacula/src/stored/record.c b/bacula/src/stored/record.c index 1ed09332e8..1fd96ca2dd 100644 --- a/bacula/src/stored/record.c +++ b/bacula/src/stored/record.c @@ -9,26 +9,37 @@ * */ /* - Copyright (C) 2001-2005 Kern Sibbald + 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 - version 2 as ammended with additional clauses defined in the - file LICENSE in the main source directory. + Copyright (C) 2001-2006 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 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - the file LICENSE for additional details. + 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 plus additions + that are listed 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., 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. +*/ #include "bacula.h" #include "stored.h" -extern int debug_level; - /* * Convert a FileIndex into a printable * ASCII string. Not reentrant. @@ -36,9 +47,8 @@ extern int debug_level; * record as a Label, otherwise it is simply * the FileIndex of the current file. */ -const 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; @@ -58,7 +68,7 @@ const char *FI_to_ascii(int fi) return "EOT_LABEL"; break; default: - sprintf(buf, "unknown: %d", fi); + sprintf(buf, _("unknown: %d"), fi); return buf; } } @@ -75,9 +85,8 @@ const char *FI_to_ascii(int fi) * dealing with a Label, hence the * stream is the JobId. */ -const char *stream_to_ascii(int stream, int fi) +const char *stream_to_ascii(char *buf, int stream, int fi) { - static char buf[20]; if (fi < 0) { sprintf(buf, "%d", stream); return buf; @@ -91,9 +100,9 @@ const char *stream_to_ascii(int stream, int fi) return "WIN32-DATA"; case STREAM_WIN32_GZIP_DATA: return "WIN32-GZIP"; - case STREAM_MD5_SIGNATURE: + case STREAM_MD5_DIGEST: return "MD5"; - case STREAM_SHA1_SIGNATURE: + case STREAM_SHA1_DIGEST: return "SHA1"; case STREAM_GZIP_DATA: return "GZIP"; @@ -111,6 +120,24 @@ const char *stream_to_ascii(int stream, int fi) 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: @@ -119,9 +146,9 @@ const char *stream_to_ascii(int stream, int fi) return "contWIN32-DATA"; case -STREAM_WIN32_GZIP_DATA: return "contWIN32-GZIP"; - case -STREAM_MD5_SIGNATURE: + case -STREAM_MD5_DIGEST: return "contMD5"; - case -STREAM_SHA1_SIGNATURE: + case -STREAM_SHA1_DIGEST: return "contSHA1"; case -STREAM_GZIP_DATA: return "contGZIP"; @@ -139,6 +166,24 @@ const char *stream_to_ascii(int stream, int fi) 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"; default: sprintf(buf, "%d", stream); return buf; @@ -201,6 +246,7 @@ bool write_record_to_block(DEV_BLOCK *block, DEV_RECORD *rec) { ser_declare; uint32_t remlen; + char buf1[100], buf2[100]; remlen = block->buf_len - block->binbuf; @@ -209,8 +255,8 @@ bool write_record_to_block(DEV_BLOCK *block, DEV_RECORD *rec) Dmsg6(890, "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->FileIndex), rec->data_len, + FI_to_ascii(buf1, rec->FileIndex), rec->VolSessionId, + stream_to_ascii(buf2, rec->Stream, rec->FileIndex), rec->data_len, remlen, rec->remainder); /* @@ -320,8 +366,8 @@ bool write_record_to_block(DEV_BLOCK *block, DEV_RECORD *rec) /* 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->FileIndex), rec->data_len, + 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, @@ -329,7 +375,7 @@ bool write_record_to_block(DEV_BLOCK *block, DEV_RECORD *rec) Dmsg2(0, "Damaged block: buf=%x binbuffrombuf=%d \n", block->buf, block->bufp-block->buf); - Emsg0(M_ABORT, 0, "Damaged buffer\n"); + Emsg0(M_ABORT, 0, _("Damaged buffer\n")); } #endif @@ -380,7 +426,7 @@ bool can_write_record_to_block(DEV_BLOCK *block, DEV_RECORD *rec) * routine may have to be called again with a new * block if the entire record was not read. */ -bool 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 remlen; @@ -390,6 +436,7 @@ bool read_record_from_block(DEV_BLOCK *block, DEV_RECORD *rec) int32_t Stream; uint32_t data_bytes; uint32_t rhl; + char buf1[100], buf2[100]; remlen = block->binbuf; rec->Block = block->BlockNumber; @@ -473,8 +520,8 @@ bool read_record_from_block(DEV_BLOCK *block, DEV_RECORD *rec) Dmsg6(450, "rd_rec_blk() got FI=%s SessId=%d Strm=%s len=%u\n" "remlen=%d data_len=%d\n", - FI_to_ascii(rec->FileIndex), rec->VolSessionId, - stream_to_ascii(rec->Stream, rec->FileIndex), data_bytes, remlen, + FI_to_ascii(buf1, rec->FileIndex), rec->VolSessionId, + stream_to_ascii(buf2, rec->Stream, rec->FileIndex), data_bytes, remlen, rec->data_len); } else { /* @@ -491,7 +538,18 @@ bool read_record_from_block(DEV_BLOCK *block, DEV_RECORD *rec) return false; } - ASSERT(data_bytes < MAX_BLOCK_LENGTH); /* temp sanity check */ + /* 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; + } rec->data = check_pool_memory_size(rec->data, rec->data_len+data_bytes); @@ -518,11 +576,11 @@ bool read_record_from_block(DEV_BLOCK *block, DEV_RECORD *rec) 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 1; + return true; } rec->remainder = 0; Dmsg4(450, "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->FileIndex), rec->data_len); + FI_to_ascii(buf1, rec->FileIndex), rec->VolSessionId, + stream_to_ascii(buf2, rec->Stream, rec->FileIndex), rec->data_len); return true; /* transferred full record */ }