#include <roken.h>
#include <afs/opr.h>
+#include <opr/lock.h>
#ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
#endif
-#include <rx/xdr.h>
-#include <lwp.h>
-#include <lock.h>
#include <afs/afsint.h>
#define FSINT_COMMON_XG
#include <afs/afscbint.h>
#include <afs/nfs.h>
#include <afs/errors.h>
#include <afs/ihandle.h>
-#include <afs/vnode.h>
-#include <afs/volume.h>
#include <afs/acl.h>
#include <afs/ptclient.h>
#include <afs/ptuser.h>
extern struct afsconf_dir *confDir; /* config dir object */
extern int lwps; /* the max number of server threads */
extern afsUUID FS_HostUUID;
+extern char *FS_configPath;
afsUUID nulluuid;
int CEs = 0; /* active clients */
int rxcon_client_key;
static struct rx_securityClass *sc = NULL;
+static int h_quota_limit;
+
+/* arguments for PerHost_EnumerateClient enumeration */
+struct enumclient_args {
+ VolumeId vid;
+ int (*proc)(struct client *client, void *rock);
+ void *rock;
+};
static void h_SetupCallbackConn_r(struct host * host);
static int h_threadquota(int);
+static int initInterfaceAddr_r(struct host *, struct interfaceAddr *);
#define CESPERBLOCK 73
struct CEBlock { /* block of CESPERBLOCK file entries */
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);
return;
}
- block = (struct HTBlock *)malloc(sizeof(struct HTBlock));
+ block = malloc(sizeof(struct HTBlock));
if (!block) {
ViceLog(0, ("Failed malloc in GetHTBlock\n"));
ShutDownAndCore(PANIC);
}
for (i = 0; i < (h_HTSPERBLOCK); i++)
- CV_INIT(&block->entry[i].cond, "block entry", CV_DEFAULT, 0);
+ opr_cv_init(&block->entry[i].cond);
for (i = 0; i < (h_HTSPERBLOCK); i++)
Lock_Init(&block->entry[i].lock);
for (i = 0; i < (h_HTSPERBLOCK - 1); i++)
afs_int32 i;
char cellstr[64];
- tdir = afsconf_Open(AFSDIR_SERVER_ETC_DIRPATH);
+ tdir = afsconf_Open(FS_configPath);
if (!tdir) {
- ViceLog(0, ("hpr_Initialize: Could not open configuration directory: %s", AFSDIR_SERVER_ETC_DIRPATH));
+ ViceLog(0,
+ ("hpr_Initialize: Could not open configuration directory: %s",
+ FS_configPath));
return -1;
}
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;
+
+ opr_Verify(pthread_setspecific(viced_uclient_key, *client) == 0);
+
+ return 0;
+}
+
int
hpr_GetHostCPS(afs_int32 host, prlist *CPS)
{
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)
- osi_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);
{
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)
- osi_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]);
hpr_IdToName(idlist *ids, namelist *names)
{
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)
- osi_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;
{
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)
- osi_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);
while (host->hostFlags & HCPS_INPROGRESS) {
slept = 1; /* I did sleep */
host->hostFlags |= HCPS_WAITING; /* I am sleeping now */
- CV_WAIT(&host->cond, &host_glock_mutex);
+ opr_cv_wait(&host->cond, &host_glock_mutex);
}
free(host->hcps.prlist_val); /* this is for hostaclRefresh */
host->hcps.prlist_val = NULL;
host->hcps.prlist_len = 0;
- host->cpsCall = slept ? (FT_ApproxTime()) : (now);
+ host->cpsCall = slept ? time(NULL) : (now);
H_UNLOCK;
code = hpr_GetHostCPS(ntohl(host->host), &host->hcps);
/* signal all who are waiting */
if (host->hostFlags & HCPS_WAITING) { /* somebody is waiting */
host->hostFlags &= ~HCPS_WAITING;
- CV_BROADCAST(&host->cond);
+ opr_cv_broadcast(&host->cond);
}
}
/* 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);
- host->LastCall = host->cpsCall = host->ActiveCall = FT_ApproxTime();
+ host->LastCall = host->cpsCall = host->ActiveCall = time(NULL);
host->hostFlags = 0;
host->hcps.prlist_val = NULL;
host->hcps.prlist_len = 0;
restart:
for (chain = hostAddrHashTable[index]; chain; chain = chain->next) {
host = chain->hostPtr;
- osi_Assert(host);
+ opr_Assert(host);
if (!(host->hostFlags & HOSTDELETED) && chain->addr == haddr
&& chain->port == hport) {
if ((host->hostFlags & HWHO_INPROGRESS) &&
goto restart;
}
h_Unlock_r(host);
- now = FT_ApproxTime(); /* always evaluate "now" */
+ now = time(NULL); /* always evaluate "now" */
if (host->hcpsfailed || (host->cpsCall + hostaclRefresh < now)) {
/*
* Every hostaclRefresh period (def 2 hrs) get the new
for (chain = hostUuidHashTable[index]; chain; chain = chain->next) {
host = chain->hostPtr;
- osi_Assert(host);
+ opr_Assert(host);
if (!(host->hostFlags & HOSTDELETED) && host->interface
&& afs_uuid_equal(&host->interface->uuid, uuidp)) {
return host;
H_UNLOCK;
return;
}
- list = (struct host **)malloc(hostCount * sizeof(struct host *));
+ list = malloc(hostCount * sizeof(struct host *));
if (!list) {
ViceLogThenPanic(0, ("Failed malloc in h_Enumerate (list)\n"));
}
}
H_UNLOCK;
}
- free((void *)list);
+ free(list);
} /* h_Enumerate */
}
/* 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) {
ViceLogThenPanic(0, ("Failed malloc in h_AddHostToUuidHashTable_r\n"));
}
if (LogLevel >= 125)
afsUUID_to_string(&host->interface->uuid, uuid1, 127);
for (uhp = &hostUuidHashTable[index]; (uth = *uhp); uhp = &uth->next) {
- osi_Assert(uth->hostPtr);
+ opr_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];
- osi_Assert(host);
- osi_Assert(host->interface);
+ opr_Assert(host);
+ opr_Assert(host->interface);
ViceLog(125, ("invalidateInterfaceAddr : host %" AFS_PTR_FMT " (%s:%d) addr %s:%d\n",
host, afs_inet_ntoa_r(host->host, hoststr),
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) {
ViceLogThenPanic(0, ("Failed malloc in h_AddHostToAddrHashTable_r\n"));
}
AFS_PTR_FMT, afs_inet_ntoa_r(addr, hoststr), ntohs(port),
newHost, oldHost));
- osi_Assert(oldHost != newHost);
+ opr_Assert(oldHost != newHost);
caps.Capabilities_val = NULL;
if (!sc) {
struct Interface *interface;
char hoststr[16], hoststr2[16];
- osi_Assert(host);
- osi_Assert(host->interface);
+ opr_Assert(host);
+ opr_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) {
ViceLogThenPanic(0, ("Failed malloc in addInterfaceAddr_r\n"));
}
struct Interface *interface;
char hoststr[16], hoststr2[16];
- osi_Assert(host);
- osi_Assert(host->interface);
+ opr_Assert(host);
+ opr_Assert(host->interface);
ViceLog(125, ("removeInterfaceAddr : host %" AFS_PTR_FMT " (%s:%d) addr %s:%d\n",
host, afs_inet_ntoa_r(host->host, hoststr),
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;
+ if (waiting > h_quota_limit) {
+ return 1;
}
return 0;
}
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) {
ViceLogThenPanic(0, ("Failed malloc in h_GetHost_r\n"));
}
}
} else if (code == 0) {
interfValid = 1;
- identP = (struct Identity *)malloc(sizeof(struct Identity));
+ identP = malloc(sizeof(struct Identity));
if (!identP) {
ViceLogThenPanic(0, ("Failed malloc in h_GetHost_r\n"));
}
host = h_Alloc_r(tcon); /* returned held and locked */
if (!host)
goto gethost_out;
- h_gethostcps_r(host, FT_ApproxTime());
+ h_gethostcps_r(host, time(NULL));
if (!(host->Console & 1)) {
int pident = 0;
cb_conn = host->callback_rxcon;
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;
code = 0;
} else if (code == 0) {
if (!identP)
- identP =
- (struct Identity *)malloc(sizeof(struct Identity));
+ identP = malloc(sizeof(struct Identity));
else
pident = 1;
/* the new host is held and locked */
} else {
/* This really is a new host */
- h_AddHostToUuidHashTable_r(&identP->uuid, host);
+ opr_Assert(interfValid == 1);
+ initInterfaceAddr_r(host, &interf);
+
cb_conn = host->callback_rxcon;
rx_GetConnection(cb_conn);
H_UNLOCK;
("InitCallBackState3 success on host %" AFS_PTR_FMT " (%s:%d)\n",
host, afs_inet_ntoa_r(host->host, hoststr),
ntohs(host->port)));
- osi_Assert(interfValid == 1);
- initInterfaceAddr_r(host, &interf);
}
}
}
} /*h_GetHost_r */
-static char localcellname[PR_MAXNAMELEN + 1];
-
/* not reentrant */
void
-h_InitHostPackage(void)
+h_InitHostPackage(int hquota)
{
+ opr_Assert(hquota > 0);
+ h_quota_limit = hquota;
+
memset(&nulluuid, 0, sizeof(afsUUID));
- afsconf_GetLocalCell(confDir, localcellname, PR_MAXNAMELEN);
rxcon_ident_key = rx_KeyCreate((rx_destructor_t) free);
rxcon_client_key = rx_KeyCreate((rx_destructor_t) 0);
- MUTEX_INIT(&host_glock_mutex, "host glock", MUTEX_DEFAULT, 0);
+ opr_mutex_init(&host_glock_mutex);
}
static int
/*MapName*/
-/* NOTE: this returns the client with a Write lock and a refCount */
-struct client *
-h_ID2Client(afs_int32 vid)
+static int
+PerHost_EnumerateClient(struct host *host, void *arock)
{
+ struct enumclient_args *args = arock;
struct client *client;
- struct host *host;
- int count;
+ int code;
- H_LOCK;
- 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 (!client->deleted && client->ViceId == vid) {
- client->refCount++;
- H_UNLOCK;
- ObtainWriteLock(&client->lock);
- return client;
+ for (client = host->FirstClient; client; client = client->next) {
+ if (!client->deleted && client->ViceId == args->vid) {
+
+ client->refCount++;
+ H_UNLOCK;
+
+ code = (*args->proc)(client, args->rock);
+
+ H_LOCK;
+ h_ReleaseClient_r(client);
+
+ if (code) {
+ return H_ENUMERATE_BAIL(0);
}
}
}
- 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);
- }
+ return 0;
+}
+
+void
+h_EnumerateClients(VolumeId vid,
+ int (*proc)(struct client *client, void *rock),
+ void *rock)
+{
+ struct enumclient_args args;
+ args.vid = vid;
+ args.proc = proc;
+ args.rock = rock;
+
+ H_LOCK;
+ h_Enumerate_r(PerHost_EnumerateClient, hostList, &args);
H_UNLOCK;
- return NULL;
}
static int
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
*
* The refCount on client->host is returned incremented. h_ReleaseClient_r
* does not decrement the refCount on client->host.
+ *
+ * *a_viceid is set to the user's ViceId, even if we don't return a client
+ * struct.
*/
struct client *
-h_FindClient_r(struct rx_connection *tcon)
+h_FindClient_r(struct rx_connection *tcon, afs_int32 *a_viceid)
{
struct client *client;
struct host *host = NULL;
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->host->hostFlags & HOSTDELETED)
&& !client->deleted) {
+ if (a_viceid) {
+ *a_viceid = client->ViceId;
+ }
client->refCount++;
h_Hold_r(client->host);
if (client->prfail != 2) {
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;
- afs_int32 islocal;
+ 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 {
- 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));
- viceid = AnonymousID;
- expTime = 0x7fffffff;
- }
- if (!code) {
- code = format_vname(uname, sizeof(uname), tname, tinst, tcell, islocal);
- if (code) {
- ViceLog(0, ("FindClient: uname truncated."));
- viceid = AnonymousID;
- expTime = 0x7fffffff;
- }
- }
- if (!code) {
- /* 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));
- 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 (a_viceid) {
+ *a_viceid = viceid;
}
if (!client) { /* loop */
int
h_ReleaseClient_r(struct client *client)
{
- osi_Assert(client->refCount > 0);
+ opr_Assert(client->refCount > 0);
client->refCount--;
return 0;
}
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) {
ViceLogThenPanic(0, ("Failed malloc in h_UserName\n"));
}
AFSDIR_SERVER_CLNTDUMP_FILEPATH));
return;
}
- now = FT_ApproxTime();
+ now = time(NULL);
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",
AFSDIR_SERVER_HOSTDUMP_FILEPATH));
return;
}
- now = FT_ApproxTime();
+ now = time(NULL);
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);
static int
h_stateVerifyUuidHash(struct fs_dump_state * state, struct host * h)
{
- int ret = 0, found = 0;
+ int ret = 0;
struct host *host = NULL;
struct h_UuidHashChain *chain;
afsUUID * uuidp = &h->interface->uuid;
h->index, host->index));
state->flags.warnings_generated = 1;
}
- found = 1;
goto done;
}
if (chain_len > FS_STATE_H_MAX_UUID_HASH_CHAIN_LEN) {
chain_len++;
}
- if (!found) {
- afsUUID_to_string(uuidp, tmp, sizeof(tmp));
- if (state->mode == FS_STATE_LOAD_MODE) {
- ViceLog(0, ("h_stateVerifyUuidHash: error: uuid %s not found in hash\n", tmp));
- ret = 1;
- goto done;
- } else {
- ViceLog(0, ("h_stateVerifyUuidHash: warning: uuid %s not found in hash\n", tmp));
- state->flags.warnings_generated = 1;
- }
+ /* Fall through, so host not found */
+
+ afsUUID_to_string(uuidp, tmp, sizeof(tmp));
+ if (state->mode == FS_STATE_LOAD_MODE) {
+ ViceLog(0, ("h_stateVerifyUuidHash: error: uuid %s not found in hash\n", tmp));
+ ret = 1;
+ goto done;
+ } else {
+ ViceLog(0, ("h_stateVerifyUuidHash: warning: uuid %s not found in hash\n", tmp));
+ state->flags.warnings_generated = 1;
}
done:
if (host->interface) {
if_len = sizeof(struct Interface) +
((host->interface->numberOfInterfaces-1) * sizeof(struct AddrPort));
- ifp = (struct Interface *) malloc(if_len);
- osi_Assert(ifp != NULL);
+ ifp = malloc(if_len);
+ opr_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);
- osi_Assert(hcps != NULL);
+ hcps = malloc(hcps_len);
+ opr_Assert(hcps != NULL);
memcpy(hcps, host->hcps.prlist_val, hcps_len);
iov[iovcnt].iov_base = (char *) hcps;
iov[iovcnt].iov_len = hcps_len;
if (hdr.interfaces) {
ifp_len = sizeof(struct Interface) +
((hdr.interfaces-1) * sizeof(struct AddrPort));
- ifp = (struct Interface *) malloc(ifp_len);
- osi_Assert(ifp != NULL);
+ ifp = malloc(ifp_len);
+ opr_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);
- osi_Assert(hcps != NULL);
+ hcps = malloc(hcps_len);
+ opr_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));
- osi_Assert(hcps != NULL);
+ hcps = malloc(sizeof(afs_int32));
+ opr_Assert(hcps != NULL);
}
if ((hdsk.hostFlags & HWHO_INPROGRESS) || !(hdsk.hostFlags & ALTADDR)) {
/* for restoring state, we better be able to get a host! */
host = GetHT();
- osi_Assert(host != NULL);
+ opr_Assert(host != NULL);
if (ifp) {
host->interface = ifp;
* Since it can serialize them, and pile up, it should be a separate LWP
* from other events.
*/
-#if 0
-static int
-CheckHost(struct host *host, int flags, void *rock)
-{
- 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(flags);
- }
- FS_STATE_UNLOCK;
-#endif
-
- /* Host is held by h_Enumerate */
- H_LOCK;
- 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: 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: 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);
- }
- H_UNLOCK;
- return held;
-
-} /*CheckHost */
-#endif
int
CheckHost_r(struct host *host, void *dummy)
void
h_CheckHosts(void)
{
- afs_uint32 now = FT_ApproxTime();
+ afs_uint32 now = time(NULL);
memset(&zerofid, 0, sizeof(zerofid));
/*
*
* The addresses in the interfaceAddr list are in host byte order.
*/
-int
+static int
initInterfaceAddr_r(struct host *host, struct interfaceAddr *interf)
{
int i, j;
char uuidstr[128];
afs_uint16 port7001 = htons(7001);
- osi_Assert(host);
- osi_Assert(interf);
+ opr_Assert(host);
+ opr_Assert(interf);
number = interf->numberOfInterfaces;
myAddr = host->host; /* current interface address */
* 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) {
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) {
ViceLogThenPanic(0, ("Failed malloc in initInterfaceAddr_r 2\n"));
}
interface->uuid = interf->uuid;
- osi_Assert(!host->interface);
+ opr_Assert(!host->interface);
host->interface = interface;
+ h_AddHostToUuidHashTable_r(&interface->uuid, host);
+
if (LogLevel >= 125) {
afsUUID_to_string(&interface->uuid, uuidstr, 127);
for (hp = &hostAddrHashTable[h_HashIndex(addr)]; (th = *hp);
hp = &th->next) {
- osi_Assert(th->hostPtr);
+ opr_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),
git://git.openafs.org / openafs.git / blobdiff