/*
* 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 <afs/stds.h>
-RCSID
- ("$Header$");
+#include <roken.h>
+#include <afs/opr.h>
-#include <stdio.h>
-#include <errno.h>
-#ifdef AFS_NT40_ENV
-#include <fcntl.h>
-#include <winsock2.h>
-#else
+#ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
#endif
-#include <afs/stds.h>
#include <rx/xdr.h>
-#include <afs/assert.h>
#include <lwp.h>
#include <lock.h>
#include <afs/afsint.h>
+#define FSINT_COMMON_XG
+#include <afs/afscbint.h>
#include <afs/rxgen_consts.h>
#include <afs/nfs.h>
#include <afs/errors.h>
#include <afs/ihandle.h>
#include <afs/vnode.h>
#include <afs/volume.h>
-#ifdef AFS_ATHENA_STDENV
-#include <krb.h>
-#endif
#include <afs/acl.h>
#include <afs/ptclient.h>
#include <afs/ptuser.h>
#include <afs/com_err.h>
#include <rx/rx.h>
#include <afs/cellconfig.h>
-#include <stdlib.h>
#include "viced_prototypes.h"
#include "viced.h"
#include "host.h"
#include "callback.h"
#ifdef AFS_DEMAND_ATTACH_FS
#include "../util/afsutil_prototypes.h"
-#include "../tviced/serialize_state.h"
+#include "serialize_state.h"
#endif /* AFS_DEMAND_ATTACH_FS */
-#ifdef AFS_PTHREAD_ENV
pthread_mutex_t host_glock_mutex;
-#endif /* AFS_PTHREAD_ENV */
extern int Console;
extern int CurrentConnections;
extern int lwps; /* the max number of server threads */
extern afsUUID FS_HostUUID;
+afsUUID nulluuid;
int CEs = 0; /* active clients */
int CEBlocks = 0; /* number of blocks of CEs */
struct client *CEFree = 0; /* first free client */
static struct rx_securityClass *sc = NULL;
static void h_SetupCallbackConn_r(struct host * host);
-static void h_AddHostToHashTable_r(afs_uint32 addr, afs_uint16 port, struct host * host);
-static void h_AddHostToUuidHashTable_r(afsUUID * uuid, struct host * host);
-static int h_DeleteHostFromHashTableByAddr_r(afs_uint32 addr, afs_uint16 port, struct host *host);
+static int h_threadquota(int);
#define CESPERBLOCK 73
struct CEBlock { /* block of CESPERBLOCK file entries */
struct client entry[CESPERBLOCK];
};
-static void h_TossStuff_r(register struct host *host);
-static int hashDelete_r(afs_uint32 addr, afs_uint16 port, struct host *host);
+void h_TossStuff_r(struct host *host);
/*
* Make sure the subnet macros have been defined.
/* get a new block of CEs and chain it on CEFree */
static void
-GetCEBlock()
+GetCEBlock(void)
{
- register struct CEBlock *block;
- register int i;
+ struct CEBlock *block;
+ int i;
- block = (struct CEBlock *)malloc(sizeof(struct CEBlock));
+ block = malloc(sizeof(struct CEBlock));
if (!block) {
ViceLog(0, ("Failed malloc in GetCEBlock\n"));
ShutDownAndCore(PANIC);
/* get the next available CE */
static struct client *
-GetCE()
+GetCE(void)
{
- register struct client *entry;
+ struct client *entry;
if (CEFree == 0)
GetCEBlock();
entry = CEFree;
CEFree = entry->next;
CEs++;
- memset((char *)entry, 0, CLIENT_TO_ZERO(entry));
+ memset(entry, 0, CLIENT_TO_ZERO(entry));
return (entry);
} /*GetCE */
/* return an entry to the free list */
static void
-FreeCE(register struct client *entry)
+FreeCE(struct client *entry)
{
entry->VenusEpoch = 0;
entry->sid = 0;
* to map IP addresses onto host pointers, and another
* to map host UUIDs onto host pointers.
*/
-static struct h_hashChain *hostHashTable[h_HASHENTRIES];
-static struct h_hashChain *hostUuidHashTable[h_HASHENTRIES];
-#define h_HashIndex(hostip) ((hostip) & (h_HASHENTRIES-1))
+static struct h_AddrHashChain *hostAddrHashTable[h_HASHENTRIES];
+static struct h_UuidHashChain *hostUuidHashTable[h_HASHENTRIES];
+#define h_HashIndex(hostip) (ntohl(hostip) & (h_HASHENTRIES-1))
#define h_UuidHashIndex(uuidp) (((int)(afs_uuid_hash(uuidp))) & (h_HASHENTRIES-1))
struct HTBlock { /* block of HTSPERBLOCK file entries */
/* get a new block of HTs and chain it on HTFree */
static void
-GetHTBlock()
+GetHTBlock(void)
{
- register struct HTBlock *block;
- register int i;
+ struct HTBlock *block;
+ int i;
static int index = 0;
if (HTBlocks == h_MAXHOSTTABLES) {
ViceLog(0, ("h_MAXHOSTTABLES reached\n"));
- ShutDownAndCore(PANIC);
+ return;
}
- block = (struct HTBlock *)malloc(sizeof(struct HTBlock));
+ block = malloc(sizeof(struct HTBlock));
if (!block) {
ViceLog(0, ("Failed malloc in GetHTBlock\n"));
ShutDownAndCore(PANIC);
}
-#ifdef AFS_PTHREAD_ENV
for (i = 0; i < (h_HTSPERBLOCK); i++)
- assert(pthread_cond_init(&block->entry[i].cond, NULL) == 0);
-#endif /* AFS_PTHREAD_ENV */
+ CV_INIT(&block->entry[i].cond, "block entry", CV_DEFAULT, 0);
for (i = 0; i < (h_HTSPERBLOCK); i++)
Lock_Init(&block->entry[i].lock);
for (i = 0; i < (h_HTSPERBLOCK - 1); i++)
/* get the next available HT */
static struct host *
-GetHT()
+GetHT(void)
{
- register struct host *entry;
+ struct host *entry;
if (HTFree == NULL)
GetHTBlock();
- assert(HTFree != NULL);
+ if (HTFree == NULL)
+ return NULL;
entry = HTFree;
HTFree = entry->next;
HTs++;
- memset((char *)entry, 0, HOST_TO_ZERO(entry));
+ memset(entry, 0, HOST_TO_ZERO(entry));
return (entry);
} /*GetHT */
/* return an entry to the free list */
static void
-FreeHT(register struct host *entry)
+FreeHT(struct host *entry)
{
entry->next = HTFree;
HTFree = entry;
{
afs_int32 code;
struct rx_connection *serverconns[MAXSERVERS];
- struct rx_securityClass *sc[3];
+ struct rx_securityClass *sc;
struct afsconf_dir *tdir;
- char tconfDir[100] = "";
- char tcell[64] = "";
- struct ktc_token ttoken;
afs_int32 scIndex;
struct afsconf_cell info;
afs_int32 i;
ViceLog(0, ("hpr_Initialize: Could not open configuration directory: %s", AFSDIR_SERVER_ETC_DIRPATH));
return -1;
}
-
+
code = afsconf_GetLocalCell(tdir, cellstr, sizeof(cellstr));
if (code) {
ViceLog(0, ("hpr_Initialize: Could not get local cell. [%d]", code));
afsconf_Close(tdir);
return code;
}
-
+
code = afsconf_GetCellInfo(tdir, cellstr, "afsprot", &info);
if (code) {
- ViceLog(0, ("hpr_Initialize: Could not locate cell %s in %s/%s", cellstr, confDir, AFSDIR_CELLSERVDB_FILE));
+ ViceLog(0, ("hpr_Initialize: Could not locate cell %s in %s/%s",
+ cellstr, tdir->name, AFSDIR_CELLSERVDB_FILE));
afsconf_Close(tdir);
return code;
}
-
+
code = rx_Init(0);
if (code) {
ViceLog(0, ("hpr_Initialize: Could not initialize rx."));
afsconf_Close(tdir);
return code;
}
-
- scIndex = 2;
- sc[0] = 0;
- sc[1] = 0;
- sc[2] = 0;
+
/* Most callers use secLevel==1, however, the fileserver uses secLevel==2
* to force use of the KeyFile. secLevel == 0 implies -noauth was
* specified. */
- if ((afsconf_GetLatestKey(tdir, 0, 0) == 0)) {
- code = afsconf_ClientAuthSecure(tdir, &sc[2], &scIndex);
- if (code)
- ViceLog(0, ("hpr_Initialize: clientauthsecure returns %d %s (so trying noauth)", code, afs_error_message(code)));
- if (code)
- scIndex = 0; /* use noauth */
- if (scIndex != 2)
- /* if there was a problem, an unauthenticated conn is returned */
- sc[scIndex] = sc[2];
- } else {
- struct ktc_principal sname;
- strcpy(sname.cell, info.name);
- sname.instance[0] = 0;
- strcpy(sname.name, "afs");
- code = ktc_GetToken(&sname, &ttoken, sizeof(ttoken), NULL);
- if (code)
- scIndex = 0;
- else {
- if (ttoken.kvno >= 0 && ttoken.kvno <= 256)
- /* this is a kerberos ticket, set scIndex accordingly */
- scIndex = 2;
- else {
- ViceLog(0, ("hpr_Initialize: funny kvno (%d) in ticket, proceeding", ttoken.kvno));
- scIndex = 2;
- }
- sc[2] =
- rxkad_NewClientSecurityObject(rxkad_clear, &ttoken.sessionKey,
- ttoken.kvno, ttoken.ticketLen,
- ttoken.ticket);
- }
+ code = afsconf_ClientAuthSecure(tdir, &sc, &scIndex);
+ if (code) {
+ ViceLog(0, ("hpr_Initialize: clientauthsecure returns %d %s "
+ "(so trying noauth)", code, afs_error_message(code)));
+ scIndex = RX_SECIDX_NULL;
+ sc = rxnull_NewClientSecurityObject();
}
- if ((scIndex == 0) && (sc[0] == 0))
- sc[0] = rxnull_NewClientSecurityObject();
- if ((scIndex == 0))
- ViceLog(0, ("hpr_Initialize: Could not get afs tokens, running unauthenticated. [%d]", code));
-
+
+ if (scIndex == RX_SECIDX_NULL)
+ ViceLog(0, ("hpr_Initialize: Could not get afs tokens, "
+ "running unauthenticated. [%d]", code));
+
memset(serverconns, 0, sizeof(serverconns)); /* terminate list!!! */
for (i = 0; i < info.numServers; i++) {
serverconns[i] =
rx_NewConnection(info.hostAddr[i].sin_addr.s_addr,
- info.hostAddr[i].sin_port, PRSRV, sc[scIndex],
- scIndex);
+ info.hostAddr[i].sin_port, PRSRV,
+ sc, scIndex);
}
code = ubik_ClientInit(serverconns, uclient);
ViceLog(0, ("hpr_Initialize: ubik client init failed. [%d]", code));
}
afsconf_Close(tdir);
- code = rxs_Release(sc[scIndex]);
+ code = rxs_Release(sc);
return code;
}
return code;
}
+static_inline int
+getThreadClient(struct ubik_client **client)
+{
+ int code;
+
+ *client = pthread_getspecific(viced_uclient_key);
+ if (*client != NULL)
+ return 0;
+
+ code = hpr_Initialize(client);
+ if (code)
+ return code;
+
+ osi_Assert(pthread_setspecific(viced_uclient_key, *client) == 0);
+
+ return 0;
+}
+
int
hpr_GetHostCPS(afs_int32 host, prlist *CPS)
{
-#ifdef AFS_PTHREAD_ENV
- register afs_int32 code;
+ afs_int32 code;
afs_int32 over;
- struct ubik_client *uclient =
- (struct ubik_client *)pthread_getspecific(viced_uclient_key);
+ struct ubik_client *uclient;
- if (!uclient) {
- code = hpr_Initialize(&uclient);
- assert(pthread_setspecific(viced_uclient_key, (void *)uclient) == 0);
- }
+ code = getThreadClient(&uclient);
+ if (code)
+ return code;
over = 0;
code = ubik_PR_GetHostCPS(uclient, 0, host, CPS, &over);
host);
}
return 0;
-#else
- return pr_GetHostCPS(host, CPS);
-#endif
}
int
hpr_NameToId(namelist *names, idlist *ids)
{
-#ifdef AFS_PTHREAD_ENV
- register afs_int32 code;
- register afs_int32 i;
- struct ubik_client *uclient =
- (struct ubik_client *)pthread_getspecific(viced_uclient_key);
+ afs_int32 code;
+ afs_int32 i;
+ struct ubik_client *uclient;
- if (!uclient) {
- code = hpr_Initialize(&uclient);
- assert(pthread_setspecific(viced_uclient_key, (void *)uclient) == 0);
- }
+ code = getThreadClient(&uclient);
+ if (code)
+ return code;
for (i = 0; i < names->namelist_len; i++)
stolower(names->namelist_val[i]);
code = ubik_PR_NameToID(uclient, 0, names, ids);
return code;
-#else
- return pr_NameToId(names, ids);
-#endif
}
int
hpr_IdToName(idlist *ids, namelist *names)
{
-#ifdef AFS_PTHREAD_ENV
- register afs_int32 code;
- struct ubik_client *uclient =
- (struct ubik_client *)pthread_getspecific(viced_uclient_key);
-
- if (!uclient) {
- code = hpr_Initialize(&uclient);
- assert(pthread_setspecific(viced_uclient_key, (void *)uclient) == 0);
- }
+ afs_int32 code;
+ struct ubik_client *uclient;
+
+ code = getThreadClient(&uclient);
+ if (code)
+ return code;
code = ubik_PR_IDToName(uclient, 0, ids, names);
return code;
-#else
- return pr_IdToName(ids, names);
-#endif
}
int
hpr_GetCPS(afs_int32 id, prlist *CPS)
{
-#ifdef AFS_PTHREAD_ENV
- register afs_int32 code;
+ afs_int32 code;
afs_int32 over;
- struct ubik_client *uclient =
- (struct ubik_client *)pthread_getspecific(viced_uclient_key);
+ struct ubik_client *uclient;
- if (!uclient) {
- code = hpr_Initialize(&uclient);
- assert(pthread_setspecific(viced_uclient_key, (void *)uclient) == 0);
- }
+ code = getThreadClient(&uclient);
+ if (code)
+ return code;
over = 0;
code = ubik_PR_GetCPS(uclient, 0, id, CPS, &over);
id);
}
return 0;
-#else
- return pr_GetCPS(id, CPS);
-#endif
}
static short consolePort = 0;
int
-h_Release(register struct host *host)
-{
- H_LOCK;
- h_Release_r(host);
- H_UNLOCK;
- return 0;
-}
-
-/**
- * If this thread does not have a hold on this host AND
- * if other threads also dont have any holds on this host AND
- * If either the HOSTDELETED or CLIENTDELETED flags are set
- * then toss the host
- */
-int
-h_Release_r(register struct host *host)
-{
-
- if (!((host)->holds[h_holdSlot()] & ~h_holdbit())) {
- if (!h_OtherHolds_r(host)) {
- /* must avoid masking this until after h_OtherHolds_r runs
- * but it should be run before h_TossStuff_r */
- (host)->holds[h_holdSlot()] &= ~h_holdbit();
- if ((host->hostFlags & HOSTDELETED)
- || (host->hostFlags & CLIENTDELETED)) {
- h_TossStuff_r(host);
- }
- } else
- (host)->holds[h_holdSlot()] &= ~h_holdbit();
- } else
- (host)->holds[h_holdSlot()] &= ~h_holdbit();
-
- return 0;
-}
-
-int
-h_OtherHolds_r(register struct host *host)
-{
- register int i, bit, slot;
- bit = h_holdbit();
- slot = h_holdSlot();
- for (i = 0; i < h_maxSlots; i++) {
- if (host->holds[i] != ((i == slot) ? bit : 0)) {
- return 1;
- }
- }
- return 0;
-}
-
-int
-h_Lock_r(register struct host *host)
+h_Lock_r(struct host *host)
{
H_UNLOCK;
h_Lock(host);
*/
int
-h_NBLock_r(register struct host *host)
+h_NBLock_r(struct host *host)
{
struct Lock *hostLock = &host->lock;
int locked = 0;
}
-#if FS_STATS_DETAILED
/*------------------------------------------------------------------------
* PRIVATE h_AddrInSameNetwork
*
return (0);
} /*h_AddrInSameNetwork */
-#endif /* FS_STATS_DETAILED */
/* Assumptions: called with held host */
void
-h_gethostcps_r(register struct host *host, register afs_int32 now)
+h_gethostcps_r(struct host *host, afs_int32 now)
{
- register int code;
+ int code;
int slept = 0;
/* wait if somebody else is already doing the getCPS call */
while (host->hostFlags & HCPS_INPROGRESS) {
slept = 1; /* I did sleep */
host->hostFlags |= HCPS_WAITING; /* I am sleeping now */
-#ifdef AFS_PTHREAD_ENV
- pthread_cond_wait(&host->cond, &host_glock_mutex);
-#else /* AFS_PTHREAD_ENV */
- if ((code = LWP_WaitProcess(&(host->hostFlags))) != LWP_SUCCESS)
- ViceLog(0, ("LWP_WaitProcess returned %d\n", code));
-#endif /* AFS_PTHREAD_ENV */
+ CV_WAIT(&host->cond, &host_glock_mutex);
}
code = hpr_GetHostCPS(ntohl(host->host), &host->hcps);
H_LOCK;
if (code) {
+ char hoststr[16];
/*
* Although ubik_Call (called by pr_GetHostCPS) traverses thru all protection servers
* and reevaluates things if no sync server or quorum is found we could still end up
* with one of these errors. In such case we would like to reevaluate the rpc call to
* find if there's cps for this guy. We treat other errors (except network failures
* ones - i.e. code < 0) as an indication that there is no CPS for this host. Ideally
- * we could like to deal this problem the other way around (i.e. if code == NOCPS
+ * we could like to deal this problem the other way around (i.e. if code == NOCPS
* ignore else retry next time) but the problem is that there're other errors (i.e.
* EPERM) for which we don't want to retry and we don't know the whole code list!
*/
if (code < 0 || code == UNOQUORUM || code == UNOTSYNC) {
- /*
+ /*
* We would have preferred to use a while loop and try again since ops in protected
* acls for this host will fail now but they'll be reevaluated on any subsequent
* call. The attempt to wait for a quorum/sync site or network error won't work
- * since this problems really should only occurs during a complete fileserver
+ * since this problems really should only occurs during a complete fileserver
* restart. Since the fileserver will start before the ptservers (and thus before
* quorums are complete) clients will be utilizing all the fileserver's lwps!!
*/
host->hcpsfailed = 1;
ViceLog(0,
- ("Warning: GetHostCPS failed (%d) for %x; will retry\n",
- code, host->host));
+ ("Warning: GetHostCPS failed (%d) for %p (%s:%d); will retry\n",
+ code, host, afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port)));
} else {
host->hcpsfailed = 0;
ViceLog(1,
- ("gethost: GetHostCPS failed (%d) for %x; ignored\n",
- code, host->host));
+ ("gethost: GetHostCPS failed (%d) for %p (%s:%d); ignored\n",
+ code, host, afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port)));
}
if (host->hcps.prlist_val)
free(host->hcps.prlist_val);
/* signal all who are waiting */
if (host->hostFlags & HCPS_WAITING) { /* somebody is waiting */
host->hostFlags &= ~HCPS_WAITING;
-#ifdef AFS_PTHREAD_ENV
- assert(pthread_cond_broadcast(&host->cond) == 0);
-#else /* AFS_PTHREAD_ENV */
- if ((code = LWP_NoYieldSignal(&(host->hostFlags))) != LWP_SUCCESS)
- ViceLog(0, ("LWP_NoYieldSignal returns %d\n", code));
-#endif /* AFS_PTHREAD_ENV */
+ CV_BROADCAST(&host->cond);
}
}
/* args in net byte order */
void
-h_flushhostcps(register afs_uint32 hostaddr, register afs_uint16 hport)
+h_flushhostcps(afs_uint32 hostaddr, afs_uint16 hport)
{
- register struct host *host;
- int held = 0;
+ struct host *host;
H_LOCK;
- host = h_Lookup_r(hostaddr, hport, &held);
+ h_Lookup_r(hostaddr, hport, &host);
if (host) {
host->hcpsfailed = 1;
- if (!held)
- h_Release_r(host);
+ h_Release_r(host);
}
H_UNLOCK;
return;
*/
#define DEF_ROPCONS 2115
-struct host *
-h_Alloc_r(register struct rx_connection *r_con)
+static struct host *
+h_Alloc_r(struct rx_connection *r_con)
{
struct servent *serverentry;
struct host *host;
- afs_int32 now;
-#if FS_STATS_DETAILED
afs_uint32 newHostAddr_HBO; /*New host IP addr, in host byte order */
-#endif /* FS_STATS_DETAILED */
host = GetHT();
+ if (!host)
+ return NULL;
+
+ h_Hold_r(host);
+ /* acquire the host lock withot dropping H_LOCK. we can do this here
+ * because we know we will not block; we just created this host and
+ * nobody else knows about it. */
+ ObtainWriteLock(&host->lock);
host->host = rxr_HostOf(r_con);
host->port = rxr_PortOf(r_con);
- h_AddHostToHashTable_r(host->host, host->port, host);
+ h_AddHostToAddrHashTable_r(host->host, host->port, host);
if (consolePort == 0) { /* find the portal number for console */
#if defined(AFS_OSF_ENV)
/* Make a callback channel even for the console, on the off chance that it
* makes a request that causes a break call back. It shouldn't. */
h_SetupCallbackConn_r(host);
- now = host->LastCall = host->cpsCall = host->ActiveCall = FT_ApproxTime();
+ host->LastCall = host->cpsCall = host->ActiveCall = FT_ApproxTime();
host->hostFlags = 0;
host->hcps.prlist_val = NULL;
host->hcps.prlist_len = 0;
h_gethostcps(host); /* do this under host hold/lock */
#endif
host->FirstClient = NULL;
- h_Hold_r(host);
- h_Lock_r(host);
h_InsertList_r(host); /* update global host List */
-#if FS_STATS_DETAILED
/*
* Compare the new host's IP address (in host byte order) with ours
* (the File Server's), remembering if they are in the same network.
newHostAddr_HBO = (afs_uint32) ntohl(host->host);
host->InSameNetwork =
h_AddrInSameNetwork(FS_HostAddr_HBO, newHostAddr_HBO);
-#endif /* FS_STATS_DETAILED */
return host;
} /*h_Alloc_r */
rx_NewConnection(host->host, host->port, 1, sc, 0);
rx_SetConnDeadTime(host->callback_rxcon, 50);
rx_SetConnHardDeadTime(host->callback_rxcon, AFS_HARDDEADTIME);
+ rx_SetConnSecondsUntilNatPing(host->callback_rxcon, 20);
}
-/* Lookup a host given an IP address and UDP port number. */
-/* hostaddr and hport are in network order */
-/* Note: host should be released by caller if 0 == *heldp and non-null */
-/* hostaddr and hport are in network order */
-struct host *
-h_Lookup_r(afs_uint32 haddr, afs_uint16 hport, int *heldp)
+/* h_Lookup_r
+ * Lookup a host given an IP address and UDP port number.
+ * hostaddr and hport are in network order
+ * hostaddr and hport are in network order
+ * On return, refCount is incremented.
+ */
+int
+h_Lookup_r(afs_uint32 haddr, afs_uint16 hport, struct host **hostp)
{
afs_int32 now;
- struct host *host = 0;
- struct h_hashChain *chain;
+ struct host *host = NULL;
+ struct h_AddrHashChain *chain;
int index = h_HashIndex(haddr);
extern int hostaclRefresh;
restart:
- for (chain = hostHashTable[index]; chain; chain = chain->next) {
+ for (chain = hostAddrHashTable[index]; chain; chain = chain->next) {
host = chain->hostPtr;
- assert(host);
+ osi_Assert(host);
if (!(host->hostFlags & HOSTDELETED) && chain->addr == haddr
&& chain->port == hport) {
- *heldp = h_Held_r(host);
- if (!*heldp)
- h_Hold_r(host);
+ if ((host->hostFlags & HWHO_INPROGRESS) &&
+ h_threadquota(host->lock.num_waiting)) {
+ *hostp = 0;
+ return VBUSY;
+ }
+ h_Hold_r(host);
h_Lock_r(host);
if (host->hostFlags & HOSTDELETED) {
h_Unlock_r(host);
- if (!*heldp)
- h_Release_r(host);
+ h_Release_r(host);
+ host = NULL;
goto restart;
}
h_Unlock_r(host);
* first time that the host is added to a group. Also
* here we also retry on previous legitimate hcps failures.
*
- * If we get here we still have a host hold.
+ * If we get here refCount is elevated.
*/
h_gethostcps_r(host, now);
}
}
host = NULL;
}
- return host;
-
+ *hostp = host;
+ return 0;
} /*h_Lookup */
/* Lookup a host given its UUID. */
h_LookupUuid_r(afsUUID * uuidp)
{
struct host *host = 0;
- struct h_hashChain *chain;
+ struct h_UuidHashChain *chain;
int index = h_UuidHashIndex(uuidp);
for (chain = hostUuidHashTable[index]; chain; chain = chain->next) {
host = chain->hostPtr;
- assert(host);
+ osi_Assert(host);
if (!(host->hostFlags & HOSTDELETED) && host->interface
&& afs_uuid_equal(&host->interface->uuid, uuidp)) {
- break;
+ return host;
}
- host = NULL;
}
- return host;
-
+ return NULL;
} /*h_Lookup */
-/*
- * h_Hold_r: Establish a hold by the current LWP on this host--the host
- * or its clients will not be physically deleted until all holds have
- * been released.
- * NOTE: h_Hold_r is a macro defined in host.h.
- */
-
/* h_TossStuff_r: Toss anything in the host structure (the host or
* clients marked for deletion. Called from h_Release_r ONLY.
* To be called, there must be no holds, and either host->deleted
* or host->clientDeleted must be set.
*/
-static void
-h_TossStuff_r(register struct host *host)
+void
+h_TossStuff_r(struct host *host)
{
- register struct client **cp, *client;
- int i;
+ struct client **cp, *client;
+ int code;
+ int wasdeleted = 0;
- /* if somebody still has this host held */
- for (i = 0; (i < h_maxSlots) && (!(host)->holds[i]); i++);
- if (i != h_maxSlots)
- return;
+ if ((host->hostFlags & HOSTDELETED)) {
+ wasdeleted = 1;
+ }
+
+ /* make sure host doesn't go away over h_NBLock_r */
+ h_Hold_r(host);
+
+ code = h_NBLock_r(host);
+
+ /* don't use h_Release_r, since that may call h_TossStuff_r again */
+ h_Decrement_r(host);
/* if somebody still has this host locked */
- if (h_NBLock_r(host) != 0) {
+ if (code != 0) {
char hoststr[16];
- ViceLog(0,
- ("Warning: h_TossStuff_r failed; Host %s:%d was locked.\n",
- afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port)));
+ if (wasdeleted) {
+ /* someone locked the host while HOSTDELETED was set; that is bad */
+ ViceLog(0, ("Warning: h_TossStuff_r failed; Host %" AFS_PTR_FMT
+ " (%s:%d flags 0x%x) was locked.\n",
+ host, afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port),
+ (unsigned)host->hostFlags));
+ }
return;
} else {
h_Unlock_r(host);
}
+ /* if somebody still has this host held */
+ /* we must check this _after_ h_NBLock_r, since h_NBLock_r can drop and
+ * reacquire H_LOCK */
+ if (host->refCount > 0) {
+ char hoststr[16];
+ if (wasdeleted) {
+ /* someone grabbed a ref while HOSTDELETED was set; that is bad */
+ ViceLog(0, ("Warning: h_TossStuff_r failed; Host %" AFS_PTR_FMT
+ " (%s:%d flags 0x%x) was held.\n",
+ host, afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port),
+ (unsigned)host->hostFlags));
+ }
+ return;
+ }
+
/* ASSUMPTION: rxi_FreeConnection() does not yield */
for (cp = &host->FirstClient; (client = *cp);) {
if ((host->hostFlags & HOSTDELETED) || client->deleted) {
if (code < 0) {
char hoststr[16];
ViceLog(0,
- ("Warning: h_TossStuff_r failed: Host %s:%d client %x was locked.\n",
- afs_inet_ntoa_r(host->host, hoststr),
+ ("Warning: h_TossStuff_r failed: Host %p (%s:%d) "
+ "client %p was locked.\n",
+ host, afs_inet_ntoa_r(host->host, hoststr),
ntohs(host->port), client));
return;
}
-
+
if (client->refCount) {
char hoststr[16];
ViceLog(0,
- ("Warning: h_TossStuff_r failed: Host %s:%d client %x refcount %d.\n",
- afs_inet_ntoa_r(host->host, hoststr),
+ ("Warning: h_TossStuff_r failed: Host %p (%s:%d) "
+ "client %p refcount %d.\n",
+ host, afs_inet_ntoa_r(host->host, hoststr),
ntohs(host->port), client, client->refCount));
/* This is the same thing we do if the host is locked */
ReleaseWriteLock(&client->lock);
host->hostFlags &= ~CLIENTDELETED;
if (host->hostFlags & HOSTDELETED) {
- register struct h_hashChain **hp, *th;
- register struct rx_connection *rxconn;
- afsUUID *uuidp;
+ struct rx_connection *rxconn;
struct AddrPort hostAddrPort;
int i;
/* if alternate addresses do not exist */
if (!(host->interface)) {
- for (hp = &hostHashTable[h_HashIndex(host->host)]; (th = *hp);
- hp = &th->next) {
- assert(th->hostPtr);
- if (th->hostPtr == host) {
- *hp = th->next;
- h_DeleteList_r(host);
- FreeHT(host);
- free(th);
- break;
- }
- }
+ h_DeleteHostFromAddrHashTable_r(host->host, host->port, host);
} else {
- /* delete all hash entries for the UUID */
- uuidp = &host->interface->uuid;
- for (hp = &hostUuidHashTable[h_UuidHashIndex(uuidp)]; (th = *hp);
- hp = &th->next) {
- assert(th->hostPtr);
- if (th->hostPtr == host) {
- *hp = th->next;
- free(th);
- break;
- }
- }
- /* delete all hash entries for alternate addresses */
- assert(host->interface->numberOfInterfaces > 0);
+ h_DeleteHostFromUuidHashTable_r(host);
+ h_DeleteHostFromAddrHashTable_r(host->host, host->port, host);
+ /* delete the hash entry for each valid alternate addresses */
for (i = 0; i < host->interface->numberOfInterfaces; i++) {
hostAddrPort = host->interface->interface[i];
-
- for (hp = &hostHashTable[h_HashIndex(hostAddrPort.addr)]; (th = *hp);
- hp = &th->next) {
- assert(th->hostPtr);
- if (th->hostPtr == host) {
- *hp = th->next;
- free(th);
- break;
- }
- }
+ /*
+ * if the interface addr/port is the primary, we already
+ * removed it. If the addr/port is not valid, its not
+ * in the hash table.
+ */
+ if (hostAddrPort.valid &&
+ (host->host != hostAddrPort.addr ||
+ host->port != hostAddrPort.port))
+ h_DeleteHostFromAddrHashTable_r(hostAddrPort.addr, hostAddrPort.port, host);
}
free(host->interface);
host->interface = NULL;
- h_DeleteList_r(host); /* remove host from global host List */
- FreeHT(host);
} /* if alternate address exists */
+
+ h_DeleteList_r(host); /* remove host from global host List */
+ FreeHT(host);
}
} /*h_TossStuff_r */
-/* h_Enumerate: Calls (*proc)(host, held, param) for at least each host in the
+
+/* h_Enumerate: Calls (*proc)(host, param) for at least each host in the
* system at the start of the enumeration (perhaps more). Hosts may be deleted
- * (have delete flag set); ditto for clients. (*proc) is always called with
- * host h_held(). The hold state of the host with respect to this lwp is passed
- * to (*proc) as the param held. The proc should return 0 if the host should be
- * released, 1 if it should be held after enumeration.
+ * (have delete flag set); ditto for clients. refCount is always incremented
+ * before (*proc) is called.
+ *
+ * The return value of the proc is a set of flags. The proc should set
+ * H_ENUMERATE_BAIL(foo) if the enumeration of hosts should be stopped early.
*/
void
-h_Enumerate(int (*proc) (), char *param)
+h_Enumerate(int (*proc) (struct host*, void *), void *param)
{
- register struct host *host, **list;
- register int *held;
- register int i, count;
+ struct host *host, **list;
+ int i, count;
+ int totalCount;
H_LOCK;
if (hostCount == 0) {
H_UNLOCK;
return;
}
- list = (struct host **)malloc(hostCount * sizeof(struct host *));
+ list = malloc(hostCount * sizeof(struct host *));
if (!list) {
- ViceLog(0, ("Failed malloc in h_Enumerate\n"));
- assert(0);
- }
- held = (int *)malloc(hostCount * sizeof(int));
- if (!held) {
- ViceLog(0, ("Failed malloc in h_Enumerate\n"));
- assert(0);
+ ViceLogThenPanic(0, ("Failed malloc in h_Enumerate (list)\n"));
}
- for (count = 0, host = hostList; host; host = host->next, count++) {
- list[count] = host;
- if (!(held[count] = h_Held_r(host)))
+ for (totalCount = count = 0, host = hostList;
+ host && totalCount < hostCount;
+ host = host->next, totalCount++) {
+
+ if (!(host->hostFlags & HOSTDELETED)) {
+ list[count] = host;
h_Hold_r(host);
+ count++;
+ }
+ }
+ if (totalCount != hostCount) {
+ ViceLog(0, ("h_Enumerate found %d of %d hosts\n", totalCount, hostCount));
+ } else if (host != NULL) {
+ ViceLog(0, ("h_Enumerate found more than %d hosts\n", hostCount));
+ ShutDownAndCore(PANIC);
}
- assert(count == hostCount);
H_UNLOCK;
for (i = 0; i < count; i++) {
- held[i] = (*proc) (list[i], held[i], param);
- if (!H_ENUMERATE_ISSET_HELD(held[i]))
- h_Release(list[i]); /* this might free up the host */
+ int flags;
+ flags = (*proc) (list[i], param);
+ H_LOCK;
+ h_Release_r(list[i]);
+ H_UNLOCK;
/* bail out of the enumeration early */
- if (H_ENUMERATE_ISSET_BAIL(held[i]))
+ if (H_ENUMERATE_ISSET_BAIL(flags)) {
break;
+ } else if (flags) {
+ ViceLog(0, ("h_Enumerate got back invalid return value %d\n", flags));
+ ShutDownAndCore(PANIC);
+ }
+ }
+ if (i < count-1) {
+ /* we bailed out of enumerating hosts early; we still have holds on
+ * some of the hosts in 'list', so release them */
+ i++;
+ H_LOCK;
+ for ( ; i < count; i++) {
+ h_Release_r(list[i]);
+ }
+ H_UNLOCK;
}
- free((void *)list);
- free((void *)held);
-} /*h_Enumerate */
+ free(list);
+} /* h_Enumerate */
+
/* h_Enumerate_r (revised):
- * Calls (*proc)(host, held, param) for each host in hostList, starting
- * at enumstart
- * Hosts may be deleted (have delete flag set); ditto for clients.
- * (*proc) is always called with
- * host h_held() and the global host lock (H_LOCK) locked.The hold state of the
- * host with respect to this lwp is passed to (*proc) as the param held.
- * The proc should return 0 if the host should be released, 1 if it should
- * be held after enumeration.
+ * Calls (*proc)(host, param) for each host in hostList, starting
+ * at enumstart. Called only under H_LOCK. Hosts may be deleted (have
+ * delete flag set); ditto for clients. refCount is always incremented
+ * before (*proc) is called.
+ *
+ * @note Assumes that hostList is only prepended to, that a host is never
+ * inserted into the middle. Otherwise this would not be guaranteed to
+ * terminate.
+ *
+ * The return value of the proc is a set of flags. The proc should set
+ * H_ENUMERATE_BAIL(foo) if the enumeration of hosts should be stopped early.
*/
void
-h_Enumerate_r(int (*proc) (), struct host *enumstart, char *param)
+h_Enumerate_r(int (*proc) (struct host *, void *),
+ struct host *enumstart, void *param)
{
- register struct host *host, *next;
- register int held, nheld;
+ struct host *host, *next;
+ int count;
+ int origHostCount;
if (hostCount == 0) {
return;
}
- if (enumstart && !(held = h_Held_r(enumstart)))
- h_Hold_r(enumstart);
- for (host = enumstart; host; host = next, held = nheld) {
+
+ host = enumstart;
+ enumstart = NULL;
+
+ /* find the first non-deleted host, so we know where to actually start
+ * enumerating */
+ for (count = 0; host && count < hostCount; count++) {
+ if (!(host->hostFlags & HOSTDELETED)) {
+ enumstart = host;
+ break;
+ }
+ host = host->next;
+ }
+ if (!enumstart) {
+ /* we didn't find a non-deleted host... */
+
+ if (host && count >= hostCount) {
+ /* ...because we found a loop */
+ ViceLog(0, ("h_Enumerate_r found more than %d hosts\n", hostCount));
+ ShutDownAndCore(PANIC);
+ }
+
+ /* ...because the hostList is full of deleted hosts */
+ return;
+ }
+
+ h_Hold_r(enumstart);
+
+ /* remember hostCount, lest it change over the potential H_LOCK drop in
+ * h_Release_r */
+ origHostCount = hostCount;
+
+ for (count = 0, host = enumstart; host && count < origHostCount; host = next, count++) {
next = host->next;
- if (next && !(nheld = h_Held_r(next)) && !H_ENUMERATE_ISSET_BAIL(held))
+
+ /* find the next non-deleted host */
+ while (next && (next->hostFlags & HOSTDELETED)) {
+ next = next->next;
+ /* inc count for the skipped-over host */
+ if (++count > origHostCount) {
+ ViceLog(0, ("h_Enumerate_r found more than %d hosts\n", origHostCount));
+ ShutDownAndCore(PANIC);
+ }
+ }
+ if (next)
h_Hold_r(next);
- held = (*proc) (host, held, param);
- if (!H_ENUMERATE_ISSET_HELD(held))
- h_Release_r(host); /* this might free up the host */
- if (H_ENUMERATE_ISSET_BAIL(held)) {
- if (!H_ENUMERATE_ISSET_HELD(nheld))
- h_Release_r(next); /* this might free up the host */
- break;
+
+ if (!(host->hostFlags & HOSTDELETED)) {
+ int flags;
+ flags = (*proc) (host, param);
+ if (H_ENUMERATE_ISSET_BAIL(flags)) {
+ h_Release_r(host); /* this might free up the host */
+ if (next) {
+ h_Release_r(next);
+ }
+ break;
+ } else if (flags) {
+ ViceLog(0, ("h_Enumerate_r got back invalid return value %d\n", flags));
+ ShutDownAndCore(PANIC);
+ }
}
+ h_Release_r(host); /* this might free up the host */
+ }
+ if (host != NULL && count >= origHostCount) {
+ ViceLog(0, ("h_Enumerate_r found more than %d hosts\n", origHostCount));
+ ShutDownAndCore(PANIC);
}
-} /*h_Enumerate_r */
+} /*h_Enumerate_r */
+
/* inserts a new HashChain structure corresponding to this UUID */
-static void
+void
h_AddHostToUuidHashTable_r(struct afsUUID *uuid, struct host *host)
{
int index;
- struct h_hashChain *chain;
+ struct h_UuidHashChain *chain;
+ char uuid1[128], uuid2[128];
+ char hoststr[16];
/* hash into proper bucket */
index = h_UuidHashIndex(uuid);
+ /* don't add the same entry multiple times */
+ for (chain = hostUuidHashTable[index]; chain; chain = chain->next) {
+ if (!chain->hostPtr)
+ continue;
+
+ if (chain->hostPtr->interface &&
+ afs_uuid_equal(&chain->hostPtr->interface->uuid, uuid)) {
+ if (LogLevel >= 125) {
+ afsUUID_to_string(&chain->hostPtr->interface->uuid, uuid1,
+ 127);
+ afsUUID_to_string(uuid, uuid2, 127);
+ ViceLog(125, ("h_AddHostToUuidHashTable_r: host %" AFS_PTR_FMT " (uuid %s) exists as %s:%d (uuid %s)\n",
+ host, uuid1,
+ afs_inet_ntoa_r(chain->hostPtr->host, hoststr),
+ ntohs(chain->hostPtr->port), uuid2));
+ }
+ return;
+ }
+ }
+
/* insert into beginning of list for this bucket */
- chain = (struct h_hashChain *)malloc(sizeof(struct h_hashChain));
+ chain = malloc(sizeof(struct h_UuidHashChain));
if (!chain) {
- ViceLog(0, ("Failed malloc in h_AddHostToUuidHashTable_r\n"));
- assert(0);
+ ViceLogThenPanic(0, ("Failed malloc in h_AddHostToUuidHashTable_r\n"));
}
- assert(chain);
chain->hostPtr = host;
chain->next = hostUuidHashTable[index];
hostUuidHashTable[index] = chain;
+ if (LogLevel < 125)
+ return;
+ afsUUID_to_string(uuid, uuid2, 127);
+ ViceLog(125,
+ ("h_AddHostToUuidHashTable_r: host %p (%s:%d) added as uuid %s\n",
+ host, afs_inet_ntoa_r(chain->hostPtr->host, hoststr),
+ ntohs(chain->hostPtr->port), uuid2));
}
+/* deletes a HashChain structure corresponding to this host */
+int
+h_DeleteHostFromUuidHashTable_r(struct host *host)
+{
+ int index;
+ struct h_UuidHashChain **uhp, *uth;
+ char uuid1[128];
+ char hoststr[16];
+
+ if (!host->interface)
+ return 0;
+
+ /* hash into proper bucket */
+ index = h_UuidHashIndex(&host->interface->uuid);
+
+ if (LogLevel >= 125)
+ afsUUID_to_string(&host->interface->uuid, uuid1, 127);
+ for (uhp = &hostUuidHashTable[index]; (uth = *uhp); uhp = &uth->next) {
+ osi_Assert(uth->hostPtr);
+ if (uth->hostPtr == host) {
+ ViceLog(125,
+ ("h_DeleteHostFromUuidHashTable_r: host %" AFS_PTR_FMT " (uuid %s %s:%d)\n",
+ host, uuid1, afs_inet_ntoa_r(host->host, hoststr),
+ ntohs(host->port)));
+ *uhp = uth->next;
+ free(uth);
+ return 1;
+ }
+ }
+ ViceLog(125,
+ ("h_DeleteHostFromUuidHashTable_r: host %" AFS_PTR_FMT " (uuid %s %s:%d) not found\n",
+ host, uuid1, afs_inet_ntoa_r(host->host, hoststr),
+ ntohs(host->port)));
+ return 0;
+}
-/* inserts a new HashChain structure corresponding to this address */
-static void
-h_AddHostToHashTable_r(afs_uint32 addr, afs_uint16 port, struct host *host)
+/*
+ * This is called with host locked and held.
+ *
+ * All addresses are in network byte order.
+ */
+static int
+invalidateInterfaceAddr_r(struct host *host, afs_uint32 addr, afs_uint16 port)
{
- int index;
- struct h_hashChain *chain;
+ int i;
+ int number;
+ struct Interface *interface;
+ char hoststr[16], hoststr2[16];
- /* hash into proper bucket */
- index = h_HashIndex(addr);
+ osi_Assert(host);
+ osi_Assert(host->interface);
- /* don't add the same entry multiple times */
- for (chain = hostHashTable[index]; chain; chain = chain->next) {
- if (chain->hostPtr == host && chain->addr == addr && chain->port == port)
- return;
+ ViceLog(125, ("invalidateInterfaceAddr : host %" AFS_PTR_FMT " (%s:%d) addr %s:%d\n",
+ host, afs_inet_ntoa_r(host->host, hoststr),
+ ntohs(host->port), afs_inet_ntoa_r(addr, hoststr2),
+ ntohs(port)));
+
+ /*
+ * Make sure this address is on the list of known addresses
+ * for this host.
+ */
+ interface = host->interface;
+ number = host->interface->numberOfInterfaces;
+ for (i = 0; i < number; i++) {
+ if (interface->interface[i].addr == addr &&
+ interface->interface[i].port == port) {
+ if (interface->interface[i].valid) {
+ h_DeleteHostFromAddrHashTable_r(addr, port, host);
+ interface->interface[i].valid = 0;
+ }
+ return 0;
+ }
}
+ /* not found */
+ return 0;
+}
+
+/*
+ * This is called with host locked and held. This function differs
+ * from removeInterfaceAddr_r in that it is called when the address
+ * is being removed from the host regardless of whether or not there
+ * is an interface list for the host. This function will delete the
+ * host if there are no addresses left on it.
+ *
+ * All addresses are in network byte order.
+ */
+static int
+removeAddress_r(struct host *host, afs_uint32 addr, afs_uint16 port)
+{
+ int i;
+ char hoststr[16], hoststr2[16];
+ struct rx_connection *rxconn;
+
+ if (!host->interface || host->interface->numberOfInterfaces == 1) {
+ if (host->host == addr && host->port == port) {
+ ViceLog(25,
+ ("Removing only address for host %" AFS_PTR_FMT " (%s:%d), deleting host.\n",
+ host, afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port)));
+ host->hostFlags |= HOSTDELETED;
+ /*
+ * Do not remove the primary addr/port from the hash table.
+ * It will be ignored due to the HOSTDELETED flag and will
+ * be removed when h_TossStuff_r() cleans up the HOSTDELETED
+ * host. Removing it here will only result in a search for
+ * the host/addr/port in the hash chain which will fail.
+ */
+ } else {
+ ViceLog(0,
+ ("Removing address that does not belong to host %" AFS_PTR_FMT " (%s:%d).\n",
+ host, afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port)));
+ }
+ } else {
+ if (host->host == addr && host->port == port) {
+ removeInterfaceAddr_r(host, addr, port);
+
+ for (i=0; i < host->interface->numberOfInterfaces; i++) {
+ if (host->interface->interface[i].valid) {
+ ViceLog(25,
+ ("Removed address for host %" AFS_PTR_FMT " (%s:%d), new primary interface %s:%d.\n",
+ host, afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port),
+ afs_inet_ntoa_r(host->interface->interface[i].addr, hoststr2),
+ ntohs(host->interface->interface[i].port)));
+ host->host = host->interface->interface[i].addr;
+ host->port = host->interface->interface[i].port;
+ h_AddHostToAddrHashTable_r(host->host, host->port, host);
+ break;
+ }
+ }
+
+ if (i == host->interface->numberOfInterfaces) {
+ ViceLog(25,
+ ("Removed only address for host %" AFS_PTR_FMT " (%s:%d), no valid alternate interfaces, deleting host.\n",
+ host, afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port)));
+ host->hostFlags |= HOSTDELETED;
+ /* addr/port was removed from the hash table */
+ host->host = 0;
+ host->port = 0;
+ } else {
+ rxconn = host->callback_rxcon;
+ host->callback_rxcon = NULL;
+
+ if (rxconn) {
+ rx_DestroyConnection(rxconn);
+ rxconn = NULL;
+ }
+
+ h_SetupCallbackConn_r(host);
+ }
+ } else {
+ /* not the primary addr/port, just invalidate it */
+ invalidateInterfaceAddr_r(host, addr, port);
+ }
+ }
+
+ return 0;
+}
+
+static void
+createHostAddrHashChain_r(int index, afs_uint32 addr, afs_uint16 port, struct host *host)
+{
+ struct h_AddrHashChain *chain;
+ char hoststr[16];
+
/* insert into beginning of list for this bucket */
- chain = (struct h_hashChain *)malloc(sizeof(struct h_hashChain));
+ chain = malloc(sizeof(struct h_AddrHashChain));
if (!chain) {
- ViceLog(0, ("Failed malloc in h_AddHostToHashTable_r\n"));
- assert(0);
+ ViceLogThenPanic(0, ("Failed malloc in h_AddHostToAddrHashTable_r\n"));
}
chain->hostPtr = host;
- chain->next = hostHashTable[index];
+ chain->next = hostAddrHashTable[index];
chain->addr = addr;
chain->port = port;
- hostHashTable[index] = chain;
+ hostAddrHashTable[index] = chain;
+ ViceLog(125, ("h_AddHostToAddrHashTable_r: host %" AFS_PTR_FMT " added as %s:%d\n",
+ host, afs_inet_ntoa_r(addr, hoststr), ntohs(port)));
+}
+
+/**
+ * Resolve host address conflicts when hashing by address.
+ *
+ * @param[in] addr an ip address of the interface
+ * @param[in] port the port of the interface
+ * @param[in] newHost the host being added with this address
+ * @param[in] oldHost the host previously added with this address
+ */
+static void
+reconcileHosts_r(afs_uint32 addr, afs_uint16 port, struct host *newHost,
+ struct host *oldHost)
+{
+ struct rx_connection *cb = NULL;
+ int code = 0;
+ struct interfaceAddr interf;
+ Capabilities caps;
+ afsUUID *newHostUuid = &nulluuid;
+ afsUUID *oldHostUuid = &nulluuid;
+ char hoststr[16];
+
+ ViceLog(125,
+ ("reconcileHosts_r: addr %s:%d newHost %" AFS_PTR_FMT " oldHost %"
+ AFS_PTR_FMT, afs_inet_ntoa_r(addr, hoststr), ntohs(port),
+ newHost, oldHost));
+
+ osi_Assert(oldHost != newHost);
+ caps.Capabilities_val = NULL;
+
+ if (!sc) {
+ sc = rxnull_NewClientSecurityObject();
+ }
+
+ cb = rx_NewConnection(addr, port, 1, sc, 0);
+ rx_SetConnDeadTime(cb, 50);
+ rx_SetConnHardDeadTime(cb, AFS_HARDDEADTIME);
+
+ h_Hold_r(newHost);
+ h_Hold_r(oldHost);
+ H_UNLOCK;
+ code = RXAFSCB_TellMeAboutYourself(cb, &interf, &caps);
+ if (code == RXGEN_OPCODE) {
+ code = RXAFSCB_WhoAreYou(cb, &interf);
+ }
+ H_LOCK;
+
+ if (code == RXGEN_OPCODE ||
+ (code == 0 && afs_uuid_equal(&interf.uuid, &nulluuid))) {
+ ViceLog(0,
+ ("reconcileHosts_r: WhoAreYou not supported for connection (%s:%d), error %d\n",
+ afs_inet_ntoa_r(addr, hoststr), ntohs(port), code));
+ goto fail;
+ }
+ if (code != 0) {
+ ViceLog(0,
+ ("reconcileHosts_r: WhoAreYou failed for connection (%s:%d), error %d\n",
+ afs_inet_ntoa_r(addr, hoststr), ntohs(port), code));
+ goto fail;
+ }
+
+ /* Since lock was dropped, the hosts may have been deleted during the rpcs. */
+ if ((newHost->hostFlags & HOSTDELETED)
+ && (oldHost->hostFlags & HOSTDELETED)) {
+ ViceLog(5,
+ ("reconcileHosts_r: new and old hosts were deleted during probe.\n"));
+ goto done;
+ }
+
+ /* A check can be done if at least one of the hosts has a uuid. It
+ * is an error if the hosts have the same (not null) uuid. */
+ if ((!(newHost->hostFlags & HOSTDELETED)) && newHost->interface) {
+ newHostUuid = &(newHost->interface->uuid);
+ }
+ if ((!(oldHost->hostFlags & HOSTDELETED)) && oldHost->interface) {
+ oldHostUuid = &(oldHost->interface->uuid);
+ }
+ if (afs_uuid_equal(newHostUuid, &nulluuid) &&
+ afs_uuid_equal(oldHostUuid, &nulluuid)) {
+ ViceLog(0,
+ ("reconcileHosts_r: Cannot reconcile hosts for connection (%s:%d), no uuids\n",
+ afs_inet_ntoa_r(addr, hoststr), ntohs(port)));
+ goto done;
+ }
+ if (afs_uuid_equal(newHostUuid, oldHostUuid)) {
+ ViceLog(0,
+ ("reconcileHosts_r: Cannot reconcile hosts for connection (%s:%d), same uuids\n",
+ afs_inet_ntoa_r(addr, hoststr), ntohs(port)));
+ goto done;
+ }
+
+ /* Determine which host should be hashed */
+ if ((!(newHost->hostFlags & HOSTDELETED))
+ && afs_uuid_equal(newHostUuid, &(interf.uuid))) {
+ /* Install the new host into the hash before removing the stale
+ * addresses. Walk the hash chain again since the hash table may have
+ * been changed when the host lock was dropped to get the uuid. */
+ struct h_AddrHashChain *chain;
+ int index = h_HashIndex(addr);
+ for (chain = hostAddrHashTable[index]; chain; chain = chain->next) {
+ if (chain->addr == addr && chain->port == port) {
+ chain->hostPtr = newHost;
+ removeAddress_r(oldHost, addr, port);
+ goto done;
+ }
+ }
+ createHostAddrHashChain_r(index, addr, port, newHost);
+ removeAddress_r(oldHost, addr, port);
+ goto done;
+ }
+ if ((!(oldHost->hostFlags & HOSTDELETED))
+ && afs_uuid_equal(oldHostUuid, &(interf.uuid))) {
+ removeAddress_r(newHost, addr, port);
+ goto done;
+ }
+
+ fail:
+ if (!(newHost->hostFlags & HOSTDELETED)) {
+ removeAddress_r(newHost, addr, port);
+ }
+ if (!(oldHost->hostFlags & HOSTDELETED)) {
+ removeAddress_r(oldHost, addr, port);
+ }
+
+ done:
+ h_Release_r(newHost);
+ h_Release_r(oldHost);
+ rx_DestroyConnection(cb);
+ return;
+}
+
+/* inserts a new HashChain structure corresponding to this address */
+void
+h_AddHostToAddrHashTable_r(afs_uint32 addr, afs_uint16 port, struct host *host)
+{
+ int index;
+ struct h_AddrHashChain *chain;
+ char hoststr[16];
+
+ /* hash into proper bucket */
+ index = h_HashIndex(addr);
+
+ /* don't add the same address:port pair entry multiple times */
+ for (chain = hostAddrHashTable[index]; chain; chain = chain->next) {
+ if (chain->addr == addr && chain->port == port) {
+ if (chain->hostPtr == host) {
+ ViceLog(125,
+ ("h_AddHostToAddrHashTable_r: host %" AFS_PTR_FMT " (%s:%d) already hashed\n",
+ host, afs_inet_ntoa_r(chain->addr, hoststr),
+ ntohs(chain->port)));
+ return;
+ }
+ if (!(chain->hostPtr->hostFlags & HOSTDELETED)) {
+ /* attempt to resolve host address collision */
+ reconcileHosts_r(addr, port, host, chain->hostPtr);
+ return;
+ }
+ }
+ }
+ createHostAddrHashChain_r(index, addr, port, host);
}
/*
- * This is called with host locked and held. At this point, the
- * hostHashTable should not be having entries for the alternate
- * interfaces. This function has to insert these entries in the
- * hostHashTable.
+ * This is called with host locked and held.
+ * It is called to either validate or add an additional interface
+ * address/port on the specified host.
*
* All addresses are in network byte order.
*/
{
int i;
int number;
- int found;
struct Interface *interface;
char hoststr[16], hoststr2[16];
- assert(host);
- assert(host->interface);
-
- ViceLog(125, ("addInterfaceAddr : host %s:%d addr %s:%d\n",
- afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port),
- afs_inet_ntoa_r(addr, hoststr2), ntohs(port)));
+ osi_Assert(host);
+ osi_Assert(host->interface);
/*
* Make sure this address is on the list of known addresses
* for this host.
*/
number = host->interface->numberOfInterfaces;
- for (i = 0, found = 0; i < number && !found; i++) {
+ for (i = 0; i < number; i++) {
if (host->interface->interface[i].addr == addr &&
- host->interface->interface[i].port == port)
- found = 1;
- }
- if (!found) {
- interface = (struct Interface *)
- malloc(sizeof(struct Interface) + (sizeof(struct AddrPort) * number));
- if (!interface) {
- ViceLog(0, ("Failed malloc in addInterfaceAddr_r\n"));
- assert(0);
- }
- interface->numberOfInterfaces = number + 1;
- interface->uuid = host->interface->uuid;
- for (i = 0; i < number; i++)
- interface->interface[i] = host->interface->interface[i];
- interface->interface[number].addr = addr;
- interface->interface[number].port = port;
- free(host->interface);
- host->interface = interface;
+ host->interface->interface[i].port == port) {
+ ViceLog(125,
+ ("addInterfaceAddr : found host %" AFS_PTR_FMT " (%s:%d) adding %s:%d%s\n",
+ host, afs_inet_ntoa_r(host->host, hoststr),
+ ntohs(host->port), afs_inet_ntoa_r(addr, hoststr2),
+ ntohs(port), host->interface->interface[i].valid ? "" :
+ ", validating"));
+
+ if (host->interface->interface[i].valid == 0) {
+ host->interface->interface[i].valid = 1;
+ h_AddHostToAddrHashTable_r(addr, port, host);
+ }
+ return 0;
+ }
}
- /*
- * Create a hash table entry for this address
- */
- h_AddHostToHashTable_r(addr, port, host);
+ ViceLog(125, ("addInterfaceAddr : host %" AFS_PTR_FMT " (%s:%d) adding %s:%d\n",
+ host, afs_inet_ntoa_r(host->host, hoststr),
+ ntohs(host->port), afs_inet_ntoa_r(addr, hoststr2),
+ ntohs(port)));
+
+ interface = malloc(sizeof(struct Interface)
+ + (sizeof(struct AddrPort) * number));
+ if (!interface) {
+ ViceLogThenPanic(0, ("Failed malloc in addInterfaceAddr_r\n"));
+ }
+ interface->numberOfInterfaces = number + 1;
+ interface->uuid = host->interface->uuid;
+ for (i = 0; i < number; i++)
+ interface->interface[i] = host->interface->interface[i];
+
+ /* Add the new valid interface */
+ interface->interface[number].addr = addr;
+ interface->interface[number].port = port;
+ interface->interface[number].valid = 1;
+ h_AddHostToAddrHashTable_r(addr, port, host);
+ free(host->interface);
+ host->interface = interface;
return 0;
}
/*
- * This is called with host locked and held. At this point, the
- * hostHashTable should not be having entries for the alternate
- * interfaces. This function has to insert these entries in the
- * hostHashTable.
+ * This is called with host locked and held.
*
* All addresses are in network byte order.
*/
{
int i;
int number;
- int found;
struct Interface *interface;
char hoststr[16], hoststr2[16];
- assert(host);
- assert(host->interface);
+ osi_Assert(host);
+ osi_Assert(host->interface);
- ViceLog(125, ("removeInterfaceAddr : host %s:%d addr %s:%d\n",
- afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port),
- afs_inet_ntoa_r(addr, hoststr2), ntohs(port)));
+ ViceLog(125, ("removeInterfaceAddr : host %" AFS_PTR_FMT " (%s:%d) addr %s:%d\n",
+ host, afs_inet_ntoa_r(host->host, hoststr),
+ ntohs(host->port), afs_inet_ntoa_r(addr, hoststr2),
+ ntohs(port)));
/*
* Make sure this address is on the list of known addresses
*/
interface = host->interface;
number = host->interface->numberOfInterfaces;
- for (i = 0, found = 0; i < number; i++) {
+ for (i = 0; i < number; i++) {
if (interface->interface[i].addr == addr &&
interface->interface[i].port == port) {
- found = 1;
- break;
- }
- }
- if (found) {
- number--;
- for (; i < number; i++) {
- interface->interface[i].addr = interface->interface[i+1].addr;
- interface->interface[i].port = interface->interface[i+1].port;
+ if (interface->interface[i].valid)
+ h_DeleteHostFromAddrHashTable_r(addr, port, host);
+ number--;
+ for (; i < number; i++) {
+ interface->interface[i] = interface->interface[i+1];
+ }
+ interface->numberOfInterfaces = number;
+ return 0;
}
- interface->numberOfInterfaces = number;
}
+ /* not found */
+ return 0;
+}
+
- /*
- * Remove the hash table entry for this address
- */
- h_DeleteHostFromHashTableByAddr_r(addr, port, host);
+static int
+h_threadquota(int waiting)
+{
+ if (lwps > 64) {
+ if (waiting > 5)
+ return 1;
+ } else if (lwps > 32) {
+ if (waiting > 4)
+ return 1;
+ } else if (lwps > 16) {
+ if (waiting > 3)
+ return 1;
+ } else {
+ if (waiting > 2)
+ return 1;
+ }
return 0;
}
-
-/* Host is returned held */
+/* If found, host is returned with refCount incremented */
struct host *
h_GetHost_r(struct rx_connection *tcon)
{
struct host *host;
struct host *oldHost;
int code;
- int held, oheld;
struct interfaceAddr interf;
int interfValid = 0;
struct Identity *identP = NULL;
char hoststr[16], hoststr2[16];
Capabilities caps;
struct rx_connection *cb_conn = NULL;
+ struct rx_connection *cb_in = NULL;
caps.Capabilities_val = NULL;
haddr = rxr_HostOf(tcon);
hport = rxr_PortOf(tcon);
retry:
+ if (cb_in) {
+ rx_DestroyConnection(cb_in);
+ cb_in = NULL;
+ }
if (caps.Capabilities_val)
free(caps.Capabilities_val);
caps.Capabilities_val = NULL;
caps.Capabilities_len = 0;
code = 0;
- host = h_Lookup_r(haddr, hport, &held);
+ if (h_Lookup_r(haddr, hport, &host))
+ return 0;
identP = (struct Identity *)rx_GetSpecific(tcon, rxcon_ident_key);
if (host && !identP && !(host->Console & 1)) {
/* This is a new connection, and we already have a host
* structure for this address. Verify that the identity
* of the caller matches the identity in the host structure.
*/
+ if ((host->hostFlags & HWHO_INPROGRESS) &&
+ h_threadquota(host->lock.num_waiting)) {
+ h_Release_r(host);
+ host = NULL;
+ goto gethost_out;
+ }
h_Lock_r(host);
- if (!(host->hostFlags & ALTADDR)) {
- /* Another thread is doing initialization */
+ if (!(host->hostFlags & ALTADDR) ||
+ (host->hostFlags & HOSTDELETED)) {
+ /* Another thread is doing initialization
+ * or this host was deleted while we
+ * waited for the lock. */
h_Unlock_r(host);
- if (!held)
- h_Release_r(host);
ViceLog(125,
- ("Host %s:%d starting h_Lookup again\n",
- afs_inet_ntoa_r(host->host, hoststr),
+ ("Host %" AFS_PTR_FMT " (%s:%d) starting h_Lookup again\n",
+ host, afs_inet_ntoa_r(host->host, hoststr),
ntohs(host->port)));
+ h_Release_r(host);
goto retry;
}
+ host->hostFlags |= HWHO_INPROGRESS;
host->hostFlags &= ~ALTADDR;
+
+ /* We received a new connection from an IP address/port
+ * that is associated with 'host' but the address/port of
+ * the callback connection does not have to match it.
+ * If there is a match, we can use the existing callback
+ * connection to verify the UUID. If they do not match
+ * we need to use a new callback connection to verify the
+ * UUID of the incoming caller and perhaps use the old
+ * callback connection to verify that the old address/port
+ * is still valid.
+ */
+
cb_conn = host->callback_rxcon;
rx_GetConnection(cb_conn);
H_UNLOCK;
- code =
- RXAFSCB_TellMeAboutYourself(cb_conn, &interf, &caps);
- if (code == RXGEN_OPCODE)
- code = RXAFSCB_WhoAreYou(cb_conn, &interf);
+ if (haddr == host->host && hport == host->port) {
+ /* The existing callback connection matches the
+ * incoming connection so just use it.
+ */
+ code =
+ RXAFSCB_TellMeAboutYourself(cb_conn, &interf, &caps);
+ if (code == RXGEN_OPCODE)
+ code = RXAFSCB_WhoAreYou(cb_conn, &interf);
+ } else {
+ /* We do not have a match. Create a new connection
+ * for the new addr/port and use multi_Rx to probe
+ * both of them simultaneously.
+ */
+ if (!sc)
+ sc = rxnull_NewClientSecurityObject();
+ cb_in = rx_NewConnection(haddr, hport, 1, sc, 0);
+ rx_SetConnDeadTime(cb_in, 50);
+ rx_SetConnHardDeadTime(cb_in, AFS_HARDDEADTIME);
+ rx_SetConnSecondsUntilNatPing(cb_in, 20);
+
+ code =
+ RXAFSCB_TellMeAboutYourself(cb_in, &interf, &caps);
+ if (code == RXGEN_OPCODE)
+ code = RXAFSCB_WhoAreYou(cb_in, &interf);
+ }
rx_PutConnection(cb_conn);
cb_conn=NULL;
H_LOCK;
- if (code == RXGEN_OPCODE) {
- identP = (struct Identity *)malloc(sizeof(struct Identity));
+ if ((code == RXGEN_OPCODE) ||
+ ((code == 0) && (afs_uuid_equal(&interf.uuid, &nulluuid)))) {
+ identP = malloc(sizeof(struct Identity));
if (!identP) {
- ViceLog(0, ("Failed malloc in h_GetHost_r\n"));
- assert(0);
+ ViceLogThenPanic(0, ("Failed malloc in h_GetHost_r\n"));
}
identP->valid = 0;
rx_SetSpecific(tcon, rxcon_ident_key, identP);
- /* The host on this connection was unable to respond to
- * the WhoAreYou. We will treat this as a new connection
- * from the existing host. The worst that can happen is
- * that we maintain some extra callback state information */
- if (host->interface) {
- ViceLog(0,
- ("Host %s:%d used to support WhoAreYou, deleting.\n",
- afs_inet_ntoa_r(host->host, hoststr),
- ntohs(host->port)));
- host->hostFlags |= HOSTDELETED;
- h_Unlock_r(host);
- if (!held)
+ if (cb_in == NULL) {
+ /* The host on this connection was unable to respond to
+ * the WhoAreYou. We will treat this as a new connection
+ * from the existing host. The worst that can happen is
+ * that we maintain some extra callback state information */
+ if (host->interface) {
+ ViceLog(0,
+ ("Host %" AFS_PTR_FMT " (%s:%d) used to support WhoAreYou, deleting.\n",
+ host,
+ afs_inet_ntoa_r(host->host, hoststr),
+ ntohs(host->port)));
+ host->hostFlags |= HOSTDELETED;
+ host->hostFlags &= ~HWHO_INPROGRESS;
+ h_Unlock_r(host);
h_Release_r(host);
- host = NULL;
- goto retry;
+ host = NULL;
+ goto retry;
+ }
+ } else {
+ /* The incoming connection does not support WhoAreYou but
+ * the original one might have. Use removeAddress_r() to
+ * remove this addr/port from the host that was found.
+ * If there are no more addresses left for the host it
+ * will be deleted. Then we retry.
+ */
+ removeAddress_r(host, haddr, hport);
+ host->hostFlags &= ~HWHO_INPROGRESS;
+ host->hostFlags |= ALTADDR;
+ h_Unlock_r(host);
+ h_Release_r(host);
+ host = NULL;
+ goto retry;
}
} else if (code == 0) {
interfValid = 1;
- identP = (struct Identity *)malloc(sizeof(struct Identity));
+ identP = malloc(sizeof(struct Identity));
if (!identP) {
- ViceLog(0, ("Failed malloc in h_GetHost_r\n"));
- assert(0);
+ ViceLogThenPanic(0, ("Failed malloc in h_GetHost_r\n"));
}
identP->valid = 1;
identP->uuid = interf.uuid;
* then this is not the same host as before. */
if (!host->interface
|| !afs_uuid_equal(&interf.uuid, &host->interface->uuid)) {
- ViceLog(25,
- ("Host %s:%d has changed its identity, deleting.\n",
- afs_inet_ntoa_r(host->host, hoststr), host->port));
- host->hostFlags |= HOSTDELETED;
+ if (cb_in) {
+ ViceLog(25,
+ ("Uuid doesn't match connection (%s:%d).\n",
+ afs_inet_ntoa_r(haddr, hoststr), ntohs(hport)));
+ removeAddress_r(host, haddr, hport);
+ } else {
+ ViceLog(25,
+ ("Uuid doesn't match host %" AFS_PTR_FMT " (%s:%d).\n",
+ host, afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port)));
+
+ removeAddress_r(host, host->host, host->port);
+ }
+ host->hostFlags &= ~HWHO_INPROGRESS;
+ host->hostFlags |= ALTADDR;
h_Unlock_r(host);
- if (!held)
- h_Release_r(host);
+ h_Release_r(host);
host = NULL;
goto retry;
+ } else if (cb_in) {
+ /* the UUID matched the client at the incoming addr/port
+ * but this is not the address of the active callback
+ * connection. Try that connection and see if the client
+ * is still there and if the reported UUID is the same.
+ */
+ int code2;
+ afsUUID uuid = host->interface->uuid;
+ cb_conn = host->callback_rxcon;
+ rx_GetConnection(cb_conn);
+ rx_SetConnDeadTime(cb_conn, 2);
+ rx_SetConnHardDeadTime(cb_conn, AFS_HARDDEADTIME);
+ H_UNLOCK;
+ code2 = RXAFSCB_ProbeUuid(cb_conn, &uuid);
+ H_LOCK;
+ rx_SetConnDeadTime(cb_conn, 50);
+ rx_SetConnHardDeadTime(cb_conn, AFS_HARDDEADTIME);
+ rx_PutConnection(cb_conn);
+ cb_conn=NULL;
+ if (code2) {
+ /* The primary address is either not responding or
+ * is not the client we are looking for. Need to
+ * remove the primary address and add swap in the new
+ * callback connection, and destroy the old one.
+ */
+ struct rx_connection *rxconn;
+ ViceLog(0,("CB: ProbeUuid for host %" AFS_PTR_FMT " (%s:%d) failed %d\n",
+ host,
+ afs_inet_ntoa_r(host->host, hoststr),
+ ntohs(host->port),code2));
+
+ /*
+ * make sure we add and then remove. otherwise, we
+ * might end up with no valid interfaces after the
+ * remove and the host will have been marked deleted.
+ */
+ addInterfaceAddr_r(host, haddr, hport);
+ removeInterfaceAddr_r(host, host->host, host->port);
+ host->host = haddr;
+ host->port = hport;
+ rxconn = host->callback_rxcon;
+ host->callback_rxcon = cb_in;
+ cb_in = NULL;
+
+ if (rxconn) {
+ /*
+ * If rx_DestroyConnection calls h_FreeConnection we
+ * will deadlock on the host_glock_mutex. Work around
+ * the problem by unhooking the client from the
+ * connection before destroying the connection.
+ */
+ rx_SetSpecific(rxconn, rxcon_client_key, (void *)0);
+ rx_DestroyConnection(rxconn);
+ }
+ }
}
} else {
- afs_inet_ntoa_r(host->host, hoststr);
- ViceLog(0,
- ("CB: WhoAreYou failed for %s:%d, error %d\n", hoststr,
- ntohs(host->port), code));
- host->hostFlags |= VENUSDOWN;
+ if (cb_in) {
+ /* A callback to the incoming connection address is failing.
+ * Assume that the addr/port is no longer associated with the host
+ * returned by h_Lookup_r.
+ */
+ ViceLog(0,
+ ("CB: WhoAreYou failed for connection (%s:%d) , error %d\n",
+ afs_inet_ntoa_r(haddr, hoststr), ntohs(hport), code));
+ removeAddress_r(host, haddr, hport);
+ host->hostFlags &= ~HWHO_INPROGRESS;
+ host->hostFlags |= ALTADDR;
+ h_Unlock_r(host);
+ h_Release_r(host);
+ host = NULL;
+ rx_DestroyConnection(cb_in);
+ cb_in = NULL;
+ goto gethost_out;
+ } else {
+ ViceLog(0,
+ ("CB: WhoAreYou failed for host %" AFS_PTR_FMT " (%s:%d), error %d\n",
+ host, afs_inet_ntoa_r(host->host, hoststr),
+ ntohs(host->port), code));
+ host->hostFlags |= VENUSDOWN;
+ }
}
if (caps.Capabilities_val
&& (caps.Capabilities_val[0] & CLIENT_CAPABILITY_ERRORTRANS))
else
host->hostFlags &= ~(HERRORTRANS);
host->hostFlags |= ALTADDR;
+ host->hostFlags &= ~HWHO_INPROGRESS;
h_Unlock_r(host);
} else if (host) {
if (!(host->hostFlags & ALTADDR)) {
/* another thread is doing the initialisation */
ViceLog(125,
- ("Host %s:%d waiting for host-init to complete\n",
- afs_inet_ntoa_r(host->host, hoststr),
+ ("Host %" AFS_PTR_FMT " (%s:%d) waiting for host-init to complete\n",
+ host, afs_inet_ntoa_r(host->host, hoststr),
ntohs(host->port)));
h_Lock_r(host);
h_Unlock_r(host);
- if (!held)
- h_Release_r(host);
ViceLog(125,
- ("Host %s:%d starting h_Lookup again\n",
- afs_inet_ntoa_r(host->host, hoststr),
+ ("Host %" AFS_PTR_FMT " (%s:%d) starting h_Lookup again\n",
+ host, afs_inet_ntoa_r(host->host, hoststr),
ntohs(host->port)));
+ h_Release_r(host);
goto retry;
}
/* We need to check whether the identity in the host structure
if (host->interface)
afsUUID_to_string(&host->interface->uuid, uuid2, 127);
ViceLog(0,
- ("CB: new identity for host %s:%d, deleting(%x %x %s %s)\n",
- afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port),
+ ("CB: new identity for host %p (%s:%d), "
+ "deleting(%x %p %s %s)\n",
+ host, afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port),
identP->valid, host->interface,
- identP->valid ? uuid1 : "",
- host->interface ? uuid2 : ""));
+ identP->valid ? uuid1 : "no_uuid",
+ host->interface ? uuid2 : "no_uuid"));
/* The host in the cache is not the host for this connection */
+ h_Lock_r(host);
host->hostFlags |= HOSTDELETED;
h_Unlock_r(host);
- if (!held)
- h_Release_r(host);
+ h_Release_r(host);
goto retry;
}
} else {
host = h_Alloc_r(tcon); /* returned held and locked */
+ if (!host)
+ goto gethost_out;
h_gethostcps_r(host, FT_ApproxTime());
if (!(host->Console & 1)) {
int pident = 0;
cb_conn = host->callback_rxcon;
rx_GetConnection(cb_conn);
+ host->hostFlags |= HWHO_INPROGRESS;
H_UNLOCK;
code =
RXAFSCB_TellMeAboutYourself(cb_conn, &interf, &caps);
rx_PutConnection(cb_conn);
cb_conn=NULL;
H_LOCK;
- if (code == RXGEN_OPCODE) {
+ if ((code == RXGEN_OPCODE) ||
+ ((code == 0) && (afs_uuid_equal(&interf.uuid, &nulluuid)))) {
if (!identP)
- identP =
- (struct Identity *)malloc(sizeof(struct Identity));
+ identP = malloc(sizeof(struct Identity));
else
pident = 1;
if (!identP) {
- ViceLog(0, ("Failed malloc in h_GetHost_r\n"));
- assert(0);
+ ViceLogThenPanic(0, ("Failed malloc in h_GetHost_r\n"));
}
identP->valid = 0;
if (!pident)
rx_SetSpecific(tcon, rxcon_ident_key, identP);
ViceLog(25,
- ("Host %s:%d does not support WhoAreYou.\n",
- afs_inet_ntoa_r(host->host, hoststr),
+ ("Host %" AFS_PTR_FMT " (%s:%d) does not support WhoAreYou.\n",
+ host, afs_inet_ntoa_r(host->host, hoststr),
ntohs(host->port)));
code = 0;
} else if (code == 0) {
if (!identP)
- identP =
- (struct Identity *)malloc(sizeof(struct Identity));
+ identP = malloc(sizeof(struct Identity));
else
pident = 1;
if (!identP) {
- ViceLog(0, ("Failed malloc in h_GetHost_r\n"));
- assert(0);
+ ViceLogThenPanic(0, ("Failed malloc in h_GetHost_r\n"));
}
identP->valid = 1;
interfValid = 1;
if (!pident)
rx_SetSpecific(tcon, rxcon_ident_key, identP);
ViceLog(25,
- ("WhoAreYou success on %s:%d\n",
- afs_inet_ntoa_r(host->host, hoststr),
+ ("WhoAreYou success on host %" AFS_PTR_FMT " (%s:%d)\n",
+ host, afs_inet_ntoa_r(host->host, hoststr),
ntohs(host->port)));
}
if (code == 0 && !identP->valid) {
} else if (code == 0) {
oldHost = h_LookupUuid_r(&identP->uuid);
if (oldHost) {
- int probefail = 0;
-
- if (!(oheld = h_Held_r(oldHost)))
- h_Hold_r(oldHost);
+ h_Hold_r(oldHost);
h_Lock_r(oldHost);
+ if (oldHost->hostFlags & HOSTDELETED) {
+ h_Unlock_r(oldHost);
+ h_Release_r(oldHost);
+ oldHost = NULL;
+ }
+ }
+
+ if (oldHost) {
+ int probefail = 0;
+
+ /* This is a new address for an existing host. Update
+ * the list of interfaces for the existing host and
+ * delete the host structure we just allocated. */
+
+ /* mark the duplicate host as deleted before we do
+ * anything. The probing code below may try to change
+ * "oldHost" to the same IP address as "host" currently
+ * has, and we do not want a pseudo-"collision" to be
+ * noticed. */
+ host->hostFlags |= HOSTDELETED;
+
+ oldHost->hostFlags |= HWHO_INPROGRESS;
+
if (oldHost->interface) {
int code2;
afsUUID uuid = oldHost->interface->uuid;
cb_conn=NULL;
if (code2) {
/* The primary address is either not responding or
- * is not the client we are looking for.
+ * is not the client we are looking for.
* MultiProbeAlternateAddress_r() will remove the
* alternate interfaces that do not have the same
* Uuid. */
- ViceLog(0,("CB: ProbeUuid for %s:%d failed %d\n",
- afs_inet_ntoa_r(oldHost->host, hoststr),
+ ViceLog(0,("CB: ProbeUuid for host %" AFS_PTR_FMT " (%s:%d) failed %d\n",
+ oldHost,
+ afs_inet_ntoa_r(oldHost->host, hoststr),
ntohs(oldHost->port),code2));
- MultiProbeAlternateAddress_r(oldHost);
- probefail = 1;
+
+ if (MultiProbeAlternateAddress_r(oldHost)) {
+ /* If MultiProbeAlternateAddress_r succeeded,
+ * it updated oldHost->host and oldHost->port
+ * to an address that responded successfully to
+ * a ProbeUuid, so it is as if the ProbeUuid
+ * call above returned success. So, only set
+ * 'probefail' if MultiProbeAlternateAddress_r
+ * fails. */
+ probefail = 1;
+ }
}
} else {
probefail = 1;
}
- /* This is a new address for an existing host. Update
- * the list of interfaces for the existing host and
- * delete the host structure we just allocated. */
if (oldHost->host != haddr || oldHost->port != hport) {
struct rx_connection *rxconn;
ViceLog(25,
- ("CB: new addr %s:%d for old host %s:%d\n",
- afs_inet_ntoa_r(haddr, hoststr),
- ntohs(hport),
- afs_inet_ntoa_r(oldHost->host, hoststr2),
- ntohs(oldHost->port)));
+ ("CB: Host %" AFS_PTR_FMT " (%s:%d) has new addr %s:%d\n",
+ oldHost,
+ afs_inet_ntoa_r(oldHost->host, hoststr2),
+ ntohs(oldHost->port),
+ afs_inet_ntoa_r(haddr, hoststr),
+ ntohs(hport)));
+ /*
+ * add then remove. otherwise the host may get marked
+ * deleted if we removed the only valid address.
+ */
+ addInterfaceAddr_r(oldHost, haddr, hport);
if (probefail || oldHost->host == haddr) {
- /* The probe failed which means that the old address is
- * either unreachable or is not the same host we were just
- * contacted by. We will also remove addresses if only
- * the port has changed because that indicates the client
- * is behind a NAT.
+ /*
+ * The probe failed which means that the old
+ * address is either unreachable or is not the
+ * same host we were just contacted by. We will
+ * also remove addresses if only the port has
+ * changed because that indicates the client
+ * is behind a NAT.
*/
removeInterfaceAddr_r(oldHost, oldHost->host, oldHost->port);
} else {
- int i, found;
+ int i;
struct Interface *interface = oldHost->interface;
int number = oldHost->interface->numberOfInterfaces;
- for (i = 0, found = 0; i < number; i++) {
+ for (i = 0; i < number; i++) {
if (interface->interface[i].addr == haddr &&
interface->interface[i].port != hport) {
- found = 1;
+ /*
+ * We have just been contacted by a client
+ * that has been seen from behind a NAT
+ * and at least one other address.
+ */
+ removeInterfaceAddr_r(oldHost, haddr,
+ interface->interface[i].port);
break;
}
}
- if (found) {
- /* We have just been contacted by a client that has been
- * seen from behind a NAT and at least one other address.
- */
- removeInterfaceAddr_r(oldHost, haddr, interface->interface[i].port);
- }
}
- addInterfaceAddr_r(oldHost, haddr, hport);
oldHost->host = haddr;
oldHost->port = hport;
rxconn = oldHost->callback_rxcon;
oldHost->callback_rxcon = host->callback_rxcon;
- host->callback_rxcon = NULL;
-
- if (rxconn) {
- struct client *client;
- /*
- * If rx_DestroyConnection calls h_FreeConnection we will
- * deadlock on the host_glock_mutex. Work around the problem
- * by unhooking the client from the connection before
- * destroying the connection.
- */
- client = rx_GetSpecific(rxconn, rxcon_client_key);
- rx_SetSpecific(rxconn, rxcon_client_key, (void *)0);
- rx_DestroyConnection(rxconn);
- }
+ host->callback_rxcon = rxconn;
+
+ /* don't destroy rxconn here; let h_TossStuff_r
+ * take care of that via h_Release_r below */
}
- host->hostFlags |= HOSTDELETED;
+ host->hostFlags &= ~HWHO_INPROGRESS;
h_Unlock_r(host);
/* release host because it was allocated by h_Alloc_r */
h_Release_r(host);
/* This really is a new host */
h_AddHostToUuidHashTable_r(&identP->uuid, host);
cb_conn = host->callback_rxcon;
- rx_GetConnection(cb_conn);
+ rx_GetConnection(cb_conn);
H_UNLOCK;
code =
RXAFSCB_InitCallBackState3(cb_conn,
H_LOCK;
if (code == 0) {
ViceLog(25,
- ("InitCallBackState3 success on %s:%d\n",
- afs_inet_ntoa_r(host->host, hoststr),
+ ("InitCallBackState3 success on host %" AFS_PTR_FMT " (%s:%d)\n",
+ host, afs_inet_ntoa_r(host->host, hoststr),
ntohs(host->port)));
- assert(interfValid == 1);
+ osi_Assert(interfValid == 1);
initInterfaceAddr_r(host, &interf);
}
}
}
if (code) {
- afs_inet_ntoa_r(host->host, hoststr);
ViceLog(0,
- ("CB: RCallBackConnectBack failed for %s:%d\n",
- hoststr, ntohs(host->port)));
+ ("CB: RCallBackConnectBack failed for %" AFS_PTR_FMT " (%s:%d)\n",
+ host, afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port)));
host->hostFlags |= VENUSDOWN;
} else {
ViceLog(125,
- ("CB: RCallBackConnectBack succeeded for %s:%d\n",
- hoststr, ntohs(host->port)));
+ ("CB: RCallBackConnectBack succeeded for %" AFS_PTR_FMT " (%s:%d)\n",
+ host, afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port)));
host->hostFlags |= RESETDONE;
}
}
else
host->hostFlags &= ~(HERRORTRANS);
host->hostFlags |= ALTADDR; /* host structure initialization complete */
+ host->hostFlags &= ~HWHO_INPROGRESS;
h_Unlock_r(host);
}
+
+ gethost_out:
if (caps.Capabilities_val)
free(caps.Capabilities_val);
caps.Capabilities_val = NULL;
caps.Capabilities_len = 0;
+ if (cb_in) {
+ rx_DestroyConnection(cb_in);
+ cb_in = NULL;
+ }
return host;
} /*h_GetHost_r */
static char localcellname[PR_MAXNAMELEN + 1];
-char local_realms[AFS_NUM_LREALMS][AFS_REALM_SZ];
-int num_lrealms = -1;
/* not reentrant */
void
-h_InitHostPackage()
+h_InitHostPackage(void)
{
+ memset(&nulluuid, 0, sizeof(afsUUID));
afsconf_GetLocalCell(confDir, localcellname, PR_MAXNAMELEN);
- if (num_lrealms == -1) {
- int i;
- for (i=0; i<AFS_NUM_LREALMS; i++) {
- if (afs_krb_get_lrealm(local_realms[i], i) != 0 /*KSUCCESS*/)
- break;
- }
-
- if (i == 0) {
- ViceLog(0,
- ("afs_krb_get_lrealm failed, using %s.\n",
- localcellname));
- strncpy(local_realms[0], localcellname, AFS_REALM_SZ);
- num_lrealms = i =1;
- } else {
- num_lrealms = i;
- }
-
- /* initialize the rest of the local realms to nullstring for debugging */
- for (; i<AFS_NUM_LREALMS; i++)
- local_realms[i][0] = '\0';
- }
rxcon_ident_key = rx_KeyCreate((rx_destructor_t) free);
rxcon_client_key = rx_KeyCreate((rx_destructor_t) 0);
-#ifdef AFS_PTHREAD_ENV
- assert(pthread_mutex_init(&host_glock_mutex, NULL) == 0);
-#endif /* AFS_PTHREAD_ENV */
+ MUTEX_INIT(&host_glock_mutex, "host glock", MUTEX_DEFAULT, 0);
}
static int
-MapName_r(char *aname, char *acell, afs_int32 * aval)
+MapName_r(char *uname, afs_int32 * aval)
{
namelist lnames;
idlist lids;
afs_int32 code;
- afs_int32 anamelen, cnamelen;
- int foreign = 0;
- char *tname;
-
- anamelen = strlen(aname);
- if (anamelen >= PR_MAXNAMELEN)
- return -1; /* bad name -- caller interprets this as anonymous, but retries later */
lnames.namelist_len = 1;
- lnames.namelist_val = (prname *) aname; /* don't malloc in the common case */
+ lnames.namelist_val = (prname *) uname;
lids.idlist_len = 0;
lids.idlist_val = NULL;
- cnamelen = strlen(acell);
- if (cnamelen) {
- if (afs_is_foreign_ticket_name(aname, NULL, acell, localcellname)) {
- ViceLog(2,
- ("MapName: cell is foreign. cell=%s, localcell=%s, localrealms={%s,%s,%s,%s}\n",
- acell, localcellname, local_realms[0],local_realms[1],local_realms[2],local_realms[3]));
- if ((anamelen + cnamelen + 1) >= PR_MAXNAMELEN) {
- ViceLog(2,
- ("MapName: Name too long, using AnonymousID for %s@%s\n",
- aname, acell));
- *aval = AnonymousID;
- return 0;
- }
- foreign = 1; /* attempt cross-cell authentication */
- tname = (char *)malloc(PR_MAXNAMELEN);
- if (!tname) {
- ViceLog(0, ("Failed malloc in MapName_r\n"));
- assert(0);
- }
- strcpy(tname, aname);
- tname[anamelen] = '@';
- strcpy(tname + anamelen + 1, acell);
- lnames.namelist_val = (prname *) tname;
- }
- }
-
H_UNLOCK;
code = hpr_NameToId(&lnames, &lids);
H_LOCK;
if (*aval == AnonymousID) {
ViceLog(2,
("MapName: NameToId on %s returns anonymousID\n",
- lnames.namelist_val));
+ lnames.namelist_val[0]));
}
free(lids.idlist_val); /* return parms are not malloced in stub if server proc aborts */
} else {
ViceLog(0,
("MapName: NameToId on '%s' is unknown\n",
- lnames.namelist_val));
+ lnames.namelist_val[0]));
code = -1;
}
}
-
- if (foreign) {
- free(lnames.namelist_val); /* We allocated this above, so we must free it now. */
- }
return code;
}
struct client *
h_ID2Client(afs_int32 vid)
{
- register struct client *client;
- register struct host *host;
+ struct client *client;
+ struct host *host;
+ int count;
H_LOCK;
- for (host = hostList; host; host = host->next) {
+ for (count = 0, host = hostList; host && count < hostCount; host = host->next, count++) {
if (host->hostFlags & HOSTDELETED)
continue;
for (client = host->FirstClient; client; client = client->next) {
}
}
}
+ if (count != hostCount) {
+ ViceLog(0, ("h_ID2Client found %d of %d hosts\n", count, hostCount));
+ } else if (host != NULL) {
+ ViceLog(0, ("h_ID2Client found more than %d hosts\n", hostCount));
+ ShutDownAndCore(PANIC);
+ }
+
+ H_UNLOCK;
+ return NULL;
+}
+
+static int
+format_vname(char *vname, int usize, const char *tname, const char *tinst,
+ const char *tcell, afs_int32 islocal)
+{
+ int len;
+
+ len = strlcpy(vname, tname, usize);
+ if (len >= usize)
+ return -1;
+ if (tinst[0]) {
+ len = strlcat(vname, ".", usize);
+ if (len >= usize)
+ return -1;
+ len = strlcat(vname, tinst, usize);
+ if (len >= usize)
+ return -1;
+ }
+ if (tcell[0] && !islocal) {
+ len = strlcat(vname, "@", usize);
+ if (len >= usize)
+ return -1;
+ len = strlcat(vname, tcell, usize);
+ if (len >= usize)
+ return -1;
+ }
+ return 0;
+}
+
+static int
+getPeerDetails(struct rx_connection *conn,
+ afs_int32 *viceid, afs_int32 *expTime, int authClass)
+{
+ int code;
+#if (64-MAXKTCNAMELEN)
+ ticket name length != 64
+#endif
+ char tname[64];
+ char tinst[64];
+ char tcell[MAXKTCREALMLEN];
+ char uname[PR_MAXNAMELEN];
+
+ *viceid = AnonymousID;
+ *expTime = 0x7fffffff;
+
+ ViceLog(5,
+ ("FindClient: authenticating connection: authClass=%d\n",
+ authClass));
+ if (authClass == 1) {
+ /* A bcrypt tickets, no longer supported */
+ ViceLog(1, ("FindClient: bcrypt ticket, using AnonymousID\n"));
+ return 0;
+ }
+
+ if (authClass == 2) {
+ /* an rxkad ticket */
+ afs_int32 kvno;
+ afs_int32 islocal;
+
+ /* kerberos ticket */
+ code = rxkad_GetServerInfo(conn, /*level */ 0, (afs_uint32 *)expTime,
+ tname, tinst, tcell, &kvno);
+ if (code) {
+ ViceLog(1, ("Failed to get rxkad ticket info\n"));
+ return 0;
+ }
+
+ ViceLog(5,
+ ("FindClient: rxkad conn: name=%s,inst=%s,cell=%s,exp=%d,kvno=%d\n",
+ tname, tinst, tcell, *expTime, kvno));
+ code = afsconf_IsLocalRealmMatch(confDir, &islocal, tname, tinst, tcell);
+
+ if (code) {
+ ViceLog(0, ("FindClient: local realm check failed; code=%d", code));
+ return 0;
+ }
+
+ code = format_vname(uname, sizeof(uname), tname, tinst, tcell, islocal);
+ if (code) {
+ ViceLog(0, ("FindClient: uname truncated."));
+ return 0;
+ }
+
+ /* translate the name to a vice id */
+ code = MapName_r(uname, viceid);
+ if (code) {
+ ViceLog(1, ("failed to map name=%s -> code=%d\n", uname,
+ code));
+ return code; /* Actually flag this is a failure */
+ }
+
+ return 0;
+ }
- H_UNLOCK;
- return NULL;
+ return 0;
}
/*
* by one. The caller must call h_ReleaseClient_r when finished with
* the client.
*
- * the client->host is returned held. h_ReleaseClient_r does not release
- * the hold on client->host.
+ * The refCount on client->host is returned incremented. h_ReleaseClient_r
+ * does not decrement the refCount on client->host.
*/
struct client *
h_FindClient_r(struct rx_connection *tcon)
{
- register struct client *client;
- register struct host *host;
+ struct client *client;
+ struct host *host = NULL;
struct client *oldClient;
- afs_int32 viceid;
+ afs_int32 viceid = 0;
afs_int32 expTime;
afs_int32 code;
int authClass;
-#if (64-MAXKTCNAMELEN)
- ticket name length != 64
-#endif
- char tname[64];
- char tinst[64];
- char uname[PR_MAXNAMELEN];
- char tcell[MAXKTCREALMLEN];
+
int fail = 0;
int created = 0;
client = (struct client *)rx_GetSpecific(tcon, rxcon_client_key);
- if (client && client->sid == rxr_CidOf(tcon)
- && client->VenusEpoch == rxr_GetEpoch(tcon)) {
+ if (client && client->sid == rx_GetConnectionId(tcon)
+ && client->VenusEpoch == rx_GetConnectionEpoch(tcon)
+ && !(client->host->hostFlags & HOSTDELETED)
+ && !client->deleted) {
+
client->refCount++;
h_Hold_r(client->host);
- if (!client->deleted && client->prfail != 2) {
+ if (client->prfail != 2) {
/* Could add shared lock on client here */
/* note that we don't have to lock entry in this path to
* ensure CPS is initialized, since we don't call rx_SetSpecific
client = NULL;
}
- authClass = rx_SecurityClassOf((struct rx_connection *)tcon);
- ViceLog(5,
- ("FindClient: authenticating connection: authClass=%d\n",
- authClass));
- if (authClass == 1) {
- /* A bcrypt tickets, no longer supported */
- ViceLog(1, ("FindClient: bcrypt ticket, using AnonymousID\n"));
- viceid = AnonymousID;
- expTime = 0x7fffffff;
- } else if (authClass == 2) {
- afs_int32 kvno;
-
- /* kerberos ticket */
- code = rxkad_GetServerInfo(tcon, /*level */ 0, &expTime,
- tname, tinst, tcell, &kvno);
- if (code) {
- ViceLog(1, ("Failed to get rxkad ticket info\n"));
- viceid = AnonymousID;
- expTime = 0x7fffffff;
- } else {
- int ilen = strlen(tinst);
- ViceLog(5,
- ("FindClient: rxkad conn: name=%s,inst=%s,cell=%s,exp=%d,kvno=%d\n",
- tname, tinst, tcell, expTime, kvno));
- strncpy(uname, tname, sizeof(uname));
- if (ilen) {
- if (strlen(uname) + 1 + ilen >= sizeof(uname))
- goto bad_name;
- strcat(uname, ".");
- strcat(uname, tinst);
- }
- /* translate the name to a vice id */
- code = MapName_r(uname, tcell, &viceid);
- if (code) {
- bad_name:
- ViceLog(1,
- ("failed to map name=%s, cell=%s -> code=%d\n", uname,
- tcell, code));
- fail = 1;
- viceid = AnonymousID;
- expTime = 0x7fffffff;
- }
- }
- } else {
- viceid = AnonymousID; /* unknown security class */
- expTime = 0x7fffffff;
- }
+ authClass = rx_SecurityClassOf(tcon);
+
+ code = getPeerDetails(tcon, &viceid, &expTime, authClass);
+ if (code)
+ fail = 1;
if (!client) { /* loop */
- host = h_GetHost_r(tcon); /* Returns it h_Held */
+ host = h_GetHost_r(tcon); /* Returns with incremented refCount */
+
+ if (!host)
+ return NULL;
retryfirstclient:
/* First try to find the client structure */
for (client = host->FirstClient; client; client = client->next) {
- if (!client->deleted && (client->sid == rxr_CidOf(tcon))
- && (client->VenusEpoch == rxr_GetEpoch(tcon))) {
+ if (!client->deleted && (client->sid == rx_GetConnectionId(tcon))
+ && (client->VenusEpoch == rx_GetConnectionEpoch(tcon))) {
client->refCount++;
H_UNLOCK;
ObtainWriteLock(&client->lock);
/* Still no client structure - get one */
if (!client) {
h_Lock_r(host);
+ if (host->hostFlags & HOSTDELETED) {
+ h_Unlock_r(host);
+ h_Release_r(host);
+ return NULL;
+ }
/* Retry to find the client structure */
for (client = host->FirstClient; client; client = client->next) {
- if (!client->deleted && (client->sid == rxr_CidOf(tcon))
- && (client->VenusEpoch == rxr_GetEpoch(tcon))) {
+ if (!client->deleted && (client->sid == rx_GetConnectionId(tcon))
+ && (client->VenusEpoch == rx_GetConnectionEpoch(tcon))) {
h_Unlock_r(host);
goto retryfirstclient;
}
ObtainWriteLock(&client->lock);
client->refCount = 1;
client->host = host;
-#if FS_STATS_DETAILED
client->InSameNetwork = host->InSameNetwork;
-#endif /* FS_STATS_DETAILED */
client->ViceId = viceid;
client->expTime = expTime; /* rx only */
client->authClass = authClass; /* rx only */
- client->sid = rxr_CidOf(tcon);
- client->VenusEpoch = rxr_GetEpoch(tcon);
+ client->sid = rx_GetConnectionId(tcon);
+ client->VenusEpoch = rx_GetConnectionEpoch(tcon);
client->CPS.prlist_val = NULL;
client->CPS.prlist_len = 0;
h_Unlock_r(host);
if (code) {
char hoststr[16];
ViceLog(0,
- ("pr_GetCPS failed(%d) for user %d, host %s:%d\n",
- code, viceid, afs_inet_ntoa_r(client->host->host,
- hoststr),
+ ("pr_GetCPS failed(%d) for user %d, host %" AFS_PTR_FMT " (%s:%d)\n",
+ code, viceid, client->host,
+ afs_inet_ntoa_r(client->host->host,hoststr),
ntohs(client->host->port)));
/* Although ubik_Call (called by pr_GetCPS) traverses thru
}
/* the disabling of system:administrators is so iffy and has so many
* possible failure modes that we will disable it again */
- /* Turn off System:Administrator for safety
+ /* Turn off System:Administrator for safety
* if (AL_IsAMember(SystemId, client->CPS) == 0)
- * assert(AL_DisableGroup(SystemId, client->CPS) == 0); */
+ * osi_Assert(AL_DisableGroup(SystemId, client->CPS) == 0); */
}
/* Now, tcon may already be set to a rock, since we blocked with no host
* the RPC from the other client structure's rock.
*/
oldClient = (struct client *)rx_GetSpecific(tcon, rxcon_client_key);
- if (oldClient && oldClient != client && oldClient->sid == rxr_CidOf(tcon)
- && oldClient->VenusEpoch == rxr_GetEpoch(tcon)) {
+ if (oldClient && oldClient != client
+ && oldClient->sid == rx_GetConnectionId(tcon)
+ && oldClient->VenusEpoch == rx_GetConnectionEpoch(tcon)
+ && !(oldClient->host->hostFlags & HOSTDELETED)) {
char hoststr[16];
if (!oldClient->deleted) {
/* if we didn't create it, it's not ours to put back */
if (created) {
- ViceLog(0, ("FindClient: stillborn client %x(%x); conn %x (host %s:%d) had client %x(%x)\n",
- client, client->sid, tcon,
+ ViceLog(0, ("FindClient: stillborn client %p(%x); "
+ "conn %p (host %s:%d) had client %p(%x)\n",
+ client, client->sid, tcon,
afs_inet_ntoa_r(rxr_HostOf(tcon), hoststr),
ntohs(rxr_PortOf(tcon)),
oldClient, oldClient->sid));
if (created) {
FreeCE(client);
created = 0;
- }
+ }
oldClient->refCount++;
+
+ h_Hold_r(oldClient->host);
+ h_Release_r(client->host);
+
H_UNLOCK;
ObtainWriteLock(&oldClient->lock);
H_LOCK;
client = oldClient;
+ host = oldClient->host;
} else {
- ViceLog(0, ("FindClient: deleted client %x(%x) already had conn %x (host %s:%d), stolen by client %x(%x)\n",
- oldClient, oldClient->sid, tcon,
- afs_inet_ntoa_r(rxr_HostOf(tcon), hoststr),
- ntohs(rxr_PortOf(tcon)),
- client, client->sid));
+ ViceLog(0, ("FindClient: deleted client %p(%x ref %d host %p href "
+ "%d) already had conn %p (host %s:%d, cid %x), stolen "
+ "by client %p(%x, ref %d host %p href %d)\n",
+ oldClient, oldClient->sid, oldClient->refCount,
+ oldClient->host, oldClient->host->refCount, tcon,
+ afs_inet_ntoa_r(rxr_HostOf(tcon), hoststr),
+ ntohs(rxr_PortOf(tcon)), rx_GetConnectionId(tcon),
+ client, client->sid, client->refCount,
+ client->host, client->host->refCount));
/* rx_SetSpecific will be done immediately below */
}
}
/* Avoid chaining in more than once. */
if (created) {
h_Lock_r(host);
+
+ if (host->hostFlags & HOSTDELETED) {
+ h_Unlock_r(host);
+ h_Release_r(host);
+
+ host = NULL;
+ client->host = NULL;
+
+ if ((client->ViceId != ANONYMOUSID) && client->CPS.prlist_val)
+ free(client->CPS.prlist_val);
+ client->CPS.prlist_val = NULL;
+ client->CPS.prlist_len = 0;
+
+ client->refCount--;
+ ReleaseWriteLock(&client->lock);
+ FreeCE(client);
+ return NULL;
+ }
+
client->next = host->FirstClient;
host->FirstClient = client;
h_Unlock_r(host);
int
h_ReleaseClient_r(struct client *client)
{
- assert(client->refCount > 0);
+ osi_Assert(client->refCount > 0);
client->refCount--;
return 0;
}
int
GetClient(struct rx_connection *tcon, struct client **cp)
{
- register struct client *client;
+ struct client *client;
+ char hoststr[16];
H_LOCK;
*cp = NULL;
client = (struct client *)rx_GetSpecific(tcon, rxcon_client_key);
if (client == NULL) {
ViceLog(0,
- ("GetClient: no client in conn %x (host %x:%d), VBUSYING\n",
- tcon, rxr_HostOf(tcon),ntohs(rxr_PortOf(tcon))));
+ ("GetClient: no client in conn %p (host %s:%d), VBUSYING\n",
+ tcon, afs_inet_ntoa_r(rxr_HostOf(tcon), hoststr),
+ ntohs(rxr_PortOf(tcon))));
H_UNLOCK;
return VBUSY;
}
- if (rxr_CidOf(tcon) != client->sid || rxr_GetEpoch(tcon) != client->VenusEpoch) {
+ if (rx_GetConnectionId(tcon) != client->sid
+ || rx_GetConnectionEpoch(tcon) != client->VenusEpoch) {
ViceLog(0,
- ("GetClient: tcon %x tcon sid %d client sid %d\n",
- tcon, rxr_CidOf(tcon), client->sid));
+ ("GetClient: tcon %p tcon sid %d client sid %d\n",
+ tcon, rx_GetConnectionId(tcon), client->sid));
H_UNLOCK;
return VBUSY;
}
if (client && client->LastCall > client->expTime && client->expTime) {
- char hoststr[16];
ViceLog(1,
("Token for %s at %s:%d expired %d\n", h_UserName(client),
afs_inet_ntoa_r(client->host->host, hoststr),
H_UNLOCK;
return VICETOKENDEAD;
}
+ if (client->deleted) {
+ ViceLog(0, ("GetClient: got deleted client, connection will appear "
+ "anonymous; tcon %p cid %x client %p ref %d host %p "
+ "(%s:%d) href %d ViceId %d\n",
+ tcon, rx_GetConnectionId(tcon), client, client->refCount,
+ client->host,
+ afs_inet_ntoa_r(client->host->host, hoststr),
+ (int)ntohs(client->host->port), client->host->refCount,
+ (int)client->ViceId));
+ }
client->refCount++;
*cp = client;
int
PutClient(struct client **cp)
{
- if (*cp == NULL)
+ if (*cp == NULL)
return -1;
H_LOCK;
static char User[PR_MAXNAMELEN + 1];
namelist lnames;
idlist lids;
- afs_int32 code;
lids.idlist_len = 1;
- lids.idlist_val = (afs_int32 *) malloc(1 * sizeof(afs_int32));
+ lids.idlist_val = malloc(1 * sizeof(afs_int32));
if (!lids.idlist_val) {
- ViceLog(0, ("Failed malloc in h_UserName\n"));
- assert(0);
+ ViceLogThenPanic(0, ("Failed malloc in h_UserName\n"));
}
lnames.namelist_len = 0;
lnames.namelist_val = (prname *) 0;
free(lids.idlist_val);
free(lnames.namelist_val);
return User;
-
} /*h_UserName */
void
-h_PrintStats()
+h_PrintStats(void)
{
ViceLog(0,
("Total Client entries = %d, blocks = %d; Host entries = %d, blocks = %d\n",
static int
-h_PrintClient(register struct host *host, int held, StreamHandle_t * file)
+h_PrintClient(struct host *host, void *rock)
{
- register struct client *client;
+ StreamHandle_t *file = (StreamHandle_t *)rock;
+ struct client *client;
int i;
char tmpStr[256];
char tbuffer[32];
char hoststr[16];
time_t LastCall, expTime;
+ struct tm tm;
H_LOCK;
LastCall = host->LastCall;
if (host->hostFlags & HOSTDELETED) {
H_UNLOCK;
- return held;
- }
- (void)afs_snprintf(tmpStr, sizeof tmpStr,
- "Host %s:%d down = %d, LastCall %s",
- afs_inet_ntoa_r(host->host, hoststr),
- ntohs(host->port), (host->hostFlags & VENUSDOWN),
- afs_ctime(&LastCall, tbuffer,
- sizeof(tbuffer)));
+ return 0;
+ }
+ strftime(tbuffer, sizeof(tbuffer), "%a %b %d %H:%M:%S %Y",
+ localtime_r(&LastCall, &tm));
+ snprintf(tmpStr, sizeof tmpStr, "Host %s:%d down = %d, LastCall %s\n",
+ afs_inet_ntoa_r(host->host, hoststr),
+ ntohs(host->port), (host->hostFlags & VENUSDOWN),
+ tbuffer);
(void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
for (client = host->FirstClient; client; client = client->next) {
if (!client->deleted) {
- expTime = client->expTime;
- (void)afs_snprintf(tmpStr, sizeof tmpStr,
- " user id=%d, name=%s, sl=%s till %s",
- client->ViceId, h_UserName(client),
- client->
- authClass ? "Authenticated" :
- "Not authenticated",
- client->
- authClass ? afs_ctime(&expTime, tbuffer,
- sizeof(tbuffer))
- : "No Limit\n");
- (void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
- (void)afs_snprintf(tmpStr, sizeof tmpStr, " CPS-%d is [",
- client->CPS.prlist_len);
+ expTime = client->expTime;
+ strftime(tbuffer, sizeof(tbuffer), "%a %b %d %H:%M:%S %Y",
+ localtime_r(&expTime, &tm));
+ snprintf(tmpStr, sizeof tmpStr,
+ " user id=%d, name=%s, sl=%s till %s\n",
+ client->ViceId, h_UserName(client),
+ client->authClass ? "Authenticated"
+ : "Not authenticated",
+ client->authClass ? tbuffer : "No Limit");
+ (void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
+ snprintf(tmpStr, sizeof tmpStr, " CPS-%d is [",
+ client->CPS.prlist_len);
(void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
if (client->CPS.prlist_val) {
- for (i = 0; i > client->CPS.prlist_len; i++) {
- (void)afs_snprintf(tmpStr, sizeof tmpStr, " %d",
- client->CPS.prlist_val[i]);
+ for (i = 0; i < client->CPS.prlist_len; i++) {
+ snprintf(tmpStr, sizeof tmpStr, " %d",
+ client->CPS.prlist_val[i]);
(void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
}
}
}
}
H_UNLOCK;
- return held;
+ return 0;
} /*h_PrintClient */
* if known
*/
void
-h_PrintClients()
+h_PrintClients(void)
{
time_t now;
char tmpStr[256];
char tbuffer[32];
+ struct tm tm;
StreamHandle_t *file = STREAM_OPEN(AFSDIR_SERVER_CLNTDUMP_FILEPATH, "w");
return;
}
now = FT_ApproxTime();
- (void)afs_snprintf(tmpStr, sizeof tmpStr, "List of active users at %s\n",
- afs_ctime(&now, tbuffer, sizeof(tbuffer)));
+ strftime(tbuffer, sizeof(tbuffer), "%a %b %d %H:%M:%S %Y",
+ localtime_r(&now, &tm));
+ snprintf(tmpStr, sizeof tmpStr, "List of active users at %s\n\n",
+ tbuffer);
(void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
h_Enumerate(h_PrintClient, (char *)file);
STREAM_REALLYCLOSE(file);
static int
-h_DumpHost(register struct host *host, int held, StreamHandle_t * file)
+h_DumpHost(struct host *host, void *rock)
{
+ StreamHandle_t *file = (StreamHandle_t *)rock;
+
int i;
char tmpStr[256];
char hoststr[16];
H_LOCK;
- (void)afs_snprintf(tmpStr, sizeof tmpStr,
- "ip:%s port:%d hidx:%d cbid:%d lock:%x last:%u active:%u down:%d del:%d cons:%d cldel:%d\n\t hpfailed:%d hcpsCall:%u hcps [",
- afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port), host->index,
- host->cblist, CheckLock(&host->lock), host->LastCall,
- host->ActiveCall, (host->hostFlags & VENUSDOWN),
- host->hostFlags & HOSTDELETED, host->Console,
- host->hostFlags & CLIENTDELETED, host->hcpsfailed,
- host->cpsCall);
+ snprintf(tmpStr, sizeof tmpStr,
+ "ip:%s port:%d hidx:%d cbid:%d lock:%x last:%u active:%u "
+ "down:%d del:%d cons:%d cldel:%d\n\t hpfailed:%d hcpsCall:%u "
+ "hcps [",
+ afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port),
+ host->index, host->cblist, CheckLock(&host->lock),
+ host->LastCall, host->ActiveCall, (host->hostFlags & VENUSDOWN),
+ host->hostFlags & HOSTDELETED, host->Console,
+ host->hostFlags & CLIENTDELETED, host->hcpsfailed,
+ host->cpsCall);
(void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
if (host->hcps.prlist_val)
for (i = 0; i < host->hcps.prlist_len; i++) {
- (void)afs_snprintf(tmpStr, sizeof tmpStr, " %d",
- host->hcps.prlist_val[i]);
+ snprintf(tmpStr, sizeof tmpStr, " %d", host->hcps.prlist_val[i]);
(void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
}
sprintf(tmpStr, "] [");
if (host->interface)
for (i = 0; i < host->interface->numberOfInterfaces; i++) {
char hoststr[16];
- sprintf(tmpStr, " %s:%d",
+ sprintf(tmpStr, " %s:%d",
afs_inet_ntoa_r(host->interface->interface[i].addr, hoststr),
ntohs(host->interface->interface[i].port));
(void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
}
- sprintf(tmpStr, "] holds: ");
- (void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
-
- for (i = 0; i < h_maxSlots; i++) {
- sprintf(tmpStr, "%04x", host->holds[i]);
- (void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
- }
- sprintf(tmpStr, " slot/bit: %d/%d\n", h_holdSlot(), h_holdbit());
+ sprintf(tmpStr, "] refCount:%d hostFlags:%hu\n", host->refCount, host->hostFlags);
(void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
H_UNLOCK;
- return held;
+ return 0;
} /*h_DumpHost */
void
-h_DumpHosts()
+h_DumpHosts(void)
{
time_t now;
StreamHandle_t *file = STREAM_OPEN(AFSDIR_SERVER_HOSTDUMP_FILEPATH, "w");
char tmpStr[256];
char tbuffer[32];
+ struct tm tm;
if (file == NULL) {
ViceLog(0,
return;
}
now = FT_ApproxTime();
- (void)afs_snprintf(tmpStr, sizeof tmpStr, "List of active hosts at %s\n",
- afs_ctime(&now, tbuffer, sizeof(tbuffer)));
+ strftime(tbuffer, sizeof(tbuffer), "%a %b %d %H:%M:%S %Y",
+ localtime_r(&now, &tm));
+ snprintf(tmpStr, sizeof tmpStr, "List of active hosts at %s\n\n", tbuffer);
(void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
h_Enumerate(h_DumpHost, (char *)file);
STREAM_REALLYCLOSE(file);
static int h_stateFillHeader(struct host_state_header * hdr);
static int h_stateCheckHeader(struct host_state_header * hdr);
static int h_stateAllocMap(struct fs_dump_state * state);
-static int h_stateSaveHost(register struct host * host, int held, struct fs_dump_state * state);
+static int h_stateSaveHost(struct host * host, void *rock);
static int h_stateRestoreHost(struct fs_dump_state * state);
-static int h_stateRestoreIndex(struct host * h, int held, struct fs_dump_state * state);
-static int h_stateVerifyHost(struct host * h, int held, struct fs_dump_state * state);
-static int h_stateVerifyAddrHash(struct fs_dump_state * state, struct host * h, afs_uint32 addr, afs_uint16 port);
+static int h_stateRestoreIndex(struct host * h, void *rock);
+static int h_stateVerifyHost(struct host * h, void *rock);
+static int h_stateVerifyAddrHash(struct fs_dump_state * state, struct host * h,
+ afs_uint32 addr, afs_uint16 port, int valid);
static int h_stateVerifyUuidHash(struct fs_dump_state * state, struct host * h);
static void h_hostToDiskEntry_r(struct host * in, struct hostDiskEntry * out);
static void h_diskEntryToHost_r(struct hostDiskEntry * in, struct host * out);
+/**
+ * Is this host busy?
+ *
+ * This is just a hint and should not be trusted; this should probably only be
+ * used by the host state serialization code when trying to detect if a host
+ * can be sanely serialized to disk or not. If this function returns 1, the
+ * host may be in an invalid state and thus should not be saved to disk.
+ */
+static int
+h_isBusy_r(struct host *host)
+{
+ struct Lock *hostLock = &host->lock;
+ int locked = 0;
+
+ LOCK_LOCK(hostLock);
+ if (hostLock->excl_locked || hostLock->readers_reading) {
+ locked = 1;
+ }
+ LOCK_UNLOCK(hostLock);
+
+ if (locked) {
+ return 1;
+ }
+
+ if ((host->hostFlags & HWHO_INPROGRESS) || !(host->hostFlags & ALTADDR)) {
+ /* We shouldn't hit this if the host wasn't locked, but just in case... */
+ return 1;
+ }
+
+ return 0;
+}
/* this procedure saves all host state to disk for fast startup */
int
/* demand attach fs
* host state serialization
*
- * this procedure restores all host state from a disk for fast startup
+ * this procedure restores all host state from a disk for fast startup
*/
int
h_stateRestore(struct fs_dump_state * state)
}
static int
-h_stateRestoreIndex(struct host * h, int held, struct fs_dump_state * state)
+h_stateRestoreIndex(struct host * h, void *rock)
{
+ struct fs_dump_state *state = (struct fs_dump_state *)rock;
if (cb_OldToNew(state, h->cblist, &h->cblist)) {
- return H_ENUMERATE_BAIL(held);
+ return H_ENUMERATE_BAIL(0);
}
- return held;
+ return 0;
}
int
}
static int
-h_stateVerifyHost(struct host * h, int held, struct fs_dump_state * state)
+h_stateVerifyHost(struct host * h, void* rock)
{
+ struct fs_dump_state *state = (struct fs_dump_state *)rock;
int i;
if (h == NULL) {
ViceLog(0, ("h_stateVerifyHost: error: NULL host pointer in linked list\n"));
- return H_ENUMERATE_BAIL(held);
+ return H_ENUMERATE_BAIL(0);
}
if (h->interface) {
for (i = h->interface->numberOfInterfaces-1; i >= 0; i--) {
- if (h_stateVerifyAddrHash(state, h, h->interface->interface[i].addr,
- h->interface->interface[i].port)) {
+ if (h_stateVerifyAddrHash(state, h, h->interface->interface[i].addr,
+ h->interface->interface[i].port,
+ h->interface->interface[i].valid)) {
state->bail = 1;
}
}
if (h_stateVerifyUuidHash(state, h)) {
state->bail = 1;
}
- } else if (h_stateVerifyAddrHash(state, h, h->host, h->port)) {
+ } else if (h_stateVerifyAddrHash(state, h, h->host, h->port, 1)) {
state->bail = 1;
}
state->bail = 1;
}
- done:
- return held;
+ return 0;
}
+/**
+ * verify a host is either in, or absent from, the addr hash table.
+ *
+ * @param[in] state fs dump state
+ * @param[in] h host we're dealing with
+ * @param[in] addr addr to look for (NBO)
+ * @param[in] port port to look for (NBO)
+ * @param[in] valid 1 if we're verifying that the specified addr and port
+ * in the hash table point to the specified host. 0 if we're
+ * verifying that the specified addr and port do NOT point
+ * to the specified host
+ *
+ * @return operation status
+ * @retval 1 failed to verify, bail out
+ * @retval 0 verified successfully, all is well
+ */
static int
-h_stateVerifyAddrHash(struct fs_dump_state * state, struct host * h, afs_uint32 addr, afs_uint16 port)
+h_stateVerifyAddrHash(struct fs_dump_state * state, struct host * h,
+ afs_uint32 addr, afs_uint16 port, int valid)
{
int ret = 0, found = 0;
struct host *host = NULL;
- struct h_hashChain *chain;
+ struct h_AddrHashChain *chain;
int index = h_HashIndex(addr);
char tmp[16];
int chain_len = 0;
- for (chain = hostHashTable[index]; chain; chain = chain->next) {
+ for (chain = hostAddrHashTable[index]; chain; chain = chain->next) {
host = chain->hostPtr;
if (host == NULL) {
afs_inet_ntoa_r(addr, tmp);
}
if ((chain->addr == addr) && (chain->port == port)) {
if (host != h) {
- ViceLog(0, ("h_stateVerifyAddrHash: warning: addr hash entry points to different host struct (%d, %d)\n",
- h->index, host->index));
- state->flags.warnings_generated = 1;
+ if (valid) {
+ ViceLog(0, ("h_stateVerifyAddrHash: warning: addr hash entry "
+ "points to different host struct (%d, %d)\n",
+ h->index, host->index));
+ state->flags.warnings_generated = 1;
+ }
+ } else {
+ if (!valid) {
+ ViceLog(0, ("h_stateVerifyAddrHash: error: addr %s:%u is "
+ "marked invalid, but points to the containing "
+ "host\n", afs_inet_ntoa_r(addr, tmp),
+ (unsigned)htons(port)));
+ ret = 1;
+ goto done;
+ }
}
found = 1;
break;
chain_len++;
}
- if (!found) {
+ if (!found && valid) {
afs_inet_ntoa_r(addr, tmp);
if (state->mode == FS_STATE_LOAD_MODE) {
- ViceLog(0, ("h_stateVerifyAddrHash: error: addr %s not found in hash\n", tmp));
+ ViceLog(0, ("h_stateVerifyAddrHash: error: addr %s:%u not found in hash\n",
+ tmp, (unsigned)htons(port)));
ret = 1;
goto done;
} else {
- ViceLog(0, ("h_stateVerifyAddrHash: warning: addr %s not found in hash\n", tmp));
+ ViceLog(0, ("h_stateVerifyAddrHash: warning: addr %s:%u not found in hash\n",
+ tmp, (unsigned)htons(port)));
state->flags.warnings_generated = 1;
}
}
{
int ret = 0, found = 0;
struct host *host = NULL;
- struct h_hashChain *chain;
+ struct h_UuidHashChain *chain;
afsUUID * uuidp = &h->interface->uuid;
int index = h_UuidHashIndex(uuidp);
char tmp[40];
if (host->interface &&
afs_uuid_equal(&host->interface->uuid, uuidp)) {
if (host != h) {
- ViceLog(0, ("h_stateVerifyUuidHash: warning: uuid hash entry points to different host struct (%d, %d)\n",
+ ViceLog(0, ("h_stateVerifyUuidHash: warning: uuid hash entry points to different host struct (%d, %d)\n",
h->index, host->index));
state->flags.warnings_generated = 1;
}
{
hdr->stamp.magic = HOST_STATE_MAGIC;
hdr->stamp.version = HOST_STATE_VERSION;
+ return 0;
}
/* check the contents of the host state header structure */
/* function called by h_Enumerate to save a host to disk */
static int
-h_stateSaveHost(register struct host * host, int held, struct fs_dump_state * state)
+h_stateSaveHost(struct host * host, void* rock)
{
- int i, if_len=0, hcps_len=0;
+ struct fs_dump_state *state = (struct fs_dump_state *) rock;
+ int if_len=0, hcps_len=0;
struct hostDiskEntry hdsk;
struct host_state_entry_header hdr;
struct Interface * ifp = NULL;
struct iovec iov[4];
int iovcnt = 2;
+ if (h_isBusy_r(host)) {
+ char hoststr[16];
+ ViceLog(1, ("Not saving host %s:%d to disk; host appears busy\n",
+ afs_inet_ntoa_r(host->host, hoststr), (int)ntohs(host->port)));
+ /* Make sure we don't try to save callbacks to disk for this host, or
+ * we'll get confused on restore */
+ DeleteAllCallBacks_r(host, 1);
+ return 0;
+ }
+
memset(&hdr, 0, sizeof(hdr));
if (state->h_hdr->index_max < host->index) {
h_hostToDiskEntry_r(host, &hdsk);
if (host->interface) {
- if_len = sizeof(struct Interface) +
+ if_len = sizeof(struct Interface) +
((host->interface->numberOfInterfaces-1) * sizeof(struct AddrPort));
- ifp = (struct Interface *) malloc(if_len);
- assert(ifp != NULL);
+ ifp = malloc(if_len);
+ osi_Assert(ifp != NULL);
memcpy(ifp, host->interface, if_len);
hdr.interfaces = host->interface->numberOfInterfaces;
iov[iovcnt].iov_base = (char *) ifp;
if (host->hcps.prlist_val) {
hdr.hcps = host->hcps.prlist_len;
hcps_len = hdr.hcps * sizeof(afs_int32);
- hcps = (afs_int32 *) malloc(hcps_len);
- assert(hcps != NULL);
+ hcps = malloc(hcps_len);
+ osi_Assert(hcps != NULL);
memcpy(hcps, host->hcps.prlist_val, hcps_len);
iov[iovcnt].iov_base = (char *) hcps;
iov[iovcnt].iov_len = hcps_len;
if (hdsk.index > state->h_hdr->index_max)
state->h_hdr->index_max = hdsk.index;
- hdr.len = sizeof(struct host_state_entry_header) +
+ hdr.len = sizeof(struct host_state_entry_header) +
sizeof(struct hostDiskEntry) + if_len + hcps_len;
hdr.magic = HOST_STATE_ENTRY_MAGIC;
iov[0].iov_len = sizeof(hdr);
iov[1].iov_base = (char *) &hdsk;
iov[1].iov_len = sizeof(struct hostDiskEntry);
-
+
if (fs_stateWriteV(state, iov, iovcnt)) {
ViceLog(0, ("h_stateSaveHost: failed to save host %d", host->index));
state->bail = 1;
state->h_hdr->records++;
- done:
if (ifp)
free(ifp);
if (hcps)
free(hcps);
if (state->bail) {
- return H_ENUMERATE_BAIL(held);
+ return H_ENUMERATE_BAIL(0);
}
- return held;
+ return 0;
}
/* restores a host from disk */
if (hdr.interfaces) {
ifp_len = sizeof(struct Interface) +
((hdr.interfaces-1) * sizeof(struct AddrPort));
- ifp = (struct Interface *) malloc(ifp_len);
- assert(ifp != NULL);
+ ifp = malloc(ifp_len);
+ osi_Assert(ifp != NULL);
iov[iovcnt].iov_base = (char *) ifp;
iov[iovcnt].iov_len = ifp_len;
iovcnt++;
}
if (hdr.hcps) {
hcps_len = hdr.hcps * sizeof(afs_int32);
- hcps = (afs_int32 *) malloc(hcps_len);
- assert(hcps != NULL);
+ hcps = malloc(hcps_len);
+ osi_Assert(hcps != NULL);
iov[iovcnt].iov_base = (char *) hcps;
iov[iovcnt].iov_len = hcps_len;
iovcnt++;
if (!hdr.hcps && hdsk.hcps_valid) {
/* valid, zero-length host cps ; does this ever happen? */
- hcps = (afs_int32 *) malloc(sizeof(afs_int32));
- assert(hcps != NULL);
+ hcps = malloc(sizeof(afs_int32));
+ osi_Assert(hcps != NULL);
}
+ if ((hdsk.hostFlags & HWHO_INPROGRESS) || !(hdsk.hostFlags & ALTADDR)) {
+ char hoststr[16];
+ ViceLog(0, ("h_stateRestoreHost: skipping host %s:%d due to invalid flags 0x%x\n",
+ afs_inet_ntoa_r(hdsk.host, hoststr), (int)ntohs(hdsk.port),
+ (unsigned)hdsk.hostFlags));
+ bail = 0;
+ state->h_map.entries[hdsk.index].valid = FS_STATE_IDX_SKIPPED;
+ goto done;
+ }
+
+ /* for restoring state, we better be able to get a host! */
host = GetHT();
- assert(host != NULL);
+ osi_Assert(host != NULL);
if (ifp) {
host->interface = ifp;
h_diskEntryToHost_r(&hdsk, host);
h_SetupCallbackConn_r(host);
+ h_AddHostToAddrHashTable_r(host->host, host->port, host);
if (ifp) {
int i;
for (i = ifp->numberOfInterfaces-1; i >= 0; i--) {
- h_AddHostToHashTable_r(ifp->interface[i].addr,
- ifp->interface[i].port, host);
+ if (ifp->interface[i].valid &&
+ !(ifp->interface[i].addr == host->host &&
+ ifp->interface[i].port == host->port)) {
+ h_AddHostToAddrHashTable_r(ifp->interface[i].addr,
+ ifp->interface[i].port,
+ host);
+ }
}
h_AddHostToUuidHashTable_r(&ifp->uuid, host);
- } else {
- h_AddHostToHashTable_r(host->host, host->port, host);
}
h_InsertList_r(host);
/* setup host id map entry */
+ state->h_map.entries[hdsk.index].valid = FS_STATE_IDX_VALID;
state->h_map.entries[hdsk.index].old_idx = hdsk.index;
state->h_map.entries[hdsk.index].new_idx = host->index;
out->ActiveCall = in->ActiveCall;
out->cpsCall = in->cpsCall;
out->cblist = in->cblist;
-#ifdef FS_STATS_DETAILED
out->InSameNetwork = in->InSameNetwork;
-#endif
/* special fields we save, but are not memcpy'd back on restore */
out->index = in->index;
out->ActiveCall = in->ActiveCall;
out->cpsCall = in->cpsCall;
out->cblist = in->cblist;
-#ifdef FS_STATS_DETAILED
out->InSameNetwork = in->InSameNetwork;
-#endif
}
/* index translation routines */
if (old >= state->h_map.len) {
ViceLog(0, ("h_OldToNew: index %d is out of range\n", old));
ret = 1;
- } else if (state->h_map.entries[old].old_idx != old) { /* sanity check */
+ } else if (state->h_map.entries[old].valid != FS_STATE_IDX_VALID ||
+ state->h_map.entries[old].old_idx != old) { /* sanity check */
ViceLog(0, ("h_OldToNew: index %d points to an invalid host record\n", old));
ret = 1;
} else {
*new = state->h_map.entries[old].new_idx;
}
- done:
return ret;
}
#endif /* AFS_DEMAND_ATTACH_FS */
void
h_GetWorkStats(int *nump, int *activep, int *delp, afs_int32 cutofftime)
{
- register struct host *host;
- register int num = 0, active = 0, del = 0;
+ struct host *host;
+ int num = 0, active = 0, del = 0;
+ int count;
H_LOCK;
- for (host = hostList; host; host = host->next) {
+ for (count = 0, host = hostList; host && count < hostCount; host = host->next, count++) {
if (!(host->hostFlags & HOSTDELETED)) {
num++;
if (host->ActiveCall > cutofftime)
del++;
}
}
+ if (count != hostCount) {
+ ViceLog(0, ("h_GetWorkStats found %d of %d hosts\n", count, hostCount));
+ } else if (host != NULL) {
+ ViceLog(0, ("h_GetWorkStats found more than %d hosts\n", hostCount));
+ ShutDownAndCore(PANIC);
+ }
H_UNLOCK;
if (nump)
*nump = num;
} /*h_GetWorkStats */
+void
+h_GetWorkStats64(afs_uint64 *nump, afs_uint64 *activep, afs_uint64 *delp,
+ afs_int32 cutofftime)
+{
+ int num, active, del;
+ h_GetWorkStats(&num, &active, &del, cutofftime);
+ if (nump)
+ *nump = num;
+ if (activep)
+ *activep = active;
+ if (delp)
+ *delp = del;
+}
/*------------------------------------------------------------------------
* PRIVATE h_ClassifyAddress
afs_int32 * a_diffSubnetP, afs_int32 * a_diffNetworkP)
{ /*h_GetHostNetStats */
- register struct host *hostP; /*Ptr to current host entry */
- register afs_uint32 currAddr_HBO; /*Curr host addr, host byte order */
+ struct host *hostP; /*Ptr to current host entry */
+ afs_uint32 currAddr_HBO; /*Curr host addr, host byte order */
+ int count;
/*
* Clear out the storage pointed to by our parameters.
*a_diffNetworkP = (afs_int32) 0;
H_LOCK;
- for (hostP = hostList; hostP; hostP = hostP->next) {
+ for (count = 0, hostP = hostList; hostP && count < hostCount; hostP = hostP->next, count++) {
if (!(hostP->hostFlags & HOSTDELETED)) {
/*
* Bump the number of undeleted host entries found.
a_diffNetworkP);
} /*Only look at non-deleted hosts */
} /*For each host record hashed to this index */
+ if (count != hostCount) {
+ ViceLog(0, ("h_GetHostNetStats found %d of %d hosts\n", count, hostCount));
+ } else if (hostP != NULL) {
+ ViceLog(0, ("h_GetHostNetStats found more than %d hosts\n", hostCount));
+ ShutDownAndCore(PANIC);
+ }
H_UNLOCK;
} /*h_GetHostNetStats */
* Since it can serialize them, and pile up, it should be a separate LWP
* from other events.
*/
+#if 0
static int
-CheckHost(register struct host *host, int held)
+CheckHost(struct host *host, int flags, void *rock)
{
- register struct client *client;
+ struct client *client;
struct rx_connection *cb_conn = NULL;
int code;
FS_STATE_RDLOCK;
if (fs_state.mode == FS_MODE_SHUTDOWN) {
FS_STATE_UNLOCK;
- return H_ENUMERATE_BAIL(held);
+ return H_ENUMERATE_BAIL(flags);
}
FS_STATE_UNLOCK;
#endif
if (host->LastCall < checktime) {
h_Lock_r(host);
if (!(host->hostFlags & HOSTDELETED)) {
+ host->hostFlags |= HWHO_INPROGRESS;
cb_conn = host->callback_rxcon;
rx_GetConnection(cb_conn);
if (host->LastCall < clientdeletetime) {
}
/* Note: it's safe to delete hosts even if they have call
* back state, because break delayed callbacks (called when a
- * message is received from the workstation) will always send a
+ * message is received from the workstation) will always send a
* break all call backs to the workstation if there is no
- *callback.
+ * callback.
*/
}
} else {
H_LOCK;
if (code) {
ViceLog(0,
- ("CheckHost: Probe failed for host %s:%d, code %d\n",
+ ("CheckHost: Probe failed for host %s:%d, code %d\n",
hoststr, ntohs(host->port), code));
host->hostFlags |= VENUSDOWN;
}
rx_PutConnection(cb_conn);
cb_conn=NULL;
H_LOCK;
+ host->hostFlags &= ~HWHO_INPROGRESS;
}
h_Unlock_r(host);
}
return held;
} /*CheckHost */
+#endif
+
+int
+CheckHost_r(struct host *host, void *dummy)
+{
+ struct client *client;
+ struct rx_connection *cb_conn = NULL;
+ int code;
+
+#ifdef AFS_DEMAND_ATTACH_FS
+ /* kill the checkhost lwp ASAP during shutdown */
+ FS_STATE_RDLOCK;
+ if (fs_state.mode == FS_MODE_SHUTDOWN) {
+ FS_STATE_UNLOCK;
+ return H_ENUMERATE_BAIL(0);
+ }
+ FS_STATE_UNLOCK;
+#endif
+
+ /* Host is held by h_Enumerate_r */
+ for (client = host->FirstClient; client; client = client->next) {
+ if (client->refCount == 0 && client->LastCall < clientdeletetime) {
+ client->deleted = 1;
+ host->hostFlags |= CLIENTDELETED;
+ }
+ }
+ if (host->LastCall < checktime) {
+ h_Lock_r(host);
+ if (!(host->hostFlags & HOSTDELETED)) {
+ host->hostFlags |= HWHO_INPROGRESS;
+ cb_conn = host->callback_rxcon;
+ rx_GetConnection(cb_conn);
+ if (host->LastCall < clientdeletetime) {
+ host->hostFlags |= HOSTDELETED;
+ if (!(host->hostFlags & VENUSDOWN)) {
+ host->hostFlags &= ~ALTADDR; /* alternate address invalid */
+ if (host->interface) {
+ H_UNLOCK;
+ code =
+ RXAFSCB_InitCallBackState3(cb_conn,
+ &FS_HostUUID);
+ H_LOCK;
+ } else {
+ H_UNLOCK;
+ code =
+ RXAFSCB_InitCallBackState(cb_conn);
+ H_LOCK;
+ }
+ host->hostFlags |= ALTADDR; /* alternate addresses valid */
+ if (code) {
+ char hoststr[16];
+ (void)afs_inet_ntoa_r(host->host, hoststr);
+ ViceLog(0,
+ ("CB: RCallBackConnectBack (host.c) failed for host %s:%d\n",
+ hoststr, ntohs(host->port)));
+ host->hostFlags |= VENUSDOWN;
+ }
+ /* Note: it's safe to delete hosts even if they have call
+ * back state, because break delayed callbacks (called when a
+ * message is received from the workstation) will always send a
+ * break all call backs to the workstation if there is no
+ * callback.
+ */
+ }
+ } else {
+ if (!(host->hostFlags & VENUSDOWN) && host->cblist) {
+ char hoststr[16];
+ (void)afs_inet_ntoa_r(host->host, hoststr);
+ if (host->interface) {
+ afsUUID uuid = host->interface->uuid;
+ H_UNLOCK;
+ code = RXAFSCB_ProbeUuid(cb_conn, &uuid);
+ H_LOCK;
+ if (code) {
+ if (MultiProbeAlternateAddress_r(host)) {
+ ViceLog(0,("CheckHost_r: Probing all interfaces of host %s:%d failed, code %d\n",
+ hoststr, ntohs(host->port), code));
+ host->hostFlags |= VENUSDOWN;
+ }
+ }
+ } else {
+ H_UNLOCK;
+ code = RXAFSCB_Probe(cb_conn);
+ H_LOCK;
+ if (code) {
+ ViceLog(0,
+ ("CheckHost_r: Probe failed for host %s:%d, code %d\n",
+ hoststr, ntohs(host->port), code));
+ host->hostFlags |= VENUSDOWN;
+ }
+ }
+ }
+ }
+ H_UNLOCK;
+ rx_PutConnection(cb_conn);
+ cb_conn=NULL;
+ H_LOCK;
+ host->hostFlags &= ~HWHO_INPROGRESS;
+ }
+ h_Unlock_r(host);
+ }
+ return 0;
+
+} /*CheckHost_r */
/*
{
afs_uint32 now = FT_ApproxTime();
- memset((char *)&zerofid, 0, sizeof(zerofid));
+ memset(&zerofid, 0, sizeof(zerofid));
/*
* Send a probe to the workstation if it hasn't been heard from in
* 15 minutes
*/
checktime = now - 15 * 60;
clientdeletetime = now - 120 * 60; /* 2 hours ago */
- h_Enumerate(CheckHost, NULL);
+ H_LOCK;
+ h_Enumerate_r(CheckHost_r, hostList, NULL);
+ H_UNLOCK;
} /*h_CheckHosts */
/*
* This is called with host locked and held. At this point, the
- * hostHashTable should not have any entries for the alternate
- * interfaces. This function has to insert these entries in the
- * hostHashTable.
+ * hostAddrHashTable has an entry for the primary addr/port inserted
+ * by h_Alloc_r(). No other interfaces should be considered valid.
*
* The addresses in the interfaceAddr list are in host byte order.
*/
int found;
struct Interface *interface;
char hoststr[16];
+ char uuidstr[128];
+ afs_uint16 port7001 = htons(7001);
- assert(host);
- assert(interf);
+ osi_Assert(host);
+ osi_Assert(interf);
number = interf->numberOfInterfaces;
myAddr = host->host; /* current interface address */
myPort = host->port; /* current port */
ViceLog(125,
- ("initInterfaceAddr : host %s:%d numAddr %d\n",
+ ("initInterfaceAddr : host %s:%d numAddr %d\n",
afs_inet_ntoa_r(myAddr, hoststr), ntohs(myPort), number));
/* validation checks */
}
/*
- * Convert IP addresses to network byte order, and remove for
- * duplicate IP addresses from the interface list.
+ * The client's notion of its own IP addresses is not reliable.
+ *
+ * 1. The client list might contain private address ranges which
+ * are likely to be re-used by many clients allocated addresses
+ * by a NAT.
+ *
+ * 2. The client list will not include any public addresses that
+ * are hidden by a NAT.
+ *
+ * 3. Private address ranges that are exposed to the server will
+ * be obtained from the rx connections that use them.
+ *
+ * 4. Lists provided by the client are not necessarily truthful.
+ * Many existing clients (UNIX) do not refresh the IP address
+ * list as the actual assigned addresses change. The end result
+ * is that they report the initial address list for the lifetime
+ * of the process. In other words, a client can report addresses
+ * that they are in fact not using. Adding these addresses to
+ * the host interface list without verification is not only
+ * pointless, it is downright dangerous.
+ *
+ * We therefore do not add alternate addresses to the addr hash table.
+ * We only use them for multi-rx callback breaks.
+ */
+
+ /*
+ * Convert IP addresses to network byte order, and remove
+ * duplicate and loopback IP addresses from the interface list, and
+ * determine whether or not the incoming addr/port is
+ * listed. Note that if the address matches it is not
+ * truly a match because the port number for the entries
+ * in the interface list are port 7001 and the port number
+ * for this connection might not be 7001.
*/
for (i = 0, count = 0, found = 0; i < number; i++) {
+ if (rx_IsLoopbackAddr(interf->addr_in[i])) {
+ continue;
+ }
interf->addr_in[i] = htonl(interf->addr_in[i]);
for (j = 0; j < count; j++) {
if (interf->addr_in[j] == interf->addr_in[i])
}
if (j == count) {
interf->addr_in[count] = interf->addr_in[i];
- if (interf->addr_in[count] == myAddr)
+ if (interf->addr_in[count] == myAddr &&
+ port7001 == myPort)
found = 1;
count++;
}
* Allocate and initialize an interface structure for this host.
*/
if (found) {
- interface = (struct Interface *)
- malloc(sizeof(struct Interface) +
- (sizeof(struct AddrPort) * (count - 1)));
+ interface = malloc(sizeof(struct Interface) +
+ (sizeof(struct AddrPort) * (count - 1)));
if (!interface) {
- ViceLog(0, ("Failed malloc in initInterfaceAddr_r\n"));
- assert(0);
+ ViceLogThenPanic(0, ("Failed malloc in initInterfaceAddr_r 1\n"));
}
interface->numberOfInterfaces = count;
} else {
- interface = (struct Interface *)
- malloc(sizeof(struct Interface) + (sizeof(struct AddrPort) * count));
- assert(interface);
+ interface = malloc(sizeof(struct Interface) +
+ (sizeof(struct AddrPort) * count));
+ if (!interface) {
+ ViceLogThenPanic(0, ("Failed malloc in initInterfaceAddr_r 2\n"));
+ }
interface->numberOfInterfaces = count + 1;
interface->interface[count].addr = myAddr;
interface->interface[count].port = myPort;
+ interface->interface[count].valid = 1;
}
- interface->uuid = interf->uuid;
+
for (i = 0; i < count; i++) {
- interface->interface[i].addr = interf->addr_in[i];
- /* We store the port as 7001 because the addresses reported by
+
+ interface->interface[i].addr = interf->addr_in[i];
+ /* We store the port as 7001 because the addresses reported by
* TellMeAboutYourself and WhoAreYou RPCs are only valid if they
* are coming from fully connected hosts (no NAT/PATs)
*/
- interface->interface[i].port = htons(7001);
+ interface->interface[i].port = port7001;
+ interface->interface[i].valid =
+ (interf->addr_in[i] == myAddr && port7001 == myPort) ? 1 : 0;
}
- assert(!host->interface);
+ interface->uuid = interf->uuid;
+
+ osi_Assert(!host->interface);
host->interface = interface;
- for (i = 0; i < host->interface->numberOfInterfaces; i++) {
- ViceLog(125, ("--- alt address %s:%d\n",
- afs_inet_ntoa_r(host->interface->interface[i].addr, hoststr),
- ntohs(host->interface->interface[i].port)));
+ if (LogLevel >= 125) {
+ afsUUID_to_string(&interface->uuid, uuidstr, 127);
+
+ ViceLog(125, ("--- uuid %s\n", uuidstr));
+ for (i = 0; i < host->interface->numberOfInterfaces; i++) {
+ ViceLog(125, ("--- alt address %s:%d\n",
+ afs_inet_ntoa_r(host->interface->interface[i].addr, hoststr),
+ ntohs(host->interface->interface[i].port)));
+ }
}
return 0;
/* deleted a HashChain structure for this address and host */
/* returns 1 on success */
-static int
-h_DeleteHostFromHashTableByAddr_r(afs_uint32 addr, afs_uint16 port, struct host *host)
+int
+h_DeleteHostFromAddrHashTable_r(afs_uint32 addr, afs_uint16 port,
+ struct host *host)
{
- int flag;
- register struct h_hashChain **hp, *th;
+ char hoststr[16];
+ struct h_AddrHashChain **hp, *th;
- for (hp = &hostHashTable[h_HashIndex(addr)]; (th = *hp);) {
- assert(th->hostPtr);
- if (th->hostPtr == host && th->addr == addr && th->port == port) {
- *hp = th->next;
- free(th);
- flag = 1;
- break;
- } else {
- hp = &th->next;
- }
+ if (addr == 0 && port == 0)
+ return 1;
+
+ for (hp = &hostAddrHashTable[h_HashIndex(addr)]; (th = *hp);
+ hp = &th->next) {
+ osi_Assert(th->hostPtr);
+ if (th->hostPtr == host && th->addr == addr && th->port == port) {
+ ViceLog(125, ("h_DeleteHostFromAddrHashTable_r: host %" AFS_PTR_FMT " (%s:%d)\n",
+ host, afs_inet_ntoa_r(host->host, hoststr),
+ ntohs(host->port)));
+ *hp = th->next;
+ free(th);
+ return 1;
+ }
}
- return flag;
+ ViceLog(125,
+ ("h_DeleteHostFromAddrHashTable_r: host %" AFS_PTR_FMT " (%s:%d) not found\n",
+ host, afs_inet_ntoa_r(host->host, hoststr),
+ ntohs(host->port)));
+ return 0;
}
if (host->interface) {
/* check alternate addresses */
number = host->interface->numberOfInterfaces;
- assert(number > 0);
- for (i = 0; i < number; i++)
- ViceLog(level, ("%s:%d ", afs_inet_ntoa_r(host->interface->interface[i].addr, hoststr),
- ntohs(host->interface->interface[i].port)));
+ if (number == 0) {
+ ViceLog(level, ("no-addresses "));
+ } else {
+ for (i = 0; i < number; i++)
+ ViceLog(level, ("%s:%d ", afs_inet_ntoa_r(host->interface->interface[i].addr, hoststr),
+ ntohs(host->interface->interface[i].port)));
+ }
}
ViceLog(level, ("\n"));
}
git://git.openafs.org / openafs.git / blobdiff