#include "afs/afs_stats.h" /* afs statistics */
#ifdef AFS_LINUX20_ENV
-#include "afs/afs_md5.h" /* For MD5 inodes - Linux only */
+#include "hcrypto/md5.h"
#endif
-#if defined(AFS_SUN56_ENV)
+#if defined(AFS_SUN5_ENV)
#include <inet/led.h>
#include <inet/common.h>
-#if defined(AFS_SUN58_ENV)
#include <netinet/ip6.h>
-#endif
#include <inet/ip.h>
#endif
#ifndef afs_strcasecmp
int
-afs_strcasecmp(char *s1, char *s2)
+afs_strcasecmp(const char *s1, const char *s2)
{
while (*s1 && *s2) {
char c1, c2;
int cc;
cc = strlen(s) + 1;
- n = (char *)afs_osi_Alloc(cc);
+ n = afs_osi_Alloc(cc);
if (n)
memcpy(n, s, cc);
void
print_internet_address(char *preamble, struct srvAddr *sa, char *postamble,
- int flag)
+ int flag, int code, struct rx_connection *rxconn)
{
struct server *aserver = sa->server;
char *ptr = "\n";
" (multi-homed address; other same-host interfaces may still be down)\n";
}
}
- afs_warn("%s%d.%d.%d.%d in cell %s%s%s", preamble, (address >> 24),
+ afs_warnall("%s%d.%d.%d.%d in cell %s%s (code %d)%s", preamble, (address >> 24),
(address >> 16) & 0xff, (address >> 8) & 0xff, (address) & 0xff,
- aserver->cell->cellName, postamble, ptr);
- afs_warnuser("%s%d.%d.%d.%d in cell %s%s%s", preamble, (address >> 24),
- (address >> 16) & 0xff, (address >> 8) & 0xff,
- (address) & 0xff, aserver->cell->cellName, postamble, ptr);
-
+ aserver->cell->cellName, postamble, code, ptr);
+
+ if (flag == 1 && rxconn) {
+ /* server was marked down, check Rx to see if this was possibly due to
+ * an ICMP error received from the network */
+ int errorigin, errtype, errcode;
+ const char *errmsg;
+ if (rx_GetNetworkError(rxconn, &errorigin, &errtype, &errcode, &errmsg) == 0) {
+ const char *str1 = " (";
+ const char *str2 = ")";
+ if (!errmsg) {
+ errmsg = str1 = str2 = "";
+ }
+ afs_warnall("afs: network error for %d.%d.%d.%d:%d: origin %d type %d code %d%s%s%s\n",
+ (address >> 24),
+ (address >> 16) & 0xff,
+ (address >> 8) & 0xff,
+ (address) & 0xff,
+ (int)ntohs(sa->sa_portal),
+ errorigin, errtype, errcode, str1, errmsg, str2);
+ }
+ }
} /*print_internet_address */
{
struct srvAddr *sa;
struct server *ts;
- struct afs_conn *tc;
+ struct sa_conn_vector *tcv;
for (i = 0; i < NSERVERS; i++) {
for (ts = afs_servers[i]; ts; ts = ts->next) {
if (ts->flags & SRVR_ISDOWN)
afs_warn("Server entry %p is marked down\n", ts);
for (sa = ts->addr; sa; sa = sa->next_sa) {
- for (tc = sa->conns; tc; tc = tc->next) {
- if (tc->refCount)
- afs_warn("conn at %p (server %x) is held\n", tc,
+ for (tcv = sa->conns; tcv; tcv = tcv->next) {
+ if (tcv->refCount)
+ afs_warn("conn at %p (server %x) is held\n", tcv,
sa->sa_ip);
}
}
for (i = 0; i < NUSERS; i++) {
for (tu = afs_users[i]; tu; tu = tu->next) {
+ if (CheckLock(&tu->lock))
+ afs_warn("user at %p is locked\n", tu);
if (tu->refCount)
afs_warn("user at %lx is held\n", (unsigned long)tu);
}
}
#ifdef AFS_LINUX20_ENV
-
-afs_int32
-afs_calc_inum(afs_int32 volume, afs_int32 vnode)
+static_inline afs_int32
+afs_calc_inum_md5(afs_int32 cell, afs_int32 volume, afs_int32 vnode)
{
- afs_int32 ino, vno = vnode;
+ afs_int32 ino = 0, vno = vnode;
char digest[16];
- struct afs_md5 ct;
+ struct md5 ct;
if (afs_new_inum) {
- AFS_MD5_Init(&ct);
- AFS_MD5_Update(&ct, &volume, 4);
- AFS_MD5_Update(&ct, &vnode, 4);
- AFS_MD5_Final(digest, &ct);
- memcpy(&ino, digest, sizeof(afs_int32));
- ino ^= (ino ^ vno) & 1;
- } else {
- ino = (volume << 16) + vnode;
+ int offset;
+ MD5_Init(&ct);
+ MD5_Update(&ct, &cell, 4);
+ MD5_Update(&ct, &volume, 4);
+ MD5_Update(&ct, &vnode, 4);
+ MD5_Final(digest, &ct);
+
+ /* Userspace may react oddly to an inode number of 0 or 1, so keep
+ * reading more of the md5 digest if we get back one of those.
+ * Make sure not to read beyond the end of the digest; if we somehow
+ * still have a 0, we will fall through to the non-md5 calculation. */
+ for (offset = 0;
+ (ino == 0 || ino == 1) &&
+ offset + sizeof(ino) <= sizeof(digest);
+ offset++) {
+
+ memcpy(&ino, &digest[offset], sizeof(ino));
+ ino ^= (ino ^ vno) & 1;
+ ino &= 0x7fffffff; /* Assumes 32 bit ino_t ..... */
+ }
}
- ino &= 0x7fffffff; /* Assumes 32 bit ino_t ..... */
return ino;
}
-
#else
+# define afs_calc_inum_md5(cell, volume, vnode) 0
+#endif
afs_int32
-afs_calc_inum (afs_int32 volume, afs_int32 vnode)
+afs_calc_inum(afs_int32 cell, afs_int32 volume, afs_int32 vnode)
{
- return (volume << 16) + vnode;
-}
+ afs_int32 ino;
-#endif
+ ino = afs_calc_inum_md5(cell, volume, vnode);
+
+ if (ino == 0 || ino == 1) {
+ ino = (volume << 16) + vnode;
+ }
+ ino &= 0x7fffffff; /* Assumes 32 bit ino_t ..... */
+ return ino;
+}
git://git.openafs.org / openafs.git / blobdiff