/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
#include <afsconfig.h>
#include <afs/param.h>
-RCSID
- ("$Header$");
+#include <roken.h>
#include <sys/types.h>
#ifdef AFS_NT40_ENV
#else
#include <netinet/in.h>
#endif
-#ifdef HAVE_STRING_H
#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
#include <afs/voldefs.h>
#include <rx/xdr.h>
#include <rx/rx.h>
#include <afs/vlserver.h>
#include <afs/nfs.h>
#include <afs/afsint.h>
+#include <ubik.h>
#include "volint.h"
#include "volser.h"
#include "lockdata.h"
+#include "vsutils_prototypes.h"
+#include "lockprocs_prototypes.h"
+
+struct ubik_client *cstruct;
+
/* Finds an index in VLDB entry that matches the volume type, server, and partition.
* If type is zero, will match first index of ANY type (RW, BK, or RO).
- * If server is zero, will match first index of ANY server and partition
+ * If server is zero, will match first index of ANY server and partition
* Zero is a valid partition field.
*/
-int
-FindIndex(entry, server, part, type)
- struct nvldbentry *entry;
- afs_int32 server, part, type;
+static int
+FindIndex(struct uvldbentry *entry, afs_uint32 server, afs_int32 part, afs_int32 type)
{
int e;
afs_int32 error = 0;
+ afsUUID m_uuid;
+ int uuid_valid = 0;
+
+ if (server && !afs_uuid_is_nil(&entry->serverNumber[0])) {
+ afs_int32 vcode, m_uniq=0;
+ bulkaddrs m_addrs;
+ ListAddrByAttributes m_attrs;
+ afs_int32 m_nentries;
+
+ m_attrs.Mask = VLADDR_IPADDR;
+ m_attrs.ipaddr = htonl(server);
+ 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);
+ uuid_valid = (vcode == 0);
+ }
for (e = 0; (e < entry->nServers) && !error; e++) {
if (!type || (entry->serverFlags[e] & type)) {
if ((!server || (entry->serverPartition[e] == part))
&& (!server
- || VLDB_IsSameAddrs(entry->serverNumber[e], server,
- &error)))
+ || (uuid_valid && afs_uuid_equal(&m_uuid, &entry->serverNumber[e]))
+ || VLDB_IsSameAddrs(entry->serverUnique[e], server, &error)))
break;
if (type == ITSRWVOL)
return -1; /* quit when we are looking for RW entry (there's only 1) */
if (error) {
fprintf(STDERR,
"Failed to get info about server's %d address(es) from vlserver (err=%d)\n",
- entry->serverNumber[e], error);
+ entry->serverUnique[e], error);
return -1;
}
}
/* Changes the rw site only */
-void
-SetAValue(entry, oserver, opart, nserver, npart, type)
- struct nvldbentry *entry;
- afs_int32 oserver, opart, nserver, npart, type;
+static void
+SetAValue(struct uvldbentry *entry, afs_uint32 oserver, afs_int32 opart,
+ afs_uint32 nserver, afs_int32 npart, afs_int32 type)
{
int e;
- afs_int32 error = 0;
e = FindIndex(entry, oserver, opart, type);
if (e == -1)
return; /* If didn't find it, just return */
- entry->serverNumber[e] = nserver;
+ entry->serverUnique[e] = nserver;
entry->serverPartition[e] = npart;
/* Now move rest of entries up */
if ((nserver == 0L) && (npart == 0L)) {
for (e++; e < entry->nServers; e++) {
- entry->serverNumber[e - 1] = entry->serverNumber[e];
+ entry->serverUnique[e - 1] = entry->serverUnique[e];
entry->serverPartition[e - 1] = entry->serverPartition[e];
entry->serverFlags[e - 1] = entry->serverFlags[e];
}
}
/* Changes the RW site only */
-Lp_SetRWValue(entry, oserver, opart, nserver, npart)
- struct nvldbentry *entry;
- afs_int32 oserver, opart, nserver, npart;
+void
+Lp_SetRWValue(struct nvldbentry *entryp, afs_uint32 oserver, afs_int32 opart,
+ afs_uint32 nserver, afs_int32 npart)
+{
+ struct uvldbentry uentry;
+
+ nvlentry_to_uvlentry(entryp, &uentry);
+ SetAValue(&uentry, oserver, opart, nserver, npart, ITSRWVOL);
+ uvlentry_to_nvlentry(&uentry, entryp);
+}
+
+void
+Lp_SetRWValueU(struct uvldbentry *entry, afs_uint32 oserver, afs_int32 opart,
+ afs_uint32 nserver, afs_int32 npart)
{
SetAValue(entry, oserver, opart, nserver, npart, ITSRWVOL);
}
/* Changes the RO site only */
-Lp_SetROValue(entry, oserver, opart, nserver, npart)
- struct nvldbentry *entry;
- afs_int32 oserver, opart, nserver, npart;
+void
+Lp_SetROValue(struct nvldbentry *entryp, afs_uint32 oserver,
+ afs_int32 opart, afs_uint32 nserver, afs_int32 npart)
+{
+ struct uvldbentry uentry;
+
+ nvlentry_to_uvlentry(entryp, &uentry);
+ SetAValue(&uentry, oserver, opart, nserver, npart, ITSROVOL);
+ uvlentry_to_nvlentry(&uentry, entryp);
+}
+
+void
+Lp_SetROValueU(struct uvldbentry *entry, afs_uint32 oserver,
+ afs_int32 opart, afs_uint32 nserver, afs_int32 npart)
{
SetAValue(entry, oserver, opart, nserver, npart, ITSROVOL);
}
/* Returns success if this server and partition matches the RW entry */
-Lp_Match(server, part, entry)
- afs_int32 server, part;
- struct nvldbentry *entry;
+int
+Lp_Match(afs_uint32 server, afs_int32 part,
+ struct nvldbentry *entryp)
+{
+ struct uvldbentry uentry;
+
+ nvlentry_to_uvlentry(entryp, &uentry);
+ if (FindIndex(&uentry, server, part, ITSRWVOL) == -1)
+ return 0;
+ uvlentry_to_nvlentry(&uentry, entryp);
+ return 1;
+}
+
+int
+Lp_MatchU(afs_uint32 server, afs_int32 part,
+ struct uvldbentry *entry)
{
if (FindIndex(entry, server, part, ITSRWVOL) == -1)
return 0;
}
/* Return the index of the RO entry (plus 1) if it exists, else return 0 */
-Lp_ROMatch(server, part, entry)
- afs_int32 server, part;
- struct nvldbentry *entry;
+int
+Lp_ROMatch(afs_uint32 server, afs_int32 part, struct nvldbentry *entryp)
+{
+ struct uvldbentry uentry;
+ int idx;
+
+ nvlentry_to_uvlentry(entryp, &uentry);
+ idx = (FindIndex(&uentry, server, part, ITSROVOL) + 1);
+ if (idx)
+ uvlentry_to_nvlentry(&uentry, entryp);
+ return idx;
+}
+
+int
+Lp_ROMatchU(afs_uint32 server, afs_int32 part, struct uvldbentry *entry)
{
return (FindIndex(entry, server, part, ITSROVOL) + 1);
}
/* Return the index of the RW entry if it exists, else return -1 */
-Lp_GetRwIndex(entry)
- struct nvldbentry *entry;
+int
+Lp_GetRwIndex(struct nvldbentry *entryp)
+{
+ struct uvldbentry uentry;
+ int idx;
+
+ nvlentry_to_uvlentry(entryp, &uentry);
+ idx = (FindIndex(&uentry, 0, 0, ITSRWVOL));
+ if (idx > -1)
+ uvlentry_to_nvlentry(&uentry, entryp);
+ return idx;
+}
+
+int
+Lp_GetRwIndexU(struct uvldbentry *entry)
{
return (FindIndex(entry, 0, 0, ITSRWVOL));
}
/*initialize queue pointed by <ahead>*/
-Lp_QInit(ahead)
- struct qHead *ahead;
+void
+Lp_QInit(struct qHead *ahead)
{
ahead->count = 0;
ahead->next = NULL;
}
/*add <elem> in front of queue <ahead> */
-Lp_QAdd(ahead, elem)
- struct qHead *ahead;
- struct aqueue *elem;
+void
+Lp_QAdd(struct qHead *ahead, struct aqueue *elem)
{
struct aqueue *temp;
}
}
-Lp_QScan(ahead, id, success, elem)
- struct qHead *ahead;
- struct aqueue **elem;
- afs_int32 id;
- int *success;
+int
+Lp_QScan(struct qHead *ahead, afs_int32 id, int *success, struct aqueue **elem)
{
struct aqueue *cptr;
/*return the element in the beginning of the queue <ahead>, free
*the space used by that element . <success> indicates if enumeration was ok*/
-Lp_QEnumerate(ahead, success, elem)
- struct qHead *ahead;
- struct aqueue *elem;
- int *success;
+void
+Lp_QEnumerate(struct qHead *ahead, int *success, struct aqueue *elem)
{
int i;
struct aqueue *temp;
*success = 0;
}
-Lp_QTraverse(ahead)
- struct qHead *ahead;
+void
+Lp_QTraverse(struct qHead *ahead)
{
int count;
struct aqueue *old, *new;
git://git.openafs.org / openafs.git / blobdiff