/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
#include <afsconfig.h>
#include <afs/param.h>
-RCSID
- ("$Header$");
+#include <roken.h>
+
+#ifdef IGNORE_SOME_GCC_WARNINGS
+# pragma GCC diagnostic warning "-Wimplicit-function-declaration"
+#endif
#include <sys/types.h>
+#include <string.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
#ifdef AFS_NT40_ENV
#include <fcntl.h>
#include <io.h>
#include <winsock2.h>
+#include <WINNT/afsreg.h>
#else
#include <sys/time.h>
#include <sys/file.h>
#endif
#include <errno.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
#include <lock.h>
#include <afs/stds.h>
#include <rx/xdr.h>
#include <rx/rx_globals.h>
#include <afs/nfs.h>
#include <afs/vlserver.h>
-#include <afs/auth.h>
#include <afs/cellconfig.h>
#include <afs/keys.h>
#include <afs/afsutil.h>
#include <afs/afsint.h>
#include <afs/cmd.h>
#include <afs/usd.h>
-#include <rx/rxkad.h>
#include "volser.h"
#include "volint.h"
+#include <afs/ihandle.h>
+#include <afs/vnode.h>
+#include <afs/volume.h>
+#include <afs/com_err.h>
+#include "dump.h"
#include "lockdata.h"
+
#ifdef AFS_AIX32_ENV
#include <signal.h>
#endif
+#include "volser_internal.h"
#include "volser_prototypes.h"
+#include "vsutils_prototypes.h"
+#include "lockprocs_prototypes.h"
#ifdef HAVE_POSIX_REGEX
#include <regex.h>
#endif
+/* Local Prototypes */
+int PrintDiagnostics(char *astring, afs_int32 acode);
+int GetVolumeInfo(afs_uint32 volid, afs_uint32 *server, afs_int32 *part,
+ afs_int32 *voltype, struct uvldbentry *rentry);
+
struct tqElem {
- afs_int32 volid;
+ afs_uint32 volid;
struct tqElem *next;
};
cmd_AddParm(ts, "-localauth",CMD_FLAG,CMD_OPTIONAL,"use server tickets");\
cmd_AddParm(ts, "-verbose", CMD_FLAG, CMD_OPTIONAL, "verbose");\
cmd_AddParm(ts, "-encrypt", CMD_FLAG, CMD_OPTIONAL, "encrypt commands");\
+cmd_AddParm(ts, "-noresolve", CMD_FLAG, CMD_OPTIONAL, "don't resolve addresses"); \
-#define ERROR_EXIT(code) {error=(code); goto error_exit;}
+#define ERROR_EXIT(code) do { \
+ error = (code); \
+ goto error_exit; \
+} while (0)
-extern int verbose;
int rxInitDone = 0;
struct rx_connection *tconn;
-afs_int32 tserver;
+afs_uint32 tserver;
extern struct ubik_client *cstruct;
const char *confdir;
static void
qInit(struct tqHead *ahead)
{
- memset((char *)ahead, 0, sizeof(struct tqHead));
+ memset(ahead, 0, sizeof(struct tqHead));
return;
}
static void
-qPut(struct tqHead *ahead, afs_int32 volid)
+qPut(struct tqHead *ahead, afs_uint32 volid)
{
struct tqElem *elem;
}
static void
-qGet(struct tqHead *ahead, afs_int32 *volid)
+qGet(struct tqHead *ahead, afs_uint32 *volid)
{
struct tqElem *tmp;
static int
VolNameOK(char *name)
{
- int total;
-
+ size_t total;
total = strlen(name);
if (!strcmp(&name[total - 9], ".readonly")) {
static int
IsNumeric(char *name)
{
- int result, len, i;
+ int result, i;
+ size_t len;
char *ptr;
result = 1;
/*
- * Parse a server name/address and return the address in HOST BYTE order
+ * Parse a server dotted address and return the address in network byte order
*/
-afs_int32
-GetServer(char *aname)
+afs_uint32
+GetServerNoresolve(char *aname)
{
- register struct hostent *th;
- afs_int32 addr;
int b1, b2, b3, b4;
- register afs_int32 code;
- char hostname[MAXHOSTCHARS];
+ afs_uint32 addr;
+ afs_int32 code;
code = sscanf(aname, "%d.%d.%d.%d", &b1, &b2, &b3, &b4);
if (code == 4) {
addr = (b1 << 24) | (b2 << 16) | (b3 << 8) | b4;
- addr = ntohl(addr); /* convert to host order */
- } else {
+ addr = htonl(addr); /* convert to network byte order */
+ return addr;
+ } else
+ return 0;
+}
+/*
+ * Parse a server name/address and return the address in network byte order
+ */
+afs_uint32
+GetServer(char *aname)
+{
+ struct hostent *th;
+ afs_uint32 addr; /* in network byte order */
+ afs_int32 code;
+ char hostname[MAXHOSTCHARS];
+
+ if ((addr = GetServerNoresolve(aname)) == 0) {
th = gethostbyname(aname);
if (!th)
return 0;
memcpy(&addr, th->h_addr, sizeof(addr));
}
- if (addr == htonl(0x7f000001)) { /* local host */
+ if (rx_IsLoopbackAddr(ntohl(addr))) { /* local host */
code = gethostname(hostname, MAXHOSTCHARS);
if (code)
return 0;
- th = gethostbyname(hostname); /* returns host byte order */
+ th = gethostbyname(hostname);
if (!th)
return 0;
memcpy(&addr, th->h_addr, sizeof(addr));
}
int
-IsPartValid(afs_int32 partId, afs_int32 server, afs_int32 *code)
+IsPartValid(afs_int32 partId, afs_uint32 server, afs_int32 *code)
{
struct partList dummyPartList;
int i, success, cnt;
- /*sends the contents of file associated with <fd> and <blksize> to Rx Stream
+ /*sends the contents of file associated with <fd> and <blksize> to Rx Stream
* associated with <call> */
-int
-SendFile(usd_handle_t ufd, register struct rx_call *call, long blksize)
+int
+SendFile(usd_handle_t ufd, struct rx_call *call, long blksize)
{
char *buffer = (char *)0;
afs_int32 error = 0;
#ifndef AFS_NT40_ENV /* NT csn't select on non-socket fd's */
fd_set in;
FD_ZERO(&in);
- FD_SET((int)(ufd->handle), &in);
+ FD_SET((intptr_t)(ufd->handle), &in);
/* don't timeout if read blocks */
- IOMGR_Select(((int)(ufd->handle)) + 1, &in, 0, 0, 0);
+#if defined(AFS_PTHREAD_ENV)
+ select(((intptr_t)(ufd->handle)) + 1, &in, 0, 0, 0);
+#else
+ IOMGR_Select(((intptr_t)(ufd->handle)) + 1, &in, 0, 0, 0);
+#endif
#endif
error = USD_READ(ufd, buffer, blksize, &nbytes);
if (error) {
- fprintf(STDERR, "File system read failed\n");
+ fprintf(STDERR, "File system read failed: %s\n",
+ afs_error_message(error));
break;
}
if (nbytes == 0) {
/* function invoked by UV_RestoreVolume, reads the data from rx_trx_stream and
* writes it out to the volume. */
afs_int32
-WriteData(struct rx_call *call, char *rock)
+WriteData(struct rx_call *call, void *rock)
{
- char *filename;
+ char *filename = (char *) rock;
usd_handle_t ufd;
long blksize;
afs_int32 error, code;
int ufdIsOpen = 0;
+ afs_hyper_t filesize, currOffset;
+ afs_uint32 buffer;
+ afs_uint32 got;
error = 0;
- filename = rock;
if (!filename || !*filename) {
usd_StandardInput(&ufd);
blksize = 4096;
code = USD_IOCTL(ufd, USD_IOCTL_GETBLKSIZE, &blksize);
}
if (code) {
- fprintf(STDERR, "Could not access file '%s'\n", filename);
+ fprintf(STDERR, "Could not access file '%s': %s\n", filename,
+ afs_error_message(code));
error = VOLSERBADOP;
goto wfail;
}
+ /* test if we have a valid dump */
+ hset64(filesize, 0, 0);
+ USD_SEEK(ufd, filesize, SEEK_END, &currOffset);
+ hset64(filesize, hgethi(currOffset), hgetlo(currOffset)-sizeof(afs_uint32));
+ USD_SEEK(ufd, filesize, SEEK_SET, &currOffset);
+ USD_READ(ufd, (char *)&buffer, sizeof(afs_uint32), &got);
+ if ((got != sizeof(afs_uint32)) || (ntohl(buffer) != DUMPENDMAGIC)) {
+ fprintf(STDERR, "Signature missing from end of file '%s'\n", filename);
+ error = VOLSERBADOP;
+ goto wfail;
+ }
+ /* rewind, we are done */
+ hset64(filesize, 0, 0);
+ USD_SEEK(ufd, filesize, SEEK_SET, &currOffset);
}
code = SendFile(ufd, call, blksize);
if (code) {
#ifndef AFS_NT40_ENV /* NT csn't select on non-socket fd's */
fd_set out;
FD_ZERO(&out);
- FD_SET((int)(ufd->handle), &out);
+ FD_SET((intptr_t)(ufd->handle), &out);
/* don't timeout if write blocks */
- IOMGR_Select(((int)(ufd->handle)) + 1, 0, &out, 0, 0);
+#if defined(AFS_PTHREAD_ENV)
+ select(((intptr_t)(ufd->handle)) + 1, &out, 0, 0, 0);
+#else
+ IOMGR_Select(((intptr_t)(ufd->handle)) + 1, 0, &out, 0, 0);
+#endif
#endif
error =
USD_WRITE(ufd, &buffer[bytesread - bytesleft], bytesleft, &w);
if (error) {
- fprintf(STDERR, "File system write failed\n");
+ fprintf(STDERR, "File system write failed: %s\n",
+ afs_error_message(error));
ERROR_EXIT(-1);
}
}
}
afs_int32
-DumpFunction(struct rx_call *call, char *filename)
+DumpFunction(struct rx_call *call, void *rock)
{
+ char *filename = (char *)rock;
usd_handle_t ufd; /* default is to stdout */
afs_int32 error = 0, code;
afs_hyper_t size;
code = USD_IOCTL(ufd, USD_IOCTL_GETBLKSIZE, &blksize);
}
if (code) {
- fprintf(STDERR, "Could not create file '%s'\n", filename);
+ fprintf(STDERR, "Could not create file '%s': %s\n", filename,
+ afs_error_message(code));
ERROR_EXIT(VOLSERBADOP);
}
}
return (error);
}
-#if SIZEOF_TIME_T!=4
-static char *
-vos_ctime(afs_int32 *timep)
-{
- time_t foo = *timep;
- return ctime(&foo);
-}
-#else
-#define vos_ctime ctime
-#endif
-
static void
-DisplayFormat(pntr, server, part, totalOK, totalNotOK, totalBusy, fast,
- longlist, disp)
- volintInfo *pntr;
- afs_int32 server, part;
- int *totalOK, *totalNotOK, *totalBusy;
- int fast, longlist, disp;
+DisplayFormat(volintInfo *pntr, afs_uint32 server, afs_int32 part,
+ int *totalOK, int *totalNotOK, int *totalBusy, int fast,
+ int longlist, int disp)
{
char pname[10];
+ time_t t;
if (fast) {
fprintf(STDOUT, "%-10lu\n", (unsigned long)pntr->volid);
*totalOK += 1;
} else {
fprintf(STDOUT, "Off-line");
- *totalNotOK++;
+ *totalNotOK += 1;
}
if (pntr->needsSalvaged == 1)
fprintf(STDOUT, "**needs salvage**");
(unsigned long)pntr->cloneID,
(unsigned long)pntr->backupID);
fprintf(STDOUT, " MaxQuota %10d K \n", pntr->maxquota);
+ t = pntr->creationDate;
fprintf(STDOUT, " Creation %s",
- vos_ctime(& pntr->creationDate));
-#ifdef FULL_LISTVOL_SWITCH
+ ctime(&t));
+ t = pntr->copyDate;
fprintf(STDOUT, " Copy %s",
- vos_ctime( & pntr->copyDate));
- if (!pntr->backupDate)
+ ctime(&t));
+
+ t = pntr->backupDate;
+ if (!t)
fprintf(STDOUT, " Backup Never\n");
else
fprintf(STDOUT, " Backup %s",
- vos_ctime( & pntr->backupDate));
- if (pntr->accessDate)
+ ctime(&t));
+
+ t = pntr->accessDate;
+ if (t)
fprintf(STDOUT, " Last Access %s",
- vos_ctime( & pntr->accessDate));
-#endif
- if (!pntr->updateDate)
+ ctime(&t));
+
+ t = pntr->updateDate;
+ if (!t)
fprintf(STDOUT, " Last Update Never\n");
- else {
+ else
fprintf(STDOUT, " Last Update %s",
- vos_ctime( & pntr->updateDate));
- fprintf(STDOUT,
- " %d accesses in the past day (i.e., vnode references)\n",
- pntr->dayUse);
- }
+ ctime(&t));
+ fprintf(STDOUT,
+ " %d accesses in the past day (i.e., vnode references)\n",
+ pntr->dayUse);
} else if (pntr->status == VBUSY) {
*totalBusy += 1;
qPut(&busyHead, pntr->volid);
*------------------------------------------------------------------------*/
static void
-XDisplayFormat(a_xInfoP, a_servID, a_partID, a_totalOKP, a_totalNotOKP,
- a_totalBusyP, a_fast, a_int32, a_showProblems)
- volintXInfo *a_xInfoP;
- afs_int32 a_servID;
- afs_int32 a_partID;
- int *a_totalOKP;
- int *a_totalNotOKP;
- int *a_totalBusyP;
- int a_fast;
- int a_int32;
- int a_showProblems;
-
+XDisplayFormat(volintXInfo *a_xInfoP, afs_uint32 a_servID, afs_int32 a_partID,
+ int *a_totalOKP, int *a_totalNotOKP, int *a_totalBusyP,
+ int a_fast, int a_int32, int a_showProblems)
{ /*XDisplayFormat */
-
+ time_t t;
char pname[10];
if (a_fast) {
(unsigned long)a_xInfoP->cloneID,
(unsigned long)a_xInfoP->backupID);
fprintf(STDOUT, " MaxQuota %10d K \n", a_xInfoP->maxquota);
+
+ t = a_xInfoP->creationDate;
fprintf(STDOUT, " Creation %s",
- vos_ctime( & a_xInfoP->creationDate));
-#ifdef FULL_LISTVOL_SWITCH
+ ctime(&t));
+
+ t = a_xInfoP->copyDate;
fprintf(STDOUT, " Copy %s",
- vos_ctime( & a_xInfoP->copyDate));
- if (!a_xInfoP->backupDate)
+ ctime(&t));
+
+ t = a_xInfoP->backupDate;
+ if (!t)
fprintf(STDOUT, " Backup Never\n");
else
fprintf(STDOUT, " Backup %s",
- vos_ctime( & a_xInfoP->backupDate));
- if (a_xInfoP->accessDate)
+ ctime(&t));
+
+ t = a_xInfoP->accessDate;
+ if (t)
fprintf(STDOUT, " Last Access %s",
- vos_ctime( & a_xInfoP->accessDate));
-#endif
- if (!a_xInfoP->updateDate)
+ ctime(&t));
+
+ t = a_xInfoP->updateDate;
+ if (!t)
fprintf(STDOUT, " Last Update Never\n");
- else {
+ else
fprintf(STDOUT, " Last Update %s",
- vos_ctime( & a_xInfoP->updateDate));
- fprintf(STDOUT,
- " %d accesses in the past day (i.e., vnode references)\n",
- a_xInfoP->dayUse);
- }
+ ctime(&t));
+ fprintf(STDOUT,
+ " %d accesses in the past day (i.e., vnode references)\n",
+ a_xInfoP->dayUse);
/*
* Print all the read/write and authorship stats.
} /*Default listing */
} /*XDisplayFormat */
-#ifdef FULL_LISTVOL_SWITCH
/*------------------------------------------------------------------------
* PRIVATE XDisplayFormat2
*
*------------------------------------------------------------------------*/
static void
-XDisplayFormat2(a_xInfoP, a_servID, a_partID, a_totalOKP, a_totalNotOKP,
- a_totalBusyP, a_fast, a_int32, a_showProblems)
- volintXInfo *a_xInfoP;
- afs_int32 a_servID;
- afs_int32 a_partID;
- int *a_totalOKP;
- int *a_totalNotOKP;
- int *a_totalBusyP;
- int a_fast;
- int a_int32;
- int a_showProblems;
-
+XDisplayFormat2(volintXInfo *a_xInfoP, afs_uint32 a_servID, afs_int32 a_partID,
+ int *a_totalOKP, int *a_totalNotOKP, int *a_totalBusyP,
+ int a_fast, int a_int32, int a_showProblems)
{ /*XDisplayFormat */
+ time_t t;
if (a_fast) {
/*
* Short & sweet.
}
fprintf(STDOUT, "name\t\t%s\n", a_xInfoP->name);
- fprintf(STDOUT, "id\t\t%lu\n", a_xInfoP->volid);
+ fprintf(STDOUT, "id\t\t%lu\n", afs_printable_uint32_lu(a_xInfoP->volid));
fprintf(STDOUT, "serv\t\t%s\t%s\n", address, hostname);
fprintf(STDOUT, "part\t\t%s\n", pname);
- switch (a_xInfoP->status) {
- case VOK:
- fprintf(STDOUT, "status\t\tOK\n");
- break;
- case VBUSY:
- fprintf(STDOUT, "status\t\tBUSY\n");
- return;
- default:
- fprintf(STDOUT, "status\t\tUNATTACHABLE\n");
- return;
- }
- fprintf(STDOUT, "backupID\t%lu\n", a_xInfoP->backupID);
- fprintf(STDOUT, "parentID\t%lu\n", a_xInfoP->parentID);
- fprintf(STDOUT, "cloneID\t\t%lu\n", a_xInfoP->cloneID);
+ fprintf(STDOUT, "status\t\tOK\n");
+ fprintf(STDOUT, "backupID\t%lu\n",
+ afs_printable_uint32_lu(a_xInfoP->backupID));
+ fprintf(STDOUT, "parentID\t%lu\n",
+ afs_printable_uint32_lu(a_xInfoP->parentID));
+ fprintf(STDOUT, "cloneID\t\t%lu\n",
+ afs_printable_uint32_lu(a_xInfoP->cloneID));
fprintf(STDOUT, "inUse\t\t%s\n", a_xInfoP->inUse ? "Y" : "N");
switch (a_xInfoP->type) {
case 0:
fprintf(STDOUT, "type\t\t?\n");
break;
}
- fprintf(STDOUT, "creationDate\t%-9lu\t%s", a_xInfoP->creationDate,
- vos_ctime(&a_xInfoP->creationDate));
- fprintf(STDOUT, "accessDate\t%-9lu\t%s", a_xInfoP->accessDate,
- vos_ctime(&a_xInfoP->accessDate));
- fprintf(STDOUT, "updateDate\t%-9lu\t%s", a_xInfoP->updateDate,
- vos_ctime(&a_xInfoP->updateDate));
- fprintf(STDOUT, "backupDate\t%-9lu\t%s", a_xInfoP->backupDate,
- vos_ctime(&a_xInfoP->backupDate));
- fprintf(STDOUT, "copyDate\t%-9lu\t%s", a_xInfoP->copyDate,
- vos_ctime(&a_xInfoP->copyDate));
-
+ t = a_xInfoP->creationDate;
+ fprintf(STDOUT, "creationDate\t%-9lu\t%s",
+ afs_printable_uint32_lu(a_xInfoP->creationDate),
+ ctime(&t));
+
+ t = a_xInfoP->accessDate;
+ fprintf(STDOUT, "accessDate\t%-9lu\t%s",
+ afs_printable_uint32_lu(a_xInfoP->accessDate),
+ ctime(&t));
+
+ t = a_xInfoP->updateDate;
+ fprintf(STDOUT, "updateDate\t%-9lu\t%s",
+ afs_printable_uint32_lu(a_xInfoP->updateDate),
+ ctime(&t));
+
+ t = a_xInfoP->backupDate;
+ fprintf(STDOUT, "backupDate\t%-9lu\t%s",
+ afs_printable_uint32_lu(a_xInfoP->backupDate),
+ ctime(&t));
+
+ t = a_xInfoP->copyDate;
+ fprintf(STDOUT, "copyDate\t%-9lu\t%s",
+ afs_printable_uint32_lu(a_xInfoP->copyDate),
+ ctime(&t));
+
fprintf(STDOUT, "diskused\t%u\n", a_xInfoP->size);
fprintf(STDOUT, "maxquota\t%u\n", a_xInfoP->maxquota);
} /*Screwed volume */
} /*Default listing */
} /*XDisplayFormat */
-#endif /*FULL_LISTVOL_SWITCH*/
-#ifdef FULL_LISTVOL_SWITCH
static void
-DisplayFormat2(server, partition, pntr)
- long server, partition;
- volintInfo *pntr;
+DisplayFormat2(long server, long partition, volintInfo *pntr)
{
static long server_cache = -1, partition_cache = -1;
static char hostname[256], address[32], pname[16];
+ time_t t;
if (server != server_cache) {
struct in_addr s;
MapPartIdIntoName(partition, pname);
partition_cache = partition;
}
- fprintf(STDOUT, "name\t\t%s\n", pntr->name);
- fprintf(STDOUT, "id\t\t%lu\n", pntr->volid);
+
+ if (pntr->status == VOK)
+ fprintf(STDOUT, "name\t\t%s\n", pntr->name);
+
+ fprintf(STDOUT, "id\t\t%lu\n",
+ afs_printable_uint32_lu(pntr->volid));
fprintf(STDOUT, "serv\t\t%s\t%s\n", address, hostname);
fprintf(STDOUT, "part\t\t%s\n", pname);
switch (pntr->status) {
fprintf(STDOUT, "status\t\tUNATTACHABLE\n");
return;
}
- fprintf(STDOUT, "backupID\t%lu\n", pntr->backupID);
- fprintf(STDOUT, "parentID\t%lu\n", pntr->parentID);
- fprintf(STDOUT, "cloneID\t\t%lu\n", pntr->cloneID);
+ fprintf(STDOUT, "backupID\t%lu\n",
+ afs_printable_uint32_lu(pntr->backupID));
+ fprintf(STDOUT, "parentID\t%lu\n",
+ afs_printable_uint32_lu(pntr->parentID));
+ fprintf(STDOUT, "cloneID\t\t%lu\n",
+ afs_printable_uint32_lu(pntr->cloneID));
fprintf(STDOUT, "inUse\t\t%s\n", pntr->inUse ? "Y" : "N");
fprintf(STDOUT, "needsSalvaged\t%s\n", pntr->needsSalvaged ? "Y" : "N");
/* 0xD3 is from afs/volume.h since I had trouble including the file */
fprintf(STDOUT, "type\t\t?\n");
break;
}
- fprintf(STDOUT, "creationDate\t%-9lu\t%s", pntr->creationDate,
- vos_ctime(&pntr->creationDate));
- fprintf(STDOUT, "accessDate\t%-9lu\t%s", pntr->accessDate,
- vos_ctime(&pntr->accessDate));
- fprintf(STDOUT, "updateDate\t%-9lu\t%s", pntr->updateDate,
- vos_ctime(&pntr->updateDate));
- fprintf(STDOUT, "backupDate\t%-9lu\t%s", pntr->backupDate,
- vos_ctime(&pntr->backupDate));
- fprintf(STDOUT, "copyDate\t%-9lu\t%s", pntr->copyDate,
- vos_ctime(&pntr->copyDate));
- fprintf(STDOUT, "flags\t\t%#lx\t(Optional)\n", pntr->flags);
+ t = pntr->creationDate;
+ fprintf(STDOUT, "creationDate\t%-9lu\t%s",
+ afs_printable_uint32_lu(pntr->creationDate),
+ ctime(&t));
+
+ t = pntr->accessDate;
+ fprintf(STDOUT, "accessDate\t%-9lu\t%s",
+ afs_printable_uint32_lu(pntr->accessDate),
+ ctime(&t));
+
+ t = pntr->updateDate;
+ fprintf(STDOUT, "updateDate\t%-9lu\t%s",
+ afs_printable_uint32_lu(pntr->updateDate),
+ ctime(&t));
+
+ t = pntr->backupDate;
+ fprintf(STDOUT, "backupDate\t%-9lu\t%s",
+ afs_printable_uint32_lu(pntr->backupDate),
+ ctime(&t));
+
+ t = pntr->copyDate;
+ fprintf(STDOUT, "copyDate\t%-9lu\t%s",
+ afs_printable_uint32_lu(pntr->copyDate),
+ ctime(&t));
+
+ fprintf(STDOUT, "flags\t\t%#lx\t(Optional)\n",
+ afs_printable_uint32_lu(pntr->flags));
fprintf(STDOUT, "diskused\t%u\n", pntr->size);
fprintf(STDOUT, "maxquota\t%u\n", pntr->maxquota);
- fprintf(STDOUT, "minquota\t%lu\t(Optional)\n", pntr->spare0);
+ fprintf(STDOUT, "minquota\t%lu\t(Optional)\n",
+ afs_printable_uint32_lu(pntr->spare0));
fprintf(STDOUT, "filecount\t%u\n", pntr->filecount);
fprintf(STDOUT, "dayUse\t\t%u\n", pntr->dayUse);
- fprintf(STDOUT, "weekUse\t\t%lu\t(Optional)\n", pntr->spare1);
- fprintf(STDOUT, "spare2\t\t%lu\t(Optional)\n", pntr->spare2);
- fprintf(STDOUT, "spare3\t\t%lu\t(Optional)\n", pntr->spare3);
+ fprintf(STDOUT, "weekUse\t\t%lu\t(Optional)\n",
+ afs_printable_uint32_lu(pntr->spare1));
+ fprintf(STDOUT, "spare2\t\t%lu\t(Optional)\n",
+ afs_printable_uint32_lu(pntr->spare2));
+ fprintf(STDOUT, "spare3\t\t%lu\t(Optional)\n",
+ afs_printable_uint32_lu(pntr->spare3));
return;
}
static void
-DisplayVolumes2(server, partition, pntr, count)
- volintInfo *pntr;
- long server, partition, count;
+DisplayVolumes2(long server, long partition, volintInfo *pntr, long count)
{
long i;
}
return;
}
-#endif /* FULL_LISTVOL_SWITCH */
static void
-DisplayVolumes(server, part, pntr, count, longlist, fast, quiet)
- afs_int32 server, part;
- volintInfo *pntr;
- afs_int32 count, longlist, fast;
- int quiet;
+DisplayVolumes(afs_uint32 server, afs_int32 part, volintInfo *pntr,
+ afs_int32 count, afs_int32 longlist, afs_int32 fast,
+ int quiet)
{
int totalOK, totalNotOK, totalBusy, i;
- afs_int32 volid;
+ afs_uint32 volid = 0;
totalOK = 0;
totalNotOK = 0;
*------------------------------------------------------------------------*/
static void
-XDisplayVolumes(a_servID, a_partID, a_xInfoP, a_count, a_int32, a_fast,
- a_quiet)
- afs_int32 a_servID;
- afs_int32 a_partID;
- volintXInfo *a_xInfoP;
- afs_int32 a_count;
- afs_int32 a_int32;
- afs_int32 a_fast;
- int a_quiet;
-
+XDisplayVolumes(afs_uint32 a_servID, afs_int32 a_partID, volintXInfo *a_xInfoP,
+ afs_int32 a_count, afs_int32 a_int32, afs_int32 a_fast,
+ int a_quiet)
{ /*XDisplayVolumes */
int totalOK; /*Total OK volumes */
int totalNotOK; /*Total screwed volumes */
int totalBusy; /*Total busy volumes */
int i; /*Loop variable */
- afs_int32 volid; /*Current volume ID */
+ afs_uint32 volid = 0; /*Current volume ID */
/*
* Initialize counters and (global!!) queues.
}
} /*XDisplayVolumes */
-#ifdef FULL_LISTVOL_SWITCH
+
/*------------------------------------------------------------------------
* PRIVATE XDisplayVolumes2
*
*------------------------------------------------------------------------*/
static void
-XDisplayVolumes2(a_servID, a_partID, a_xInfoP, a_count, a_int32, a_fast,
- a_quiet)
- afs_int32 a_servID;
- afs_int32 a_partID;
- volintXInfo *a_xInfoP;
- afs_int32 a_count;
- afs_int32 a_int32;
- afs_int32 a_fast;
- int a_quiet;
-
+XDisplayVolumes2(afs_uint32 a_servID, afs_int32 a_partID, volintXInfo *a_xInfoP,
+ afs_int32 a_count, afs_int32 a_int32, afs_int32 a_fast,
+ int a_quiet)
{ /*XDisplayVolumes */
int totalOK; /*Total OK volumes */
int totalNotOK; /*Total screwed volumes */
int totalBusy; /*Total busy volumes */
int i; /*Loop variable */
- afs_int32 volid; /*Current volume ID */
+ afs_uint32 volid = 0; /*Current volume ID */
/*
* Initialize counters and (global!!) queues.
}
} /*XDisplayVolumes2 */
-#endif /* FULL_LISTVOL_SWITCH */
-/* set <server> and <part> to the correct values depending on
+/* set <server> and <part> to the correct values depending on
* <voltype> and <entry> */
static void
-GetServerAndPart(entry, voltype, server, part, previdx)
- struct nvldbentry *entry;
- afs_int32 *server, *part;
- int voltype;
- int *previdx;
+GetServerAndPart(struct uvldbentry *entry, int voltype, afs_uint32 *server,
+ afs_int32 *part, int *previdx)
{
int i, istart, vtype;
istart = ((*previdx < 0) ? 0 : *previdx + 1);
}
- for (i = istart; i < entry->nServers; i++) {
+ for (i = istart; i < entry->nServers && i < NMAXNSERVERS; i++) {
if (entry->serverFlags[i] & vtype) {
- *server = entry->serverNumber[i];
+ /* *uuid = entry->serverNumber[i]; */
+ *server = entry->serverUnique[i];
*part = entry->serverPartition[i];
*previdx = i;
return;
}
static void
-PostVolumeStats(entry)
- struct nvldbentry *entry;
+PrintLocked(afs_int32 aflags)
{
- SubEnumerateEntry(entry);
- /* Check for VLOP_ALLOPERS */
- if (entry->flags & VLOP_ALLOPERS)
+ afs_int32 flags = aflags & VLOP_ALLOPERS;
+
+ if (flags) {
fprintf(STDOUT, " Volume is currently LOCKED \n");
+
+ if (flags & VLOP_MOVE) {
+ fprintf(STDOUT, " Volume is locked for a move operation\n");
+ }
+ if (flags & VLOP_RELEASE) {
+ fprintf(STDOUT, " Volume is locked for a release operation\n");
+ }
+ if (flags & VLOP_BACKUP) {
+ fprintf(STDOUT, " Volume is locked for a backup operation\n");
+ }
+ if (flags & VLOP_DELETE) {
+ fprintf(STDOUT, " Volume is locked for a delete/misc operation\n");
+ }
+ if (flags & VLOP_DUMP) {
+ fprintf(STDOUT, " Volume is locked for a dump/restore operation\n");
+ }
+ }
+}
+
+static void
+PostVolumeStats(struct uvldbentry *entry)
+{
+ SubEnumerateEntryU(entry);
+ /* Check for VLOP_ALLOPERS */
+ PrintLocked(entry->flags);
return;
}
*------------------------------------------------------------------------*/
static void
-XVolumeStats(a_xInfoP, a_entryP, a_srvID, a_partID, a_volType)
- volintXInfo *a_xInfoP;
- struct nvldbentry *a_entryP;
- afs_int32 a_srvID;
- afs_int32 a_partID;
- int a_volType;
-
+XVolumeStats(volintXInfo *a_xInfoP, struct uvldbentry *a_entryP,
+ afs_int32 a_srvID, afs_int32 a_partID, int a_volType)
{ /*XVolumeStats */
int totalOK, totalNotOK, totalBusy; /*Dummies - we don't really count here */
} /*XVolumeStats */
static void
-VolumeStats(pntr, entry, server, part, voltype)
- volintInfo *pntr;
- struct nvldbentry *entry;
- int voltype;
- afs_int32 server, part;
+VolumeStats_int(volintInfo *pntr, struct uvldbentry *entry, afs_uint32 server,
+ afs_int32 part, int voltype)
{
int totalOK, totalNotOK, totalBusy;
}
/* command to forcibly remove a volume */
-static
-NukeVolume(as)
- register struct cmd_syndesc *as;
+static int
+NukeVolume(struct cmd_syndesc *as)
{
- register afs_int32 code;
- afs_int32 volID, err;
+ afs_int32 code;
+ afs_uint32 volID;
+ afs_int32 err;
afs_int32 partID;
- afs_int32 server;
- register char *tp;
+ afs_uint32 server;
+ char *tp;
server = GetServer(tp = as->parms[0].items->data);
if (!server) {
* As advertised.
*------------------------------------------------------------------------
*/
-static
-ExamineVolume(as)
- register struct cmd_syndesc *as;
+static int
+ExamineVolume(struct cmd_syndesc *as, void *arock)
{
- struct nvldbentry entry;
+ struct uvldbentry entry;
afs_int32 vcode = 0;
volintInfo *pntr = (volintInfo *) 0;
volintXInfo *xInfoP = (volintXInfo *) 0;
- afs_int32 volid;
+ afs_uint32 volid;
afs_int32 code, err, error = 0;
int voltype, foundserv = 0, foundentry = 0;
- afs_int32 aserver, apart;
+ afs_uint32 aserver;
+ afs_int32 apart;
int previdx = -1;
int wantExtendedInfo; /*Do we want extended vol info? */
-
+ int isSubEnum=0; /* Keep track whether sub enumerate called. */
wantExtendedInfo = (as->parms[1].items ? 1 : 0); /* -extended */
volid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err); /* -id */
(unsigned long)volid);
fflush(STDOUT);
}
- vcode = VLDB_GetEntryByID(volid, -1, &entry);
+ vcode = VLDB_GetEntryByIDU(volid, -1, &entry);
if (vcode) {
fprintf(STDERR,
"Could not fetch the entry for volume number %lu from VLDB \n",
}
if (verbose)
fprintf(STDOUT, "done\n");
- MapHostToNetwork(&entry);
+ MapHostToNetworkU(&entry);
if (entry.volumeId[RWVOL] == volid)
voltype = RWVOL;
foundserv = 1;
if (wantExtendedInfo)
XVolumeStats(xInfoP, &entry, aserver, apart, voltype);
- else
-#ifdef FULL_LISTVOL_SWITCH
- if (as->parms[2].items) {
+ else if (as->parms[2].items) {
DisplayFormat2(aserver, apart, pntr);
- EnumerateEntry(&entry);
+ EnumerateEntryU(&entry);
+ isSubEnum = 1;
} else
-#endif /* FULL_LISTVOL_SWITCH */
- VolumeStats(pntr, &entry, aserver, apart, voltype);
+ VolumeStats_int(pntr, &entry, aserver, apart, voltype);
if ((voltype == BACKVOL) && !(entry.flags & BACK_EXISTS)) {
/* The VLDB says there is no backup volume yet we found one on disk */
fprintf(STDERR, "Dump only information from VLDB\n\n");
fprintf(STDOUT, "%s \n", entry.name); /* PostVolumeStats doesn't print name */
}
- PostVolumeStats(&entry);
+
+ if (!isSubEnum)
+ PostVolumeStats(&entry);
return (error);
}
* As advertised.
*------------------------------------------------------------------------
*/
-static
-SetFields(as)
- register struct cmd_syndesc *as;
+static int
+SetFields(struct cmd_syndesc *as, void *arock)
{
- struct nvldbentry entry;
- afs_int32 vcode = 0;
+ struct uvldbentry entry;
volintInfo info;
- afs_int32 volid;
+ afs_uint32 volid;
afs_int32 code, err;
- afs_int32 aserver, apart;
+ afs_uint32 aserver;
+ afs_int32 apart;
int previdx = -1;
volid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err); /* -id */
return -1;
}
- code = VLDB_GetEntryByID(volid, RWVOL, &entry);
+ code = VLDB_GetEntryByIDU(volid, RWVOL, &entry);
if (code) {
fprintf(STDERR,
"Could not fetch the entry for volume number %lu from VLDB \n",
(unsigned long)volid);
return (code);
}
- MapHostToNetwork(&entry);
+ MapHostToNetworkU(&entry);
GetServerAndPart(&entry, RWVOL, &aserver, &apart, &previdx);
if (previdx == -1) {
if (as->parms[1].items) {
/* -max <quota> */
- code = util_GetInt32(as->parms[1].items->data, &info.maxquota);
+ code = util_GetHumanInt32(as->parms[1].items->data, &info.maxquota);
if (code) {
fprintf(STDERR, "invalid quota value\n");
return code;
* As advertised.
*------------------------------------------------------------------------
*/
-static
-volOnline(as)
- register struct cmd_syndesc *as;
+static int
+volOnline(struct cmd_syndesc *as, void *arock)
{
- afs_int32 server, partition, volid;
+ afs_uint32 server;
+ afs_int32 partition;
+ afs_uint32 volid;
afs_int32 code, err = 0;
server = GetServer(as->parms[0].items->data);
*------------------------------------------------------------------------
*/
static int
-volOffline(register struct cmd_syndesc *as)
+volOffline(struct cmd_syndesc *as, void *arock)
{
- afs_int32 server, partition, volid;
+ afs_uint32 server;
+ afs_int32 partition;
+ afs_uint32 volid;
afs_int32 code, err = 0;
afs_int32 transflag, sleeptime, transdone;
}
static int
-CreateVolume(register struct cmd_syndesc *as)
+CreateVolume(struct cmd_syndesc *as, void *arock)
{
afs_int32 pnum;
char part[10];
- afs_int32 volid, code;
- struct nvldbentry entry;
+ afs_uint32 volid = 0, rovolid = 0, bkvolid = 0;
+ afs_uint32 *arovolid;
+ afs_int32 code;
+ struct uvldbentry entry;
afs_int32 vcode;
afs_int32 quota;
+ arovolid = &rovolid;
+
quota = 5000;
tserver = GetServer(as->parms[0].items->data);
if (!tserver) {
as->parms[2].items->data);
return EINVAL;
}
- vcode = VLDB_GetEntryByName(as->parms[2].items->data, &entry);
+ vcode = VLDB_GetEntryByNameU(as->parms[2].items->data, &entry);
if (!vcode) {
fprintf(STDERR, "Volume %s already exists\n",
as->parms[2].items->data);
}
if (as->parms[3].items) {
- if (!IsNumeric(as->parms[3].items->data)) {
- fprintf(STDERR, "Initial quota %s should be numeric.\n",
- as->parms[3].items->data);
+ code = util_GetHumanInt32(as->parms[3].items->data, "a);
+ if (code) {
+ fprintf(STDERR, "vos: bad integer specified for quota.\n");
+ return code;
+ }
+ }
+
+ if (as->parms[4].items) {
+ if (!IsNumeric(as->parms[4].items->data)) {
+ fprintf(STDERR, "vos: Given volume ID %s should be numeric.\n",
+ as->parms[4].items->data);
return EINVAL;
}
- code = util_GetInt32(as->parms[3].items->data, "a);
+ code = util_GetUInt32(as->parms[4].items->data, &volid);
if (code) {
- fprintf(STDERR, "vos: bad integer specified for quota.\n");
+ fprintf(STDERR, "vos: bad integer specified for volume ID.\n");
+ return code;
+ }
+ }
+
+ if (as->parms[5].items) {
+ if (!IsNumeric(as->parms[5].items->data)) {
+ fprintf(STDERR, "vos: Given RO volume ID %s should be numeric.\n",
+ as->parms[5].items->data);
+ return EINVAL;
+ }
+
+ code = util_GetUInt32(as->parms[5].items->data, &rovolid);
+ if (code) {
+ fprintf(STDERR, "vos: bad integer specified for volume ID.\n");
return code;
}
+
+ if (rovolid == 0) {
+ arovolid = NULL;
+ }
}
code =
- UV_CreateVolume2(tserver, pnum, as->parms[2].items->data, quota, 0,
- 0, 0, 0, &volid);
+ UV_CreateVolume3(tserver, pnum, as->parms[2].items->data, quota, 0,
+ 0, 0, 0, &volid, arovolid, &bkvolid);
if (code) {
PrintDiagnostics("create", code);
return code;
return 0;
}
+#if 0
static afs_int32
-DeleteAll(entry)
- struct nvldbentry *entry;
+DeleteAll(struct uvldbentry *entry)
{
int i;
- afs_int32 error, code, curserver, curpart, volid;
+ afs_int32 error, code, curserver, curpart;
+ afs_uint32 volid;
- MapHostToNetwork(entry);
+ MapHostToNetworkU(entry);
error = 0;
for (i = 0; i < entry->nServers; i++) {
- curserver = entry->serverNumber[i];
+ curserver = entry->serverUnique[i];
curpart = entry->serverPartition[i];
if (entry->serverFlags[i] & ITSROVOL) {
volid = entry->volumeId[ROVOL];
}
return error;
}
+#endif
-static
-DeleteVolume(as)
- struct cmd_syndesc *as;
+static int
+DeleteVolume(struct cmd_syndesc *as, void *arock)
{
afs_int32 err, code = 0;
- afs_int32 server = 0, partition = -1, volid;
+ afs_uint32 server = 0;
+ afs_int32 partition = -1;
+ afs_uint32 volid;
char pname[10];
afs_int32 idx, j;
* them in from the VLDB entry.
*/
if ((partition == -1) || !server) {
- struct nvldbentry entry;
+ struct uvldbentry entry;
- code = VLDB_GetEntryByID(volid, -1, &entry);
+ code = VLDB_GetEntryByIDU(volid, -1, &entry);
if (code) {
fprintf(STDERR,
"Could not fetch the entry for volume %lu from VLDB\n",
if (((volid == entry.volumeId[RWVOL]) && (entry.flags & RW_EXISTS))
|| ((volid == entry.volumeId[BACKVOL])
&& (entry.flags & BACK_EXISTS))) {
- idx = Lp_GetRwIndex(&entry);
- if ((idx == -1) || (server && (server != entry.serverNumber[idx]))
+ idx = Lp_GetRwIndexU(&entry);
+ if ((idx == -1) || (server && (server != entry.serverUnique[idx]))
|| ((partition != -1)
&& (partition != entry.serverPartition[idx]))) {
fprintf(STDERR, "VLDB: Volume '%s' no match\n",
if (entry.serverFlags[j] != ITSROVOL)
continue;
- if (((server == 0) || (server == entry.serverNumber[j]))
+ if (((server == 0) || (server == entry.serverUnique[j]))
&& ((partition == -1)
|| (partition == entry.serverPartition[j]))) {
if (idx != -1) {
return ENOENT;
}
- server = htonl(entry.serverNumber[idx]);
+ server = htonl(entry.serverUnique[idx]);
partition = entry.serverPartition[idx];
}
}
#define TESTM 0 /* set for move space tests, clear for production */
-static
-MoveVolume(as)
- register struct cmd_syndesc *as;
+static int
+MoveVolume(struct cmd_syndesc *as, void *arock)
{
- afs_int32 volid, fromserver, toserver, frompart, topart;
+ afs_uint32 volid;
+ afs_uint32 fromserver, toserver;
+ afs_int32 frompart, topart;
afs_int32 flags, code, err;
char fromPartName[10], toPartName[10];
- struct diskPartition partition; /* for space check */
+ struct diskPartition64 partition; /* for space check */
volintInfo *p;
volid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
* check target partition for space to move volume
*/
- code = UV_PartitionInfo(toserver, toPartName, &partition);
+ code = UV_PartitionInfo64(toserver, toPartName, &partition);
if (code) {
fprintf(STDERR, "vos: cannot access partition %s\n", toPartName);
exit(1);
}
if (TESTM)
- fprintf(STDOUT, "target partition %s free space %d\n", toPartName,
+ fprintf(STDOUT, "target partition %s free space %" AFS_INT64_FMT "\n", toPartName,
partition.free);
p = (volintInfo *) 0;
if (code) {
fprintf(STDERR, "vos:cannot access volume %lu\n",
(unsigned long)volid);
- free(p);
exit(1);
}
if (TESTM)
return 0;
}
-static
-CopyVolume(as)
- register struct cmd_syndesc *as;
+static int
+CopyVolume(struct cmd_syndesc *as, void *arock)
{
- afs_int32 volid, fromserver, toserver, frompart, topart, code, err, flags;
+ afs_uint32 volid;
+ afs_uint32 fromserver, toserver;
+ afs_int32 frompart, topart, code, err, flags;
char fromPartName[10], toPartName[10], *tovolume;
- struct nvldbentry entry;
- struct diskPartition partition; /* for space check */
+ struct uvldbentry entry;
+ struct diskPartition64 partition; /* for space check */
volintInfo *p;
volid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
tovolume);
return EINVAL;
}
- code = VLDB_GetEntryByName(tovolume, &entry);
+ code = VLDB_GetEntryByNameU(tovolume, &entry);
if (!code) {
fprintf(STDERR, "Volume %s already exists\n", tovolume);
PrintDiagnostics("copy", code);
* check target partition for space to move volume
*/
- code = UV_PartitionInfo(toserver, toPartName, &partition);
+ code = UV_PartitionInfo64(toserver, toPartName, &partition);
if (code) {
fprintf(STDERR, "vos: cannot access partition %s\n", toPartName);
exit(1);
}
if (TESTM)
- fprintf(STDOUT, "target partition %s free space %d\n", toPartName,
+ fprintf(STDOUT, "target partition %s free space %" AFS_INT64_FMT "\n", toPartName,
partition.free);
p = (volintInfo *) 0;
if (code) {
fprintf(STDERR, "vos:cannot access volume %lu\n",
(unsigned long)volid);
- free(p);
exit(1);
}
}
-static
-ShadowVolume(as)
- register struct cmd_syndesc *as;
+static int
+ShadowVolume(struct cmd_syndesc *as, void *arock)
{
- afs_int32 volid, fromserver, toserver, frompart, topart, tovolid;
+ afs_uint32 volid, tovolid;
+ afs_uint32 fromserver, toserver;
+ afs_int32 frompart, topart;
afs_int32 code, err, flags;
char fromPartName[10], toPartName[10], toVolName[32], *tovolume;
- struct nvldbentry entry;
- struct diskPartition partition; /* for space check */
+ struct diskPartition64 partition; /* for space check */
volintInfo *p, *q;
p = (volintInfo *) 0;
* check target partition for space to move volume
*/
- code = UV_PartitionInfo(toserver, toPartName, &partition);
+ code = UV_PartitionInfo64(toserver, toPartName, &partition);
if (code) {
fprintf(STDERR, "vos: cannot access partition %s\n", toPartName);
exit(1);
}
if (TESTM)
- fprintf(STDOUT, "target partition %s free space %d\n", toPartName,
+ fprintf(STDOUT, "target partition %s free space %" AFS_INT64_FMT "\n", toPartName,
partition.free);
/* Don't do this again if we did it above */
}
-static
-CloneVolume(as)
- register struct cmd_syndesc *as;
+static int
+CloneVolume(struct cmd_syndesc *as, void *arock)
{
- afs_int32 server, part, volid, cloneid, voltype;
+ afs_uint32 volid, cloneid;
+ afs_uint32 server;
+ afs_int32 part, voltype;
char partName[10], *volname;
afs_int32 code, err, flags;
- struct nvldbentry entry;
+ struct uvldbentry entry;
volid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
if (volid == 0) {
volname, VOLSER_OLDMAXVOLNAME - 1);
return E2BIG;
}
+#if 0
+ /*
+ * In order that you be able to make clones of RO or BK, this
+ * check must be omitted.
+ */
if (!VolNameOK(volname)) {
fprintf(STDERR,
"Illegal volume name %s, should not end in .readonly or .backup\n",
volname);
return EINVAL;
}
+#endif
if (IsNumeric(volname)) {
fprintf(STDERR,
"Illegal volume name %s, should not be a number\n",
if (as->parms[6].items) flags |= RV_RDONLY;
- code =
+ code =
UV_CloneVolume(server, part, volid, cloneid, volname, flags);
if (code) {
return code;
}
MapPartIdIntoName(part, partName);
- fprintf(STDOUT, "Created clone for volume %lu\n",
+ fprintf(STDOUT, "Created clone for volume %s\n",
as->parms[0].items->data);
return 0;
}
-static
-BackupVolume(as)
- register struct cmd_syndesc *as;
+static int
+BackupVolume(struct cmd_syndesc *as, void *arock)
{
- afs_int32 avolid, aserver, apart, vtype, code, err;
- struct nvldbentry entry;
+ afs_uint32 avolid;
+ afs_uint32 aserver;
+ afs_int32 apart, vtype, code, err;
+ struct uvldbentry entry;
- afs_int32 buvolid, buserver, bupart, butype;
- struct nvldbentry buentry;
+ afs_uint32 buvolid;
+ afs_uint32 buserver;
+ afs_int32 bupart, butype;
+ struct uvldbentry buentry;
avolid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
if (avolid == 0) {
return 0;
}
-static
-ReleaseVolume(as)
- register struct cmd_syndesc *as;
+static int
+ReleaseVolume(struct cmd_syndesc *as, void *arock)
{
- struct nvldbentry entry;
- afs_int32 avolid, aserver, apart, vtype, code, err;
+ struct uvldbentry entry;
+ afs_uint32 avolid;
+ afs_uint32 aserver;
+ afs_int32 apart, vtype, code, err;
int force = 0;
if (as->parms[1].items)
return 0;
}
-static
-DumpVolume(as)
- register struct cmd_syndesc *as;
-
+static int
+DumpVolumeCmd(struct cmd_syndesc *as, void *arock)
{
- afs_int32 avolid, aserver, apart, voltype, fromdate = 0, code, err, i;
- char filename[NameLen];
- struct nvldbentry entry;
+ afs_uint32 avolid;
+ afs_uint32 aserver;
+ afs_int32 apart, voltype, fromdate = 0, code, err, i, flags;
+ char filename[MAXPATHLEN];
+ struct uvldbentry entry;
rx_SetRxDeadTime(60 * 10);
for (i = 0; i < MAXSERVERS; i++) {
strcpy(filename, "");
}
+ flags = as->parms[6].items ? VOLDUMPV2_OMITDIRS : 0;
+retry_dump:
if (as->parms[5].items) {
code =
UV_DumpClonedVolume(avolid, aserver, apart, fromdate,
- DumpFunction, filename);
+ DumpFunction, filename, flags);
} else {
code =
UV_DumpVolume(avolid, aserver, apart, fromdate, DumpFunction,
- filename);
+ filename, flags);
+ }
+ if ((code == RXGEN_OPCODE) && (as->parms[6].items)) {
+ flags &= ~VOLDUMPV2_OMITDIRS;
+ goto retry_dump;
}
if (code) {
PrintDiagnostics("dump", code);
#define TS_KEEP 2
#define TS_NEW 3
-static
-RestoreVolume(as)
- register struct cmd_syndesc *as;
-
+static int
+RestoreVolumeCmd(struct cmd_syndesc *as, void *arock)
{
- afs_int32 avolid, aparentid, aserver, apart, code, vcode, err;
+ afs_uint32 avolid, aparentid;
+ afs_uint32 aserver;
+ afs_int32 apart, code, vcode, err;
afs_int32 aoverwrite = ASK;
afs_int32 acreation = 0, alastupdate = 0;
- int restoreflags, readonly = 0, offline = 0, voltype = RWVOL;
- char prompt;
- char afilename[NameLen], avolname[VOLSER_MAXVOLNAME + 1], apartName[10];
+ int restoreflags = 0;
+ int readonly = 0, offline = 0, voltype = RWVOL;
+ char afilename[MAXPATHLEN], avolname[VOLSER_MAXVOLNAME + 1], apartName[10];
char volname[VOLSER_MAXVOLNAME + 1];
- struct nvldbentry entry;
-
- prompt = 'n';
+ struct uvldbentry entry;
aparentid = 0;
if (as->parms[4].items) {
/* Check if volume exists or not */
vsu_ExtractName(volname, avolname);
- vcode = VLDB_GetEntryByName(volname, &entry);
+ vcode = VLDB_GetEntryByNameU(volname, &entry);
if (vcode) { /* no volume - do a full restore */
restoreflags = RV_FULLRST;
if ((aoverwrite == INC) || (aoverwrite == ABORT))
"Volume does not exist; Will perform a full restore\n");
}
- else if ((!readonly && Lp_GetRwIndex(&entry) == -1) /* RW volume does not exist - do a full */
- ||(readonly && !Lp_ROMatch(0, 0, &entry))) { /* RO volume does not exist - do a full */
+ else if ((!readonly && Lp_GetRwIndexU(&entry) == -1) /* RW volume does not exist - do a full */
+ ||(readonly && !Lp_ROMatchU(0, 0, &entry))) { /* RO volume does not exist - do a full */
restoreflags = RV_FULLRST;
if ((aoverwrite == INC) || (aoverwrite == ABORT))
fprintf(STDERR,
}
else { /* volume exists - do we do a full incremental or abort */
- int Oserver, Opart, Otype, vol_elsewhere = 0;
- struct nvldbentry Oentry;
+ afs_uint32 Oserver;
+ afs_int32 Opart, Otype, vol_elsewhere = 0;
+ struct uvldbentry Oentry;
int c, dc;
if (avolid == 0) {
default:
restoreflags |= RV_LUDUMP;
}
+ if (as->parms[10].items) {
+ restoreflags |= RV_NODEL;
+ }
+
code =
UV_RestoreVolume2(aserver, apart, avolid, aparentid,
return 0;
}
-static
-LockReleaseCmd(as)
- register struct cmd_syndesc *as;
-
+static int
+LockReleaseCmd(struct cmd_syndesc *as, void *arock)
{
- afs_int32 avolid, code, err;
+ afs_uint32 avolid;
+ afs_int32 code, err;
avolid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
if (avolid == 0) {
return 0;
}
-static
-AddSite(as)
- register struct cmd_syndesc *as;
+static int
+AddSite(struct cmd_syndesc *as, void *arock)
{
- afs_int32 avolid, aserver, apart, code, err;
+ afs_uint32 avolid;
+ afs_uint32 aserver;
+ afs_int32 apart, code, err, arovolid, valid = 0;
char apartName[10], avolname[VOLSER_MAXVOLNAME + 1];
vsu_ExtractName(avolname, as->parms[2].items->data);;
as->parms[2].items->data);
exit(1);
}
+ arovolid = 0;
+ if (as->parms[3].items) {
+ vsu_ExtractName(avolname, as->parms[3].items->data);
+ arovolid = vsu_GetVolumeID(avolname, cstruct, &err);
+ if (!arovolid) {
+ fprintf(STDERR, "vos: invalid ro volume id '%s'\n",
+ as->parms[3].items->data);
+ exit(1);
+ }
+ }
aserver = GetServer(as->parms[0].items->data);
if (aserver == 0) {
fprintf(STDERR, "vos: server '%s' not found in host table\n",
as->parms[1].items->data);
exit(1);
}
- code = UV_AddSite(aserver, apart, avolid);
+ if (as->parms[4].items) {
+ valid = 1;
+ }
+ code = UV_AddSite2(aserver, apart, avolid, arovolid, valid);
if (code) {
PrintDiagnostics("addsite", code);
exit(1);
return 0;
}
-static
-RemoveSite(as)
- register struct cmd_syndesc *as;
+static int
+RemoveSite(struct cmd_syndesc *as, void *arock)
{
- afs_int32 avolid, aserver, apart, code, err;
+ afs_uint32 avolid;
+ afs_uint32 aserver;
+ afs_int32 apart, code, err;
char apartName[10], avolname[VOLSER_MAXVOLNAME + 1];
vsu_ExtractName(avolname, as->parms[2].items->data);
return 0;
}
-static
-ChangeLocation(as)
- register struct cmd_syndesc *as;
+static int
+ChangeLocation(struct cmd_syndesc *as, void *arock)
{
- afs_int32 avolid, aserver, apart, code, err;
+ afs_uint32 avolid;
+ afs_uint32 aserver;
+ afs_int32 apart, code, err;
char apartName[10];
avolid = vsu_GetVolumeID(as->parms[2].items->data, cstruct, &err);
return 0;
}
-static
-ListPartitions(as)
- register struct cmd_syndesc *as;
+static int
+ListPartitions(struct cmd_syndesc *as, void *arock)
{
- afs_int32 aserver, code;
+ afs_uint32 aserver;
+ afs_int32 code;
struct partList dummyPartList;
int i;
char pname[10];
}
static int
-CompareVolName(p1, p2)
- char *p1, *p2;
+CompareVolName(const void *p1, const void *p2)
{
volintInfo *arg1, *arg2;
*------------------------------------------------------------------------*/
static int
-XCompareVolName(a_obj1P, a_obj2P)
- char *a_obj1P, *a_obj2P;
-
+XCompareVolName(const void *a_obj1P, const void *a_obj2P)
{ /*XCompareVolName */
return (strcmp
} /*XCompareVolName */
static int
-CompareVolID(p1, p2)
- char *p1, *p2;
+CompareVolID(const void *p1, const void *p2)
{
volintInfo *arg1, *arg2;
*------------------------------------------------------------------------*/
static int
-XCompareVolID(a_obj1P, a_obj2P)
- char *a_obj1P, *a_obj2P;
-
+XCompareVolID(const void *a_obj1P, const void *a_obj2P)
{ /*XCompareVolID */
afs_int32 id1, id2; /*Volume IDs we're comparing */
* As advertised.
*------------------------------------------------------------------------*/
-static
-ListVolumes(as)
- register struct cmd_syndesc *as;
+static int
+ListVolumes(struct cmd_syndesc *as, void *arock)
{
afs_int32 apart, int32list, fast;
- afs_int32 aserver, code;
- volintInfo *pntr, *oldpntr;
+ afs_uint32 aserver;
+ afs_int32 code;
+ volintInfo *pntr;
+ volintInfo *oldpntr = NULL;
afs_int32 count;
int i;
char *base;
- volintXInfo *xInfoP, *origxInfoP; /*Ptr to current/orig extended vol info */
+ volintXInfo *xInfoP;
+ volintXInfo *origxInfoP = NULL; /*Ptr to current/orig extended vol info */
int wantExtendedInfo; /*Do we want extended vol info? */
char pname[10];
as->parms[0].items->data, pname,
(unsigned long)count);
if (wantExtendedInfo) {
-#ifdef FULL_LISTVOL_SWITCH
if (as->parms[6].items)
XDisplayVolumes2(aserver, dummyPartList.partId[i], origxInfoP,
count, int32list, fast, quiet);
else
-#endif /* FULL_LISTVOL_SWITCH */
- XDisplayVolumes(aserver, dummyPartList.partId[i], origxInfoP,
+ XDisplayVolumes(aserver, dummyPartList.partId[i], origxInfoP,
count, int32list, fast, quiet);
if (xInfoP)
free(xInfoP);
xInfoP = (volintXInfo *) 0;
} else {
-#ifdef FULL_LISTVOL_SWITCH
if (as->parms[6].items)
DisplayVolumes2(aserver, dummyPartList.partId[i], oldpntr,
count);
else
-#endif /* FULL_LISTVOL_SWITCH */
DisplayVolumes(aserver, dummyPartList.partId[i], oldpntr,
count, int32list, fast, quiet);
if (pntr)
return 0;
}
-static
-SyncVldb(as)
- register struct cmd_syndesc *as;
+static int
+SyncVldb(struct cmd_syndesc *as, void *arock)
{
afs_int32 pnum = 0, code; /* part name */
char part[10];
}
}
+ if (as->parms[3].items) {
+ flags |= 2; /* don't update */
+ }
+
if (as->parms[2].items) {
/* Synchronize an individual volume */
volname = as->parms[2].items->data;
if (tserver) {
fprintf(STDOUT, " with state of server %s", as->parms[0].items->data);
}
- if (flags) {
+ if (flags & 1) {
MapPartIdIntoName(pnum, part);
fprintf(STDOUT, " partition %s\n", part);
}
return 0;
}
-static
-SyncServer(as)
- register struct cmd_syndesc *as;
-
+static int
+SyncServer(struct cmd_syndesc *as, void *arock)
{
afs_int32 pnum, code; /* part name */
char part[10];
pnum = -1;
}
+ if (as->parms[2].items) {
+ flags |= 2; /* don't update */
+ }
code = UV_SyncServer(tserver, pnum, flags, 0 /*unused */ );
if (code) {
PrintDiagnostics("syncserv", code);
exit(1);
}
- if (flags) {
+ if (flags & 1) {
MapPartIdIntoName(pnum, part);
fprintf(STDOUT, "Server %s partition %s synchronized with VLDB\n",
as->parms[0].items->data, part);
}
-static
-VolumeInfoCmd(name)
- char *name;
+static int
+VolumeInfoCmd(char *name)
{
- struct nvldbentry entry;
+ struct uvldbentry entry;
afs_int32 vcode;
/* The vlserver will handle names with the .readonly
* and .backup extension as well as volume ids.
*/
- vcode = VLDB_GetEntryByName(name, &entry);
+ vcode = VLDB_GetEntryByNameU(name, &entry);
if (vcode) {
PrintError("", vcode);
exit(1);
}
- MapHostToNetwork(&entry);
- EnumerateEntry(&entry);
+ MapHostToNetworkU(&entry);
+ EnumerateEntryU(&entry);
/* Defect #3027: grubby check to handle locked volume.
* If VLOP_ALLOPERS is set, the entry is locked.
* Leave this routine as is, but put in correct check.
*/
- if (entry.flags & VLOP_ALLOPERS)
- fprintf(STDOUT, " Volume is currently LOCKED \n");
+ PrintLocked(entry.flags);
return 0;
}
-static
-VolumeZap(as)
- register struct cmd_syndesc *as;
-
+static int
+VolumeZap(struct cmd_syndesc *as, void *arock)
{
- struct nvldbentry entry;
- afs_int32 volid, code, server, part, zapbackupid = 0, backupid = 0, err;
+ struct uvldbentry entry;
+ afs_uint32 volid, zapbackupid = 0, backupid = 0;
+ afs_int32 code, server, part, err;
if (as->parms[3].items) {
/* force flag is on, use the other version */
as->parms[1].items->data);
exit(1);
}
- code = VLDB_GetEntryByID(volid, -1, &entry);
+ code = VLDB_GetEntryByIDU(volid, -1, &entry);
if (!code) {
if (volid == entry.volumeId[RWVOL])
backupid = entry.volumeId[BACKVOL];
return 0;
}
-static
-VolserStatus(as)
- register struct cmd_syndesc *as;
-
+static int
+VolserStatus(struct cmd_syndesc *as, void *arock)
{
- afs_int32 server, code;
+ afs_uint32 server;
+ afs_int32 code;
transDebugInfo *pntr, *oldpntr;
afs_int32 count;
int i;
char pname[10];
+ time_t t;
server = GetServer(as->parms[0].items->data);
if (!server) {
for (i = 0; i < count; i++) {
/*print out the relevant info */
fprintf(STDOUT, "--------------------------------------\n");
+ t = pntr->creationTime;
fprintf(STDOUT, "transaction: %lu created: %s",
- (unsigned long)pntr->tid, vos_ctime( & pntr->time));
+ (unsigned long)pntr->tid, ctime(&t));
+ t = pntr->time;
+ fprintf(STDOUT, "lastActiveTime: %s", ctime(&t));
if (pntr->returnCode) {
fprintf(STDOUT, "returnCode: %lu\n",
(unsigned long)pntr->returnCode);
fprintf(STDOUT, "volume: %lu partition: %s procedure: %s\n",
(unsigned long)pntr->volid, pname, pntr->lastProcName);
if (pntr->callValid) {
- fprintf(STDOUT,
- "packetRead: %lu lastReceiveTime: %d packetSend: %lu lastSendTime: %d\n",
- (unsigned long)pntr->readNext, pntr->lastReceiveTime,
- (unsigned long)pntr->transmitNext, pntr->lastSendTime);
+ t = pntr->lastReceiveTime;
+ fprintf(STDOUT, "packetRead: %lu lastReceiveTime: %s",
+ (unsigned long)pntr->readNext, ctime(&t));
+ t = pntr->lastSendTime;
+ fprintf(STDOUT, "packetSend: %lu lastSendTime: %s",
+ (unsigned long)pntr->transmitNext, ctime(&t));
}
pntr++;
fprintf(STDOUT, "--------------------------------------\n");
return 0;
}
-static
-RenameVolume(as)
- register struct cmd_syndesc *as;
+static int
+RenameVolume(struct cmd_syndesc *as, void *arock)
{
afs_int32 code1, code2, code;
- struct nvldbentry entry;
+ struct uvldbentry entry;
- code1 = VLDB_GetEntryByName(as->parms[0].items->data, &entry);
+ code1 = VLDB_GetEntryByNameU(as->parms[0].items->data, &entry);
if (code1) {
fprintf(STDERR, "vos: Could not find entry for volume %s\n",
as->parms[0].items->data);
exit(1);
}
- code2 = VLDB_GetEntryByName(as->parms[1].items->data, &entry);
+ code2 = VLDB_GetEntryByNameU(as->parms[1].items->data, &entry);
if ((!code1) && (!code2)) { /*the newname already exists */
fprintf(STDERR, "vos: volume %s already exists\n",
as->parms[1].items->data);
as->parms[1].items->data);
exit(1);
}
- MapHostToNetwork(&entry);
+ MapHostToNetworkU(&entry);
code =
- UV_RenameVolume(&entry, as->parms[0].items->data,
- as->parms[1].items->data);
+ UV_RenameVolumeU(&entry, as->parms[0].items->data,
+ as->parms[1].items->data);
if (code) {
PrintDiagnostics("rename", code);
exit(1);
return 0;
}
-GetVolumeInfo(volid, server, part, voltype, rentry)
- afs_int32 *server, volid, *part, *voltype;
- register struct nvldbentry *rentry;
+int
+GetVolumeInfo(afs_uint32 volid, afs_uint32 *server, afs_int32 *part, afs_int32 *voltype,
+ struct uvldbentry *rentry)
{
afs_int32 vcode;
int i, index = -1;
- vcode = VLDB_GetEntryByID(volid, -1, rentry);
+ vcode = VLDB_GetEntryByIDU(volid, -1, rentry);
if (vcode) {
fprintf(STDERR,
"Could not fetch the entry for volume %lu from VLDB \n",
PrintError("", vcode);
return (vcode);
}
- MapHostToNetwork(rentry);
+ MapHostToNetworkU(rentry);
if (volid == rentry->volumeId[ROVOL]) {
*voltype = ROVOL;
for (i = 0; i < rentry->nServers; i++) {
return -1;
}
- *server = rentry->serverNumber[index];
+ *server = rentry->serverUnique[index];
*part = rentry->serverPartition[index];
return 0;
}
- index = Lp_GetRwIndex(rentry);
+ index = Lp_GetRwIndexU(rentry);
if (index == -1) {
fprintf(STDERR,
"RW Volume is not found in VLDB entry for volume %lu\n",
}
if (volid == rentry->volumeId[RWVOL]) {
*voltype = RWVOL;
- *server = rentry->serverNumber[index];
+ *server = rentry->serverUnique[index];
*part = rentry->serverPartition[index];
return 0;
}
if (volid == rentry->volumeId[BACKVOL]) {
*voltype = BACKVOL;
- *server = rentry->serverNumber[index];
+ *server = rentry->serverUnique[index];
*part = rentry->serverPartition[index];
return 0;
}
return -1;
}
-static
-DeleteEntry(as)
- register struct cmd_syndesc *as;
-
+static int
+DeleteEntry(struct cmd_syndesc *as, void *arock)
{
- afs_int32 apart;
- afs_int32 avolid;
+ afs_int32 apart = 0;
+ afs_uint32 avolid;
afs_int32 vcode;
struct VldbListByAttributes attributes;
- nbulkentries arrayEntries;
- register struct nvldbentry *vllist;
+ ubulkentries arrayEntries;
+ struct uvldbentry *vllist;
struct cmd_item *itp;
afs_int32 nentries;
int j;
fflush(STDOUT);
continue;
}
- vcode = ubik_Call(VL_DeleteEntry, cstruct, 0, avolid, RWVOL);
+ vcode = ubik_VL_DeleteEntry(cstruct, 0, avolid, RWVOL);
if (vcode) {
fprintf(STDERR, "Could not delete entry for volume %s\n",
itp->data);
}
if (as->parms[2].items) { /* -server */
- afs_int32 aserver;
+ afs_uint32 aserver;
aserver = GetServer(as->parms[2].items->data);
if (aserver == 0) {
fprintf(STDERR, "vos: server '%s' not found in host table\n",
/* Get all the VLDB entries on a server and/or partition */
memset(&arrayEntries, 0, sizeof(arrayEntries));
- vcode = VLDB_ListAttributes(&attributes, &nentries, &arrayEntries);
+ vcode = VLDB_ListAttributesU(&attributes, &nentries, &arrayEntries);
if (vcode) {
fprintf(STDERR, "Could not access the VLDB for attributes\n");
PrintError("", vcode);
/* Process each entry */
for (j = 0; j < nentries; j++) {
- vllist = &arrayEntries.nbulkentries_val[j];
+ vllist = &arrayEntries.ubulkentries_val[j];
if (seenprefix) {
/* It only deletes the RW volumes */
if (strncmp(vllist->name, prefix, strlen(prefix))) {
/* Only matches the RW volume name */
avolid = vllist->volumeId[RWVOL];
- vcode = ubik_Call(VL_DeleteEntry, cstruct, 0, avolid, RWVOL);
+ vcode = ubik_VL_DeleteEntry(cstruct, 0, avolid, RWVOL);
if (vcode) {
fprintf(STDOUT, "Could not delete VDLB entry for %s\n",
vllist->name);
fprintf(STDOUT,
"Total VLDB entries deleted: %lu; failed to delete: %lu\n",
(unsigned long)totalBack, (unsigned long)totalFail);
- if (arrayEntries.nbulkentries_val)
- free(arrayEntries.nbulkentries_val);
+
+ xdr_free((xdrproc_t) xdr_ubulkentries, &arrayEntries);
return 0;
}
static int
-CompareVldbEntryByName(p1, p2)
- char *p1, *p2;
+CompareVldbEntryByName(const void *p1, const void *p2)
{
- struct nvldbentry *arg1, *arg2;
+ struct uvldbentry *arg1, *arg2;
- arg1 = (struct nvldbentry *)p1;
- arg2 = (struct nvldbentry *)p2;
+ arg1 = (struct uvldbentry *)p1;
+ arg2 = (struct uvldbentry *)p2;
return (strcmp(arg1->name, arg2->name));
}
/*
-static int CompareVldbEntry(p1,p2)
-char *p1,*p2;
+static int CompareVldbEntry(char *p1, char *p2)
{
- struct nvldbentry *arg1,*arg2;
+ struct uvldbentry *arg1,*arg2;
int i;
int pos1, pos2;
char comp1[100],comp2[100];
char temp1[20],temp2[20];
- arg1 = (struct nvldbentry *)p1;
- arg2 = (struct nvldbentry *)p2;
+ arg1 = (struct uvldbentry *)p1;
+ arg2 = (struct uvldbentry *)p2;
pos1 = -1;
pos2 = -1;
pos1 = 0;
pos2 = 0;
}
- sprintf(comp1,"%10u",arg1->serverNumber[pos1]);
- sprintf(comp2,"%10u",arg2->serverNumber[pos2]);
+ sprintf(comp1,"%10u",arg1->serverUnique[pos1]);
+ sprintf(comp2,"%10u",arg2->serverUnique[pos2]);
sprintf(temp1,"%10u",arg1->serverPartition[pos1]);
sprintf(temp2,"%10u",arg2->serverPartition[pos2]);
strcat(comp1,temp1);
}
*/
-static
-ListVLDB(as)
- struct cmd_syndesc *as;
+static int
+ListVLDB(struct cmd_syndesc *as, void *arock)
{
afs_int32 apart;
- afs_int32 aserver, code;
+ afs_uint32 aserver;
+ afs_int32 code;
afs_int32 vcode;
struct VldbListByAttributes attributes;
- nbulkentries arrayEntries;
- struct nvldbentry *vllist, *tarray = 0, *ttarray;
- afs_int32 centries, nentries = 0, tarraysize, parraysize;
+ ubulkentries arrayEntries;
+ struct uvldbentry *vllist, *tarray = 0, *ttarray;
+ afs_int32 centries, nentries = 0;
+ afs_int32 tarraysize = 0;
+ afs_int32 parraysize;
int j;
char pname[10];
int quiet, sort, lock;
nextindex = -1;
vcode =
- VLDB_ListAttributesN2(&attributes, 0, thisindex, ¢ries,
+ VLDB_ListAttributesN2U(&attributes, 0, thisindex, ¢ries,
&arrayEntries, &nextindex);
if (vcode == RXGEN_OPCODE) {
/* Vlserver not running with ListAttributesN2. Fall back */
vcode =
- VLDB_ListAttributes(&attributes, ¢ries, &arrayEntries);
+ VLDB_ListAttributesU(&attributes, ¢ries, &arrayEntries);
nextindex = -1;
}
if (vcode) {
/* We don't sort, so just print the entries now */
if (!sort) {
for (j = 0; j < centries; j++) { /* process each entry */
- vllist = &arrayEntries.nbulkentries_val[j];
- MapHostToNetwork(vllist);
- EnumerateEntry(vllist);
+ vllist = &arrayEntries.ubulkentries_val[j];
+ MapHostToNetworkU(vllist);
+ EnumerateEntryU(vllist);
- if (vllist->flags & VLOP_ALLOPERS)
- fprintf(STDOUT, " Volume is currently LOCKED \n");
+ PrintLocked(vllist->flags);
}
}
else if (centries > 0) {
if (!tarray) {
/* steal away the first bulk entries array */
- tarray = (struct nvldbentry *)arrayEntries.nbulkentries_val;
- tarraysize = centries * sizeof(struct nvldbentry);
- arrayEntries.nbulkentries_val = 0;
+ tarray = (struct uvldbentry *)arrayEntries.ubulkentries_val;
+ tarraysize = centries * sizeof(struct uvldbentry);
+ arrayEntries.ubulkentries_val = 0;
} else {
/* Grow the tarray to keep the extra entries */
- parraysize = (centries * sizeof(struct nvldbentry));
+ parraysize = (centries * sizeof(struct uvldbentry));
ttarray =
- (struct nvldbentry *)realloc(tarray,
+ (struct uvldbentry *)realloc(tarray,
tarraysize + parraysize);
if (!ttarray) {
fprintf(STDERR,
/* Copy them in */
memcpy(((char *)tarray) + tarraysize,
- (char *)arrayEntries.nbulkentries_val, parraysize);
+ (char *)arrayEntries.ubulkentries_val, parraysize);
tarraysize += parraysize;
}
}
/* Free the bulk array */
- if (arrayEntries.nbulkentries_val) {
- free(arrayEntries.nbulkentries_val);
- arrayEntries.nbulkentries_val = 0;
- }
+ xdr_free((xdrproc_t) xdr_ubulkentries, &arrayEntries);
}
/* Here is where we now sort all the entries and print them */
if (sort && (nentries > 0)) {
- qsort((char *)tarray, nentries, sizeof(struct nvldbentry),
+ qsort((char *)tarray, nentries, sizeof(struct uvldbentry),
CompareVldbEntryByName);
for (vllist = tarray, j = 0; j < nentries; j++, vllist++) {
- MapHostToNetwork(vllist);
- EnumerateEntry(vllist);
+ MapHostToNetworkU(vllist);
+ EnumerateEntryU(vllist);
- if (vllist->flags & VLOP_ALLOPERS)
- fprintf(STDOUT, " Volume is currently LOCKED \n");
+ PrintLocked(vllist->flags);
}
}
return 0;
}
-static
-BackSys(as)
- register struct cmd_syndesc *as;
+static int
+BackSys(struct cmd_syndesc *as, void *arock)
{
- afs_int32 apart = 0, avolid;
- afs_int32 aserver = 0, code, aserver1, apart1;
+ afs_uint32 avolid;
+ afs_int32 apart = 0;
+ afs_uint32 aserver = 0, aserver1;
+ afs_int32 code, apart1;
afs_int32 vcode;
struct VldbListByAttributes attributes;
- nbulkentries arrayEntries;
- register struct nvldbentry *vllist;
+ ubulkentries arrayEntries;
+ struct uvldbentry *vllist;
afs_int32 nentries;
int j;
char pname[10];
int seenprefix, seenxprefix, exclude, ex, exp, noaction;
afs_int32 totalBack = 0;
afs_int32 totalFail = 0;
- int previdx = -1, error, same;
- int comp = 0;
+ int previdx = -1;
+ int error;
+ int same = 0;
struct cmd_item *ti;
+ int match = 0;
+#ifndef HAVE_POSIX_REGEX
char *ccode;
- int match;
+#endif
memset(&attributes, 0, sizeof(struct VldbListByAttributes));
attributes.Mask = 0;
}
memset(&arrayEntries, 0, sizeof(arrayEntries)); /* initialize to hint the stub to alloc space */
- vcode = VLDB_ListAttributes(&attributes, &nentries, &arrayEntries);
+ vcode = VLDB_ListAttributesU(&attributes, &nentries, &arrayEntries);
if (vcode) {
fprintf(STDERR, "Could not access the VLDB for attributes\n");
PrintError("", vcode);
}
for (j = 0; j < nentries; j++) { /* process each vldb entry */
- vllist = &arrayEntries.nbulkentries_val[j];
+ vllist = &arrayEntries.ubulkentries_val[j];
if (seenprefix) {
for (ti = as->parms[0].items; ti; ti = ti->next) {
}
avolid = vllist->volumeId[RWVOL];
- MapHostToNetwork(vllist);
+ MapHostToNetworkU(vllist);
GetServerAndPart(vllist, RWVOL, &aserver1, &apart1, &previdx);
if (aserver1 == -1 || apart1 == -1) {
fprintf(STDOUT, "could not backup %s, invalid VLDB entry\n",
fprintf(STDOUT, "Total volumes backed up: %lu; failed to backup: %lu\n",
(unsigned long)totalBack, (unsigned long)totalFail);
fflush(STDOUT);
- if (arrayEntries.nbulkentries_val)
- free(arrayEntries.nbulkentries_val);
+ xdr_free((xdrproc_t) xdr_ubulkentries, &arrayEntries);
return 0;
}
-static
-UnlockVLDB(as)
- register struct cmd_syndesc *as;
+static int
+UnlockVLDB(struct cmd_syndesc *as, void *arock)
{
afs_int32 apart;
- afs_int32 aserver, code;
+ afs_uint32 aserver = 0;
+ afs_int32 code;
afs_int32 vcode;
struct VldbListByAttributes attributes;
- nbulkentries arrayEntries;
- register struct nvldbentry *vllist;
+ ubulkentries arrayEntries;
+ struct uvldbentry *vllist;
afs_int32 nentries;
int j;
- afs_int32 volid;
+ afs_uint32 volid;
afs_int32 totalE;
char pname[10];
attributes.flag = VLOP_ALLOPERS;
attributes.Mask |= VLLIST_FLAG;
memset(&arrayEntries, 0, sizeof(arrayEntries)); /*initialize to hint the stub to alloc space */
- vcode = VLDB_ListAttributes(&attributes, &nentries, &arrayEntries);
+ vcode = VLDB_ListAttributesU(&attributes, &nentries, &arrayEntries);
if (vcode) {
fprintf(STDERR, "Could not access the VLDB for attributes\n");
PrintError("", vcode);
exit(1);
}
for (j = 0; j < nentries; j++) { /* process each entry */
- vllist = &arrayEntries.nbulkentries_val[j];
+ vllist = &arrayEntries.ubulkentries_val[j];
volid = vllist->volumeId[RWVOL];
vcode =
- ubik_Call(VL_ReleaseLock, cstruct, 0, volid, -1,
- LOCKREL_OPCODE | LOCKREL_AFSID | LOCKREL_TIMESTAMP);
+ ubik_VL_ReleaseLock(cstruct, 0, volid, -1,
+ LOCKREL_OPCODE | LOCKREL_AFSID |
+ LOCKREL_TIMESTAMP);
if (vcode) {
fprintf(STDERR, "Could not unlock entry for volume %s\n",
vllist->name);
}
}
- if (arrayEntries.nbulkentries_val)
- free(arrayEntries.nbulkentries_val);
+ xdr_free((xdrproc_t) xdr_ubulkentries, &arrayEntries);
return 0;
}
static char *
PrintInt64Size(afs_uint64 in)
{
- register afs_uint32 hi, lo;
- register char * units;
+ afs_uint32 hi, lo;
+ char * units;
static char output[16];
SplitInt64(in,hi,lo);
return output;
}
-static
-PartitionInfo(as)
- register struct cmd_syndesc *as;
+static int
+PartitionInfo(struct cmd_syndesc *as, void *arock)
{
afs_int32 apart;
- afs_int32 aserver, code;
+ afs_uint32 aserver;
+ afs_int32 code;
char pname[10];
- struct diskPartition partition;
+ struct diskPartition64 partition;
struct partList dummyPartList;
int i, cnt;
int printSummary=0, sumPartitions=0;
- afs_uint64 sumFree, sumStorage, tmp;
+ afs_uint64 sumFree, sumStorage;
ZeroInt64(sumFree);
ZeroInt64(sumStorage);
for (i = 0; i < cnt; i++) {
if (dummyPartList.partFlags[i] & PARTVALID) {
MapPartIdIntoName(dummyPartList.partId[i], pname);
- code = UV_PartitionInfo(aserver, pname, &partition);
+ code = UV_PartitionInfo64(aserver, pname, &partition);
if (code) {
fprintf(STDERR, "Could not get information on partition %s\n",
pname);
exit(1);
}
fprintf(STDOUT,
- "Free space on partition %s: %d K blocks out of total %d\n",
+ "Free space on partition %s: %" AFS_INT64_FMT " K blocks out of total %" AFS_INT64_FMT "\n",
pname, partition.free, partition.minFree);
sumPartitions++;
- FillInt64(tmp,0,partition.free);
- AddUInt64(sumFree,tmp,&sumFree);
- FillInt64(tmp,0,partition.minFree);
- AddUInt64(sumStorage,tmp,&sumStorage);
+ AddUInt64(sumFree,partition.free,&sumFree);
+ AddUInt64(sumStorage,partition.minFree,&sumStorage);
}
}
if (printSummary) {
PrintInt64Size(sumFree));
fprintf(STDOUT,
"%s on %d partitions\n",
- PrintInt64Size(sumStorage),
+ PrintInt64Size(sumStorage),
sumPartitions);
}
return 0;
}
-static
-ChangeAddr(as)
- register struct cmd_syndesc *as;
-
+static int
+ChangeAddr(struct cmd_syndesc *as, void *arock)
{
afs_int32 ip1, ip2, vcode;
int remove = 0;
- ip1 = GetServer(as->parms[0].items->data);
+ if (noresolve)
+ ip1 = GetServerNoresolve(as->parms[0].items->data);
+ else
+ ip1 = GetServer(as->parms[0].items->data);
if (!ip1) {
fprintf(STDERR, "vos: invalid host address\n");
return (EINVAL);
}
if (as->parms[1].items) {
- ip2 = GetServer(as->parms[1].items->data);
+ if (noresolve)
+ ip2 = GetServerNoresolve(as->parms[1].items->data);
+ else
+ ip2 = GetServer(as->parms[1].items->data);
if (!ip2) {
fprintf(STDERR, "vos: invalid host address\n");
return (EINVAL);
}
} else {
/* Play a trick here. If we are removing an address, ip1 will be -1
- * and ip2 will be the original address. This switch prevents an
+ * and ip2 will be the original address. This switch prevents an
* older revision vlserver from removing the IP address.
*/
remove = 1;
ip1 = 0xffffffff;
}
- vcode = ubik_Call_New(VL_ChangeAddr, cstruct, 0, ntohl(ip1), ntohl(ip2));
+ vcode = ubik_VL_ChangeAddr(cstruct, UBIK_CALL_NEW, ntohl(ip1), ntohl(ip2));
if (vcode) {
+ char hoststr1[16], hoststr2[16];
if (remove) {
+ afs_inet_ntoa_r(ip2, hoststr2);
fprintf(STDERR, "Could not remove server %s from the VLDB\n",
- as->parms[0].items->data);
+ hoststr2);
if (vcode == VL_NOENT) {
fprintf(STDERR,
"vlserver does not support the remove flag or ");
}
} else {
+ afs_inet_ntoa_r(ip1, hoststr1);
+ afs_inet_ntoa_r(ip2, hoststr2);
fprintf(STDERR, "Could not change server %s to server %s\n",
- as->parms[0].items->data, as->parms[1].items->data);
+ hoststr1, hoststr2);
}
PrintError("", vcode);
return (vcode);
}
static void
-print_addrs(const bulkaddrs * addrs, const afsUUID * m_uuid, int nentries,
- int print, int noresolve)
+print_addrs(const bulkaddrs * addrs, afsUUID * m_uuid, int nentries,
+ int print)
{
- afs_int32 vcode;
+ afs_int32 vcode, m_uniq=0;
afs_int32 i, j;
- struct VLCallBack vlcb;
- afs_int32 *addrp;
+ afs_uint32 *addrp;
bulkaddrs m_addrs;
ListAddrByAttributes m_attrs;
- afs_int32 m_nentries, *m_addrp;
+ afs_int32 m_nentries;
+ afs_uint32 *m_addrp;
afs_int32 base, index;
char buf[1024];
}
/* print out the list of all the server */
- addrp = (afs_int32 *) addrs->bulkaddrs_val;
+ addrp = (afs_uint32 *) addrs->bulkaddrs_val;
for (i = 0; i < nentries; i++, addrp++) {
- /* If it is a multihomed address, then we will need to
+ /* If it is a multihomed address, then we will need to
* get the addresses for this multihomed server from
* the vlserver and print them.
*/
m_addrs.bulkaddrs_val = 0;
m_addrs.bulkaddrs_len = 0;
vcode =
- ubik_Call(VL_GetAddrsU, cstruct, 0, &m_attrs, &m_uuid,
- &vlcb, &m_nentries, &m_addrs);
+ ubik_VL_GetAddrsU(cstruct, 0, &m_attrs, m_uuid,
+ &m_uniq, &m_nentries,
+ &m_addrs);
if (vcode) {
fprintf(STDERR,
"vos: could not list the multi-homed server addresses\n");
}
/* Print the list */
- m_addrp = (afs_int32 *) m_addrs.bulkaddrs_val;
+ m_addrp = (afs_uint32 *) m_addrs.bulkaddrs_val;
for (j = 0; j < m_nentries; j++, m_addrp++) {
*m_addrp = htonl(*m_addrp);
if (noresolve) {
return;
}
-static
-ListAddrs(as)
- register struct cmd_syndesc *as;
+static int
+ListAddrs(struct cmd_syndesc *as, void *arock)
{
- afs_int32 vcode;
- afs_int32 i, noresolve = 0, printuuid = 0;
+ afs_int32 vcode, m_uniq=0;
+ afs_int32 i, printuuid = 0;
struct VLCallBack vlcb;
afs_int32 nentries;
bulkaddrs m_addrs;
if (as->parms[0].items) {
/* -uuid */
if (afsUUID_from_string(as->parms[0].items->data, &askuuid) < 0) {
- fprintf(STDERR, "vos: invalid UUID '%s'\n",
+ fprintf(STDERR, "vos: invalid UUID '%s'\n",
as->parms[0].items->data);
exit(-1);
}
if (as->parms[1].items) {
/* -host */
struct hostent *he;
- afs_int32 saddr;
+ afs_uint32 saddr;
he = hostutil_GetHostByName((char *)as->parms[1].items->data);
if (he == NULL) {
fprintf(STDERR, "vos: Can't get host info for '%s'\n",
m_attrs.ipaddr = ntohl(saddr);
}
if (as->parms[2].items) {
- noresolve = 1;
- }
- if (as->parms[3].items) {
printuuid = 1;
}
m_addrs.bulkaddrs_len = 0;
vcode =
- ubik_Call_New(VL_GetAddrs, cstruct, 0, 0, 0, &vlcb, &nentries,
- &m_addrs);
+ ubik_VL_GetAddrs(cstruct, UBIK_CALL_NEW, 0, 0, &vlcb, &nentries,
+ &m_addrs);
if (vcode) {
fprintf(STDERR, "vos: could not list the server addresses\n");
PrintError("", vcode);
m_attrs.index = i;
vcode =
- ubik_Call_New(VL_GetAddrsU, cstruct, 0, &m_attrs, &m_uuid,
- &vlcb, &m_nentries, &m_addrs);
+ ubik_VL_GetAddrsU(cstruct, UBIK_CALL_NEW, &m_attrs, &m_uuid,
+ &m_uniq, &m_nentries, &m_addrs);
if (vcode == VL_NOENT) {
if (m_attrs.Mask == VLADDR_UUID) {
return (vcode);
}
- print_addrs(&m_addrs, &m_uuid, m_nentries, printuuid, noresolve);
+ print_addrs(&m_addrs, &m_uuid, m_nentries, printuuid);
i++;
if ((as->parms[1].items) || (as->parms[0].items) || (i > nentries))
return 0;
}
-static
-LockEntry(as)
- register struct cmd_syndesc *as;
+static int
+SetAddrs(struct cmd_syndesc *as, void *arock)
+{
+ afs_int32 vcode;
+ bulkaddrs m_addrs;
+ afsUUID askuuid;
+ afs_uint32 FS_HostAddrs_HBO[ADDRSPERSITE];
+
+ memset(&m_addrs, 0, sizeof(bulkaddrs));
+ memset(&askuuid, 0, sizeof(afsUUID));
+ if (as->parms[0].items) {
+ /* -uuid */
+ if (afsUUID_from_string(as->parms[0].items->data, &askuuid) < 0) {
+ fprintf(STDERR, "vos: invalid UUID '%s'\n",
+ as->parms[0].items->data);
+ exit(-1);
+ }
+ }
+ if (as->parms[1].items) {
+ /* -host */
+ struct cmd_item *ti;
+ afs_uint32 saddr;
+ int i = 0;
+
+ for (ti = as->parms[1].items; ti && i < ADDRSPERSITE; ti = ti->next) {
+
+ if (noresolve)
+ saddr = GetServerNoresolve(ti->data);
+ else
+ saddr = GetServer(ti->data);
+
+ if (!saddr) {
+ fprintf(STDERR, "vos: Can't get host info for '%s'\n",
+ ti->data);
+ exit(-1);
+ }
+ /* Convert it to host byte order */
+ FS_HostAddrs_HBO[i] = ntohl(saddr);
+ i++;
+ }
+ m_addrs.bulkaddrs_len = i;
+ m_addrs.bulkaddrs_val = FS_HostAddrs_HBO;
+ }
+
+ vcode = ubik_VL_RegisterAddrs(cstruct, 0, &askuuid, 0, &m_addrs);
+
+ if (vcode) {
+ if (vcode == VL_MULTIPADDR) {
+ fprintf(STDERR, "vos: VL_RegisterAddrs rpc failed; The IP address exists on a different server; repair it\n");
+ PrintError("", vcode);
+ return vcode;
+ } else if (vcode == RXGEN_OPCODE) {
+ fprintf(STDERR, "vlserver doesn't support VL_RegisterAddrs rpc; ignored\n");
+ PrintError("", vcode);
+ return vcode;
+ }
+ }
+ if (verbose) {
+ fprintf(STDOUT, "vos: Changed UUID with addresses:\n");
+ print_addrs(&m_addrs, &askuuid, m_addrs.bulkaddrs_len, 1);
+ }
+ return 0;
+}
+
+static int
+LockEntry(struct cmd_syndesc *as, void *arock)
{
- afs_int32 avolid, vcode, err;
+ afs_uint32 avolid;
+ afs_int32 vcode, err;
avolid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
if (avolid == 0) {
as->parms[0].items->data);
exit(1);
}
- vcode = ubik_Call(VL_SetLock, cstruct, 0, avolid, -1, VLOP_DELETE);
+ vcode = ubik_VL_SetLock(cstruct, 0, avolid, -1, VLOP_DELETE);
if (vcode) {
fprintf(STDERR, "Could not lock VLDB entry for volume %s\n",
as->parms[0].items->data);
return 0;
}
-static
-ConvertRO(as)
- register struct cmd_syndesc *as;
-
+static int
+ConvertRO(struct cmd_syndesc *as, void *arock)
{
afs_int32 partition = -1;
- afs_int32 server, volid, code, i, same;
- struct nvldbentry entry, storeEntry;
+ afs_uint32 volid;
+ afs_uint32 server;
+ afs_int32 code, i, same;
+ struct uvldbentry entry, storeEntry;
afs_int32 vcode;
- afs_int32 rwindex;
- afs_int32 rwserver = 0;
- afs_int32 rwpartition;
- afs_int32 roindex;
- afs_int32 roserver = 0;
- afs_int32 ropartition;
+ afs_int32 rwindex = 0;
+ afs_uint32 rwserver = 0;
+ afs_int32 rwpartition = 0;
+ afs_int32 roindex = 0;
+ afs_uint32 roserver = 0;
+ afs_int32 ropartition = 0;
int force = 0;
struct rx_connection *aconn;
- char c, dc;
+ int c, dc;
server = GetServer(as->parms[0].items->data);
if (!server) {
if (as->parms[3].items)
force = 1;
- vcode = VLDB_GetEntryByID(volid, -1, &entry);
+ vcode = VLDB_GetEntryByIDU(volid, -1, &entry);
if (vcode) {
fprintf(STDERR,
"Could not fetch the entry for volume %lu from VLDB\n",
if (volid != entry.volumeId[ROVOL])
volid = entry.volumeId[ROVOL];
- MapHostToNetwork(&entry);
+ MapHostToNetworkU(&entry);
for (i = 0; i < entry.nServers; i++) {
if (entry.serverFlags[i] & ITSRWVOL) {
rwindex = i;
- rwserver = entry.serverNumber[i];
+ rwserver = entry.serverUnique[i];
rwpartition = entry.serverPartition[i];
}
if (entry.serverFlags[i] & ITSROVOL) {
- same = VLDB_IsSameAddrs(server, entry.serverNumber[i], &code);
+ same = VLDB_IsSameAddrs(server, entry.serverUnique[i], &code);
if (code) {
fprintf(STDERR,
"Failed to get info about server's %d address(es) from vlserver (err=%d); aborting call!\n",
}
if (same) {
roindex = i;
- roserver = entry.serverNumber[i];
+ roserver = entry.serverUnique[i];
ropartition = entry.serverPartition[i];
break;
}
}
vcode =
- ubik_Call(VL_SetLock, cstruct, 0, entry.volumeId[RWVOL], RWVOL,
+ ubik_VL_SetLock(cstruct, 0, entry.volumeId[RWVOL], RWVOL,
VLOP_MOVE);
aconn = UV_Bind(server, AFSCONF_VOLUMEPORT);
code = AFSVolConvertROtoRWvolume(aconn, partition, volid);
if (rwserver) {
(entry.nServers)--;
if (rwindex != entry.nServers) {
- entry.serverNumber[rwindex] = entry.serverNumber[entry.nServers];
+ entry.serverUnique[rwindex] = entry.serverUnique[entry.nServers];
entry.serverPartition[rwindex] =
entry.serverPartition[entry.nServers];
entry.serverFlags[rwindex] = entry.serverFlags[entry.nServers];
- entry.serverNumber[entry.nServers] = 0;
+ entry.serverUnique[entry.nServers] = 0;
entry.serverPartition[entry.nServers] = 0;
entry.serverFlags[entry.nServers] = 0;
}
entry.flags |= RO_EXISTS;
}
}
- MapNetworkToHost(&entry, &storeEntry);
+ MapNetworkToHostU(&entry, &storeEntry);
code =
- VLDB_ReplaceEntry(entry.volumeId[RWVOL], RWVOL, &storeEntry,
+ VLDB_ReplaceEntryU(entry.volumeId[RWVOL], RWVOL, &storeEntry,
(LOCKREL_OPCODE | LOCKREL_AFSID |
LOCKREL_TIMESTAMP));
if (code) {
return code;
}
-static
-Sizes(as)
- register struct cmd_syndesc *as;
+static int
+Sizes(struct cmd_syndesc *as, void *arock)
{
- afs_int32 avolid, aserver, apart, voltype, fromdate = 0, code, err, i;
- struct nvldbentry entry;
+ afs_uint32 avolid;
+ afs_uint32 aserver;
+ afs_int32 apart, voltype, fromdate = 0, code, err, i;
+ struct uvldbentry entry;
volintSize vol_size;
rx_SetRxDeadTime(60 * 10);
code = ktime_DateToInt32(as->parms[4].items->data, &fromdate);
if (code) {
fprintf(STDERR, "vos: failed to parse date '%s' (error=%d))\n",
- as->parms[1].items->data, code);
+ as->parms[4].items->data, code);
return code;
}
}
fprintf(STDOUT, "Volume: %s\n", as->parms[0].items->data);
if (as->parms[3].items) { /* do the dump estimate */
-#ifdef AFS_64BIT_ENV
vol_size.dump_size = 0;
-#else
- FillInt64(vol_size.dump_size,0, 1);
-#endif
code = UV_GetSize(avolid, aserver, apart, fromdate, &vol_size);
if (code) {
PrintDiagnostics("size", code);
return 0;
}
-PrintDiagnostics(astring, acode)
- char *astring;
- afs_int32 acode;
+static int
+EndTrans(struct cmd_syndesc *as, void *arock)
+{
+ afs_uint32 server;
+ afs_int32 code, tid, rcode;
+ struct rx_connection *aconn;
+
+ server = GetServer(as->parms[0].items->data);
+ if (!server) {
+ fprintf(STDERR, "vos: host '%s' not found in host table\n",
+ as->parms[0].items->data);
+ return EINVAL;
+ }
+
+ code = util_GetInt32(as->parms[1].items->data, &tid);
+ if (code) {
+ fprintf(STDERR, "vos: bad integer specified for transaction ID.\n");
+ return code;
+ }
+
+ aconn = UV_Bind(server, AFSCONF_VOLUMEPORT);
+ code = AFSVolEndTrans(aconn, tid, &rcode);
+ if (!code) {
+ code = rcode;
+ }
+
+ if (code) {
+ PrintDiagnostics("endtrans", code);
+ return 1;
+ }
+
+ return 0;
+}
+
+int
+PrintDiagnostics(char *astring, afs_int32 acode)
{
if (acode == EACCES) {
fprintf(STDERR,
}
-static
-MyBeforeProc(as, arock)
- struct cmd_syndesc *as;
- char *arock;
+#ifdef AFS_NT40_ENV
+static DWORD
+win32_enableCrypt(void)
{
- register char *tcell;
- register afs_int32 code;
- register afs_int32 sauth;
+ HKEY parmKey;
+ DWORD dummyLen;
+ DWORD cryptall = 0;
+ DWORD code;
+
+ /* Look up configuration parameters in Registry */
+ code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, AFSREG_CLT_SVC_PARAM_SUBKEY,
+ 0, (IsWow64()?KEY_WOW64_64KEY:0)|KEY_QUERY_VALUE, &parmKey);
+ if (code != ERROR_SUCCESS) {
+ dummyLen = sizeof(cryptall);
+ RegQueryValueEx(parmKey, "SecurityLevel", NULL, NULL,
+ (BYTE *) &cryptall, &dummyLen);
+ }
+ RegCloseKey (parmKey);
+
+ return cryptall;
+}
+#endif /* AFS_NT40_ENV */
+
+static int
+MyBeforeProc(struct cmd_syndesc *as, void *arock)
+{
+ char *tcell;
+ afs_int32 code;
+ afs_int32 sauth;
/* Initialize the ubik_client connection */
rx_SetRxDeadTime(90);
tcell = as->parms[12].items->data;
if (as->parms[14].items) /* -serverauth specified */
sauth = 1;
- if (as->parms[16].items) /* -crypt specified */
+ if (as->parms[16].items /* -encrypt specified */
+#ifdef AFS_NT40_ENV
+ || win32_enableCrypt()
+#endif /* AFS_NT40_ENV */
+ )
vsu_SetCrypt(1);
if ((code =
vsu_ClientInit((as->parms[13].items != 0), confdir, tcell, sauth,
verbose = 1;
else
verbose = 0;
+ if (as->parms[17].items) /* -noresolve flag set */
+ noresolve = 1;
+ else
+ noresolve = 0;
return 0;
}
int
-osi_audit()
+osi_audit(void)
{
/* this sucks but it works for now.
*/
#include "AFS_component_version_number.c"
-main(argc, argv)
- int argc;
- char **argv;
+int
+main(int argc, char **argv)
{
- register afs_int32 code;
+ afs_int32 code;
- register struct cmd_syndesc *ts;
+ struct cmd_syndesc *ts;
#ifdef AFS_AIX32_ENV
/*
- * The following signal action for AIX is necessary so that in case of a
- * crash (i.e. core is generated) we can include the user's data section
+ * The following signal action for AIX is necessary so that in case of a
+ * crash (i.e. core is generated) we can include the user's data section
* in the core dump. Unfortunately, by default, only a partial core is
* generated which, in many cases, isn't too useful.
*/
cmd_SetBeforeProc(MyBeforeProc, NULL);
- ts = cmd_CreateSyntax("create", CreateVolume, 0, "create a new volume");
+ ts = cmd_CreateSyntax("create", CreateVolume, NULL, "create a new volume");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "volume name");
cmd_AddParm(ts, "-maxquota", CMD_SINGLE, CMD_OPTIONAL,
"initial quota (KB)");
+ cmd_AddParm(ts, "-id", CMD_SINGLE, CMD_OPTIONAL, "volume ID");
+ cmd_AddParm(ts, "-roid", CMD_SINGLE, CMD_OPTIONAL, "readonly volume ID");
#ifdef notdef
cmd_AddParm(ts, "-minquota", CMD_SINGLE, CMD_OPTIONAL, "");
#endif
COMMONPARMS;
- ts = cmd_CreateSyntax("remove", DeleteVolume, 0, "delete a volume");
+ ts = cmd_CreateSyntax("remove", DeleteVolume, NULL, "delete a volume");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("move", MoveVolume, 0, "move a volume");
+ ts = cmd_CreateSyntax("move", MoveVolume, NULL, "move a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-fromserver", CMD_SINGLE, 0, "machine name on source");
cmd_AddParm(ts, "-frompartition", CMD_SINGLE, 0,
"copy live volume without cloning");
COMMONPARMS;
- ts = cmd_CreateSyntax("copy", CopyVolume, 0, "copy a volume");
+ ts = cmd_CreateSyntax("copy", CopyVolume, NULL, "copy a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID on source");
cmd_AddParm(ts, "-fromserver", CMD_SINGLE, 0, "machine name on source");
cmd_AddParm(ts, "-frompartition", CMD_SINGLE, 0,
"copy live volume without cloning");
COMMONPARMS;
- ts = cmd_CreateSyntax("shadow", ShadowVolume, 0,
+ ts = cmd_CreateSyntax("shadow", ShadowVolume, NULL,
"make or update a shadow volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID on source");
cmd_AddParm(ts, "-fromserver", CMD_SINGLE, 0, "machine name on source");
"do incremental update if target exists");
COMMONPARMS;
- ts = cmd_CreateSyntax("backup", BackupVolume, 0,
+ ts = cmd_CreateSyntax("backup", BackupVolume, NULL,
"make backup of a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("clone", CloneVolume, 0,
+ ts = cmd_CreateSyntax("clone", CloneVolume, NULL,
"make clone of a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "server");
"make clone volume read-only, not readwrite");
COMMONPARMS;
- ts = cmd_CreateSyntax("release", ReleaseVolume, 0, "release a volume");
+ ts = cmd_CreateSyntax("release", ReleaseVolume, NULL, "release a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL,
"force a complete release");
COMMONPARMS;
- ts = cmd_CreateSyntax("dump", DumpVolume, 0, "dump a volume");
+ ts = cmd_CreateSyntax("dump", DumpVolumeCmd, NULL, "dump a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-time", CMD_SINGLE, CMD_OPTIONAL, "dump from time");
cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_OPTIONAL, "dump file");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition");
cmd_AddParm(ts, "-clone", CMD_FLAG, CMD_OPTIONAL,
"dump a clone of the volume");
+ cmd_AddParm(ts, "-omitdirs", CMD_FLAG, CMD_OPTIONAL,
+ "omit unchanged directories from an incremental dump");
COMMONPARMS;
- ts = cmd_CreateSyntax("restore", RestoreVolume, 0, "restore a volume");
+ ts = cmd_CreateSyntax("restore", RestoreVolumeCmd, NULL,
+ "restore a volume");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of volume to be restored");
"dump | keep | new");
cmd_AddParm(ts, "-lastupdate", CMD_SINGLE, CMD_OPTIONAL,
"dump | keep | new");
+ cmd_AddParm(ts, "-nodelete", CMD_FLAG, CMD_OPTIONAL,
+ "do not delete old site when restoring to a new site");
COMMONPARMS;
- ts = cmd_CreateSyntax("unlock", LockReleaseCmd, 0,
+ ts = cmd_CreateSyntax("unlock", LockReleaseCmd, NULL,
"release lock on VLDB entry for a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("changeloc", ChangeLocation, 0,
+ ts = cmd_CreateSyntax("changeloc", ChangeLocation, NULL,
"change an RW volume's location in the VLDB");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0,
"machine name for new location");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("addsite", AddSite, 0, "add a replication site");
+ ts = cmd_CreateSyntax("addsite", AddSite, NULL, "add a replication site");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name for new site");
cmd_AddParm(ts, "-partition", CMD_SINGLE, 0,
"partition name for new site");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
+ cmd_AddParm(ts, "-roid", CMD_SINGLE, CMD_OPTIONAL, "volume name or ID for RO");
+ cmd_AddParm(ts, "-valid", CMD_FLAG, CMD_OPTIONAL, "publish as an up-to-date site in VLDB");
COMMONPARMS;
- ts = cmd_CreateSyntax("remsite", RemoveSite, 0,
+ ts = cmd_CreateSyntax("remsite", RemoveSite, NULL,
"remove a replication site");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("listpart", ListPartitions, 0, "list partitions");
+ ts = cmd_CreateSyntax("listpart", ListPartitions, NULL, "list partitions");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
COMMONPARMS;
- ts = cmd_CreateSyntax("listvol", ListVolumes, 0,
+ ts = cmd_CreateSyntax("listvol", ListVolumes, NULL,
"list volumes on server (bypass VLDB)");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name");
"generate minimal information");
cmd_AddParm(ts, "-extended", CMD_FLAG, CMD_OPTIONAL,
"list extended volume fields");
-#ifdef FULL_LISTVOL_SWITCH
cmd_AddParm(ts, "-format", CMD_FLAG, CMD_OPTIONAL,
"machine readable format");
-#endif /* FULL_LISTVOL_SWITCH */
COMMONPARMS;
- ts = cmd_CreateSyntax("syncvldb", SyncVldb, 0,
+ ts = cmd_CreateSyntax("syncvldb", SyncVldb, NULL,
"synchronize VLDB with server");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name");
cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_OPTIONAL, "volume name or ID");
+ cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "report without updating");
COMMONPARMS;
- ts = cmd_CreateSyntax("syncserv", SyncServer, 0,
+ ts = cmd_CreateSyntax("syncserv", SyncServer, NULL,
"synchronize server with VLDB");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name");
+ cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "report without updating");
COMMONPARMS;
- ts = cmd_CreateSyntax("examine", ExamineVolume, 0,
+ ts = cmd_CreateSyntax("examine", ExamineVolume, NULL,
"everything about the volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-extended", CMD_FLAG, CMD_OPTIONAL,
"list extended volume fields");
-#ifdef FULL_LISTVOL_SWITCH
cmd_AddParm(ts, "-format", CMD_FLAG, CMD_OPTIONAL,
"machine readable format");
-#endif /* FULL_LISTVOL_SWITCH */
COMMONPARMS;
cmd_CreateAlias(ts, "volinfo");
- ts = cmd_CreateSyntax("setfields", SetFields, 0,
+ ts = cmd_CreateSyntax("setfields", SetFields, NULL,
"change volume info fields");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-maxquota", CMD_SINGLE, CMD_OPTIONAL, "quota (KB)");
cmd_AddParm(ts, "-clearVolUpCounter", CMD_FLAG, CMD_OPTIONAL, "clear volUpdateCounter");
COMMONPARMS;
- ts = cmd_CreateSyntax("offline", volOffline, 0, (char *)CMD_HIDDEN);
+ ts = cmd_CreateSyntax("offline", volOffline, NULL, "force the volume status to offline");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "server name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-busy", CMD_FLAG, CMD_OPTIONAL, "busy volume");
COMMONPARMS;
- ts = cmd_CreateSyntax("online", volOnline, 0, (char *)CMD_HIDDEN);
+ ts = cmd_CreateSyntax("online", volOnline, NULL, "force the volume status to online");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "server name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("zap", VolumeZap, 0,
+ ts = cmd_CreateSyntax("zap", VolumeZap, NULL,
"delete the volume, don't bother with VLDB");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
"also delete backup volume if one is found");
COMMONPARMS;
- ts = cmd_CreateSyntax("status", VolserStatus, 0,
+ ts = cmd_CreateSyntax("status", VolserStatus, NULL,
"report on volser status");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
COMMONPARMS;
- ts = cmd_CreateSyntax("rename", RenameVolume, 0, "rename a volume");
+ ts = cmd_CreateSyntax("rename", RenameVolume, NULL, "rename a volume");
cmd_AddParm(ts, "-oldname", CMD_SINGLE, 0, "old volume name ");
cmd_AddParm(ts, "-newname", CMD_SINGLE, 0, "new volume name ");
COMMONPARMS;
- ts = cmd_CreateSyntax("listvldb", ListVLDB, 0,
+ ts = cmd_CreateSyntax("listvldb", ListVLDB, NULL,
"list volumes in the VLDB");
cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_OPTIONAL, "volume name or ID");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name");
"do not alphabetically sort the volume names");
COMMONPARMS;
- ts = cmd_CreateSyntax("backupsys", BackSys, 0, "en masse backups");
+ ts = cmd_CreateSyntax("backupsys", BackSys, NULL, "en masse backups");
cmd_AddParm(ts, "-prefix", CMD_LIST, CMD_OPTIONAL,
"common prefix on volume(s)");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name");
cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "no action");
COMMONPARMS;
- ts = cmd_CreateSyntax("delentry", DeleteEntry, 0,
+ ts = cmd_CreateSyntax("delentry", DeleteEntry, NULL,
"delete VLDB entry for a volume");
cmd_AddParm(ts, "-id", CMD_LIST, CMD_OPTIONAL, "volume name or ID");
cmd_AddParm(ts, "-prefix", CMD_SINGLE, CMD_OPTIONAL,
"prefix of the volume whose VLDB entry is to be deleted");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name");
- cmd_AddParm(ts, "-noexecute", CMD_FLAG, CMD_OPTIONAL | CMD_HIDE,
+ cmd_AddParm(ts, "-noexecute", CMD_FLAG, CMD_OPTIONAL,
"no execute");
COMMONPARMS;
- ts = cmd_CreateSyntax("partinfo", PartitionInfo, 0,
+ ts = cmd_CreateSyntax("partinfo", PartitionInfo, NULL,
"list partition information");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name");
"print storage summary");
COMMONPARMS;
- ts = cmd_CreateSyntax("unlockvldb", UnlockVLDB, 0,
+ ts = cmd_CreateSyntax("unlockvldb", UnlockVLDB, NULL,
"unlock all the locked entries in the VLDB");
cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name");
COMMONPARMS;
- ts = cmd_CreateSyntax("lock", LockEntry, 0,
+ ts = cmd_CreateSyntax("lock", LockEntry, NULL,
"lock VLDB entry for a volume");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
COMMONPARMS;
- ts = cmd_CreateSyntax("changeaddr", ChangeAddr, 0,
+ ts = cmd_CreateSyntax("changeaddr", ChangeAddr, NULL,
"change the IP address of a file server");
cmd_AddParm(ts, "-oldaddr", CMD_SINGLE, 0, "original IP address");
cmd_AddParm(ts, "-newaddr", CMD_SINGLE, CMD_OPTIONAL, "new IP address");
"remove the IP address from the VLDB");
COMMONPARMS;
- ts = cmd_CreateSyntax("listaddrs", ListAddrs, 0,
+ ts = cmd_CreateSyntax("listaddrs", ListAddrs, NULL,
"list the IP address of all file servers registered in the VLDB");
cmd_AddParm(ts, "-uuid", CMD_SINGLE, CMD_OPTIONAL, "uuid of server");
cmd_AddParm(ts, "-host", CMD_SINGLE, CMD_OPTIONAL, "address of host");
- cmd_AddParm(ts, "-noresolve", CMD_FLAG, CMD_OPTIONAL,
- "don't resolve addresses");
cmd_AddParm(ts, "-printuuid", CMD_FLAG, CMD_OPTIONAL,
"print uuid of hosts");
COMMONPARMS;
- ts = cmd_CreateSyntax("convertROtoRW", ConvertRO, 0,
+ ts = cmd_CreateSyntax("convertROtoRW", ConvertRO, NULL,
"convert a RO volume into a RW volume (after loss of old RW volume)");
cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name");
cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL, "don't ask");
COMMONPARMS;
- ts = cmd_CreateSyntax("size", Sizes, 0,
+ ts = cmd_CreateSyntax("size", Sizes, NULL,
"obtain various sizes of the volume.");
cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID");
cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name");
cmd_AddParm(ts, "-time", CMD_SINGLE, CMD_OPTIONAL, "dump from time");
COMMONPARMS;
+ ts = cmd_CreateSyntax("endtrans", EndTrans, NULL,
+ "end a volserver transaction");
+ cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name");
+ cmd_AddParm(ts, "-transaction", CMD_SINGLE, 0,
+ "transaction ID");
+ COMMONPARMS;
+
+ ts = cmd_CreateSyntax("setaddrs", SetAddrs, NULL,
+ "set the list of IP address for a given UUID in the VLDB");
+ cmd_AddParm(ts, "-uuid", CMD_SINGLE, 0, "uuid of server");
+ cmd_AddParm(ts, "-host", CMD_LIST, 0, "address of host");
+
+ COMMONPARMS;
code = cmd_Dispatch(argc, argv);
if (rxInitDone) {
/* Shut down the ubik_client and rx connections */
git://git.openafs.org / openafs.git / blobdiff