#include <afsconfig.h>
#include <afs/param.h>
+#include <afs/stds.h>
+#include <roken.h>
+#include <afs/opr.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.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
-#include <afs/stds.h>
#include <rx/xdr.h>
-#include <afs/assert.h>
#include <lwp.h>
#include <lock.h>
#include <afs/afsint.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;
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);
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++)
if (HTFree == NULL)
GetHTBlock();
- assert(HTFree != NULL);
+ if (HTFree == NULL)
+ return NULL;
entry = HTFree;
HTFree = entry->next;
HTs++;
code = afsconf_GetCellInfo(tdir, cellstr, "afsprot", &info);
if (code) {
ViceLog(0, ("hpr_Initialize: Could not locate cell %s in %s/%s",
- cellstr, confDir->name, AFSDIR_CELLSERVDB_FILE));
+ cellstr, tdir->name, AFSDIR_CELLSERVDB_FILE));
afsconf_Close(tdir);
return code;
}
/* 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, &scIndex);
- if (code)
- ViceLog(0, ("hpr_Initialize: clientauthsecure returns %d %s (so trying noauth)", code, afs_error_message(code)));
- if (code)
- scIndex = RX_SECIDX_NULL;
- }
- if ((scIndex == RX_SECIDX_NULL) && (sc == NULL))
- sc = rxnull_NewClientSecurityObject();
+ 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 == RX_SECIDX_NULL)
- ViceLog(0, ("hpr_Initialize: Could not get afs tokens, running unauthenticated. [%d]", code));
+ 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++) {
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
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);
- if (!code)
- assert(pthread_setspecific(viced_uclient_key, (void *)uclient) == 0);
- else
- return code;
- }
+ 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
afs_int32 code;
afs_int32 i;
- struct ubik_client *uclient =
- (struct ubik_client *)pthread_getspecific(viced_uclient_key);
+ struct ubik_client *uclient;
- if (!uclient) {
- code = hpr_Initialize(&uclient);
- if (!code)
- assert(pthread_setspecific(viced_uclient_key, (void *)uclient) == 0);
- else
- return code;
- }
+ 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
afs_int32 code;
- struct ubik_client *uclient =
- (struct ubik_client *)pthread_getspecific(viced_uclient_key);
+ struct ubik_client *uclient;
- if (!uclient) {
- code = hpr_Initialize(&uclient);
- if (!code)
- assert(pthread_setspecific(viced_uclient_key, (void *)uclient) == 0);
- else
- return code;
- }
+ 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
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);
- if (!code)
- assert(pthread_setspecific(viced_uclient_key, (void *)uclient) == 0);
- else
- return code;
- }
+ 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;
}
-#if FS_STATS_DETAILED
/*------------------------------------------------------------------------
* PRIVATE h_AddrInSameNetwork
*
return (0);
} /*h_AddrInSameNetwork */
-#endif /* FS_STATS_DETAILED */
/* Assumptions: called with held host */
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);
}
/* 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);
}
}
*/
#define DEF_ROPCONS 2115
-struct host *
+static struct host *
h_Alloc_r(struct rx_connection *r_con)
{
struct servent *serverentry;
struct host *host;
-#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_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);
}
/* h_Lookup_r
restart:
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) {
if ((host->hostFlags & HWHO_INPROGRESS) &&
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)) {
return host;
{
struct client **cp, *client;
int code;
+ int wasdeleted = 0;
+
+ if ((host->hostFlags & HOSTDELETED)) {
+ wasdeleted = 1;
+ }
/* make sure host doesn't go away over h_NBLock_r */
h_Hold_r(host);
/* if somebody still has this host locked */
if (code != 0) {
char hoststr[16];
- ViceLog(0,
- ("Warning: h_TossStuff_r failed; Host %" AFS_PTR_FMT " (%s:%d) was locked.\n",
- host, 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);
* reacquire H_LOCK */
if (host->refCount > 0) {
char hoststr[16];
- ViceLog(0,
- ("Warning: h_TossStuff_r failed; Host %" AFS_PTR_FMT " (%s:%d) was held.\n",
- host, afs_inet_ntoa_r(host->host, hoststr), ntohs(host->port)));
+ 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;
}
-/* 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. refCount is always incremented
- * before (*proc) is called. The param flags is passed to (*proc) as the
- * param flags, permitting (*proc) to stop the enumeration (BAIL).
- *
- * Needed? Why not always h_Hold_r and h_Release_r in (*proc), or even -never-
- * h_Hold_r or h_Release_r in (*proc)?
+ * before (*proc) is called.
*
- * **The proc should return 0 if the host should be released, 1 if it should
- * be held after enumeration.
+ * 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) (struct host*, int, void *), void *param)
+h_Enumerate(int (*proc) (struct host*, void *), void *param)
{
struct host *host, **list;
- int *flags;
int i, count;
int totalCount;
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 (list)\n"));
- assert(0);
- }
- flags = (int *)malloc(hostCount * sizeof(int));
- if (!flags) {
- ViceLog(0, ("Failed malloc in h_Enumerate (flags)\n"));
- assert(0);
+ ViceLogThenPanic(0, ("Failed malloc in h_Enumerate (list)\n"));
}
for (totalCount = count = 0, host = hostList;
host && totalCount < hostCount;
}
H_UNLOCK;
for (i = 0; i < count; i++) {
- flags[i] = (*proc) (list[i], flags[i], param);
+ 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(flags[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);
+ }
}
- free((void *)list);
- free((void *)flags);
+ 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(list);
} /* h_Enumerate */
/* h_Enumerate_r (revised):
- * Calls (*proc)(host, flags, param) for each host in hostList, starting
+ * 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. The param flags is passed to (*proc) as the
- * param flags, permitting (*proc) to stop the enumeration (BAIL).
- *
- * Needed? Why not always h_Hold_r and h_Release_r in (*proc), or even -never-
- * h_Hold_r or h_Release_r in (*proc)?
+ * 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 proc should return 0 if the host should be released, 1 if it should
- * be held after enumeration.
+ * 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 *, int, void *),
+h_Enumerate_r(int (*proc) (struct host *, void *),
struct host *enumstart, void *param)
{
struct host *host, *next;
- int flags = 0;
- int nflags = 0;
int count;
int origHostCount;
* h_Release_r */
origHostCount = hostCount;
- for (count = 0, host = enumstart; host && count < origHostCount; host = next, flags = nflags, count++) {
+ for (count = 0, host = enumstart; host && count < origHostCount; host = next, count++) {
next = host->next;
/* find the next non-deleted host */
ShutDownAndCore(PANIC);
}
}
- if (next && !H_ENUMERATE_ISSET_BAIL(flags))
+ if (next)
h_Hold_r(next);
if (!(host->hostFlags & HOSTDELETED)) {
- flags = (*proc) (host, flags, param);
+ 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 */
}
/* insert into beginning of list for this bucket */
- chain = (struct h_UuidHashChain *)malloc(sizeof(struct h_UuidHashChain));
+ 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"));
}
chain->hostPtr = host;
chain->next = hostUuidHashTable[index];
if (LogLevel >= 125)
afsUUID_to_string(&host->interface->uuid, uuid1, 127);
for (uhp = &hostUuidHashTable[index]; (uth = *uhp); uhp = &uth->next) {
- assert(uth->hostPtr);
+ osi_Assert(uth->hostPtr);
if (uth->hostPtr == host) {
ViceLog(125,
("h_DeleteHostFromUuidHashTable_r: host %" AFS_PTR_FMT " (uuid %s %s:%d)\n",
struct Interface *interface;
char hoststr[16], hoststr2[16];
- assert(host);
- assert(host->interface);
+ osi_Assert(host);
+ osi_Assert(host->interface);
ViceLog(125, ("invalidateInterfaceAddr : host %" AFS_PTR_FMT " (%s:%d) addr %s:%d\n",
host, afs_inet_ntoa_r(host->host, hoststr),
rxconn = NULL;
}
- if (!sc)
- sc = rxnull_NewClientSecurityObject();
- host->callback_rxcon =
- rx_NewConnection(host->host, host->port, 1, sc, 0);
- rx_SetConnDeadTime(host->callback_rxcon, 50);
- rx_SetConnHardDeadTime(host->callback_rxcon, AFS_HARDDEADTIME);
+ h_SetupCallbackConn_r(host);
}
} else {
/* not the primary addr/port, just invalidate it */
char hoststr[16];
/* insert into beginning of list for this bucket */
- chain = (struct h_AddrHashChain *)malloc(sizeof(struct h_AddrHashChain));
+ chain = malloc(sizeof(struct h_AddrHashChain));
if (!chain) {
- ViceLog(0, ("Failed malloc in h_AddHostToAddrHashTable_r\n"));
- assert(0);
+ ViceLogThenPanic(0, ("Failed malloc in h_AddHostToAddrHashTable_r\n"));
}
chain->hostPtr = host;
chain->next = hostAddrHashTable[index];
AFS_PTR_FMT, afs_inet_ntoa_r(addr, hoststr), ntohs(port),
newHost, oldHost));
- assert(oldHost != newHost);
+ osi_Assert(oldHost != newHost);
caps.Capabilities_val = NULL;
if (!sc) {
struct Interface *interface;
char hoststr[16], hoststr2[16];
- assert(host);
- assert(host->interface);
+ osi_Assert(host);
+ osi_Assert(host->interface);
/*
* Make sure this address is on the list of known addresses
ntohs(host->port), afs_inet_ntoa_r(addr, hoststr2),
ntohs(port)));
- interface = (struct Interface *)
- malloc(sizeof(struct Interface) + (sizeof(struct AddrPort) * number));
+ interface = malloc(sizeof(struct Interface)
+ + (sizeof(struct AddrPort) * number));
if (!interface) {
- ViceLog(0, ("Failed malloc in addInterfaceAddr_r\n"));
- assert(0);
+ ViceLogThenPanic(0, ("Failed malloc in addInterfaceAddr_r\n"));
}
interface->numberOfInterfaces = number + 1;
interface->uuid = host->interface->uuid;
struct Interface *interface;
char hoststr[16], hoststr2[16];
- assert(host);
- assert(host->interface);
+ osi_Assert(host);
+ osi_Assert(host->interface);
ViceLog(125, ("removeInterfaceAddr : host %" AFS_PTR_FMT " (%s:%d) addr %s:%d\n",
host, afs_inet_ntoa_r(host->host, hoststr),
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);
H_LOCK;
if ((code == RXGEN_OPCODE) ||
((code == 0) && (afs_uuid_equal(&interf.uuid, &nulluuid)))) {
- 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 = 0;
rx_SetSpecific(tcon, rxcon_ident_key, identP);
}
} 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;
}
} 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;
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)
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 (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) {
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. */
-
- /* prevent warnings while manipulating interface lists */
- host->hostFlags |= HOSTDELETED;
-
if (oldHost->host != haddr || oldHost->port != hport) {
struct rx_connection *rxconn;
}
}
}
- h_AddHostToAddrHashTable_r(haddr, hport, oldHost);
oldHost->host = haddr;
oldHost->port = hport;
rxconn = oldHost->callback_rxcon;
("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);
}
}
static char localcellname[PR_MAXNAMELEN + 1];
-char local_realms[AFS_NUM_LREALMS][AFS_REALM_SZ];
-int num_lrealms = -1;
/* not reentrant */
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;
code = -1;
}
}
-
- if (foreign) {
- free(lnames.namelist_val); /* We allocated this above, so we must free it now. */
- }
return code;
}
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;
+ }
+
+ return 0;
+}
+
/*
* Called by the server main loop. Returns a h_Held client, which must be
* released later the main loop. Allocates a client if the matching one
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)
- && !(client->host->hostFlags & HOSTDELETED)) {
+ 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;
+ authClass = rx_SecurityClassOf(tcon);
- /* kerberos ticket */
- code = rxkad_GetServerInfo(tcon, /*level */ 0, (afs_uint32 *)&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;
- }
+ code = getPeerDetails(tcon, &viceid, &expTime, authClass);
+ if (code)
+ fail = 1;
if (!client) { /* loop */
host = h_GetHost_r(tcon); /* Returns with incremented refCount */
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);
}
/* 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);
* possible failure modes that we will disable it again */
/* 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 */
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 %p(%x) already had "
- "conn %p (host %s:%d), stolen by client %p(%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 */
}
}
int
h_ReleaseClient_r(struct client *client)
{
- assert(client->refCount > 0);
+ osi_Assert(client->refCount > 0);
client->refCount--;
return 0;
}
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 %p tcon sid %d client sid %d\n",
- tcon, rxr_CidOf(tcon), client->sid));
+ tcon, rx_GetConnectionId(tcon), client->sid));
H_UNLOCK;
return VBUSY;
}
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;
idlist lids;
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;
static int
-h_PrintClient(struct host *host, int flags, void *rock)
+h_PrintClient(struct host *host, void *rock)
{
StreamHandle_t *file = (StreamHandle_t *)rock;
struct client *client;
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 flags;
- }
- (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 flags;
+ return 0;
} /*h_PrintClient */
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(struct host *host, int flags, void *rock)
+h_DumpHost(struct host *host, void *rock)
{
StreamHandle_t *file = (StreamHandle_t *)rock;
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, "] [");
(void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
H_UNLOCK;
- return flags;
+ return 0;
} /*h_DumpHost */
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(struct host * host, int flags, void *rock);
+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 flags, void *rock);
-static int h_stateVerifyHost(struct host * h, int flags, void *rock);
+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
}
static int
-h_stateRestoreIndex(struct host * h, int flags, void *rock)
+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(flags);
+ return H_ENUMERATE_BAIL(0);
}
- return flags;
+ return 0;
}
int
}
static int
-h_stateVerifyHost(struct host * h, int flags, void* rock)
+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(flags);
+ return H_ENUMERATE_BAIL(0);
}
if (h->interface) {
state->bail = 1;
}
- return flags;
+ return 0;
}
/**
/* function called by h_Enumerate to save a host to disk */
static int
-h_stateSaveHost(struct host * host, int flags, void* rock)
+h_stateSaveHost(struct host * host, void* rock)
{
struct fs_dump_state *state = (struct fs_dump_state *) rock;
int if_len=0, hcps_len=0;
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) {
if (host->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 (hcps)
free(hcps);
if (state->bail) {
- return H_ENUMERATE_BAIL(flags);
+ return H_ENUMERATE_BAIL(0);
}
- return flags;
+ 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_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 {
#endif
int
-CheckHost_r(struct host *host, int flags, void *dummy)
+CheckHost_r(struct host *host, void *dummy)
{
struct client *client;
struct rx_connection *cb_conn = NULL;
FS_STATE_RDLOCK;
if (fs_state.mode == FS_MODE_SHUTDOWN) {
FS_STATE_UNLOCK;
- return H_ENUMERATE_BAIL(flags);
+ return H_ENUMERATE_BAIL(0);
}
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) {
rx_PutConnection(cb_conn);
cb_conn=NULL;
H_LOCK;
+ host->hostFlags &= ~HWHO_INPROGRESS;
}
h_Unlock_r(host);
}
- return flags;
+ return 0;
} /*CheckHost_r */
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 */
/*
* Convert IP addresses to network byte order, and remove
- * duplicate IP addresses from the interface list, and
+ * 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
* 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])
* 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 1\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));
+ interface = malloc(sizeof(struct Interface) +
+ (sizeof(struct AddrPort) * count));
if (!interface) {
- ViceLog(0, ("Failed malloc in initInterfaceAddr_r 2\n"));
- assert(0);
+ ViceLogThenPanic(0, ("Failed malloc in initInterfaceAddr_r 2\n"));
}
interface->numberOfInterfaces = count + 1;
interface->interface[count].addr = myAddr;
interface->uuid = interf->uuid;
- assert(!host->interface);
+ osi_Assert(!host->interface);
host->interface = interface;
if (LogLevel >= 125) {
for (hp = &hostAddrHashTable[h_HashIndex(addr)]; (th = *hp);
hp = &th->next) {
- assert(th->hostPtr);
+ 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),