Unix CM: Log reason for marking server up or down

[openafs.git] / src / afs / afs_util.c

diff --git a/src/afs/afs_util.c b/src/afs/afs_util.c
index 7dfc5c7..90696f1 100644 (file)
--- a/src/afs/afs_util.c
+++ b/src/afs/afs_util.c
@@ -194,7 +194,7 @@ afs_strdup(char *s)
 
 void
 print_internet_address(char *preamble, struct srvAddr *sa, char *postamble,
-                      int flag)
+                      int flag, int code)
 {
     struct server *aserver = sa->server;
     char *ptr = "\n";
@@ -214,12 +214,12 @@ print_internet_address(char *preamble, struct srvAddr *sa, char *postamble,
                " (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_warn("%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),
+            aserver->cell->cellName, postamble, code, ptr);
+    afs_warnuser("%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);
+                (address) & 0xff, aserver->cell->cellName, postamble, code, ptr);
 
 }                              /*print_internet_address */
 
@@ -368,34 +368,51 @@ afs_data_pointer_to_int32(const void *p)
 }
 
 #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 md5 ct;
 
     if (afs_new_inum) {
+       int offset;
        MD5_Init(&ct);
+       MD5_Update(&ct, &cell, 4);
        MD5_Update(&ct, &volume, 4);
        MD5_Update(&ct, &vnode, 4);
        MD5_Final(digest, &ct);
-       memcpy(&ino, digest, sizeof(afs_int32));
-       ino ^= (ino ^ vno) & 1;
-    } else {
-       ino = (volume << 16) + vnode;
+
+       /* 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;
+}