/*
* 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
/* Local Prototypes */
int PrintDiagnostics(char *astring, afs_int32 acode);
-int GetVolumeInfo(afs_uint32 volid, afs_int32 *server, afs_int32 *part,
- afs_int32 *voltype, struct nvldbentry *rentry);
+int GetVolumeInfo(afs_uint32 volid, afs_uint32 *server, afs_int32 *part,
+ afs_int32 *voltype, struct uvldbentry *rentry);
struct tqElem {
afs_uint32 volid;
cmd_AddParm(ts, "-encrypt", CMD_FLAG, CMD_OPTIONAL, "encrypt commands");\
cmd_AddParm(ts, "-noresolve", CMD_FLAG, CMD_OPTIONAL, "don't resolve addresses"); \
-#define ERROR_EXIT(code) {error=(code); goto error_exit;}
+#define ERROR_EXIT(code) do { \
+ error = (code); \
+ goto error_exit; \
+} while (0)
int rxInitDone = 0;
struct rx_connection *tconn;
-afs_int32 tserver;
+afs_uint32 tserver;
extern struct ubik_client *cstruct;
const char *confdir;
static int
VolNameOK(char *name)
{
- int total;
-
+ size_t total;
total = strlen(name);
if (!strcmp(&name[total - 9], ".readonly")) {
static int
IsNumeric(char *name)
{
- int result, len, i;
+ int result, i;
+ size_t len;
char *ptr;
result = 1;
/*
- * Parse a server name/address and return the address in HOST BYTE order
+ * Parse a server dotted address and return the address in network byte order
*/
-afs_int32
-GetServer(char *aname)
+afs_uint32
+GetServerNoresolve(char *aname)
{
- register struct hostent *th;
- afs_int32 addr;
int b1, b2, b3, b4;
- register afs_int32 code;
- char hostname[MAXHOSTCHARS];
+ afs_uint32 addr;
+ afs_int32 code;
code = sscanf(aname, "%d.%d.%d.%d", &b1, &b2, &b3, &b4);
if (code == 4) {
addr = (b1 << 24) | (b2 << 16) | (b3 << 8) | b4;
- addr = ntohl(addr); /* convert to host order */
- } else {
+ addr = htonl(addr); /* convert to network byte order */
+ return addr;
+ } else
+ return 0;
+}
+/*
+ * Parse a server name/address and return the address in network byte order
+ */
+afs_uint32
+GetServer(char *aname)
+{
+ struct hostent *th;
+ afs_uint32 addr; /* in network byte order */
+ afs_int32 code;
+ char hostname[MAXHOSTCHARS];
+
+ if ((addr = GetServerNoresolve(aname)) == 0) {
th = gethostbyname(aname);
if (!th)
return 0;
memcpy(&addr, th->h_addr, sizeof(addr));
}
- if (addr == htonl(0x7f000001)) { /* local host */
+ if (rx_IsLoopbackAddr(ntohl(addr))) { /* local host */
code = gethostname(hostname, MAXHOSTCHARS);
if (code)
return 0;
- th = gethostbyname(hostname); /* returns host byte order */
+ th = gethostbyname(hostname);
if (!th)
return 0;
memcpy(&addr, th->h_addr, sizeof(addr));
}
int
-IsPartValid(afs_int32 partId, afs_int32 server, afs_int32 *code)
+IsPartValid(afs_int32 partId, afs_uint32 server, afs_int32 *code)
{
struct partList dummyPartList;
int i, success, cnt;
- /*sends the contents of file associated with <fd> and <blksize> to Rx Stream
+ /*sends the contents of file associated with <fd> and <blksize> to Rx Stream
* associated with <call> */
-int
-SendFile(usd_handle_t ufd, register struct rx_call *call, long blksize)
+int
+SendFile(usd_handle_t ufd, struct rx_call *call, long blksize)
{
char *buffer = (char *)0;
afs_int32 error = 0;
long blksize;
afs_int32 error, code;
int ufdIsOpen = 0;
- afs_hyper_t filesize, currOffset;
- afs_uint32 buffer;
- afs_uint32 got;
+ afs_hyper_t filesize, currOffset;
+ afs_uint32 buffer;
+ afs_uint32 got;
error = 0;
}
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)
{
*------------------------------------------------------------------------*/
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 */
*------------------------------------------------------------------------*/
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 */
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;
}
}
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 */
*------------------------------------------------------------------------*/
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 */
-/* 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 uvldbentry *entry, int voltype, afs_uint32 *server,
afs_int32 *part, int *previdx)
{
int i, istart, vtype;
istart = ((*previdx < 0) ? 0 : *previdx + 1);
}
- for (i = istart; i < entry->nServers; i++) {
+ for (i = istart; i < entry->nServers && i < NMAXNSERVERS; i++) {
if (entry->serverFlags[i] & vtype) {
- *server = entry->serverNumber[i];
+ /* *uuid = entry->serverNumber[i]; */
+ *server = entry->serverUnique[i];
*part = entry->serverPartition[i];
*previdx = i;
return;
}
static void
-PostVolumeStats(struct nvldbentry *entry)
+PrintLocked(afs_int32 aflags)
{
- SubEnumerateEntry(entry);
- /* Check for VLOP_ALLOPERS */
- if (entry->flags & VLOP_ALLOPERS)
+ afs_int32 flags = aflags & VLOP_ALLOPERS;
+
+ if (flags) {
fprintf(STDOUT, " Volume is currently LOCKED \n");
+
+ if (flags & VLOP_MOVE) {
+ fprintf(STDOUT, " Volume is locked for a move operation\n");
+ }
+ if (flags & VLOP_RELEASE) {
+ fprintf(STDOUT, " Volume is locked for a release operation\n");
+ }
+ if (flags & VLOP_BACKUP) {
+ fprintf(STDOUT, " Volume is locked for a backup operation\n");
+ }
+ if (flags & VLOP_DELETE) {
+ fprintf(STDOUT, " Volume is locked for a delete/misc operation\n");
+ }
+ if (flags & VLOP_DUMP) {
+ fprintf(STDOUT, " Volume is locked for a dump/restore operation\n");
+ }
+ }
+}
+
+static void
+PostVolumeStats(struct uvldbentry *entry)
+{
+ SubEnumerateEntryU(entry);
+ /* Check for VLOP_ALLOPERS */
+ PrintLocked(entry->flags);
return;
}
*------------------------------------------------------------------------*/
static void
-XVolumeStats(volintXInfo *a_xInfoP, struct nvldbentry *a_entryP,
+XVolumeStats(volintXInfo *a_xInfoP, struct uvldbentry *a_entryP,
afs_int32 a_srvID, afs_int32 a_partID, int a_volType)
{ /*XVolumeStats */
} /*XVolumeStats */
static void
-VolumeStats_int(volintInfo *pntr, struct nvldbentry *entry, afs_int32 server,
+VolumeStats_int(volintInfo *pntr, struct uvldbentry *entry, afs_uint32 server,
afs_int32 part, int voltype)
{
int totalOK, totalNotOK, totalBusy;
/* command to forcibly remove a volume */
static 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;
+ struct uvldbentry entry;
afs_int32 vcode = 0;
volintInfo *pntr = (volintInfo *) 0;
volintXInfo *xInfoP = (volintXInfo *) 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 */
(unsigned long)volid);
fflush(STDOUT);
}
- vcode = VLDB_GetEntryByID(volid, -1, &entry);
+ vcode = VLDB_GetEntryByIDU(volid, -1, &entry);
if (vcode) {
fprintf(STDERR,
"Could not fetch the entry for volume number %lu from VLDB \n",
}
if (verbose)
fprintf(STDOUT, "done\n");
- MapHostToNetwork(&entry);
+ MapHostToNetworkU(&entry);
if (entry.volumeId[RWVOL] == volid)
voltype = RWVOL;
XVolumeStats(xInfoP, &entry, aserver, apart, voltype);
else if (as->parms[2].items) {
DisplayFormat2(aserver, apart, pntr);
- EnumerateEntry(&entry);
+ EnumerateEntryU(&entry);
+ isSubEnum = 1;
} else
VolumeStats_int(pntr, &entry, aserver, apart, voltype);
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;
+ struct uvldbentry 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 */
return -1;
}
- code = VLDB_GetEntryByID(volid, RWVOL, &entry);
+ code = VLDB_GetEntryByIDU(volid, RWVOL, &entry);
if (code) {
fprintf(STDERR,
"Could not fetch the entry for volume number %lu from VLDB \n",
(unsigned long)volid);
return (code);
}
- MapHostToNetwork(&entry);
+ MapHostToNetworkU(&entry);
GetServerAndPart(&entry, RWVOL, &aserver, &apart, &previdx);
if (previdx == -1) {
*------------------------------------------------------------------------
*/
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;
}
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 = 0, rovolid = 0, bkvolid = 0;
afs_uint32 *arovolid;
afs_int32 code;
- struct nvldbentry entry;
+ struct uvldbentry entry;
afs_int32 vcode;
afs_int32 quota;
as->parms[2].items->data);
return EINVAL;
}
- vcode = VLDB_GetEntryByName(as->parms[2].items->data, &entry);
+ vcode = VLDB_GetEntryByNameU(as->parms[2].items->data, &entry);
if (!vcode) {
fprintf(STDERR, "Volume %s already exists\n",
as->parms[2].items->data);
#if 0
static afs_int32
-DeleteAll(struct nvldbentry *entry)
+DeleteAll(struct uvldbentry *entry)
{
int i;
afs_int32 error, code, curserver, curpart;
afs_uint32 volid;
- MapHostToNetwork(entry);
+ MapHostToNetworkU(entry);
error = 0;
for (i = 0; i < entry->nServers; i++) {
- curserver = entry->serverNumber[i];
+ curserver = entry->serverUnique[i];
curpart = entry->serverPartition[i];
if (entry->serverFlags[i] & ITSROVOL) {
volid = entry->volumeId[ROVOL];
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;
* them in from the VLDB entry.
*/
if ((partition == -1) || !server) {
- struct nvldbentry entry;
+ struct uvldbentry entry;
- code = VLDB_GetEntryByID(volid, -1, &entry);
+ code = VLDB_GetEntryByIDU(volid, -1, &entry);
if (code) {
fprintf(STDERR,
"Could not fetch the entry for volume %lu from VLDB\n",
if (((volid == entry.volumeId[RWVOL]) && (entry.flags & RW_EXISTS))
|| ((volid == entry.volumeId[BACKVOL])
&& (entry.flags & BACK_EXISTS))) {
- idx = Lp_GetRwIndex(&entry);
- if ((idx == -1) || (server && (server != entry.serverNumber[idx]))
+ idx = Lp_GetRwIndexU(&entry);
+ if ((idx == -1) || (server && (server != entry.serverUnique[idx]))
|| ((partition != -1)
&& (partition != entry.serverPartition[idx]))) {
fprintf(STDERR, "VLDB: Volume '%s' no match\n",
if (entry.serverFlags[j] != ITSROVOL)
continue;
- if (((server == 0) || (server == entry.serverNumber[j]))
+ if (((server == 0) || (server == entry.serverUnique[j]))
&& ((partition == -1)
|| (partition == entry.serverPartition[j]))) {
if (idx != -1) {
return ENOENT;
}
- server = htonl(entry.serverNumber[idx]);
+ server = htonl(entry.serverUnique[idx]);
partition = entry.serverPartition[idx];
}
#define TESTM 0 /* set for move space tests, clear for production */
static 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 uvldbentry entry;
struct diskPartition64 partition; /* for space check */
volintInfo *p;
tovolume);
return EINVAL;
}
- code = VLDB_GetEntryByName(tovolume, &entry);
+ code = VLDB_GetEntryByNameU(tovolume, &entry);
if (!code) {
fprintf(STDERR, "Volume %s already exists\n", tovolume);
PrintDiagnostics("copy", code);
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;
+ struct uvldbentry entry;
volid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
if (volid == 0) {
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_int32 aserver, apart, vtype, code, err;
- struct nvldbentry entry;
+ afs_uint32 aserver;
+ afs_int32 apart, vtype, code, err;
+ struct uvldbentry entry;
afs_uint32 buvolid;
- afs_int32 buserver, bupart, butype;
- struct nvldbentry buentry;
+ afs_uint32 buserver;
+ afs_int32 bupart, butype;
+ struct uvldbentry buentry;
avolid = vsu_GetVolumeID(as->parms[0].items->data, cstruct, &err);
if (avolid == 0) {
}
static int
-ReleaseVolume(register struct cmd_syndesc *as, void *arock)
+ReleaseVolume(struct cmd_syndesc *as, void *arock)
{
- struct nvldbentry entry;
+ struct uvldbentry entry;
afs_uint32 avolid;
- afs_int32 aserver, apart, vtype, code, err;
+ afs_uint32 aserver;
+ afs_int32 apart, vtype, code, err;
int force = 0;
if (as->parms[1].items)
}
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;
+ struct uvldbentry entry;
rx_SetRxDeadTime(60 * 10);
for (i = 0; i < MAXSERVERS; i++) {
#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';
+ struct uvldbentry entry;
aparentid = 0;
if (as->parms[4].items) {
/* Check if volume exists or not */
vsu_ExtractName(volname, avolname);
- vcode = VLDB_GetEntryByName(volname, &entry);
+ vcode = VLDB_GetEntryByNameU(volname, &entry);
if (vcode) { /* no volume - do a full restore */
restoreflags = RV_FULLRST;
if ((aoverwrite == INC) || (aoverwrite == ABORT))
"Volume does not exist; Will perform a full restore\n");
}
- else if ((!readonly && Lp_GetRwIndex(&entry) == -1) /* RW volume does not exist - do a full */
- ||(readonly && !Lp_ROMatch(0, 0, &entry))) { /* RO volume does not exist - do a full */
+ else if ((!readonly && Lp_GetRwIndexU(&entry) == -1) /* RW volume does not exist - do a full */
+ ||(readonly && !Lp_ROMatchU(0, 0, &entry))) { /* RO volume does not exist - do a full */
restoreflags = RV_FULLRST;
if ((aoverwrite == INC) || (aoverwrite == ABORT))
fprintf(STDERR,
}
else { /* volume exists - do we do a full incremental or abort */
- int Oserver, Opart, Otype, vol_elsewhere = 0;
- struct nvldbentry Oentry;
+ afs_uint32 Oserver;
+ afs_int32 Opart, Otype, vol_elsewhere = 0;
+ struct uvldbentry Oentry;
int c, dc;
if (avolid == 0) {
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, arovolid, 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);;
}
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);
}
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;
}
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
VolumeInfoCmd(char *name)
{
- struct nvldbentry entry;
+ struct uvldbentry entry;
afs_int32 vcode;
/* The vlserver will handle names with the .readonly
* and .backup extension as well as volume ids.
*/
- vcode = VLDB_GetEntryByName(name, &entry);
+ vcode = VLDB_GetEntryByNameU(name, &entry);
if (vcode) {
PrintError("", vcode);
exit(1);
}
- MapHostToNetwork(&entry);
- EnumerateEntry(&entry);
+ MapHostToNetworkU(&entry);
+ EnumerateEntryU(&entry);
/* Defect #3027: grubby check to handle locked volume.
* If VLOP_ALLOPERS is set, the entry is locked.
* Leave this routine as is, but put in correct check.
*/
- if (entry.flags & VLOP_ALLOPERS)
- fprintf(STDOUT, " Volume is currently LOCKED \n");
+ PrintLocked(entry.flags);
return 0;
}
static int
-VolumeZap(register struct cmd_syndesc *as, void *arock)
+VolumeZap(struct cmd_syndesc *as, void *arock)
{
- struct nvldbentry entry;
+ struct uvldbentry entry;
afs_uint32 volid, zapbackupid = 0, backupid = 0;
afs_int32 code, server, part, err;
as->parms[1].items->data);
exit(1);
}
- code = VLDB_GetEntryByID(volid, -1, &entry);
+ code = VLDB_GetEntryByIDU(volid, -1, &entry);
if (!code) {
if (volid == entry.volumeId[RWVOL])
backupid = entry.volumeId[BACKVOL];
}
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;
for (i = 0; i < count; i++) {
/*print out the relevant info */
fprintf(STDOUT, "--------------------------------------\n");
- t = pntr->time;
+ t = pntr->creationTime;
fprintf(STDOUT, "transaction: %lu created: %s",
(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;
+ struct uvldbentry entry;
- code1 = VLDB_GetEntryByName(as->parms[0].items->data, &entry);
+ code1 = VLDB_GetEntryByNameU(as->parms[0].items->data, &entry);
if (code1) {
fprintf(STDERR, "vos: Could not find entry for volume %s\n",
as->parms[0].items->data);
exit(1);
}
- code2 = VLDB_GetEntryByName(as->parms[1].items->data, &entry);
+ code2 = VLDB_GetEntryByNameU(as->parms[1].items->data, &entry);
if ((!code1) && (!code2)) { /*the newname already exists */
fprintf(STDERR, "vos: volume %s already exists\n",
as->parms[1].items->data);
as->parms[1].items->data);
exit(1);
}
- MapHostToNetwork(&entry);
+ MapHostToNetworkU(&entry);
code =
- UV_RenameVolume(&entry, as->parms[0].items->data,
- as->parms[1].items->data);
+ UV_RenameVolumeU(&entry, as->parms[0].items->data,
+ as->parms[1].items->data);
if (code) {
PrintDiagnostics("rename", code);
exit(1);
}
int
-GetVolumeInfo(afs_uint32 volid, afs_int32 *server, afs_int32 *part, afs_int32 *voltype,
- struct nvldbentry *rentry)
+GetVolumeInfo(afs_uint32 volid, afs_uint32 *server, afs_int32 *part, afs_int32 *voltype,
+ struct uvldbentry *rentry)
{
afs_int32 vcode;
int i, index = -1;
- vcode = VLDB_GetEntryByID(volid, -1, rentry);
+ vcode = VLDB_GetEntryByIDU(volid, -1, rentry);
if (vcode) {
fprintf(STDERR,
"Could not fetch the entry for volume %lu from VLDB \n",
PrintError("", vcode);
return (vcode);
}
- MapHostToNetwork(rentry);
+ MapHostToNetworkU(rentry);
if (volid == rentry->volumeId[ROVOL]) {
*voltype = ROVOL;
for (i = 0; i < rentry->nServers; i++) {
return -1;
}
- *server = rentry->serverNumber[index];
+ *server = rentry->serverUnique[index];
*part = rentry->serverPartition[index];
return 0;
}
- index = Lp_GetRwIndex(rentry);
+ index = Lp_GetRwIndexU(rentry);
if (index == -1) {
fprintf(STDERR,
"RW Volume is not found in VLDB entry for volume %lu\n",
}
if (volid == rentry->volumeId[RWVOL]) {
*voltype = RWVOL;
- *server = rentry->serverNumber[index];
+ *server = rentry->serverUnique[index];
*part = rentry->serverPartition[index];
return 0;
}
if (volid == rentry->volumeId[BACKVOL]) {
*voltype = BACKVOL;
- *server = rentry->serverNumber[index];
+ *server = rentry->serverUnique[index];
*part = rentry->serverPartition[index];
return 0;
}
}
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;
+ ubulkentries arrayEntries;
+ struct uvldbentry *vllist;
struct cmd_item *itp;
afs_int32 nentries;
int j;
}
if (as->parms[2].items) { /* -server */
- afs_int32 aserver;
+ afs_uint32 aserver;
aserver = GetServer(as->parms[2].items->data);
if (aserver == 0) {
fprintf(STDERR, "vos: server '%s' not found in host table\n",
/* Get all the VLDB entries on a server and/or partition */
memset(&arrayEntries, 0, sizeof(arrayEntries));
- vcode = VLDB_ListAttributes(&attributes, &nentries, &arrayEntries);
+ vcode = VLDB_ListAttributesU(&attributes, &nentries, &arrayEntries);
if (vcode) {
fprintf(STDERR, "Could not access the VLDB for attributes\n");
PrintError("", vcode);
/* Process each entry */
for (j = 0; j < nentries; j++) {
- vllist = &arrayEntries.nbulkentries_val[j];
+ vllist = &arrayEntries.ubulkentries_val[j];
if (seenprefix) {
/* It only deletes the RW volumes */
if (strncmp(vllist->name, prefix, strlen(prefix))) {
fprintf(STDOUT,
"Total VLDB entries deleted: %lu; failed to delete: %lu\n",
(unsigned long)totalBack, (unsigned long)totalFail);
- if (arrayEntries.nbulkentries_val)
- free(arrayEntries.nbulkentries_val);
+
+ xdr_free((xdrproc_t) xdr_ubulkentries, &arrayEntries);
return 0;
}
static int
CompareVldbEntryByName(const void *p1, const void *p2)
{
- struct nvldbentry *arg1, *arg2;
+ struct uvldbentry *arg1, *arg2;
- arg1 = (struct nvldbentry *)p1;
- arg2 = (struct nvldbentry *)p2;
+ arg1 = (struct uvldbentry *)p1;
+ arg2 = (struct uvldbentry *)p2;
return (strcmp(arg1->name, arg2->name));
}
/*
static int CompareVldbEntry(char *p1, char *p2)
{
- struct nvldbentry *arg1,*arg2;
+ struct uvldbentry *arg1,*arg2;
int i;
int pos1, pos2;
char comp1[100],comp2[100];
char temp1[20],temp2[20];
- arg1 = (struct nvldbentry *)p1;
- arg2 = (struct nvldbentry *)p2;
+ arg1 = (struct uvldbentry *)p1;
+ arg2 = (struct uvldbentry *)p2;
pos1 = -1;
pos2 = -1;
pos1 = 0;
pos2 = 0;
}
- sprintf(comp1,"%10u",arg1->serverNumber[pos1]);
- sprintf(comp2,"%10u",arg2->serverNumber[pos2]);
+ sprintf(comp1,"%10u",arg1->serverUnique[pos1]);
+ sprintf(comp2,"%10u",arg2->serverUnique[pos2]);
sprintf(temp1,"%10u",arg1->serverPartition[pos1]);
sprintf(temp2,"%10u",arg2->serverPartition[pos2]);
strcat(comp1,temp1);
ListVLDB(struct cmd_syndesc *as, void *arock)
{
afs_int32 apart;
- afs_int32 aserver, code;
+ afs_uint32 aserver;
+ afs_int32 code;
afs_int32 vcode;
struct VldbListByAttributes attributes;
- nbulkentries arrayEntries;
- struct nvldbentry *vllist, *tarray = 0, *ttarray;
+ ubulkentries arrayEntries;
+ struct uvldbentry *vllist, *tarray = 0, *ttarray;
afs_int32 centries, nentries = 0;
afs_int32 tarraysize = 0;
afs_int32 parraysize;
nextindex = -1;
vcode =
- VLDB_ListAttributesN2(&attributes, 0, thisindex, ¢ries,
+ VLDB_ListAttributesN2U(&attributes, 0, thisindex, ¢ries,
&arrayEntries, &nextindex);
if (vcode == RXGEN_OPCODE) {
/* Vlserver not running with ListAttributesN2. Fall back */
vcode =
- VLDB_ListAttributes(&attributes, ¢ries, &arrayEntries);
+ VLDB_ListAttributesU(&attributes, ¢ries, &arrayEntries);
nextindex = -1;
}
if (vcode) {
/* We don't sort, so just print the entries now */
if (!sort) {
for (j = 0; j < centries; j++) { /* process each entry */
- vllist = &arrayEntries.nbulkentries_val[j];
- MapHostToNetwork(vllist);
- EnumerateEntry(vllist);
+ vllist = &arrayEntries.ubulkentries_val[j];
+ MapHostToNetworkU(vllist);
+ EnumerateEntryU(vllist);
- if (vllist->flags & VLOP_ALLOPERS)
- fprintf(STDOUT, " Volume is currently LOCKED \n");
+ PrintLocked(vllist->flags);
}
}
else if (centries > 0) {
if (!tarray) {
/* steal away the first bulk entries array */
- tarray = (struct nvldbentry *)arrayEntries.nbulkentries_val;
- tarraysize = centries * sizeof(struct nvldbentry);
- arrayEntries.nbulkentries_val = 0;
+ tarray = (struct uvldbentry *)arrayEntries.ubulkentries_val;
+ tarraysize = centries * sizeof(struct uvldbentry);
+ arrayEntries.ubulkentries_val = 0;
} else {
/* Grow the tarray to keep the extra entries */
- parraysize = (centries * sizeof(struct nvldbentry));
+ parraysize = (centries * sizeof(struct uvldbentry));
ttarray =
- (struct nvldbentry *)realloc(tarray,
+ (struct uvldbentry *)realloc(tarray,
tarraysize + parraysize);
if (!ttarray) {
fprintf(STDERR,
/* Copy them in */
memcpy(((char *)tarray) + tarraysize,
- (char *)arrayEntries.nbulkentries_val, parraysize);
+ (char *)arrayEntries.ubulkentries_val, parraysize);
tarraysize += parraysize;
}
}
/* Free the bulk array */
- if (arrayEntries.nbulkentries_val) {
- free(arrayEntries.nbulkentries_val);
- arrayEntries.nbulkentries_val = 0;
- }
+ xdr_free((xdrproc_t) xdr_ubulkentries, &arrayEntries);
}
/* Here is where we now sort all the entries and print them */
if (sort && (nentries > 0)) {
- qsort((char *)tarray, nentries, sizeof(struct nvldbentry),
+ qsort((char *)tarray, nentries, sizeof(struct uvldbentry),
CompareVldbEntryByName);
for (vllist = tarray, j = 0; j < nentries; j++, vllist++) {
- MapHostToNetwork(vllist);
- EnumerateEntry(vllist);
+ MapHostToNetworkU(vllist);
+ EnumerateEntryU(vllist);
- if (vllist->flags & VLOP_ALLOPERS)
- fprintf(STDOUT, " Volume is currently LOCKED \n");
+ PrintLocked(vllist->flags);
}
}
}
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;
+ ubulkentries arrayEntries;
+ struct uvldbentry *vllist;
afs_int32 nentries;
int j;
char pname[10];
}
memset(&arrayEntries, 0, sizeof(arrayEntries)); /* initialize to hint the stub to alloc space */
- vcode = VLDB_ListAttributes(&attributes, &nentries, &arrayEntries);
+ vcode = VLDB_ListAttributesU(&attributes, &nentries, &arrayEntries);
if (vcode) {
fprintf(STDERR, "Could not access the VLDB for attributes\n");
PrintError("", vcode);
}
for (j = 0; j < nentries; j++) { /* process each vldb entry */
- vllist = &arrayEntries.nbulkentries_val[j];
+ vllist = &arrayEntries.ubulkentries_val[j];
if (seenprefix) {
for (ti = as->parms[0].items; ti; ti = ti->next) {
}
avolid = vllist->volumeId[RWVOL];
- MapHostToNetwork(vllist);
+ MapHostToNetworkU(vllist);
GetServerAndPart(vllist, RWVOL, &aserver1, &apart1, &previdx);
if (aserver1 == -1 || apart1 == -1) {
fprintf(STDOUT, "could not backup %s, invalid VLDB entry\n",
fprintf(STDOUT, "Total volumes backed up: %lu; failed to backup: %lu\n",
(unsigned long)totalBack, (unsigned long)totalFail);
fflush(STDOUT);
- if (arrayEntries.nbulkentries_val)
- free(arrayEntries.nbulkentries_val);
+ xdr_free((xdrproc_t) xdr_ubulkentries, &arrayEntries);
return 0;
}
static 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;
+ ubulkentries arrayEntries;
+ struct uvldbentry *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_ListAttributes(&attributes, &nentries, &arrayEntries);
+ vcode = VLDB_ListAttributesU(&attributes, &nentries, &arrayEntries);
if (vcode) {
fprintf(STDERR, "Could not access the VLDB for attributes\n");
PrintError("", vcode);
exit(1);
}
for (j = 0; j < nentries; j++) { /* process each entry */
- vllist = &arrayEntries.nbulkentries_val[j];
+ vllist = &arrayEntries.ubulkentries_val[j];
volid = vllist->volumeId[RWVOL];
vcode =
ubik_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_ubulkentries, &arrayEntries);
return 0;
}
static char *
PrintInt64Size(afs_uint64 in)
{
- register afs_uint32 hi, lo;
- register char * units;
+ afs_uint32 hi, lo;
+ char * units;
static char output[16];
SplitInt64(in,hi,lo);
}
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;
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);
{
afs_int32 vcode, m_uniq=0;
afs_int32 i, j;
- afs_int32 *addrp;
+ afs_uint32 *addrp;
bulkaddrs m_addrs;
ListAddrByAttributes m_attrs;
- afs_int32 m_nentries, *m_addrp;
+ afs_int32 m_nentries;
+ afs_uint32 *m_addrp;
afs_int32 base, index;
char buf[1024];
}
/* print out the list of all the server */
- addrp = (afs_int32 *) addrs->bulkaddrs_val;
+ addrp = (afs_uint32 *) addrs->bulkaddrs_val;
for (i = 0; i < nentries; i++, addrp++) {
- /* If it is a multihomed address, then we will need to
+ /* If it is a multihomed address, then we will need to
* get the addresses for this multihomed server from
* the vlserver and print them.
*/
}
/* Print the list */
- m_addrp = (afs_int32 *) m_addrs.bulkaddrs_val;
+ m_addrp = (afs_uint32 *) m_addrs.bulkaddrs_val;
for (j = 0; j < m_nentries; j++, m_addrp++) {
*m_addrp = htonl(*m_addrp);
if (noresolve) {
}
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;
if (as->parms[0].items) {
/* -uuid */
if (afsUUID_from_string(as->parms[0].items->data, &askuuid) < 0) {
- fprintf(STDERR, "vos: invalid UUID '%s'\n",
+ fprintf(STDERR, "vos: invalid UUID '%s'\n",
as->parms[0].items->data);
exit(-1);
}
if (as->parms[1].items) {
/* -host */
struct hostent *he;
- afs_int32 saddr;
+ afs_uint32 saddr;
he = hostutil_GetHostByName((char *)as->parms[1].items->data);
if (he == NULL) {
fprintf(STDERR, "vos: Can't get host info for '%s'\n",
return 0;
}
+
static int
-LockEntry(register struct cmd_syndesc *as, void *arock)
+SetAddrs(struct cmd_syndesc *as, void *arock)
+{
+ afs_int32 vcode;
+ bulkaddrs m_addrs;
+ afsUUID askuuid;
+ afs_uint32 FS_HostAddrs_HBO[ADDRSPERSITE];
+
+ memset(&m_addrs, 0, sizeof(bulkaddrs));
+ memset(&askuuid, 0, sizeof(afsUUID));
+ if (as->parms[0].items) {
+ /* -uuid */
+ if (afsUUID_from_string(as->parms[0].items->data, &askuuid) < 0) {
+ fprintf(STDERR, "vos: invalid UUID '%s'\n",
+ as->parms[0].items->data);
+ exit(-1);
+ }
+ }
+ if (as->parms[1].items) {
+ /* -host */
+ struct cmd_item *ti;
+ afs_uint32 saddr;
+ int i = 0;
+
+ for (ti = as->parms[1].items; ti && i < ADDRSPERSITE; ti = ti->next) {
+
+ if (noresolve)
+ saddr = GetServerNoresolve(ti->data);
+ else
+ saddr = GetServer(ti->data);
+
+ if (!saddr) {
+ fprintf(STDERR, "vos: Can't get host info for '%s'\n",
+ ti->data);
+ exit(-1);
+ }
+ /* Convert it to host byte order */
+ FS_HostAddrs_HBO[i] = ntohl(saddr);
+ i++;
+ }
+ m_addrs.bulkaddrs_len = i;
+ m_addrs.bulkaddrs_val = FS_HostAddrs_HBO;
+ }
+
+ vcode = ubik_VL_RegisterAddrs(cstruct, 0, &askuuid, 0, &m_addrs);
+
+ if (vcode) {
+ if (vcode == VL_MULTIPADDR) {
+ fprintf(STDERR, "vos: VL_RegisterAddrs rpc failed; The IP address exists on a different server; repair it\n");
+ PrintError("", vcode);
+ return vcode;
+ } else if (vcode == RXGEN_OPCODE) {
+ fprintf(STDERR, "vlserver doesn't support VL_RegisterAddrs rpc; ignored\n");
+ PrintError("", vcode);
+ return vcode;
+ }
+ }
+ if (verbose) {
+ fprintf(STDOUT, "vos: Changed UUID with addresses:\n");
+ print_addrs(&m_addrs, &askuuid, m_addrs.bulkaddrs_len, 1);
+ }
+ return 0;
+}
+
+static int
+LockEntry(struct cmd_syndesc *as, void *arock)
{
afs_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 uvldbentry entry, 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) {
if (as->parms[3].items)
force = 1;
- vcode = VLDB_GetEntryByID(volid, -1, &entry);
+ vcode = VLDB_GetEntryByIDU(volid, -1, &entry);
if (vcode) {
fprintf(STDERR,
"Could not fetch the entry for volume %lu from VLDB\n",
if (volid != entry.volumeId[ROVOL])
volid = entry.volumeId[ROVOL];
- MapHostToNetwork(&entry);
+ MapHostToNetworkU(&entry);
for (i = 0; i < entry.nServers; i++) {
if (entry.serverFlags[i] & ITSRWVOL) {
rwindex = i;
- rwserver = entry.serverNumber[i];
+ rwserver = entry.serverUnique[i];
rwpartition = entry.serverPartition[i];
}
if (entry.serverFlags[i] & ITSROVOL) {
- same = VLDB_IsSameAddrs(server, entry.serverNumber[i], &code);
+ same = VLDB_IsSameAddrs(server, entry.serverUnique[i], &code);
if (code) {
fprintf(STDERR,
"Failed to get info about server's %d address(es) from vlserver (err=%d); aborting call!\n",
}
if (same) {
roindex = i;
- roserver = entry.serverNumber[i];
+ roserver = entry.serverUnique[i];
ropartition = entry.serverPartition[i];
break;
}
if (rwserver) {
(entry.nServers)--;
if (rwindex != entry.nServers) {
- entry.serverNumber[rwindex] = entry.serverNumber[entry.nServers];
+ entry.serverUnique[rwindex] = entry.serverUnique[entry.nServers];
entry.serverPartition[rwindex] =
entry.serverPartition[entry.nServers];
entry.serverFlags[rwindex] = entry.serverFlags[entry.nServers];
- entry.serverNumber[entry.nServers] = 0;
+ entry.serverUnique[entry.nServers] = 0;
entry.serverPartition[entry.nServers] = 0;
entry.serverFlags[entry.nServers] = 0;
}
entry.flags |= RO_EXISTS;
}
}
- MapNetworkToHost(&entry, &storeEntry);
+ MapNetworkToHostU(&entry, &storeEntry);
code =
- VLDB_ReplaceEntry(entry.volumeId[RWVOL], RWVOL, &storeEntry,
+ VLDB_ReplaceEntryU(entry.volumeId[RWVOL], RWVOL, &storeEntry,
(LOCKREL_OPCODE | LOCKREL_AFSID |
LOCKREL_TIMESTAMP));
if (code) {
}
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;
- struct nvldbentry entry;
+ afs_uint32 aserver;
+ afs_int32 apart, voltype, fromdate = 0, code, err, i;
+ struct uvldbentry entry;
volintSize vol_size;
rx_SetRxDeadTime(60 * 10);
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_int32 server, code, tid, rcode;
+ afs_uint32 server;
+ afs_int32 code, tid, rcode;
struct rx_connection *aconn;
server = GetServer(as->parms[0].items->data);
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);
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.
*/
"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