#include <afsconfig.h>
#include <afs/param.h>
-RCSID
- ("$Header$");
#include <sys/types.h>
#include <ctype.h>
#include <afs/daemon_com.h>
#include <afs/fssync.h>
#include <afs/acl.h>
+#include <afs/com_err.h>
+#include <afs/vol_prototypes.h>
#include "volser.h"
#include "volint.h"
+#include "dumpstuff.h"
#ifndef AFS_NT40_ENV
#ifdef O_LARGEFILE
extern int DoLogging;
-/* This iod stuff is a silly little package to emulate the old qi_in stuff, which
- emulated the stdio stuff. There is a big assumption here, that the
- rx_Read will never be called directly, by a routine like readFile, when
- there is an old character that was pushed back with iod_ungetc. This
- is really bletchy, and is here for compatibility only. Eventually,
- we should define a volume format that doesn't require
- the pushing back of characters (i.e. characters should not double both
- as an end marker and a begin marker) */
-struct iod {
- struct rx_call *call; /* call to which to write, might be an array */
- int device; /* dump device ID for volume */
- int parentId; /* dump parent ID for volume */
- struct DiskPartition64 *dumpPartition; /* Dump partition. */
- struct rx_call **calls; /* array of pointers to calls */
- int ncalls; /* how many calls/codes in array */
- int *codes; /* one return code for each call */
- char haveOldChar; /* state for pushing back a character */
- char oldChar;
-};
-
/* Forward Declarations */
static int DumpDumpHeader(register struct iod *iodp, register Volume * vp,
int volid, int vnodeNumber, int dumpEverything,
register struct volintSize *size);
+#define MAX_SECTIONS 3
+#define MIN_TLV_TAG 5
+#define MAX_TLV_TAG 0x60
+#define MAX_STANDARD_TAG 0x7a
+static afs_uint32 oldtags[MAX_SECTIONS][16];
+int oldtagsInited = 0;
+
+static void
+RegisterTag(afs_int32 section, unsigned char tag)
+{
+ afs_uint32 off = tag >> 5;
+ afs_uint32 mask = 1 << (tag & 0x1f);
+ oldtags[section][off] |= mask;
+}
+
+static void
+initNonStandardTags(void)
+{
+ RegisterTag(0, 'n'); /* volume name */
+ RegisterTag(0, 't'); /* fromtime, V_backupDate */
+ RegisterTag(1, 'A'); /* V_accessDate */
+ RegisterTag(1, 'C'); /* V_creationDate */
+ RegisterTag(1, 'D'); /* V_dayUseDate */
+ RegisterTag(1, 'E'); /* V_expirationDate */
+ RegisterTag(1, 'M'); /* nullstring (motd) */
+ RegisterTag(1, 'U'); /* V_updateDate */
+ RegisterTag(1, 'W'); /* V_weekUse */
+ RegisterTag(1, 'Z'); /* V_dayUse */
+ RegisterTag(1, 'O'); /* V_offlineMessage */
+ RegisterTag(1, 'b'); /* V_blessed */
+ RegisterTag(1, 'n'); /* V_name */
+ RegisterTag(1, 's'); /* V_inService */
+ RegisterTag(1, 't'); /* V_type */
+ RegisterTag(2, 'A'); /* VVnodeDiskACL */
+ RegisterTag(2, 'b'); /* modeBits */
+ RegisterTag(2, 'f'); /* small file */
+ RegisterTag(2, 'h'); /* large file */
+ RegisterTag(2, 'l'); /* linkcount */
+ RegisterTag(2, 't'); /* type */
+ oldtagsInited = 1;
+}
+
static void
iod_Init(register struct iod *iodp, register struct rx_call *call)
{
iodp->haveOldChar = 0;
return iodp->oldChar;
}
- if (iod_Read(iodp, &t, 1) == 1)
+ if (iod_Read(iodp, (char *) &t, 1) == 1)
return t;
return EOF;
}
static int
ReadShort(register struct iod *iodp, register unsigned short *sp)
{
- register b1, b0;
+ register int b1, b0;
b1 = iod_getc(iodp);
if (b1 == EOF)
return 0;
ReadString(register struct iod *iodp, register char *to, register int maxa)
{
register int c;
- int first = 1;
*to = '\0';
if (maxa == 0)
*to++ = iod_getc(iodp);
}
+/*
+ * returns 1 on success and 0 otherwise
+ */
+static afs_int32
+ReadStandardTagLen(register struct iod *iodp, unsigned char tag, afs_int32 section,
+ afs_size_t *length)
+{
+ afs_int32 code, i;
+ afs_uint32 off = tag >> 5;
+ afs_uint32 mask = 1 << (tag & 0x1f);
+ unsigned char len, buf[8], *p;
+
+ if (!oldtagsInited)
+ initNonStandardTags();
+
+ if (tag < MIN_TLV_TAG
+ || tag > MAX_STANDARD_TAG
+ || section >= MAX_SECTIONS
+ || (oldtags[section][ off] & mask)) {
+ Log("Trying to use ReadStandardTag with tag 0x%02x for section %d, aborting\n", tag, section);
+ return 0;
+ }
+ if (tag <= MAX_TLV_TAG) {
+ len = iod_getc(iodp);
+ if (len < 128)
+ *length = len;
+ else {
+ len &= 0x7f;
+ if ((code = iod_Read(iodp, (char *)buf, len)) != len)
+ return VOLSERDUMPERROR;
+ *length = 0;
+ p = (unsigned char *)&buf;
+ for (i=0; i<len; i++) {
+ *length = ((*length) << 8) | *p++;
+ }
+ }
+ } else {
+ if (tag < MAX_STANDARD_TAG)
+ *length = 4;
+ }
+ return 1;
+}
+
+static char skipbuf[256];
+
+static afs_int32
+SkipData(register struct iod *iodp, afs_size_t length)
+{
+ while (length > 256) {
+ if (iod_Read(iodp, (char *)&skipbuf, 256) != 256)
+ return 0;
+ length -= 256;
+ }
+ if (iod_Read(iodp, (char *)&skipbuf, length) != length)
+ return 0;
+ return 1;
+}
+
+static char *secname[3] = {"ReadDumpHeader", "ReadVolumeHeader", "ReadVnodes"};
+
+static int
+HandleUnknownTag(struct iod *iodp, int tag, afs_int32 section,
+ afs_int32 critical)
+{
+ afs_size_t taglen = 0;
+ afs_uint32 trash;
+
+ if (critical) {
+ Log("%s: unknown critical tag x%02x, aborting\n",
+ secname[section], tag);
+ return 0;
+ }
+ Log("%s: unknown tag x%02x found, skipping\n", secname[section], tag);
+ if (tag >= 0x06 && tag <= 0x60) {
+ if (!ReadStandardTagLen(iodp, tag, 1, &taglen)) {
+ Log("%s: error reading length field for tag x%02x, aborting\n",
+ secname[section], tag);
+ return 0;
+ }
+ if (!SkipData(iodp, taglen)) {
+ Log("%s: error skipping %llu bytes for tag x%02x, aborting\n",
+ secname[section], taglen, tag);
+ return 0;
+ }
+ return 1;
+ }
+ if (tag >= 0x61 && tag <= 0x7a) {
+ if (!ReadInt32(iodp, &trash)) {
+ Log("%s: error skipping int32 for tag x%02x, aborting\n",
+ secname[section], tag);
+ return 0;
+ }
+ return 1;
+ }
+ if (tag >= 0x7b && tag < 0x80) /* dataless tag */
+ return 1;
+ Log("%s: unknown invalid tag x%02x, aborting\n", secname[section], tag);
+ return 0;
+}
+
static int
ReadVolumeHeader(register struct iod *iodp, VolumeDiskData * vol)
{
- register tag;
+ register int tag;
afs_uint32 trash;
+ afs_int32 critical = 0;
memset(vol, 0, sizeof(*vol));
while ((tag = iod_getc(iodp)) > D_MAX && tag != EOF) {
+ if (critical)
+ critical--;
switch (tag) {
case 'i':
if (!ReadInt32(iodp, &vol->id))
return VOLSERREAD_DUMPERROR;
break;
case 'V':
- if (!ReadInt32(iodp, (afs_uint32 *) & vol->volUpdateCounter))
+ if (!ReadInt32(iodp, (afs_uint32 *) &trash/*volUpdateCounter*/))
return VOLSERREAD_DUMPERROR;
break;
+ case 0x7e:
+ critical = 2;
+ break;
+ default:
+ if (!HandleUnknownTag(iodp, tag, 1, critical))
+ return VOLSERREAD_DUMPERROR;
}
}
iod_ungetc(iodp, tag);
static int
DumpString(register struct iod *iodp, char tag, register char *s)
{
- register n;
+ register int n;
int code = 0;
code = iod_Write(iodp, &tag, 1);
if (code != 1)
return 0;
}
+static afs_int32
+DumpStandardTag(register struct iod *iodp, char tag, afs_uint32 section)
+{
+ afs_int32 code;
+ afs_uint32 off = tag >> 5;
+ afs_uint32 mask = 1 << (tag & 0x1f);
+
+ if (!oldtagsInited)
+ initNonStandardTags();
+
+ if (tag < MIN_TLV_TAG
+ || tag > MAX_STANDARD_TAG
+ || section >= MAX_SECTIONS
+ || (oldtags[section][ off] & mask)) {
+ Log("Trying to use DumpStandardTag with tag 0x%02x for section %d, aborting\n", tag, section);
+ return VOLSERDUMPERROR;
+ }
+ code = iod_Write(iodp, &tag, 1);
+ return 0;
+}
+
+AFS_UNUSED
+static afs_int32
+DumpStandardTagLen(register struct iod *iodp, char tag, afs_uint32 section,
+ afs_size_t length)
+{
+ char buf[10];
+ char *p;
+ afs_int32 code, len;
+
+ if (tag < MIN_TLV_TAG || tag > MAX_TLV_TAG) {
+ Log("Trying to use DumpStandardTagLen with tag 0x%02x for section %d, aborting\n", tag, section);
+ return VOLSERDUMPERROR;
+ }
+ code = DumpStandardTag(iodp, tag, section);
+ if (code)
+ return code;
+ p = &buf[9];
+ if (length < 128) { /* byte after tag contains length */
+ *p-- = length;
+ len = 1;
+ } else { /* byte after tag contains length of length field | 0x80 */
+ for (len=0; length; length=length >> 8) {
+ *p-- = length;
+ len++;
+ }
+ *p-- = len + 128;
+ len += 1;
+ }
+ p++;
+ code = iod_Write(iodp, p, len);
+ if (code != len)
+ return VOLSERDUMPERROR;
+ return 0;
+}
+
static int
DumpFile(struct iod *iodp, int vnode, FdHandle_t * handleP)
{
int code = 0, error = 0;
- afs_int32 pad = 0, offset;
+ afs_int32 pad = 0;
+ afs_int32 offset = 0;
afs_sfsize_t n, nbytes, howMany, howBig;
afs_foff_t lcode = 0;
byte *p;
+ afs_uint32 hi, lo;
#ifndef AFS_NT40_ENV
struct afs_stat status;
#endif
afs_sfsize_t size;
#ifdef AFS_AIX_ENV
#include <sys/statfs.h>
-#if defined(AFS_AIX52_ENV) && defined(AFS_LARGEFILE_ENV)
+#if defined(AFS_AIX52_ENV)
struct statfs64 tstatfs;
-#else /* !AFS_AIX52_ENV || !AFS_LARGEFILE_ENV */
+#else /* !AFS_AIX52_ENV */
struct statfs tstatfs;
-#endif /* !AFS_AIX52_ENV || !AFS_LARGEFILE_ENV */
+#endif /* !AFS_AIX52_ENV */
int statfs_code;
#endif
/* Unfortunately in AIX valuable fields such as st_blksize are
* gone from the stat structure.
*/
-#if defined(AFS_AIX52_ENV) && defined(AFS_LARGEFILE_ENV)
+#if defined(AFS_AIX52_ENV)
statfs_code = fstatfs64(handleP->fd_fd, &tstatfs);
-#else /* !AFS_AIX52_ENV || !AFS_LARGEFILE_ENV */
+#else /* !AFS_AIX52_ENV */
statfs_code = fstatfs(handleP->fd_fd, &tstatfs);
-#endif /* !AFS_AIX52_ENV || !AFS_LARGEFILE_ENV */
+#endif /* !AFS_AIX52_ENV */
if (statfs_code != 0) {
Log("DumpFile: fstatfs returned error code %d on descriptor %d\n", errno, handleP->fd_fd);
return VOLSERDUMPERROR;
size = FDH_SIZE(handleP);
-#ifdef AFS_LARGEFILE_ENV
- {
- afs_uint32 hi, lo;
- SplitInt64(size, hi, lo);
- if (hi == 0L) {
- code = DumpInt32(iodp, 'f', lo);
- } else {
- code = DumpDouble(iodp, 'h', hi, lo);
- }
+ SplitInt64(size, hi, lo);
+ if (hi == 0L) {
+ code = DumpInt32(iodp, 'f', lo);
+ } else {
+ code = DumpDouble(iodp, 'h', hi, lo);
}
-#else /* !AFS_LARGEFILE_ENV */
- code = DumpInt32(iodp, 'f', size);
-#endif /* !AFS_LARGEFILE_ENV */
if (code) {
return VOLSERDUMPERROR;
}
/* Record the read error */
if (n < 0) {
n = 0;
- Log("1 Volser: DumpFile: Error %d reading inode %s for vnode %d\n", errno, PrintInode(NULL, handleP->fd_ih->ih_ino), vnode);
+ Log("1 Volser: DumpFile: Error reading inode %s for vnode %d: %s\n", PrintInode(NULL, handleP->fd_ih->ih_ino), vnode, afs_error_message(errno));
} else if (!pad) {
Log("1 Volser: DumpFile: Error reading inode %s for vnode %d\n", PrintInode(NULL, handleP->fd_ih->ih_ino), vnode);
}
lcode = FDH_SEEK(handleP, (size_t)((size - nbytes) + howMany), SEEK_SET);
if (lcode != ((size - nbytes) + howMany)) {
if (lcode < 0) {
- Log("1 Volser: DumpFile: Error %d seeking in inode %s for vnode %d\n", errno, PrintInode(NULL, handleP->fd_ih->ih_ino), vnode);
+ Log("1 Volser: DumpFile: Error seeking in inode %s for vnode %d: %s\n", PrintInode(NULL, handleP->fd_ih->ih_ino), vnode, afs_error_message(errno));
} else {
Log("1 Volser: DumpFile: Error seeking in inode %s for vnode %d\n", PrintInode(NULL, handleP->fd_ih->ih_ino), vnode);
lcode = -1;
code = DumpInt32(iodp, 'D', V_dayUseDate(vp));
if (!code)
code = DumpInt32(iodp, 'Z', V_dayUse(vp));
- if (!code)
- code = DumpInt32(iodp, 'V', V_volUpCounter(vp));
return code;
}
ProcessIndex(Volume * vp, VnodeClass class, afs_int32 ** Bufp, int *sizep,
int del)
{
- int i, nVnodes, offset, code, index = 0;
+ int i, nVnodes, offset, code;
afs_int32 *Buf;
int cnt = 0;
int size;
FDH_CLOSE(fdP);
return -1;
}
- memset((char *)Buf, 0, nVnodes * sizeof(afs_int32));
+ memset(Buf, 0, nVnodes * sizeof(afs_int32));
STREAM_SEEK(afile, offset = vcp->diskSize, 0);
while (1) {
code = STREAM_READ(vnode, vcp->diskSize, 1, afile);
{
afs_int32 vnodeNumber;
char buf[SIZEOF_LARGEDISKVNODE];
- register tag;
+ register int tag;
struct VnodeDiskObject *vnode = (struct VnodeDiskObject *)buf;
struct VnodeDiskObject oldvnode;
int idx;
IHandle_t *tmpH;
FdHandle_t *fdP;
Inode nearInode;
+ afs_int32 critical = 0;
tag = iod_getc(iodp);
V_pref(vp, nearInode);
}
while ((tag = iod_getc(iodp)) > D_MAX && tag != EOF) {
haveStuff = 1;
+ if (critical)
+ critical--;
switch (tag) {
case 't':
vnode->type = (VnodeType) iod_getc(iodp);
VAclDiskSize(vnode));
acl_NtohACL(VVnodeDiskACL(vnode));
break;
-#ifdef AFS_LARGEFILE_ENV
case 'h':
-#endif
case 'f':{
Inode ino;
Error error;
V_parentId(vp), vnodeNumber,
vnode->uniquifier, vnode->dataVersion);
if (!VALID_INO(ino)) {
- perror("unable to allocate inode");
- Log("1 Volser: ReadVnodes: Restore aborted\n");
+ Log("1 Volser: ReadVnodes: IH_CREATE: %s - restore aborted\n",
+ afs_error_message(errno));
return VOLSERREAD_DUMPERROR;
}
nearInode = ino;
IH_INIT(tmpH, vp->device, V_parentId(vp), ino);
fdP = IH_OPEN(tmpH);
if (fdP == NULL) {
+ Log("1 Volser: ReadVnodes: IH_OPEN: %s - restore aborted\n",
+ afs_error_message(errno));
IH_RELEASE(tmpH);
return VOLSERREAD_DUMPERROR;
}
}
break;
}
+ case 0x7e:
+ critical = 2;
+ break;
+ default:
+ if (!HandleUnknownTag(iodp, tag, 2, critical))
+ return VOLSERREAD_DUMPERROR;
}
}
if (haveStuff) {
FdHandle_t *fdP = IH_OPEN(vp->vnodeIndex[class].handle);
if (fdP == NULL) {
- Log("1 Volser: ReadVnodes: Error opening vnode index; restore aborted\n");
+ Log("1 Volser: ReadVnodes: Error opening vnode index: %s; restore aborted\n",
+ afs_error_message(errno));
return VOLSERREAD_DUMPERROR;
}
if (FDH_SEEK(fdP, vnodeIndexOffset(vcp, vnodeNumber), SEEK_SET) <
0) {
- Log("1 Volser: ReadVnodes: Error seeking into vnode index; restore aborted\n");
+ Log("1 Volser: ReadVnodes: Error seeking into vnode index: %s; restore aborted\n",
+ afs_error_message(errno));
FDH_REALLYCLOSE(fdP);
return VOLSERREAD_DUMPERROR;
}
vnode->vnodeMagic = vcp->magic;
if (FDH_SEEK(fdP, vnodeIndexOffset(vcp, vnodeNumber), SEEK_SET) <
0) {
- Log("1 Volser: ReadVnodes: Error seeking into vnode index; restore aborted\n");
+ Log("1 Volser: ReadVnodes: Error seeking into vnode index: %s; restore aborted\n",
+ afs_error_message(errno));
FDH_REALLYCLOSE(fdP);
return VOLSERREAD_DUMPERROR;
}
if (FDH_WRITE(fdP, vnode, vcp->diskSize) != vcp->diskSize) {
- Log("1 Volser: ReadVnodes: Error writing vnode index; restore aborted\n");
+ Log("1 Volser: ReadVnodes: Error writing vnode index: %s; restore aborted\n",
+ afs_error_message(errno));
FDH_REALLYCLOSE(fdP);
return VOLSERREAD_DUMPERROR;
}
#ifdef AFS_64BIT_ENV
{
afs_uint32 filesize_high = 0L, filesize_low = 0L;
-#ifdef AFS_LARGEFILE_ENV
if (tag == 'h') {
if (!ReadInt32(iodp, &filesize_high)) {
*status = 1;
return 0;
}
}
-#endif /* !AFS_LARGEFILE_ENV */
if (!ReadInt32(iodp, &filesize_low)) {
*status = 1;
return 0;
if (nbytes < size)
size = nbytes;
- if ((code = iod_Read(iodp, p, size)) != size) {
- Log("1 Volser: WriteFile: Error reading dump file %d size=%llu nbytes=%u (%d of %u); restore aborted\n", vn, (afs_uintmax_t) filesize, nbytes, code, size);
+ if ((code = iod_Read(iodp, (char *) p, size)) != size) {
+ Log("1 Volser: WriteFile: Error reading dump file %d size=%llu nbytes=%u (%d of %u): %s; restore aborted\n", vn, (afs_uintmax_t) filesize, nbytes, code, size, afs_error_message(errno));
*status = 3;
break;
}
if (lcode > 0)
written += lcode;
if (lcode != size) {
- Log("1 Volser: WriteFile: Error writing (%d,%u) bytes to vnode %d; restore aborted\n", (int)(lcode>>32), (int)(lcode & 0xffffffff), vn);
+ Log("1 Volser: WriteFile: Error writing (%d,%u) bytes to vnode %d: %s; restore aborted\n", (int)(lcode>>32), (int)(lcode & 0xffffffff), vn, afs_error_message(errno));
*status = 4;
break;
}
static int
ReadDumpHeader(register struct iod *iodp, struct DumpHeader *hp)
{
- register tag;
+ register int tag;
afs_uint32 beginMagic;
+ afs_int32 critical = 0;
if (iod_getc(iodp) != D_DUMPHEADER || !ReadInt32(iodp, &beginMagic)
|| !ReadInt32(iodp, (afs_uint32 *) & hp->version)
|| beginMagic != DUMPBEGINMAGIC)
while ((tag = iod_getc(iodp)) > D_MAX) {
unsigned short arrayLength;
register int i;
+ if (critical)
+ critical--;
switch (tag) {
case 'v':
if (!ReadInt32(iodp, &hp->volumeId))
|| !ReadInt32(iodp, (afs_uint32 *) & hp->dumpTimes[i].to))
return 0;
break;
+ case 0x7e:
+ critical = 2;
+ break;
+ default:
+ if (!HandleUnknownTag(iodp, tag, 0, critical))
+ return VOLSERREAD_DUMPERROR;
}
}
if (!hp->volumeId || !hp->nDumpTimes) {
/* if (!code) code = DumpInt32(iodp, 'Z', V_dayUse(vp)); */
FillInt64(addvar,0, 5);
AddUInt64(v_size->dump_size, addvar, &v_size->dump_size);
-/* if (!code) code = DumpInt32(iodp, 'V', V_volUpCounter(vp)); */
- FillInt64(addvar,0, 5);
- AddUInt64(v_size->dump_size, addvar, &v_size->dump_size);
return code;
}
afs_int32 fromtime, register struct volintSize *v_size)
{
int code = 0;
- int UseLatestReadOnlyClone = 1;
+/* int UseLatestReadOnlyClone = 1; */
/* afs_int32 dumpTimes[2]; */
afs_uint64 addvar;
/* iodp->device = vp->device; */