* fake-addrinfo.h (struct face, struct fac): Always declare.

(krb5int_fac): Renamed from fac, and made extern.  Always declare.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16615 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 47a08800d4787318cc9a68a2870e06bfa10d0263..9c836f724a6c3bb7a55b441eec2b510c08de2822 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-19  Ken Raeburn  <raeburn@mit.edu>
+
+       * fake-addrinfo.h (struct face, struct fac): Always declare.
+       (krb5int_fac): Renamed from fac, and made extern.  Always
+       declare.
+
 2004-07-16  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in, port-sockets.h: Don't check for macsock.h.

diff --git a/src/include/fake-addrinfo.h b/src/include/fake-addrinfo.h
index f247e75ad64d4b8f467fd6998ddd04a2a9b0f96c..09d2d6140f3e36646a7077d7c6d1d60c49fd2fe1 100644 (file)
--- a/src/include/fake-addrinfo.h
+++ b/src/include/fake-addrinfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001,2002,2003 by the Massachusetts Institute of Technology,
+ * Copyright (C) 2001,2002,2003,2004 by the Massachusetts Institute of Technology,
  * Cambridge, MA, USA.  All Rights Reserved.
  * 
  * This software is being provided to you, the LICENSEE, by the 
@@ -569,6 +569,21 @@ int getnameinfo (const struct sockaddr *addr, socklen_t len,
 #include <stdlib.h>
 #endif
 
+struct face {
+    struct in_addr *addrs4;
+    struct in6_addr *addrs6;
+    unsigned int naddrs4, naddrs6;
+    time_t expiration;
+    char *canonname, *name;
+    struct face *next;
+};
+
+/* fake addrinfo cache */
+struct fac {
+    struct face *data;
+};
+extern struct fac krb5int_fac;
+
 #ifdef NEED_FAKE_GETADDRINFO
 #include <string.h> /* for strspn */
 
@@ -624,30 +639,15 @@ static inline int fai_add_entry (struct addrinfo **result, void *addr,
 /* fake addrinfo cache entries */
 #define CACHE_ENTRY_LIFETIME   15 /* seconds */
 
-struct face {
-    struct in_addr *addrs4;
-    struct in6_addr *addrs6;
-    unsigned int naddrs4, naddrs6;
-    time_t expiration;
-    char *canonname, *name;
-    struct face *next;
-};
-
-/* fake addrinfo cache */
-struct fac {
-    struct face *data;
-};
-static struct fac fac;
-
 static void plant_face (const char *name, struct face *entry)
 {
     entry->name = strdup(name);
     if (entry->name == NULL)
        /* @@ Wastes memory.  */
        return;
-    entry->next = fac.data;
+    entry->next = krb5int_fac.data;
     entry->expiration = time(0) + CACHE_ENTRY_LIFETIME;
-    fac.data = entry;
+    krb5int_fac.data = entry;
 #ifdef DEBUG_ADDRINFO
     printf("added cache entry '%s' at %p: %d ipv4, %d ipv6; expire %d\n",
           name, entry, entry->naddrs4, entry->naddrs6, entry->expiration);
@@ -664,7 +664,7 @@ static int find_face (const char *name, struct face **entry)
 #ifdef DEBUG_ADDRINFO
     printf("scanning cache at %d for '%s'...\n", now, name);
 #endif
-    for (fpp = &fac.data; *fpp; ) {
+    for (fpp = &krb5int_fac.data; *fpp; ) {
        fp = *fpp;
 #ifdef DEBUG_ADDRINFO
        printf("  checking expiration time of @%p: %d\n",
@@ -686,7 +686,7 @@ static int find_face (const char *name, struct face **entry)
            fpp = &(*fpp)->next;
     }
 
-    for (fp = fac.data; fp; fp = fp->next) {
+    for (fp = krb5int_fac.data; fp; fp = fp->next) {
 #ifdef DEBUG_ADDRINFO
        printf("  comparing entry @%p\n", fp);
 #endif