/*
* 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>
+#include <roken.h>
+
+#ifdef IGNORE_SOME_GCC_WARNINGS
+# pragma GCC diagnostic warning "-Wimplicit-function-declaration"
+#endif
-#include <sys/types.h>
-#include <string.h>
#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#include <io.h>
-#include <winsock2.h>
-#else
-#include <sys/time.h>
-#include <sys/file.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#include <WINNT/afsreg.h>
#endif
-#include <sys/stat.h>
+
#ifdef AFS_AIX_ENV
#include <sys/statfs.h>
#endif
-#include <errno.h>
#include <lock.h>
#include <afs/stds.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"
/* Local Prototypes */
int PrintDiagnostics(char *astring, afs_int32 acode);
-int GetVolumeInfo(afs_uint32 volid, afs_int32 *server, afs_int32 *part,
+int GetVolumeInfo(afs_uint32 volid, afs_uint32 *server, afs_int32 *part,
afs_int32 *voltype, struct nvldbentry *rentry);
struct tqElem {
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"); \
+cmd_AddParm(ts, "-config", CMD_SINGLE, CMD_OPTIONAL, "config location"); \
-#define ERROR_EXIT(code) {error=(code); goto error_exit;}
+#define ERROR_EXIT(code) do { \
+ error = (code); \
+ goto error_exit; \
+} while (0)
int rxInitDone = 0;
-struct rx_connection *tconn;
-afs_int32 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;
}
{
struct tqElem *elem;
- elem = (struct tqElem *)malloc(sizeof(struct tqElem));
+ elem = malloc(sizeof(struct tqElem));
elem->next = ahead->next;
elem->volid = volid;
ahead->next = elem;
{
usd_handle_t ufd;
int code;
- afs_hyper_t size;
+ afs_int64 size;
code = usd_Open(filename, USD_OPEN_RDONLY, 0, &ufd);
if (code) {
static int
VolNameOK(char *name)
{
- int total;
+ size_t total;
total = strlen(name);
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;
int done = 0;
afs_uint32 nbytes;
- buffer = (char *)malloc(blksize);
+ buffer = malloc(blksize);
if (!buffer) {
fprintf(STDERR, "malloc failed\n");
return -1;
#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 */
#if defined(AFS_PTHREAD_ENV)
- select(((int)(ufd->handle)) + 1, &in, 0, 0, 0);
+ select(((intptr_t)(ufd->handle)) + 1, &in, 0, 0, 0);
#else
- IOMGR_Select(((int)(ufd->handle)) + 1, &in, 0, 0, 0);
+ 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) {
long blksize;
afs_int32 error, code;
int ufdIsOpen = 0;
- afs_hyper_t filesize, currOffset;
- afs_uint32 buffer;
- afs_uint32 got;
+ afs_int64 currOffset;
+ afs_uint32 buffer;
+ afs_uint32 got;
error = 0;
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_SEEK(ufd, 0, SEEK_END, &currOffset);
+ USD_SEEK(ufd, currOffset - sizeof(afs_uint32), 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);
+ USD_SEEK(ufd, 0, SEEK_SET, &currOffset);
}
code = SendFile(ufd, call, blksize);
if (code) {
afs_uint32 bytesleft, w;
afs_int32 error = 0;
- buffer = (char *)malloc(blksize);
+ buffer = malloc(blksize);
if (!buffer) {
fprintf(STDERR, "memory allocation failed\n");
ERROR_EXIT(-1);
#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 */
#if defined(AFS_PTHREAD_ENV)
- select(((int)(ufd->handle)) + 1, &out, 0, 0, 0);
+ select(((intptr_t)(ufd->handle)) + 1, &out, 0, 0, 0);
#else
- IOMGR_Select(((int)(ufd->handle)) + 1, 0, &out, 0, 0);
+ 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);
}
}
char *filename = (char *)rock;
usd_handle_t ufd; /* default is to stdout */
afs_int32 error = 0, code;
- afs_hyper_t size;
+ afs_int64 size;
long blksize;
int ufdIsOpen = 0;
usd_Open(filename, USD_OPEN_CREATE | USD_OPEN_RDWR, 0666, &ufd);
if (code == 0) {
ufdIsOpen = 1;
- hzero(size);
+ size = 0;
code = USD_IOCTL(ufd, USD_IOCTL_SETSIZE, &size);
}
if (code == 0) {
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);
}
-static char *
-vos_ctime(afs_int32 *timep)
-{
- time_t foo = *timep;
- return ctime(&foo);
-}
-
static void
-DisplayFormat(volintInfo *pntr, afs_int32 server, afs_int32 part,
+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);
(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
fprintf(STDOUT, " Last Update %s",
- vos_ctime( & pntr->updateDate));
+ ctime(&t));
fprintf(STDOUT,
" %d accesses in the past day (i.e., vnode references)\n",
pntr->dayUse);
*------------------------------------------------------------------------*/
static void
-XDisplayFormat(volintXInfo *a_xInfoP, afs_int32 a_servID, afs_int32 a_partID,
+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
fprintf(STDOUT, " Last Update %s",
- vos_ctime( & a_xInfoP->updateDate));
+ ctime(&t));
fprintf(STDOUT,
" %d accesses in the past day (i.e., vnode references)\n",
a_xInfoP->dayUse);
} /*Default listing */
} /*XDisplayFormat */
-#ifdef FULL_LISTVOL_SWITCH
/*------------------------------------------------------------------------
* PRIVATE XDisplayFormat2
*
*------------------------------------------------------------------------*/
static void
-XDisplayFormat2(volintXInfo *a_xInfoP, afs_int32 a_servID, afs_int32 a_partID,
+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, "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",
+ 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",
+ fprintf(STDOUT, "parentID\t%lu\n",
afs_printable_uint32_lu(a_xInfoP->parentID));
- fprintf(STDOUT, "cloneID\t\t%lu\n",
+ 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) {
fprintf(STDOUT, "type\t\t?\n");
break;
}
- fprintf(STDOUT, "creationDate\t%-9lu\t%s",
+ t = a_xInfoP->creationDate;
+ fprintf(STDOUT, "creationDate\t%-9lu\t%s",
afs_printable_uint32_lu(a_xInfoP->creationDate),
- vos_ctime(&a_xInfoP->creationDate));
- fprintf(STDOUT, "accessDate\t%-9lu\t%s",
+ ctime(&t));
+
+ t = a_xInfoP->accessDate;
+ fprintf(STDOUT, "accessDate\t%-9lu\t%s",
afs_printable_uint32_lu(a_xInfoP->accessDate),
- vos_ctime(&a_xInfoP->accessDate));
- fprintf(STDOUT, "updateDate\t%-9lu\t%s",
+ ctime(&t));
+
+ t = a_xInfoP->updateDate;
+ fprintf(STDOUT, "updateDate\t%-9lu\t%s",
afs_printable_uint32_lu(a_xInfoP->updateDate),
- vos_ctime(&a_xInfoP->updateDate));
- fprintf(STDOUT, "backupDate\t%-9lu\t%s",
+ ctime(&t));
+
+ t = a_xInfoP->backupDate;
+ fprintf(STDOUT, "backupDate\t%-9lu\t%s",
afs_printable_uint32_lu(a_xInfoP->backupDate),
- vos_ctime(&a_xInfoP->backupDate));
- fprintf(STDOUT, "copyDate\t%-9lu\t%s",
+ ctime(&t));
+
+ t = a_xInfoP->copyDate;
+ fprintf(STDOUT, "copyDate\t%-9lu\t%s",
afs_printable_uint32_lu(a_xInfoP->copyDate),
- vos_ctime(&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(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",
+
+ 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);
fprintf(STDOUT, "status\t\tUNATTACHABLE\n");
return;
}
- fprintf(STDOUT, "backupID\t%lu\n",
+ fprintf(STDOUT, "backupID\t%lu\n",
afs_printable_uint32_lu(pntr->backupID));
- fprintf(STDOUT, "parentID\t%lu\n",
+ fprintf(STDOUT, "parentID\t%lu\n",
afs_printable_uint32_lu(pntr->parentID));
- fprintf(STDOUT, "cloneID\t\t%lu\n",
+ 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");
fprintf(STDOUT, "type\t\t?\n");
break;
}
- fprintf(STDOUT, "creationDate\t%-9lu\t%s",
+ t = pntr->creationDate;
+ fprintf(STDOUT, "creationDate\t%-9lu\t%s",
afs_printable_uint32_lu(pntr->creationDate),
- vos_ctime(&pntr->creationDate));
- fprintf(STDOUT, "accessDate\t%-9lu\t%s",
+ ctime(&t));
+
+ t = pntr->accessDate;
+ fprintf(STDOUT, "accessDate\t%-9lu\t%s",
afs_printable_uint32_lu(pntr->accessDate),
- vos_ctime(&pntr->accessDate));
- fprintf(STDOUT, "updateDate\t%-9lu\t%s",
+ ctime(&t));
+
+ t = pntr->updateDate;
+ fprintf(STDOUT, "updateDate\t%-9lu\t%s",
afs_printable_uint32_lu(pntr->updateDate),
- vos_ctime(&pntr->updateDate));
- fprintf(STDOUT, "backupDate\t%-9lu\t%s",
+ ctime(&t));
+
+ t = pntr->backupDate;
+ fprintf(STDOUT, "backupDate\t%-9lu\t%s",
afs_printable_uint32_lu(pntr->backupDate),
- vos_ctime(&pntr->backupDate));
- fprintf(STDOUT, "copyDate\t%-9lu\t%s",
+ ctime(&t));
+
+ t = pntr->copyDate;
+ fprintf(STDOUT, "copyDate\t%-9lu\t%s",
afs_printable_uint32_lu(pntr->copyDate),
- vos_ctime(&pntr->copyDate));
- fprintf(STDOUT, "flags\t\t%#lx\t(Optional)\n",
+ 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",
+ 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",
afs_printable_uint32_lu(pntr->spare1));
- fprintf(STDOUT, "spare2\t\t%lu\t(Optional)\n",
+ fprintf(STDOUT, "spare2\t\t%lu\t(Optional)\n",
afs_printable_uint32_lu(pntr->spare2));
- fprintf(STDOUT, "spare3\t\t%lu\t(Optional)\n",
+ fprintf(STDOUT, "spare3\t\t%lu\t(Optional)\n",
afs_printable_uint32_lu(pntr->spare3));
return;
}
}
return;
}
-#endif /* FULL_LISTVOL_SWITCH */
static void
-DisplayVolumes(afs_int32 server, afs_int32 part, volintInfo *pntr,
+DisplayVolumes(afs_uint32 server, afs_int32 part, volintInfo *pntr,
afs_int32 count, afs_int32 longlist, afs_int32 fast,
int quiet)
{
*------------------------------------------------------------------------*/
static void
-XDisplayVolumes(afs_int32 a_servID, afs_int32 a_partID, volintXInfo *a_xInfoP,
+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 */
}
} /*XDisplayVolumes */
-#ifdef FULL_LISTVOL_SWITCH
+
/*------------------------------------------------------------------------
* PRIVATE XDisplayVolumes2
*
*------------------------------------------------------------------------*/
static void
-XDisplayVolumes2(afs_int32 a_servID, afs_int32 a_partID, volintXInfo *a_xInfoP,
+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 */
}
} /*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(struct nvldbentry *entry, int voltype, afs_int32 *server,
+GetServerAndPart(struct nvldbentry *entry, int voltype, afs_uint32 *server,
afs_int32 *part, int *previdx)
{
int i, istart, vtype;
}
static void
+PrintLocked(afs_int32 aflags)
+{
+ 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 nvldbentry *entry)
{
SubEnumerateEntry(entry);
/* Check for VLOP_ALLOPERS */
- if (entry->flags & VLOP_ALLOPERS)
- fprintf(STDOUT, " Volume is currently LOCKED \n");
+ PrintLocked(entry->flags);
return;
}
} /*XVolumeStats */
static void
-VolumeStats_int(volintInfo *pntr, struct nvldbentry *entry, afs_int32 server,
+VolumeStats_int(volintInfo *pntr, struct nvldbentry *entry, afs_uint32 server,
afs_int32 part, int voltype)
{
- int totalOK, totalNotOK, totalBusy;
+ int totalOK = 0;
+ int totalNotOK = 0;
+ int totalBusy = 0;
DisplayFormat(pntr, server, part, &totalOK, &totalNotOK, &totalBusy, 0, 1,
1);
/* command to forcibly remove a volume */
static int
-NukeVolume(register struct cmd_syndesc *as)
+NukeVolume(struct cmd_syndesc *as)
{
- register afs_int32 code;
+ 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) {
*------------------------------------------------------------------------
*/
static int
-ExamineVolume(register struct cmd_syndesc *as, void *arock)
+ExamineVolume(struct cmd_syndesc *as, void *arock)
{
struct nvldbentry entry;
afs_int32 vcode = 0;
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 */
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);
+ isSubEnum = 1;
} else
-#endif /* FULL_LISTVOL_SWITCH */
VolumeStats_int(pntr, &entry, aserver, apart, voltype);
if ((voltype == BACKVOL) && !(entry.flags & BACK_EXISTS)) {
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);
}
*------------------------------------------------------------------------
*/
static int
-SetFields(register struct cmd_syndesc *as, void *arock)
+SetFields(struct cmd_syndesc *as, void *arock)
{
struct nvldbentry entry;
volintInfo info;
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 */
*------------------------------------------------------------------------
*/
static int
-volOnline(register struct cmd_syndesc *as, void *arock)
+volOnline(struct cmd_syndesc *as, void *arock)
{
- afs_int32 server, partition;
+ afs_uint32 server;
+ afs_int32 partition;
afs_uint32 volid;
afs_int32 code, err = 0;
*------------------------------------------------------------------------
*/
static int
-volOffline(register struct cmd_syndesc *as, void *arock)
+volOffline(struct cmd_syndesc *as, void *arock)
{
- afs_int32 server, partition;
+ afs_uint32 server;
+ afs_int32 partition;
afs_uint32 volid;
afs_int32 code, err = 0;
afs_int32 transflag, sleeptime, transdone;
transflag = (as->parms[4].items ? ITBusy : ITOffline);
sleeptime = (as->parms[3].items ? atol(as->parms[3].items->data) : 0);
- transdone = (sleeptime ? 0 /*online */ : VTOutOfService);
+ transdone = ((sleeptime || as->parms[4].items) ? 0 /*online */ : VTOutOfService);
if (as->parms[4].items && !as->parms[3].items) {
fprintf(STDERR, "-sleep option must be used with -busy flag\n");
return -1;
}
static int
-CreateVolume(register struct cmd_syndesc *as, void *arock)
+CreateVolume(struct cmd_syndesc *as, void *arock)
{
afs_int32 pnum;
char part[10];
- afs_uint32 volid;
+ afs_uint32 volid = 0, rovolid = 0, bkvolid = 0;
+ afs_uint32 *arovolid;
afs_int32 code;
struct nvldbentry entry;
afs_int32 vcode;
afs_int32 quota;
+ afs_uint32 tserver;
+
+ arovolid = &rovolid;
quota = 5000;
tserver = GetServer(as->parms[0].items->data);
}
}
+ 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_GetUInt32(as->parms[4].items->data, &volid);
+ if (code) {
+ 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;
DeleteVolume(struct cmd_syndesc *as, void *arock)
{
afs_int32 err, code = 0;
- afs_int32 server = 0, partition = -1;
+ afs_uint32 server = 0;
+ afs_int32 partition = -1;
afs_uint32 volid;
char pname[10];
afs_int32 idx, j;
#define TESTM 0 /* set for move space tests, clear for production */
static int
-MoveVolume(register struct cmd_syndesc *as, void *arock)
+MoveVolume(struct cmd_syndesc *as, void *arock)
{
afs_uint32 volid;
- afs_int32 fromserver, toserver, frompart, topart;
+ afs_uint32 fromserver, toserver;
+ afs_int32 frompart, topart;
afs_int32 flags, code, err;
char fromPartName[10], toPartName[10];
}
static int
-CopyVolume(register struct cmd_syndesc *as, void *arock)
+CopyVolume(struct cmd_syndesc *as, void *arock)
{
afs_uint32 volid;
- afs_int32 fromserver, toserver, frompart, topart, code, err, flags;
+ afs_uint32 fromserver, toserver;
+ afs_int32 frompart, topart, code, err, flags;
char fromPartName[10], toPartName[10], *tovolume;
struct nvldbentry entry;
struct diskPartition64 partition; /* for space check */
static int
-ShadowVolume(register struct cmd_syndesc *as, void *arock)
+ShadowVolume(struct cmd_syndesc *as, void *arock)
{
afs_uint32 volid, tovolid;
- afs_int32 fromserver, toserver, frompart, topart;
+ afs_uint32 fromserver, toserver;
+ afs_int32 frompart, topart;
afs_int32 code, err, flags;
char fromPartName[10], toPartName[10], toVolName[32], *tovolume;
struct diskPartition64 partition; /* for space check */
static int
-CloneVolume(register struct cmd_syndesc *as, void *arock)
+CloneVolume(struct cmd_syndesc *as, void *arock)
{
afs_uint32 volid, cloneid;
- afs_int32 server, part, voltype;
+ afs_uint32 server;
+ afs_int32 part, voltype;
char partName[10], *volname;
afs_int32 code, err, flags;
struct nvldbentry entry;
return E2BIG;
}
#if 0
- /*
+ /*
* In order that you be able to make clones of RO or BK, this
* check must be omitted.
*/
flags = 0;
if (as->parms[5].items) flags |= RV_OFFLINE;
+ if (as->parms[6].items && as->parms[7].items) {
+ fprintf(STDERR, "vos: cannot specify that a volume be -readwrite and -readonly\n");
+ return EINVAL;
+ }
if (as->parms[6].items) flags |= RV_RDONLY;
+ if (as->parms[7].items) flags |= RV_RWONLY;
- code =
+ code =
UV_CloneVolume(server, part, volid, cloneid, volname, flags);
if (code) {
static int
-BackupVolume(register struct cmd_syndesc *as, void *arock)
+BackupVolume(struct cmd_syndesc *as, void *arock)
{
afs_uint32 avolid;
- afs_int32 aserver, apart, vtype, code, err;
+ afs_uint32 aserver;
+ afs_int32 apart, vtype, code, err;
struct nvldbentry entry;
afs_uint32 buvolid;
- afs_int32 buserver, bupart, butype;
+ afs_uint32 buserver;
+ afs_int32 bupart, butype;
struct nvldbentry buentry;
avolid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
}
static int
-ReleaseVolume(register struct cmd_syndesc *as, void *arock)
+ReleaseVolume(struct cmd_syndesc *as, void *arock)
{
struct nvldbentry entry;
afs_uint32 avolid;
- afs_int32 aserver, apart, vtype, code, err;
+ afs_uint32 aserver;
+ afs_int32 apart, vtype, code, err;
int force = 0;
+ int stayUp = 0;
if (as->parms[1].items)
force = 1;
+ if (as->parms[2].items)
+ stayUp = 1;
avolid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
if (avolid == 0) {
if (err)
return E2BIG;
}
- code = UV_ReleaseVolume(avolid, aserver, apart, force);
+ code = UV_ReleaseVolume(avolid, aserver, apart, force, stayUp);
+
if (code) {
PrintDiagnostics("release", code);
return code;
}
static int
-DumpVolumeCmd(register struct cmd_syndesc *as, void *arock)
+DumpVolumeCmd(struct cmd_syndesc *as, void *arock)
{
afs_uint32 avolid;
- afs_int32 aserver, apart, voltype, fromdate = 0, code, err, i, flags;
+ afs_uint32 aserver;
+ afs_int32 apart, voltype, fromdate = 0, code, err, i, flags;
char filename[MAXPATHLEN];
struct nvldbentry entry;
if (rxConn == 0)
break;
rx_SetConnDeadTime(rxConn, rx_connDeadTime);
- if (rxConn->service)
- rxConn->service->connDeadTime = rx_connDeadTime;
+ if (rx_ServiceOf(rxConn))
+ rx_ServiceOf(rxConn)->connDeadTime = rx_connDeadTime;
}
avolid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
#define TS_NEW 3
static int
-RestoreVolumeCmd(register struct cmd_syndesc *as, void *arock)
+RestoreVolumeCmd(struct cmd_syndesc *as, void *arock)
{
afs_uint32 avolid, aparentid;
- afs_int32 aserver, apart, code, vcode, err;
+ afs_uint32 aserver;
+ afs_int32 apart, code, vcode, err;
afs_int32 aoverwrite = ASK;
afs_int32 acreation = 0, alastupdate = 0;
int restoreflags = 0;
int readonly = 0, offline = 0, voltype = RWVOL;
- char prompt;
char afilename[MAXPATHLEN], avolname[VOLSER_MAXVOLNAME + 1], apartName[10];
char volname[VOLSER_MAXVOLNAME + 1];
struct nvldbentry entry;
- prompt = 'n';
-
aparentid = 0;
if (as->parms[4].items) {
avolid = vsu_GetVolumeID(as->parms[4].items->data, cstruct, &err);
}
else { /* volume exists - do we do a full incremental or abort */
- int Oserver, Opart, Otype, vol_elsewhere = 0;
+ afs_uint32 Oserver;
+ afs_int32 Opart, Otype, vol_elsewhere = 0;
struct nvldbentry Oentry;
int c, dc;
if (as->parms[10].items) {
restoreflags |= RV_NODEL;
}
-
+
code =
UV_RestoreVolume2(aserver, apart, avolid, aparentid,
}
static int
-LockReleaseCmd(register struct cmd_syndesc *as, void *arock)
+LockReleaseCmd(struct cmd_syndesc *as, void *arock)
{
afs_uint32 avolid;
afs_int32 code, err;
}
static int
-AddSite(register struct cmd_syndesc *as, void *arock)
+AddSite(struct cmd_syndesc *as, void *arock)
{
afs_uint32 avolid;
- afs_int32 aserver, apart, code, err, valid = 0;
+ 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);
}
- if (as->parms[3].items) {
+ if (as->parms[4].items) {
valid = 1;
}
- code = UV_AddSite(aserver, apart, avolid, valid);
+ code = UV_AddSite2(aserver, apart, avolid, arovolid, valid);
if (code) {
PrintDiagnostics("addsite", code);
exit(1);
}
static int
-RemoveSite(register struct cmd_syndesc *as, void *arock)
+RemoveSite(struct cmd_syndesc *as, void *arock)
{
afs_uint32 avolid;
- afs_int32 aserver, apart, code, err;
+ afs_uint32 aserver;
+ afs_int32 apart, code, err;
char apartName[10], avolname[VOLSER_MAXVOLNAME + 1];
vsu_ExtractName(avolname, as->parms[2].items->data);
}
static int
-ChangeLocation(register struct cmd_syndesc *as, void *arock)
+ChangeLocation(struct cmd_syndesc *as, void *arock)
{
afs_uint32 avolid;
- afs_int32 aserver, apart, code, err;
+ afs_uint32 aserver;
+ afs_int32 apart, code, err;
char apartName[10];
avolid = vsu_GetVolumeID(as->parms[2].items->data, cstruct, &err);
}
code = UV_ChangeLocation(aserver, apart, avolid);
if (code) {
- PrintDiagnostics("addsite", code);
+ PrintDiagnostics("changeloc", code);
exit(1);
}
MapPartIdIntoName(apart, apartName);
}
static int
-ListPartitions(register struct cmd_syndesc *as, void *arock)
+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
-ListVolumes(register struct cmd_syndesc *as, void *arock)
+ListVolumes(struct cmd_syndesc *as, void *arock)
{
afs_int32 apart, int32list, fast;
- afs_int32 aserver, code;
+ afs_uint32 aserver;
+ afs_int32 code;
volintInfo *pntr;
volintInfo *oldpntr = NULL;
afs_int32 count;
&pntr, &count);
if (code) {
PrintDiagnostics("listvol", code);
- if (pntr)
- free(pntr);
exit(1);
}
if (wantExtendedInfo) {
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)
}
static int
-SyncVldb(register struct cmd_syndesc *as, void *arock)
+SyncVldb(struct cmd_syndesc *as, void *arock)
{
afs_int32 pnum = 0, code; /* part name */
char part[10];
int flags = 0;
char *volname = 0;
+ afs_uint32 tserver;
tserver = 0;
if (as->parms[0].items) {
}
static int
-SyncServer(register struct cmd_syndesc *as, void *arock)
+SyncServer(struct cmd_syndesc *as, void *arock)
{
afs_int32 pnum, code; /* part name */
char part[10];
+ afs_uint32 tserver;
int flags = 0;
* 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 int
-VolumeZap(register struct cmd_syndesc *as, void *arock)
+VolumeZap(struct cmd_syndesc *as, void *arock)
{
struct nvldbentry entry;
afs_uint32 volid, zapbackupid = 0, backupid = 0;
}
static int
-VolserStatus(register struct cmd_syndesc *as, void *arock)
+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");
}
static int
-RenameVolume(register struct cmd_syndesc *as, void *arock)
+RenameVolume(struct cmd_syndesc *as, void *arock)
{
afs_int32 code1, code2, code;
struct nvldbentry entry;
}
int
-GetVolumeInfo(afs_uint32 volid, afs_int32 *server, afs_int32 *part, afs_int32 *voltype,
+GetVolumeInfo(afs_uint32 volid, afs_uint32 *server, afs_int32 *part, afs_int32 *voltype,
struct nvldbentry *rentry)
{
afs_int32 vcode;
}
static int
-DeleteEntry(register struct cmd_syndesc *as, void *arock)
+DeleteEntry(struct cmd_syndesc *as, void *arock)
{
afs_int32 apart = 0;
afs_uint32 avolid;
afs_int32 vcode;
struct VldbListByAttributes attributes;
nbulkentries arrayEntries;
- register struct nvldbentry *vllist;
+ struct nvldbentry *vllist;
struct cmd_item *itp;
afs_int32 nentries;
int j;
itp->data);
continue;
}
- if (as->parms[4].items) { /* -noexecute */
+ if (as->parms[4].items || as->parms[5].items) {
+ /* -noexecute (hidden) or -dryrun */
fprintf(STDOUT, "Would have deleted VLDB entry for %s \n",
itp->data);
fflush(STDOUT);
}
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",
}
}
- if (as->parms[4].items) { /* -noexecute */
+ if (as->parms[4].items || as->parms[5].items) {
+ /* -noexecute (hidden) or -dryrun */
fprintf(STDOUT, "Would have deleted VLDB entry for %s \n",
vllist->name);
fflush(STDOUT);
avolid = vllist->volumeId[RWVOL];
vcode = ubik_VL_DeleteEntry(cstruct, 0, avolid, RWVOL);
if (vcode) {
- fprintf(STDOUT, "Could not delete VDLB entry for %s\n",
+ fprintf(STDOUT, "Could not delete VLDB entry for %s\n",
vllist->name);
totalFail++;
PrintError("", vcode);
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_nbulkentries, &arrayEntries);
return 0;
}
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;
MapHostToNetwork(vllist);
EnumerateEntry(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;
+ /* malloc the first bulk entries array */
+ tarraysize = centries * sizeof(struct nvldbentry);
+ tarray = malloc(tarraysize);
+ if (!tarray) {
+ fprintf(STDERR,
+ "Could not allocate enough space for the VLDB entries\n");
+ goto bypass;
+ }
+ memcpy((char*)tarray, arrayEntries.nbulkentries_val, tarraysize);
} else {
/* Grow the tarray to keep the extra entries */
parraysize = (centries * sizeof(struct nvldbentry));
- ttarray =
- (struct nvldbentry *)realloc(tarray,
- tarraysize + parraysize);
+ ttarray = realloc(tarray, tarraysize + parraysize);
if (!ttarray) {
fprintf(STDERR,
"Could not allocate enough space for the VLDB entries\n");
}
/* Free the bulk array */
- if (arrayEntries.nbulkentries_val) {
- free(arrayEntries.nbulkentries_val);
- arrayEntries.nbulkentries_val = 0;
- }
+ xdr_free((xdrproc_t) xdr_nbulkentries, &arrayEntries);
}
/* Here is where we now sort all the entries and print them */
MapHostToNetwork(vllist);
EnumerateEntry(vllist);
- if (vllist->flags & VLOP_ALLOPERS)
- fprintf(STDOUT, " Volume is currently LOCKED \n");
+ PrintLocked(vllist->flags);
}
}
}
static int
-BackSys(register struct cmd_syndesc *as, void *arock)
+BackSys(struct cmd_syndesc *as, void *arock)
{
afs_uint32 avolid;
afs_int32 apart = 0;
- afs_int32 aserver = 0, code, aserver1, apart1;
+ afs_uint32 aserver = 0, aserver1;
+ afs_int32 code, apart1;
afs_int32 vcode;
struct VldbListByAttributes attributes;
nbulkentries arrayEntries;
- register struct nvldbentry *vllist;
+ struct nvldbentry *vllist;
afs_int32 nentries;
int j;
char pname[10];
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_nbulkentries, &arrayEntries);
return 0;
}
static int
-UnlockVLDB(register struct cmd_syndesc *as, void *arock)
+UnlockVLDB(struct cmd_syndesc *as, void *arock)
{
afs_int32 apart;
- afs_int32 aserver = 0;
+ afs_uint32 aserver = 0;
afs_int32 code;
afs_int32 vcode;
struct VldbListByAttributes attributes;
nbulkentries arrayEntries;
- register struct nvldbentry *vllist;
+ struct nvldbentry *vllist;
afs_int32 nentries;
int j;
afs_uint32 volid;
volid = vllist->volumeId[RWVOL];
vcode =
ubik_VL_ReleaseLock(cstruct, 0, volid, -1,
- LOCKREL_OPCODE | LOCKREL_AFSID |
+ LOCKREL_OPCODE | LOCKREL_AFSID |
LOCKREL_TIMESTAMP);
if (vcode) {
fprintf(STDERR, "Could not unlock entry for volume %s\n",
}
}
- if (arrayEntries.nbulkentries_val)
- free(arrayEntries.nbulkentries_val);
+ xdr_free((xdrproc_t) xdr_nbulkentries, &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);
}
static int
-PartitionInfo(register struct cmd_syndesc *as, void *arock)
+PartitionInfo(struct cmd_syndesc *as, void *arock)
{
afs_int32 apart;
- afs_int32 aserver, code;
+ afs_uint32 aserver;
+ afs_int32 code;
char pname[10];
struct diskPartition64 partition;
struct partList dummyPartList;
PrintInt64Size(sumFree));
fprintf(STDOUT,
"%s on %d partitions\n",
- PrintInt64Size(sumStorage),
+ PrintInt64Size(sumStorage),
sumPartitions);
}
return 0;
}
static int
-ChangeAddr(register struct cmd_syndesc *as, void *arock)
+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,
+print_addrs(const bulkaddrs * addrs, afsUUID * m_uuid, int nentries,
int print)
{
- afs_int32 vcode;
- afs_int32 i, j;
- struct VLCallBack vlcb;
- afs_int32 *addrp;
- bulkaddrs m_addrs;
- ListAddrByAttributes m_attrs;
- afs_int32 m_nentries, *m_addrp;
- afs_int32 base, index;
+ int i;
+ afs_uint32 *addrp;
char buf[1024];
if (print) {
}
/* 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
- * get the addresses for this multihomed server from
- * the vlserver and print them.
- */
- if (((*addrp & 0xff000000) == 0xff000000) && ((*addrp) & 0xffff)) {
- /* Get the list of multihomed fileservers */
- base = (*addrp >> 16) & 0xff;
- index = (*addrp) & 0xffff;
-
- if ((base >= 0) && (base <= VL_MAX_ADDREXTBLKS) && (index >= 1)
- && (index <= VL_MHSRV_PERBLK)) {
- m_attrs.Mask = VLADDR_INDEX;
- m_attrs.index = (base * VL_MHSRV_PERBLK) + index;
- m_nentries = 0;
- m_addrs.bulkaddrs_val = 0;
- m_addrs.bulkaddrs_len = 0;
- vcode =
- ubik_VL_GetAddrsU(cstruct, 0, &m_attrs, &m_uuid,
- (afs_int32 *)&vlcb, &m_nentries, &m_addrs);
- if (vcode) {
- fprintf(STDERR,
- "vos: could not list the multi-homed server addresses\n");
- PrintError("", vcode);
- }
-
- /* Print the list */
- m_addrp = (afs_int32 *) m_addrs.bulkaddrs_val;
- for (j = 0; j < m_nentries; j++, m_addrp++) {
- *m_addrp = htonl(*m_addrp);
- if (noresolve) {
- char hoststr[16];
- printf("%s ", afs_inet_ntoa_r(*m_addrp, hoststr));
- } else {
- printf("%s ", hostutil_GetNameByINet(*m_addrp));
- }
- }
- if (j == 0) {
- printf("<unknown>\n");
- } else {
- printf("\n");
- }
-
- continue;
- }
- }
-
- /* Otherwise, it is a non-multihomed entry and contains
- * the IP address of the server - print it.
- */
*addrp = htonl(*addrp);
if (noresolve) {
char hoststr[16];
}
static int
-ListAddrs(register struct cmd_syndesc *as, void *arock)
+ListAddrs(struct cmd_syndesc *as, void *arock)
{
- afs_int32 vcode;
+ afs_int32 vcode, m_uniq=0;
afs_int32 i, printuuid = 0;
struct VLCallBack vlcb;
afs_int32 nentries;
afsUUID m_uuid, askuuid;
afs_int32 m_nentries;
- memset(&m_attrs, 0, sizeof(struct ListAddrByAttributes));
- m_attrs.Mask = VLADDR_INDEX;
+ if (as->parms[0].items && as->parms[1].items) {
+ fprintf(STDERR, "vos: Can't use the -uuid and -host flags together\n");
+ exit(-1);
+ }
- memset(&m_addrs, 0, sizeof(bulkaddrs));
+ memset(&m_attrs, 0, sizeof(struct ListAddrByAttributes));
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",
+ fprintf(STDERR, "vos: invalid UUID '%s'\n",
as->parms[0].items->data);
exit(-1);
}
m_attrs.Mask = VLADDR_UUID;
m_attrs.uuid = askuuid;
- }
- if (as->parms[1].items) {
+ } else 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",
memcpy(&saddr, he->h_addr, 4);
m_attrs.Mask = VLADDR_IPADDR;
m_attrs.ipaddr = ntohl(saddr);
+ } else {
+ /* by index */
+ m_attrs.Mask = VLADDR_INDEX;
}
+
if (as->parms[2].items) {
printuuid = 1;
}
- m_addrs.bulkaddrs_val = 0;
- m_addrs.bulkaddrs_len = 0;
+ memset(&m_addrs, 0, sizeof(bulkaddrs));
+ memset(&vlcb, 0, sizeof(struct VLCallBack));
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);
- return (vcode);
+ goto out;
+ }
+
+ for (i = 1, m_nentries = 0; nentries; i++) {
+ m_attrs.index = i;
+
+ xdr_free((xdrproc_t)xdr_bulkaddrs, &m_addrs); /* reset addr list */
+ vcode =
+ ubik_VL_GetAddrsU(cstruct, UBIK_CALL_NEW, &m_attrs, &m_uuid,
+ &m_uniq, &m_nentries, &m_addrs);
+ switch (vcode) {
+ case 0: /* success */
+ print_addrs(&m_addrs, &m_uuid, m_nentries, printuuid);
+ nentries--;
+ break;
+
+ case VL_NOENT:
+ if (m_attrs.Mask == VLADDR_UUID) {
+ fprintf(STDERR, "vos: no entry for UUID '%s' found in VLDB\n",
+ as->parms[0].items->data);
+ exit(-1);
+ } else if (m_attrs.Mask == VLADDR_IPADDR) {
+ fprintf(STDERR, "vos: no entry for host '%s' [0x%08x] found in VLDB\n",
+ as->parms[1].items->data, m_attrs.ipaddr);
+ exit(-1);
+ }
+ continue;
+
+ case VL_INDEXERANGE:
+ vcode = 0; /* not an error, just means we're done */
+ goto out;
+
+ default: /* any other error */
+ fprintf(STDERR, "vos: could not list the server addresses\n");
+ PrintError("", vcode);
+ goto out;
+ }
+
+ /* if -uuid or -host, only list one response */
+ if (as->parms[1].items || as->parms[0].items)
+ break;
}
- m_nentries = 0;
- m_addrs.bulkaddrs_val = 0;
- m_addrs.bulkaddrs_len = 0;
- i = 1;
- while (1) {
- m_attrs.index = i;
+out:
+ xdr_free((xdrproc_t)xdr_bulkaddrs, &m_addrs);
+ return vcode;
+}
- vcode =
- ubik_Call_New(VL_GetAddrsU, cstruct, 0, &m_attrs, &m_uuid,
- &vlcb, &m_nentries, &m_addrs);
- if (vcode == VL_NOENT) {
- if (m_attrs.Mask == VLADDR_UUID) {
- fprintf(STDERR, "vos: no entry for UUID '%s' found in VLDB\n",
- as->parms[0].items->data);
- exit(-1);
- } else if (m_attrs.Mask == VLADDR_IPADDR) {
- fprintf(STDERR, "vos: no entry for host '%s' [0x%08x] found in VLDB\n",
- as->parms[1].items->data, m_attrs.ipaddr);
- exit(-1);
- } else {
- i++;
- nentries++;
- continue;
- }
- }
+static int
+SetAddrs(struct cmd_syndesc *as, void *arock)
+{
+ afs_int32 vcode;
+ bulkaddrs m_addrs;
+ afsUUID askuuid;
+ afs_uint32 FS_HostAddrs_HBO[ADDRSPERSITE];
- if (vcode == VL_INDEXERANGE) {
- break;
+ 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;
- if (vcode) {
- fprintf(STDERR, "vos: could not list the server addresses\n");
- PrintError("", vcode);
- return (vcode);
- }
+ for (ti = as->parms[1].items; ti && i < ADDRSPERSITE; ti = ti->next) {
- print_addrs(&m_addrs, &m_uuid, m_nentries, printuuid);
- i++;
+ if (noresolve)
+ saddr = GetServerNoresolve(ti->data);
+ else
+ saddr = GetServer(ti->data);
- if ((as->parms[1].items) || (as->parms[0].items) || (i > nentries))
- break;
+ 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");
+ } else if (vcode == RXGEN_OPCODE) {
+ fprintf(STDERR, "vlserver doesn't support VL_RegisterAddrs rpc; ignored\n");
+ } else {
+ fprintf(STDERR, "vos: VL_RegisterAddrs rpc failed\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(register struct cmd_syndesc *as, void *arock)
+LockEntry(struct cmd_syndesc *as, void *arock)
{
afs_uint32 avolid;
afs_int32 vcode, err;
}
static int
-ConvertRO(register struct cmd_syndesc *as, void *arock)
+ConvertRO(struct cmd_syndesc *as, void *arock)
{
afs_int32 partition = -1;
afs_uint32 volid;
- afs_int32 server, code, i, same;
- struct nvldbentry entry, storeEntry;
+ afs_uint32 server;
+ afs_int32 code, i, same;
+ struct nvldbentry entry, checkEntry, storeEntry;
afs_int32 vcode;
afs_int32 rwindex = 0;
- afs_int32 rwserver = 0;
+ afs_uint32 rwserver = 0;
afs_int32 rwpartition = 0;
afs_int32 roindex = 0;
- afs_int32 roserver = 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) {
PrintError("", code);
else
fprintf(STDERR, "Unknown volume ID or name '%s'\n",
- as->parms[0].items->data);
+ as->parms[2].items->data);
return -1;
}
if (as->parms[3].items)
force = 1;
+ memset(&entry, 0, sizeof(entry));
vcode = VLDB_GetEntryByID(volid, -1, &entry);
if (vcode) {
fprintf(STDERR,
"Could not fetch the entry for volume %lu from VLDB\n",
(unsigned long)volid);
- PrintError("convertROtoRW", code);
+ PrintError("convertROtoRW ", vcode);
return vcode;
}
/* use RO volid even if user specified RW or BK volid */
-
if (volid != entry.volumeId[ROVOL])
volid = entry.volumeId[ROVOL];
rwindex = i;
rwserver = entry.serverNumber[i];
rwpartition = entry.serverPartition[i];
- }
- if (entry.serverFlags[i] & ITSROVOL) {
+ if (roserver)
+ break;
+ } else if ((entry.serverFlags[i] & ITSROVOL) && !roserver) {
same = VLDB_IsSameAddrs(server, entry.serverNumber[i], &code);
if (code) {
fprintf(STDERR,
roindex = i;
roserver = entry.serverNumber[i];
ropartition = entry.serverPartition[i];
- break;
+ if (rwserver)
+ break;
}
}
}
if (!roserver) {
fprintf(STDERR, "Warning: RO volume didn't exist in vldb!\n");
}
- if (ropartition != partition) {
+ if (roserver && (ropartition != partition)) {
fprintf(STDERR,
"Warning: RO volume should be in partition %d instead of %d (vldb)\n",
ropartition, partition);
vcode =
ubik_VL_SetLock(cstruct, 0, entry.volumeId[RWVOL], RWVOL,
VLOP_MOVE);
+ if (vcode) {
+ fprintf(STDERR,
+ "Unable to lock volume %lu, code %d\n",
+ (unsigned long)entry.volumeId[RWVOL],vcode);
+ PrintError("", vcode);
+ return -1;
+ }
+
+ /* make sure the VLDB entry hasn't changed since we started */
+ memset(&checkEntry, 0, sizeof(checkEntry));
+ vcode = VLDB_GetEntryByID(volid, -1, &checkEntry);
+ if (vcode) {
+ fprintf(STDERR,
+ "Could not fetch the entry for volume %lu from VLDB\n",
+ (unsigned long)volid);
+ PrintError("convertROtoRW ", vcode);
+ code = vcode;
+ goto error_exit;
+ }
+
+ MapHostToNetwork(&checkEntry);
+ entry.flags &= ~VLOP_ALLOPERS; /* clear any stale lock operation flags */
+ entry.flags |= VLOP_MOVE; /* set to match SetLock operation above */
+ if (memcmp(&entry, &checkEntry, sizeof(entry)) != 0) {
+ fprintf(STDERR,
+ "VLDB entry for volume %lu has changed; please reissue the command.\n",
+ (unsigned long)volid);
+ code = -1;
+ goto error_exit;
+ }
+
aconn = UV_Bind(server, AFSCONF_VOLUMEPORT);
code = AFSVolConvertROtoRWvolume(aconn, partition, volid);
if (code) {
"Converting RO volume %lu to RW volume failed with code %d\n",
(unsigned long)volid, code);
PrintError("convertROtoRW ", code);
- return -1;
+ goto error_exit;
+ }
+ /* Update the VLDB to match what we did on disk as much as possible. */
+ /* If the converted RO was in the VLDB, make it look like the new RW. */
+ if (roserver) {
+ entry.serverFlags[roindex] = ITSRWVOL;
+ } else {
+ /* Add a new site entry for the newly created RW. It's possible
+ * (but unlikely) that we are already at MAXNSERVERS and that this
+ * new site will invalidate the whole VLDB entry; however,
+ * VLDB_ReplaceEntry will detect this and return VL_BADSERVER,
+ * so we need no extra guard logic here.
+ */
+ afs_int32 newrwindex = entry.nServers;
+ (entry.nServers)++;
+ entry.serverNumber[newrwindex] = server;
+ entry.serverPartition[newrwindex] = partition;
+ entry.serverFlags[newrwindex] = ITSRWVOL;
}
- entry.serverFlags[roindex] = ITSRWVOL;
entry.flags |= RW_EXISTS;
entry.flags &= ~BACK_EXISTS;
+
+ /* if the old RW was in the VLDB, remove it by decrementing the number */
+ /* of servers, replacing the RW entry with the last entry, and zeroing */
+ /* out the last entry. */
if (rwserver) {
(entry.nServers)--;
if (rwindex != entry.nServers) {
"Warning: volume converted, but vldb update failed with code %d!\n",
code);
}
+
+ error_exit:
vcode = UV_LockRelease(entry.volumeId[RWVOL]);
if (vcode) {
- PrintDiagnostics("unlock", vcode);
+ fprintf(STDERR,
+ "Unable to unlock volume %lu, code %d\n",
+ (unsigned long)entry.volumeId[RWVOL],vcode);
+ PrintError("", vcode);
}
return code;
}
static int
-Sizes(register struct cmd_syndesc *as, void *arock)
+Sizes(struct cmd_syndesc *as, void *arock)
{
afs_uint32 avolid;
- afs_int32 aserver, apart, voltype, fromdate = 0, code, err, i;
+ afs_uint32 aserver;
+ afs_int32 apart, voltype, fromdate = 0, code, err, i;
struct nvldbentry entry;
volintSize vol_size;
if (rxConn == 0)
break;
rx_SetConnDeadTime(rxConn, rx_connDeadTime);
- if (rxConn->service)
- rxConn->service->connDeadTime = rx_connDeadTime;
+ if (rx_ServiceOf(rxConn))
+ rx_ServiceOf(rxConn)->connDeadTime = rx_connDeadTime;
}
avolid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
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;
}
+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)
{
}
+#ifdef AFS_NT40_ENV
+static DWORD
+win32_enableCrypt(void)
+{
+ 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)
{
- register char *tcell;
- register afs_int32 code;
- register afs_int32 sauth;
+ char *tcell;
+ afs_int32 code;
+ int secFlags;
/* Initialize the ubik_client connection */
rx_SetRxDeadTime(90);
- cstruct = (struct ubik_client *)0;
+ cstruct = NULL;
+ secFlags = AFSCONF_SECOPTS_FALLBACK_NULL;
- sauth = 0;
tcell = NULL;
if (as->parms[12].items) /* if -cell specified */
tcell = as->parms[12].items->data;
- if (as->parms[14].items) /* -serverauth specified */
- sauth = 1;
- if (as->parms[16].items) /* -crypt specified */
- vsu_SetCrypt(1);
- if ((code =
- vsu_ClientInit((as->parms[13].items != 0), confdir, tcell, sauth,
- &cstruct, UV_SetSecurity))) {
+
+ if (as->parms[13].items)
+ secFlags |= AFSCONF_SECOPTS_NOAUTH;
+
+ if (as->parms[14].items) { /* -localauth specified */
+ secFlags |= AFSCONF_SECOPTS_LOCALAUTH;
+ confdir = AFSDIR_SERVER_ETC_DIRPATH;
+ }
+
+ if (as->parms[16].items /* -encrypt specified */
+#ifdef AFS_NT40_ENV
+ || win32_enableCrypt()
+#endif /* AFS_NT40_ENV */
+ )
+ secFlags |= AFSCONF_SECOPTS_ALWAYSENCRYPT;
+
+ if (as->parms[18].items) /* -config flag set */
+ confdir = as->parms[18].items->data;
+
+ if ((code = vsu_ClientInit(confdir, tcell, secFlags, UV_SetSecurity,
+ &cstruct))) {
fprintf(STDERR, "could not initialize VLDB library (code=%lu) \n",
(unsigned long)code);
exit(1);
noresolve = 1;
else
noresolve = 0;
+
return 0;
}
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_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
"leave clone volume offline");
cmd_AddParm(ts, "-readonly", CMD_FLAG, CMD_OPTIONAL,
"make clone volume read-only, not readwrite");
+ cmd_AddParm(ts, "-readwrite", CMD_FLAG, CMD_OPTIONAL,
+ "make clone volume readwrite, not read-only");
COMMONPARMS;
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");
+ cmd_AddParm(ts, "-stayonline", CMD_FLAG, CMD_OPTIONAL,
+ "release to cloned temp vol, then clone back to repsite RO");
COMMONPARMS;
ts = cmd_CreateSyntax("dump", DumpVolumeCmd, NULL, "dump a volume");
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;
"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, NULL,
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");
+ cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "list what would be done, don't do it");
COMMONPARMS;
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");
+ cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "list what would be done, don't do it");
COMMONPARMS;
ts = cmd_CreateSyntax("examine", ExamineVolume, NULL,
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");
"exclude common prefix volumes");
cmd_AddParm(ts, "-xprefix", CMD_LIST, CMD_OPTIONAL,
"negative prefix on volume(s)");
- cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "no action");
+ cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "list what would be done, don't do it");
COMMONPARMS;
ts = cmd_CreateSyntax("delentry", DeleteEntry, NULL,
"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,
- "no execute");
+ cmd_AddParm(ts, "-noexecute", CMD_FLAG, CMD_OPTIONAL|CMD_HIDDEN, "");
+ cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL,
+ "list what would be done, don't do it");
COMMONPARMS;
ts = cmd_CreateSyntax("partinfo", PartitionInfo, NULL,
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