# 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"
/* 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);
+ afs_int32 *voltype, struct nvldbentry *rentry);
struct tqElem {
afs_uint32 volid;
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) {
{
size_t total;
+
total = strlen(name);
if (!strcmp(&name[total - 9], ".readonly")) {
return 0;
long blksize;
afs_int32 error, code;
int ufdIsOpen = 0;
- afs_hyper_t filesize, currOffset;
+ afs_int64 currOffset;
afs_uint32 buffer;
afs_uint32 got;
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) {
/* set <server> and <part> to the correct values depending on
* <voltype> and <entry> */
static void
-GetServerAndPart(struct uvldbentry *entry, int voltype, afs_uint32 *server,
+GetServerAndPart(struct nvldbentry *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 < NMAXNSERVERS; i++) {
+ for (i = istart; i < entry->nServers; i++) {
if (entry->serverFlags[i] & vtype) {
- /* *uuid = entry->serverNumber[i]; */
- *server = entry->serverUnique[i];
+ *server = entry->serverNumber[i];
*part = entry->serverPartition[i];
*previdx = i;
return;
}
static void
-PostVolumeStats(struct uvldbentry *entry)
+PostVolumeStats(struct nvldbentry *entry)
{
- SubEnumerateEntryU(entry);
+ SubEnumerateEntry(entry);
/* Check for VLOP_ALLOPERS */
PrintLocked(entry->flags);
return;
*------------------------------------------------------------------------*/
static void
-XVolumeStats(volintXInfo *a_xInfoP, struct uvldbentry *a_entryP,
+XVolumeStats(volintXInfo *a_xInfoP, struct nvldbentry *a_entryP,
afs_int32 a_srvID, afs_int32 a_partID, int a_volType)
{ /*XVolumeStats */
} /*XVolumeStats */
static void
-VolumeStats_int(volintInfo *pntr, struct uvldbentry *entry, afs_uint32 server,
+VolumeStats_int(volintInfo *pntr, struct nvldbentry *entry, afs_uint32 server,
afs_int32 part, int voltype)
{
int totalOK, totalNotOK, totalBusy;
static int
ExamineVolume(struct cmd_syndesc *as, void *arock)
{
- struct uvldbentry entry;
+ struct nvldbentry entry;
afs_int32 vcode = 0;
volintInfo *pntr = (volintInfo *) 0;
volintXInfo *xInfoP = (volintXInfo *) 0;
(unsigned long)volid);
fflush(STDOUT);
}
- vcode = VLDB_GetEntryByIDU(volid, -1, &entry);
+ vcode = VLDB_GetEntryByID(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");
- MapHostToNetworkU(&entry);
+ MapHostToNetwork(&entry);
if (entry.volumeId[RWVOL] == volid)
voltype = RWVOL;
XVolumeStats(xInfoP, &entry, aserver, apart, voltype);
else if (as->parms[2].items) {
DisplayFormat2(aserver, apart, pntr);
- EnumerateEntryU(&entry);
+ EnumerateEntry(&entry);
isSubEnum = 1;
} else
VolumeStats_int(pntr, &entry, aserver, apart, voltype);
static int
SetFields(struct cmd_syndesc *as, void *arock)
{
- struct uvldbentry entry;
+ struct nvldbentry entry;
volintInfo info;
afs_uint32 volid;
afs_int32 code, err;
return -1;
}
- code = VLDB_GetEntryByIDU(volid, RWVOL, &entry);
+ code = VLDB_GetEntryByID(volid, RWVOL, &entry);
if (code) {
fprintf(STDERR,
"Could not fetch the entry for volume number %lu from VLDB \n",
(unsigned long)volid);
return (code);
}
- MapHostToNetworkU(&entry);
+ MapHostToNetwork(&entry);
GetServerAndPart(&entry, RWVOL, &aserver, &apart, &previdx);
if (previdx == -1) {
afs_uint32 volid = 0, rovolid = 0, bkvolid = 0;
afs_uint32 *arovolid;
afs_int32 code;
- struct uvldbentry entry;
+ struct nvldbentry entry;
afs_int32 vcode;
afs_int32 quota;
as->parms[2].items->data);
return EINVAL;
}
- vcode = VLDB_GetEntryByNameU(as->parms[2].items->data, &entry);
+ vcode = VLDB_GetEntryByName(as->parms[2].items->data, &entry);
if (!vcode) {
fprintf(STDERR, "Volume %s already exists\n",
as->parms[2].items->data);
#if 0
static afs_int32
-DeleteAll(struct uvldbentry *entry)
+DeleteAll(struct nvldbentry *entry)
{
int i;
afs_int32 error, code, curserver, curpart;
afs_uint32 volid;
- MapHostToNetworkU(entry);
+ MapHostToNetwork(entry);
error = 0;
for (i = 0; i < entry->nServers; i++) {
- curserver = entry->serverUnique[i];
+ curserver = entry->serverNumber[i];
curpart = entry->serverPartition[i];
if (entry->serverFlags[i] & ITSROVOL) {
volid = entry->volumeId[ROVOL];
* them in from the VLDB entry.
*/
if ((partition == -1) || !server) {
- struct uvldbentry entry;
+ struct nvldbentry entry;
- code = VLDB_GetEntryByIDU(volid, -1, &entry);
+ code = VLDB_GetEntryByID(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_GetRwIndexU(&entry);
- if ((idx == -1) || (server && (server != entry.serverUnique[idx]))
+ idx = Lp_GetRwIndex(&entry);
+ if ((idx == -1) || (server && (server != entry.serverNumber[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.serverUnique[j]))
+ if (((server == 0) || (server == entry.serverNumber[j]))
&& ((partition == -1)
|| (partition == entry.serverPartition[j]))) {
if (idx != -1) {
return ENOENT;
}
- server = htonl(entry.serverUnique[idx]);
+ server = htonl(entry.serverNumber[idx]);
partition = entry.serverPartition[idx];
}
afs_uint32 fromserver, toserver;
afs_int32 frompart, topart, code, err, flags;
char fromPartName[10], toPartName[10], *tovolume;
- struct uvldbentry entry;
+ struct nvldbentry entry;
struct diskPartition64 partition; /* for space check */
volintInfo *p;
tovolume);
return EINVAL;
}
- code = VLDB_GetEntryByNameU(tovolume, &entry);
+ code = VLDB_GetEntryByName(tovolume, &entry);
if (!code) {
fprintf(STDERR, "Volume %s already exists\n", tovolume);
PrintDiagnostics("copy", code);
afs_int32 part, voltype;
char partName[10], *volname;
afs_int32 code, err, flags;
- struct uvldbentry entry;
+ struct nvldbentry entry;
volid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
if (volid == 0) {
afs_uint32 avolid;
afs_uint32 aserver;
afs_int32 apart, vtype, code, err;
- struct uvldbentry entry;
+ struct nvldbentry entry;
afs_uint32 buvolid;
afs_uint32 buserver;
afs_int32 bupart, butype;
- struct uvldbentry buentry;
+ struct nvldbentry buentry;
avolid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
if (avolid == 0) {
ReleaseVolume(struct cmd_syndesc *as, void *arock)
{
- struct uvldbentry entry;
+ struct nvldbentry entry;
afs_uint32 avolid;
afs_uint32 aserver;
afs_int32 apart, vtype, code, err;
afs_uint32 aserver;
afs_int32 apart, voltype, fromdate = 0, code, err, i, flags;
char filename[MAXPATHLEN];
- struct uvldbentry entry;
+ struct nvldbentry entry;
rx_SetRxDeadTime(60 * 10);
for (i = 0; i < MAXSERVERS; i++) {
int readonly = 0, offline = 0, voltype = RWVOL;
char afilename[MAXPATHLEN], avolname[VOLSER_MAXVOLNAME + 1], apartName[10];
char volname[VOLSER_MAXVOLNAME + 1];
- struct uvldbentry entry;
+ struct nvldbentry entry;
aparentid = 0;
if (as->parms[4].items) {
/* Check if volume exists or not */
vsu_ExtractName(volname, avolname);
- vcode = VLDB_GetEntryByNameU(volname, &entry);
+ vcode = VLDB_GetEntryByName(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_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 */
+ 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 */
restoreflags = RV_FULLRST;
if ((aoverwrite == INC) || (aoverwrite == ABORT))
fprintf(STDERR,
else { /* volume exists - do we do a full incremental or abort */
afs_uint32 Oserver;
afs_int32 Opart, Otype, vol_elsewhere = 0;
- struct uvldbentry Oentry;
+ struct nvldbentry Oentry;
int c, dc;
if (avolid == 0) {
static int
VolumeInfoCmd(char *name)
{
- struct uvldbentry entry;
+ struct nvldbentry entry;
afs_int32 vcode;
/* The vlserver will handle names with the .readonly
* and .backup extension as well as volume ids.
*/
- vcode = VLDB_GetEntryByNameU(name, &entry);
+ vcode = VLDB_GetEntryByName(name, &entry);
if (vcode) {
PrintError("", vcode);
exit(1);
}
- MapHostToNetworkU(&entry);
- EnumerateEntryU(&entry);
+ MapHostToNetwork(&entry);
+ EnumerateEntry(&entry);
/* Defect #3027: grubby check to handle locked volume.
* If VLOP_ALLOPERS is set, the entry is locked.
static int
VolumeZap(struct cmd_syndesc *as, void *arock)
{
- struct uvldbentry entry;
+ struct nvldbentry entry;
afs_uint32 volid, zapbackupid = 0, backupid = 0;
afs_int32 code, server, part, err;
as->parms[1].items->data);
exit(1);
}
- code = VLDB_GetEntryByIDU(volid, -1, &entry);
+ code = VLDB_GetEntryByID(volid, -1, &entry);
if (!code) {
if (volid == entry.volumeId[RWVOL])
backupid = entry.volumeId[BACKVOL];
RenameVolume(struct cmd_syndesc *as, void *arock)
{
afs_int32 code1, code2, code;
- struct uvldbentry entry;
+ struct nvldbentry entry;
- code1 = VLDB_GetEntryByNameU(as->parms[0].items->data, &entry);
+ code1 = VLDB_GetEntryByName(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_GetEntryByNameU(as->parms[1].items->data, &entry);
+ code2 = VLDB_GetEntryByName(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);
}
- MapHostToNetworkU(&entry);
+ MapHostToNetwork(&entry);
code =
- UV_RenameVolumeU(&entry, as->parms[0].items->data,
- as->parms[1].items->data);
+ UV_RenameVolume(&entry, as->parms[0].items->data,
+ as->parms[1].items->data);
if (code) {
PrintDiagnostics("rename", code);
exit(1);
int
GetVolumeInfo(afs_uint32 volid, afs_uint32 *server, afs_int32 *part, afs_int32 *voltype,
- struct uvldbentry *rentry)
+ struct nvldbentry *rentry)
{
afs_int32 vcode;
int i, index = -1;
- vcode = VLDB_GetEntryByIDU(volid, -1, rentry);
+ vcode = VLDB_GetEntryByID(volid, -1, rentry);
if (vcode) {
fprintf(STDERR,
"Could not fetch the entry for volume %lu from VLDB \n",
PrintError("", vcode);
return (vcode);
}
- MapHostToNetworkU(rentry);
+ MapHostToNetwork(rentry);
if (volid == rentry->volumeId[ROVOL]) {
*voltype = ROVOL;
for (i = 0; i < rentry->nServers; i++) {
return -1;
}
- *server = rentry->serverUnique[index];
+ *server = rentry->serverNumber[index];
*part = rentry->serverPartition[index];
return 0;
}
- index = Lp_GetRwIndexU(rentry);
+ index = Lp_GetRwIndex(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->serverUnique[index];
+ *server = rentry->serverNumber[index];
*part = rentry->serverPartition[index];
return 0;
}
if (volid == rentry->volumeId[BACKVOL]) {
*voltype = BACKVOL;
- *server = rentry->serverUnique[index];
+ *server = rentry->serverNumber[index];
*part = rentry->serverPartition[index];
return 0;
}
afs_uint32 avolid;
afs_int32 vcode;
struct VldbListByAttributes attributes;
- ubulkentries arrayEntries;
- struct uvldbentry *vllist;
+ nbulkentries arrayEntries;
+ 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);
/* Get all the VLDB entries on a server and/or partition */
memset(&arrayEntries, 0, sizeof(arrayEntries));
- vcode = VLDB_ListAttributesU(&attributes, &nentries, &arrayEntries);
+ vcode = VLDB_ListAttributes(&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.ubulkentries_val[j];
+ vllist = &arrayEntries.nbulkentries_val[j];
if (seenprefix) {
/* It only deletes the RW volumes */
if (strncmp(vllist->name, prefix, strlen(prefix))) {
}
}
- 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.ubulkentries_val)
- free(arrayEntries.ubulkentries_val);
+
+ xdr_free((xdrproc_t) xdr_nbulkentries, &arrayEntries);
return 0;
}
static int
CompareVldbEntryByName(const void *p1, const void *p2)
{
- struct uvldbentry *arg1, *arg2;
+ struct nvldbentry *arg1, *arg2;
- arg1 = (struct uvldbentry *)p1;
- arg2 = (struct uvldbentry *)p2;
+ arg1 = (struct nvldbentry *)p1;
+ arg2 = (struct nvldbentry *)p2;
return (strcmp(arg1->name, arg2->name));
}
/*
static int CompareVldbEntry(char *p1, char *p2)
{
- struct uvldbentry *arg1,*arg2;
+ struct nvldbentry *arg1,*arg2;
int i;
int pos1, pos2;
char comp1[100],comp2[100];
char temp1[20],temp2[20];
- arg1 = (struct uvldbentry *)p1;
- arg2 = (struct uvldbentry *)p2;
+ arg1 = (struct nvldbentry *)p1;
+ arg2 = (struct nvldbentry *)p2;
pos1 = -1;
pos2 = -1;
pos1 = 0;
pos2 = 0;
}
- sprintf(comp1,"%10u",arg1->serverUnique[pos1]);
- sprintf(comp2,"%10u",arg2->serverUnique[pos2]);
+ sprintf(comp1,"%10u",arg1->serverNumber[pos1]);
+ sprintf(comp2,"%10u",arg2->serverNumber[pos2]);
sprintf(temp1,"%10u",arg1->serverPartition[pos1]);
sprintf(temp2,"%10u",arg2->serverPartition[pos2]);
strcat(comp1,temp1);
afs_int32 code;
afs_int32 vcode;
struct VldbListByAttributes attributes;
- ubulkentries arrayEntries;
- struct uvldbentry *vllist, *tarray = 0, *ttarray;
+ nbulkentries arrayEntries;
+ struct nvldbentry *vllist, *tarray = 0, *ttarray;
afs_int32 centries, nentries = 0;
afs_int32 tarraysize = 0;
afs_int32 parraysize;
nextindex = -1;
vcode =
- VLDB_ListAttributesN2U(&attributes, 0, thisindex, ¢ries,
+ VLDB_ListAttributesN2(&attributes, 0, thisindex, ¢ries,
&arrayEntries, &nextindex);
if (vcode == RXGEN_OPCODE) {
/* Vlserver not running with ListAttributesN2. Fall back */
vcode =
- VLDB_ListAttributesU(&attributes, ¢ries, &arrayEntries);
+ VLDB_ListAttributes(&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.ubulkentries_val[j];
- MapHostToNetworkU(vllist);
- EnumerateEntryU(vllist);
+ vllist = &arrayEntries.nbulkentries_val[j];
+ MapHostToNetwork(vllist);
+ EnumerateEntry(vllist);
PrintLocked(vllist->flags);
}
*/
else if (centries > 0) {
if (!tarray) {
- /* steal away the first bulk entries array */
- tarray = (struct uvldbentry *)arrayEntries.ubulkentries_val;
- tarraysize = centries * sizeof(struct uvldbentry);
- arrayEntries.ubulkentries_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 uvldbentry));
+ parraysize = (centries * sizeof(struct nvldbentry));
ttarray =
- (struct uvldbentry *)realloc(tarray,
+ (struct nvldbentry *)realloc(tarray,
tarraysize + parraysize);
if (!ttarray) {
fprintf(STDERR,
/* Copy them in */
memcpy(((char *)tarray) + tarraysize,
- (char *)arrayEntries.ubulkentries_val, parraysize);
+ (char *)arrayEntries.nbulkentries_val, parraysize);
tarraysize += parraysize;
}
}
/* Free the bulk array */
- if (arrayEntries.ubulkentries_val) {
- free(arrayEntries.ubulkentries_val);
- arrayEntries.ubulkentries_val = 0;
- }
+ xdr_free((xdrproc_t) xdr_nbulkentries, &arrayEntries);
}
/* Here is where we now sort all the entries and print them */
if (sort && (nentries > 0)) {
- qsort((char *)tarray, nentries, sizeof(struct uvldbentry),
+ qsort((char *)tarray, nentries, sizeof(struct nvldbentry),
CompareVldbEntryByName);
for (vllist = tarray, j = 0; j < nentries; j++, vllist++) {
- MapHostToNetworkU(vllist);
- EnumerateEntryU(vllist);
+ MapHostToNetwork(vllist);
+ EnumerateEntry(vllist);
PrintLocked(vllist->flags);
}
afs_int32 code, apart1;
afs_int32 vcode;
struct VldbListByAttributes attributes;
- ubulkentries arrayEntries;
- struct uvldbentry *vllist;
+ nbulkentries arrayEntries;
+ struct nvldbentry *vllist;
afs_int32 nentries;
int j;
char pname[10];
}
memset(&arrayEntries, 0, sizeof(arrayEntries)); /* initialize to hint the stub to alloc space */
- vcode = VLDB_ListAttributesU(&attributes, &nentries, &arrayEntries);
+ vcode = VLDB_ListAttributes(&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.ubulkentries_val[j];
+ vllist = &arrayEntries.nbulkentries_val[j];
if (seenprefix) {
for (ti = as->parms[0].items; ti; ti = ti->next) {
}
avolid = vllist->volumeId[RWVOL];
- MapHostToNetworkU(vllist);
+ MapHostToNetwork(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.ubulkentries_val)
- free(arrayEntries.ubulkentries_val);
+ xdr_free((xdrproc_t) xdr_nbulkentries, &arrayEntries);
return 0;
}
afs_int32 code;
afs_int32 vcode;
struct VldbListByAttributes attributes;
- ubulkentries arrayEntries;
- struct uvldbentry *vllist;
+ nbulkentries arrayEntries;
+ struct nvldbentry *vllist;
afs_int32 nentries;
int j;
afs_uint32 volid;
attributes.flag = VLOP_ALLOPERS;
attributes.Mask |= VLLIST_FLAG;
memset(&arrayEntries, 0, sizeof(arrayEntries)); /*initialize to hint the stub to alloc space */
- vcode = VLDB_ListAttributesU(&attributes, &nentries, &arrayEntries);
+ vcode = VLDB_ListAttributes(&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.ubulkentries_val[j];
+ vllist = &arrayEntries.nbulkentries_val[j];
volid = vllist->volumeId[RWVOL];
vcode =
ubik_VL_ReleaseLock(cstruct, 0, volid, -1,
}
}
- if (arrayEntries.ubulkentries_val)
- free(arrayEntries.ubulkentries_val);
+ xdr_free((xdrproc_t) xdr_nbulkentries, &arrayEntries);
return 0;
}
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];
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 */
}
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_uint32 saddr;
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_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);
- }
-
- m_nentries = 0;
- m_addrs.bulkaddrs_val = 0;
- m_addrs.bulkaddrs_len = 0;
- i = 1;
- while (1) {
- m_attrs.index = i;
-
- vcode =
- 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) {
- 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;
- }
- }
-
- if (vcode == VL_INDEXERANGE) {
- break;
- }
-
- if (vcode) {
- fprintf(STDERR, "vos: could not list the server addresses\n");
- PrintError("", vcode);
- return (vcode);
- }
-
- print_addrs(&m_addrs, &m_uuid, m_nentries, printuuid);
- i++;
+ 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 ((as->parms[1].items) || (as->parms[0].items) || (i > nentries))
- break;
+ /* if -uuid or -host, only list one response */
+ if (as->parms[1].items || as->parms[0].items)
+ break;
}
- return 0;
+out:
+ xdr_free((xdrproc_t)xdr_bulkaddrs, &m_addrs);
+ return vcode;
}
afs_uint32 volid;
afs_uint32 server;
afs_int32 code, i, same;
- struct uvldbentry entry, storeEntry;
+ struct nvldbentry entry, storeEntry;
afs_int32 vcode;
afs_int32 rwindex = 0;
afs_uint32 rwserver = 0;
if (as->parms[3].items)
force = 1;
- vcode = VLDB_GetEntryByIDU(volid, -1, &entry);
+ vcode = VLDB_GetEntryByID(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];
- MapHostToNetworkU(&entry);
+ MapHostToNetwork(&entry);
for (i = 0; i < entry.nServers; i++) {
if (entry.serverFlags[i] & ITSRWVOL) {
rwindex = i;
- rwserver = entry.serverUnique[i];
+ rwserver = entry.serverNumber[i];
rwpartition = entry.serverPartition[i];
}
if (entry.serverFlags[i] & ITSROVOL) {
- same = VLDB_IsSameAddrs(server, entry.serverUnique[i], &code);
+ same = VLDB_IsSameAddrs(server, entry.serverNumber[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.serverUnique[i];
+ roserver = entry.serverNumber[i];
ropartition = entry.serverPartition[i];
break;
}
if (rwserver) {
(entry.nServers)--;
if (rwindex != entry.nServers) {
- entry.serverUnique[rwindex] = entry.serverUnique[entry.nServers];
+ entry.serverNumber[rwindex] = entry.serverNumber[entry.nServers];
entry.serverPartition[rwindex] =
entry.serverPartition[entry.nServers];
entry.serverFlags[rwindex] = entry.serverFlags[entry.nServers];
- entry.serverUnique[entry.nServers] = 0;
+ entry.serverNumber[entry.nServers] = 0;
entry.serverPartition[entry.nServers] = 0;
entry.serverFlags[entry.nServers] = 0;
}
entry.flags |= RO_EXISTS;
}
}
- MapNetworkToHostU(&entry, &storeEntry);
+ MapNetworkToHost(&entry, &storeEntry);
code =
- VLDB_ReplaceEntryU(entry.volumeId[RWVOL], RWVOL, &storeEntry,
+ VLDB_ReplaceEntry(entry.volumeId[RWVOL], RWVOL, &storeEntry,
(LOCKREL_OPCODE | LOCKREL_AFSID |
LOCKREL_TIMESTAMP));
if (code) {
afs_uint32 avolid;
afs_uint32 aserver;
afs_int32 apart, voltype, fromdate = 0, code, err, i;
- struct uvldbentry entry;
+ struct nvldbentry entry;
volintSize vol_size;
rx_SetRxDeadTime(60 * 10);
#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;
}
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