/*
* 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 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>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <arpa/inet.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 "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"
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;
{
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;
afs_uint32
GetServer(char *aname)
{
- register struct hostent *th;
+ struct hostent *th;
afs_uint32 addr; /* in network byte order */
- register afs_int32 code;
+ afs_int32 code;
char hostname[MAXHOSTCHARS];
if ((addr = GetServerNoresolve(aname)) == 0) {
- /*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;
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;
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) {
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) {
fprintf(STDOUT, "serv\t\t%s\t%s\n", address, hostname);
fprintf(STDOUT, "part\t\t%s\n", pname);
fprintf(STDOUT, "status\t\tOK\n");
- fprintf(STDOUT, "backupID\t%lu\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) {
break;
}
t = a_xInfoP->creationDate;
- fprintf(STDOUT, "creationDate\t%-9lu\t%s",
+ 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",
+ 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",
+ 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",
+ 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",
+ 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);
if (pntr->status == VOK)
fprintf(STDOUT, "name\t\t%s\n", pntr->name);
- fprintf(STDOUT, "id\t\t%lu\n",
+ 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");
break;
}
t = pntr->creationDate;
- fprintf(STDOUT, "creationDate\t%-9lu\t%s",
+ 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",
+ 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",
+ 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",
+ 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",
+ fprintf(STDOUT, "copyDate\t%-9lu\t%s",
afs_printable_uint32_lu(pntr->copyDate),
ctime(&t));
- fprintf(STDOUT, "flags\t\t%#lx\t(Optional)\n",
+ 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;
}
} /*XDisplayVolumes2 */
-/* 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_uint32 *server,
/* 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_uint32 server;
- register char *tp;
+ 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;
*------------------------------------------------------------------------
*/
static int
-SetFields(register struct cmd_syndesc *as, void *arock)
+SetFields(struct cmd_syndesc *as, void *arock)
{
struct nvldbentry entry;
volintInfo info;
*------------------------------------------------------------------------
*/
static int
-volOnline(register struct cmd_syndesc *as, void *arock)
+volOnline(struct cmd_syndesc *as, void *arock)
{
afs_uint32 server;
afs_int32 partition;
*------------------------------------------------------------------------
*/
static int
-volOffline(register struct cmd_syndesc *as, void *arock)
+volOffline(struct cmd_syndesc *as, void *arock)
{
afs_uint32 server;
afs_int32 partition;
}
static int
-CreateVolume(register struct cmd_syndesc *as, void *arock)
+CreateVolume(struct cmd_syndesc *as, void *arock)
{
afs_int32 pnum;
char part[10];
#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;
}
static int
-CopyVolume(register struct cmd_syndesc *as, void *arock)
+CopyVolume(struct cmd_syndesc *as, void *arock)
{
afs_uint32 volid;
afs_uint32 fromserver, toserver;
static int
-ShadowVolume(register struct cmd_syndesc *as, void *arock)
+ShadowVolume(struct cmd_syndesc *as, void *arock)
{
afs_uint32 volid, tovolid;
afs_uint32 fromserver, toserver;
static int
-CloneVolume(register struct cmd_syndesc *as, void *arock)
+CloneVolume(struct cmd_syndesc *as, void *arock)
{
afs_uint32 volid, cloneid;
afs_uint32 server;
return E2BIG;
}
#if 0
- /*
+ /*
* In order that you be able to make clones of RO or BK, this
* check must be omitted.
*/
if (as->parms[6].items) flags |= RV_RDONLY;
- 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_uint32 aserver;
}
static int
-ReleaseVolume(register struct cmd_syndesc *as, void *arock)
+ReleaseVolume(struct cmd_syndesc *as, void *arock)
{
struct nvldbentry entry;
}
static int
-DumpVolumeCmd(register struct cmd_syndesc *as, void *arock)
+DumpVolumeCmd(struct cmd_syndesc *as, void *arock)
{
afs_uint32 avolid;
afs_uint32 aserver;
#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_uint32 aserver;
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);
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_uint32 aserver;
}
static int
-RemoveSite(register struct cmd_syndesc *as, void *arock)
+RemoveSite(struct cmd_syndesc *as, void *arock)
{
afs_uint32 avolid;
}
static int
-ChangeLocation(register struct cmd_syndesc *as, void *arock)
+ChangeLocation(struct cmd_syndesc *as, void *arock)
{
afs_uint32 avolid;
afs_uint32 aserver;
}
static int
-ListPartitions(register struct cmd_syndesc *as, void *arock)
+ListPartitions(struct cmd_syndesc *as, void *arock)
{
afs_uint32 aserver;
afs_int32 code;
*------------------------------------------------------------------------*/
static int
-ListVolumes(register struct cmd_syndesc *as, void *arock)
+ListVolumes(struct cmd_syndesc *as, void *arock)
{
afs_int32 apart, int32list, fast;
afs_uint32 aserver;
}
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];
}
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];
}
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_uint32 server;
afs_int32 code;
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;
}
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[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);
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;
}
*/
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));
}
/* 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 */
}
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 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_uint32 aserver = 0;
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_uint32 aserver;
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;
}
} 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;
print_addrs(const bulkaddrs * addrs, afsUUID * m_uuid, int nentries,
int print)
{
- afs_int32 vcode, m_uniq=0;
- afs_int32 i, j;
+ int i;
afs_uint32 *addrp;
- bulkaddrs m_addrs;
- ListAddrByAttributes m_attrs;
- afs_int32 m_nentries;
- afs_uint32 *m_addrp;
- afs_int32 base, index;
char buf[1024];
if (print) {
/* print out the list of all the server */
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,
- &m_uniq, &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_uint32 *) 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, m_uniq=0;
afs_int32 i, printuuid = 0;
memset(&m_attrs, 0, sizeof(struct ListAddrByAttributes));
m_attrs.Mask = VLADDR_INDEX;
- 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",
+ fprintf(STDERR, "vos: invalid UUID '%s'\n",
as->parms[0].items->data);
exit(-1);
}
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_VL_GetAddrs(cstruct, UBIK_CALL_NEW, 0, 0, &vlcb, &nentries,
if (vcode) {
fprintf(STDERR, "vos: could not list the server addresses\n");
PrintError("", vcode);
- return (vcode);
+ goto out;
}
m_nentries = 0;
- m_addrs.bulkaddrs_val = 0;
- m_addrs.bulkaddrs_len = 0;
i = 1;
while (1) {
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);
}
if (vcode == VL_INDEXERANGE) {
- break;
+ vcode = 0; /* not an error, just means we're done */
+ goto out;
}
if (vcode) {
fprintf(STDERR, "vos: could not list the server addresses\n");
PrintError("", vcode);
- return (vcode);
+ goto out;
}
print_addrs(&m_addrs, &m_uuid, m_nentries, printuuid);
i++;
if ((as->parms[1].items) || (as->parms[0].items) || (i > nentries))
- break;
+ goto out;
}
- return 0;
+out:
+ xdr_free((xdrproc_t)xdr_bulkaddrs, &m_addrs);
+ return vcode;
}
static int
-SetAddrs(register struct cmd_syndesc *as, void *arock)
+SetAddrs(struct cmd_syndesc *as, void *arock)
{
afs_int32 vcode;
bulkaddrs m_addrs;
}
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 ropartition = 0;
int force = 0;
struct rx_connection *aconn;
- char c, dc;
+ int c, dc;
server = GetServer(as->parms[0].items->data);
if (!server) {
}
static int
-Sizes(register struct cmd_syndesc *as, void *arock)
+Sizes(struct cmd_syndesc *as, void *arock)
{
afs_uint32 avolid;
afs_uint32 aserver;
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);
}
static int
-EndTrans(register struct cmd_syndesc *as, void *arock)
+EndTrans(struct cmd_syndesc *as, void *arock)
{
afs_uint32 server;
afs_int32 code, tid, rcode;
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;
+ afs_int32 sauth;
/* Initialize the ubik_client connection */
rx_SetRxDeadTime(90);
#endif /* AFS_NT40_ENV */
)
vsu_SetCrypt(1);
+
+ if (as->parms[18].items) /* -config flag set */
+ confdir = as->parms[18].items->data;
+
if ((code =
vsu_ClientInit((as->parms[13].items != 0), confdir, tcell, sauth,
&cstruct, UV_SetSecurity))) {
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, "-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,
"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,
git://git.openafs.org / openafs.git / blobdiff