#include <afs/prs_fs.h>
#include <afs/auth.h>
#include <afs/afsutil.h>
+#include <afs/com_err.h>
#include <rx/rx.h>
#include <afs/cellconfig.h>
#include <stdlib.h>
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 void
FreeCE(register struct client *entry)
{
+ entry->VenusEpoch = 0;
+ entry->sid = 0;
entry->next = CEFree;
CEFree = entry;
CEs--;
} /*FreeHT */
+afs_int32
+hpr_Initialize(struct ubik_client **uclient)
+{
+ afs_int32 code;
+ struct rx_connection *serverconns[MAXSERVERS];
+ struct rx_securityClass *sc[3];
+ struct afsconf_dir *tdir;
+ char tconfDir[100] = "";
+ char tcell[64] = "";
+ struct ktc_token ttoken;
+ afs_int32 scIndex;
+ struct afsconf_cell info;
+ afs_int32 i;
+ char cellstr[64];
+
+ tdir = afsconf_Open(AFSDIR_SERVER_ETC_DIRPATH);
+ if (!tdir) {
+ 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));
+ 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);
+ }
+ }
+ 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));
+
+ 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);
+ }
+
+ code = ubik_ClientInit(serverconns, uclient);
+ if (code) {
+ ViceLog(0, ("hpr_Initialize: ubik client init failed. [%d]", code));
+ }
+ afsconf_Close(tdir);
+ code = rxs_Release(sc[scIndex]);
+ return code;
+}
+
+int
+hpr_End(struct ubik_client *uclient)
+{
+ int code = 0;
+
+ if (uclient) {
+ code = ubik_ClientDestroy(uclient);
+ }
+ return code;
+}
+
+int
+hpr_GetHostCPS(afs_int32 host, prlist *CPS)
+{
+#ifdef AFS_PTHREAD_ENV
+ register afs_int32 code;
+ afs_int32 over;
+ 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);
+ }
+
+ over = 0;
+ code = ubik_PR_GetHostCPS(uclient, 0, host, CPS, &over);
+ if (code != PRSUCCESS)
+ return code;
+ if (over) {
+ /* do something about this, probably make a new call */
+ /* don't forget there's a hard limit in the interface */
+ fprintf(stderr,
+ "membership list for host id %d exceeds display limit\n",
+ 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);
+
+ if (!uclient) {
+ code = hpr_Initialize(&uclient);
+ assert(pthread_setspecific(viced_uclient_key, (void *)uclient) == 0);
+ }
+
+ 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);
+ }
+
+ 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 over;
+ 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);
+ }
+
+ over = 0;
+ code = ubik_PR_GetCPS(uclient, 0, id, CPS, &over);
+ if (code != PRSUCCESS)
+ return code;
+ if (over) {
+ /* do something about this, probably make a new call */
+ /* don't forget there's a hard limit in the interface */
+ fprintf(stderr, "membership list for id %d exceeds display limit\n",
+ id);
+ }
+ return 0;
+#else
+ return pr_GetCPS(id, CPS);
+#endif
+}
static short consolePort = 0;
host->cpsCall = slept ? (FT_ApproxTime()) : (now);
H_UNLOCK;
- code = pr_GetHostCPS(host->host, &host->hcps);
+ code = hpr_GetHostCPS(ntohl(host->host), &host->hcps);
H_LOCK;
if (code) {
/*
if ((client->ViceId != ANONYMOUSID) && client->CPS.prlist_val)
free(client->CPS.prlist_val);
client->CPS.prlist_val = NULL;
- if (client->tcon) {
- rx_SetSpecific(client->tcon, rxcon_client_key, (void *)0);
- }
CurrentConnections--;
*cp = client->next;
ReleaseWriteLock(&client->lock);
Console--;
if ((rxconn = host->callback_rxcon)) {
host->callback_rxcon = (struct rx_connection *)0;
- /*
- * 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);
- if (client && client->tcon == rxconn)
- client->tcon = NULL;
- rx_SetSpecific(rxconn, rxcon_client_key, (void *)0);
rx_DestroyConnection(rxconn);
}
if (host->hcps.prlist_val)
} /*h_TossStuff_r */
-/* Called by rx when a server connection disappears */
-int
-h_FreeConnection(struct rx_connection *tcon)
-{
- register struct client *client;
-
- client = (struct client *)rx_GetSpecific(tcon, rxcon_client_key);
- if (client) {
- H_LOCK;
- if (client->tcon == tcon)
- client->tcon = NULL;
- H_UNLOCK;
- }
- return 0;
-} /*h_FreeConnection */
-
-
/* h_Enumerate: Calls (*proc)(host, held, 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
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_BAIL(held)) {
+ if (!H_ENUMERATE_ISSET_HELD(nheld))
+ h_Release_r(next); /* this might free up the host */
break;
+ }
}
} /*h_Enumerate_r */
/* hash into proper bucket */
index = h_HashIndex(addr);
+ /* 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;
+ }
+
/* insert into beginning of list for this bucket */
chain = (struct h_hashChain *)malloc(sizeof(struct h_hashChain));
if (!chain) {
chain->addr = addr;
chain->port = port;
hostHashTable[index] = chain;
-
}
/*
return 0;
}
+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 */
struct 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))
+ return 0;
h_Lock_r(host);
if (!(host->hostFlags & ALTADDR)) {
+ host->hostFlags &= ~HWHO_INPROGRESS;
/* Another thread is doing initialization */
h_Unlock_r(host);
if (!held)
rx_PutConnection(cb_conn);
cb_conn=NULL;
H_LOCK;
- if (code == RXGEN_OPCODE) {
+ if ((code == RXGEN_OPCODE) ||
+ (afs_uuid_equal(&interf.uuid, &nulluuid))) {
identP = (struct Identity *)malloc(sizeof(struct Identity));
if (!identP) {
ViceLog(0, ("Failed malloc in h_GetHost_r\n"));
afs_inet_ntoa_r(host->host, hoststr),
ntohs(host->port)));
host->hostFlags |= HOSTDELETED;
+ host->hostFlags &= ~HWHO_INPROGRESS;
h_Unlock_r(host);
if (!held)
h_Release_r(host);
("Host %s:%d has changed its identity, deleting.\n",
afs_inet_ntoa_r(host->host, hoststr), host->port));
host->hostFlags |= HOSTDELETED;
+ host->hostFlags &= ~HWHO_INPROGRESS;
h_Unlock_r(host);
if (!held)
h_Release_r(host);
else
host->hostFlags &= ~(HERRORTRANS);
host->hostFlags |= ALTADDR;
+ host->hostFlags &= ~HWHO_INPROGRESS;
h_Unlock_r(host);
} else if (host) {
if (!(host->hostFlags & ALTADDR)) {
afs_inet_ntoa_r(host->host, hoststr),
ntohs(host->port)));
h_Lock_r(host);
+ host->hostFlags &= ~HWHO_INPROGRESS;
h_Unlock_r(host);
if (!held)
h_Release_r(host);
/* The host in the cache is not the host for this connection */
host->hostFlags |= HOSTDELETED;
+ host->hostFlags &= ~HWHO_INPROGRESS;
h_Unlock_r(host);
if (!held)
h_Release_r(host);
rx_PutConnection(cb_conn);
cb_conn=NULL;
H_LOCK;
- if (code == RXGEN_OPCODE) {
+ if ((code == RXGEN_OPCODE) ||
+ afs_uuid_equal(&interf.uuid, &nulluuid)) {
if (!identP)
identP =
(struct Identity *)malloc(sizeof(struct Identity));
if (!(oheld = h_Held_r(oldHost)))
h_Hold_r(oldHost);
h_Lock_r(oldHost);
+ oldHost->hostFlags |= HWHO_INPROGRESS;
if (oldHost->interface) {
+ int code2;
afsUUID uuid = oldHost->interface->uuid;
cb_conn = oldHost->callback_rxcon;
rx_GetConnection(cb_conn);
rx_SetConnDeadTime(cb_conn, 2);
rx_SetConnHardDeadTime(cb_conn, AFS_HARDDEADTIME);
H_UNLOCK;
- code = RXAFSCB_ProbeUuid(cb_conn, &uuid);
+ 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 (code && MultiProbeAlternateAddress_r(oldHost)) {
+ if (code2) {
+ /* The primary address is either not responding or
+ * 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),
+ ntohs(oldHost->port),code2));
+ MultiProbeAlternateAddress_r(oldHost);
probefail = 1;
}
} else {
probefail = 1;
}
- if (probefail) {
- /* The old host is either does not have a Uuid,
- * is not responding to Probes,
- * or does not have a matching Uuid.
- * Delete it! */
- oldHost->hostFlags |= HOSTDELETED;
- h_Unlock_r(oldHost);
- /* Let the holder be last release */
- if (!oheld) {
- h_Release_r(oldHost);
- }
- oldHost = NULL;
- }
- }
- if (oldHost) {
/* 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)));
- if (oldHost->host == haddr) {
- /* We have just been contacted by a client behind a NAT */
+ 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.
+ */
removeInterfaceAddr_r(oldHost, oldHost->host, oldHost->port);
} else {
int i, found;
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->hostFlags |= HOSTDELETED;
+ host->hostFlags &= ~HWHO_INPROGRESS;
h_Unlock_r(host);
/* release host because it was allocated by h_Alloc_r */
h_Release_r(host);
else
host->hostFlags &= ~(HERRORTRANS);
host->hostFlags |= ALTADDR; /* host structure initialization complete */
+ host->hostFlags &= ~HWHO_INPROGRESS;
h_Unlock_r(host);
}
if (caps.Capabilities_val)
void
h_InitHostPackage()
{
+ memset(&nulluuid, 0, sizeof(afsUUID));
afsconf_GetLocalCell(confDir, localcellname, PR_MAXNAMELEN);
if (num_lrealms == -1) {
int i;
break;
}
- if (i=0) {
+ if (i == 0) {
ViceLog(0,
("afs_krb_get_lrealm failed, using %s.\n",
localcellname));
}
H_UNLOCK;
- code = pr_NameToId(&lnames, &lids);
+ code = hpr_NameToId(&lnames, &lids);
H_LOCK;
if (code == 0) {
if (lids.idlist_val) {
int created = 0;
client = (struct client *)rx_GetSpecific(tcon, rxcon_client_key);
- if (client) {
+ if (client && client->sid == rxr_CidOf(tcon)
+ && client->VenusEpoch == rxr_GetEpoch(tcon)) {
client->refCount++;
h_Hold_r(client->host);
if (!client->deleted && client->prfail != 2) {
H_UNLOCK;
ObtainWriteLock(&client->lock); /* released at end */
H_LOCK;
+ } else {
+ client = NULL;
}
authClass = rx_SecurityClassOf((struct rx_connection *)tcon);
expTime = 0x7fffffff;
} else if (authClass == 2) {
afs_int32 kvno;
-
+
/* kerberos ticket */
code = rxkad_GetServerInfo(tcon, /*level */ 0, &expTime,
tname, tinst, tcell, &kvno);
if (!client) { /* loop */
host = h_GetHost_r(tcon); /* Returns it h_Held */
+ if (!host)
+ return 0;
+
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->tcon && (client->tcon != tcon)) {
- ViceLog(0,
- ("*** Vid=%d, sid=%x, tcon=%x, Tcon=%x ***\n",
- client->ViceId, client->sid, client->tcon,
- tcon));
- oldClient =
- (struct client *)rx_GetSpecific(client->tcon,
- rxcon_client_key);
- if (oldClient) {
- if (oldClient == client)
- rx_SetSpecific(client->tcon, rxcon_client_key,
- NULL);
- else
- ViceLog(0,
- ("Client-conn mismatch: CL1=%x, CN=%x, CL2=%x\n",
- client, client->tcon, oldClient));
- }
- client->tcon = (struct rx_connection *)0;
- }
client->refCount++;
H_UNLOCK;
ObtainWriteLock(&client->lock);
client->CPS.prlist_val = AnonCPS.prlist_val;
} else {
H_UNLOCK;
- code = pr_GetCPS(viceid, &client->CPS);
+ code = hpr_GetCPS(viceid, &client->CPS);
H_LOCK;
if (code) {
char hoststr[16];
* the RPC from the other client structure's rock.
*/
oldClient = (struct client *)rx_GetSpecific(tcon, rxcon_client_key);
- if (oldClient && oldClient->tcon == tcon) {
+ if (oldClient && oldClient != client && oldClient->sid == rxr_CidOf(tcon)
+ && oldClient->VenusEpoch == rxr_GetEpoch(tcon)) {
char hoststr[16];
if (!oldClient->deleted) {
/* if we didn't create it, it's not ours to put back */
free(client->CPS.prlist_val);
client->CPS.prlist_val = NULL;
client->CPS.prlist_len = 0;
- if (client->tcon) {
- rx_SetSpecific(client->tcon, rxcon_client_key, (void *)0);
- }
}
/* We should perhaps check for 0 here */
client->refCount--;
FreeCE(client);
created = 0;
}
- ObtainWriteLock(&oldClient->lock);
oldClient->refCount++;
+ H_UNLOCK;
+ ObtainWriteLock(&oldClient->lock);
+ H_LOCK;
client = oldClient;
} else {
- oldClient->tcon = (struct rx_connection *)0;
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),
h_Unlock_r(host);
CurrentConnections++; /* increment number of connections */
}
- client->tcon = tcon;
rx_SetSpecific(tcon, rxcon_client_key, client);
ReleaseWriteLock(&client->lock);
H_LOCK;
*cp = NULL;
client = (struct client *)rx_GetSpecific(tcon, rxcon_client_key);
- if (client == NULL || client->tcon == NULL) {
+ if (client == NULL) {
ViceLog(0,
("GetClient: no client in conn %x (host %x:%d), VBUSYING\n",
tcon, rxr_HostOf(tcon),ntohs(rxr_PortOf(tcon))));
H_UNLOCK;
return VBUSY;
}
- if (rxr_CidOf(client->tcon) != client->sid) {
+ if (rxr_CidOf(tcon) != client->sid || rxr_GetEpoch(tcon) != client->VenusEpoch) {
ViceLog(0,
("GetClient: tcon %x tcon sid %d client sid %d\n",
- client->tcon, rxr_CidOf(client->tcon), client->sid));
+ tcon, rxr_CidOf(tcon), client->sid));
H_UNLOCK;
return VBUSY;
}
- if (!(client && client->tcon && rxr_CidOf(client->tcon) == client->sid)) {
- if (!client)
- ViceLog(0, ("GetClient: no client in conn %x\n", tcon));
- else
- ViceLog(0,
- ("GetClient: tcon %x tcon sid %d client sid %d\n",
- client->tcon, client->tcon ? rxr_CidOf(client->tcon)
- : -1, client->sid));
- assert(0);
- }
if (client && client->LastCall > client->expTime && client->expTime) {
char hoststr[16];
ViceLog(1,
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));
lnames.namelist_len = 0;
lnames.namelist_val = (prname *) 0;
lids.idlist_val[0] = client->ViceId;
- if (pr_IdToName(&lids, &lnames)) {
+ if (hpr_IdToName(&lids, &lnames)) {
/* We need to free id we alloced above! */
free(lids.idlist_val);
return "*UNKNOWN USER NAME*";
char tmpStr[256];
char tbuffer[32];
char hoststr[16];
+ time_t LastCall, expTime;
H_LOCK;
+ LastCall = host->LastCall;
if (host->hostFlags & HOSTDELETED) {
H_UNLOCK;
return held;
"Host %s:%d down = %d, LastCall %s",
afs_inet_ntoa_r(host->host, hoststr),
ntohs(host->port), (host->hostFlags & VENUSDOWN),
- afs_ctime((time_t *) & host->LastCall, tbuffer,
+ afs_ctime(&LastCall, tbuffer,
sizeof(tbuffer)));
(void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
for (client = host->FirstClient; client; client = client->next) {
if (!client->deleted) {
- if (client->tcon) {
+ expTime = client->expTime;
(void)afs_snprintf(tmpStr, sizeof tmpStr,
" user id=%d, name=%s, sl=%s till %s",
client->ViceId, h_UserName(client),
authClass ? "Authenticated" :
"Not authenticated",
client->
- authClass ? afs_ctime((time_t *) & client->
- expTime, tbuffer,
+ authClass ? afs_ctime(&expTime, tbuffer,
sizeof(tbuffer))
: "No Limit\n");
(void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
- } else {
- (void)afs_snprintf(tmpStr, sizeof tmpStr,
- " user=%s, no current server connection\n",
- h_UserName(client));
- (void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
- }
(void)afs_snprintf(tmpStr, sizeof tmpStr, " CPS-%d is [",
client->CPS.prlist_len);
(void)STREAM_WRITE(tmpStr, strlen(tmpStr), 1, file);
}
if (host->LastCall < checktime) {
h_Lock_r(host);
+ host->hostFlags |= HWHO_INPROGRESS;
if (!(host->hostFlags & HOSTDELETED)) {
cb_conn = host->callback_rxcon;
rx_GetConnection(cb_conn);
}
} 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;
H_LOCK;
if (code) {
if (MultiProbeAlternateAddress_r(host)) {
- char hoststr[16];
- (void)afs_inet_ntoa_r(host->host, hoststr);
- ViceLog(0,
- ("ProbeUuid failed for host %s:%d\n",
- hoststr, ntohs(host->port)));
+ ViceLog(0,("CheckHost: Probing all interfaces of host %s:%d failed, code %d\n",
+ hoststr, ntohs(host->port), code));
host->hostFlags |= VENUSDOWN;
}
}
code = RXAFSCB_Probe(cb_conn);
H_LOCK;
if (code) {
- char hoststr[16];
- (void)afs_inet_ntoa_r(host->host, hoststr);
ViceLog(0,
- ("Probe failed for host %s:%d\n", hoststr,
- ntohs(host->port)));
+ ("CheckHost: Probe failed for host %s:%d, code %d\n",
+ hoststr, ntohs(host->port), code));
host->hostFlags |= VENUSDOWN;
}
}
cb_conn=NULL;
H_LOCK;
}
+ host->hostFlags &= ~HWHO_INPROGRESS;
h_Unlock_r(host);
}
H_UNLOCK;
afs_uint16 myPort;
int found;
struct Interface *interface;
+ char hoststr[16];
assert(host);
assert(interf);
- ViceLog(125,
- ("initInterfaceAddr : host %x numAddr %d\n", host->host,
- interf->numberOfInterfaces));
-
number = interf->numberOfInterfaces;
myAddr = host->host; /* current interface address */
myPort = host->port; /* current port */
+ ViceLog(125,
+ ("initInterfaceAddr : host %s:%d numAddr %d\n",
+ afs_inet_ntoa_r(myAddr, hoststr), ntohs(myPort), number));
+
/* validation checks */
if (number < 0 || number > AFS_MAX_INTERFACE_ADDR) {
ViceLog(0,
- ("Number of alternate addresses returned is %d\n", number));
+ ("Invalid number of alternate addresses is %d\n", number));
return -1;
}
host->interface = interface;
for (i = 0; i < host->interface->numberOfInterfaces; i++) {
- char hoststr[16];
ViceLog(125, ("--- alt address %s:%d\n",
afs_inet_ntoa_r(host->interface->interface[i].addr, hoststr),
ntohs(host->interface->interface[i].port)));
git://git.openafs.org / openafs.git / blobdiff