auth: fix afsconf_GetExtendedCellInfo memory leak

[openafs.git] / src / auth / test / testcellconf.c

diff --git a/src/auth/test/testcellconf.c b/src/auth/test/testcellconf.c
index c790ece..a16a9dd 100644 (file)
--- a/src/auth/test/testcellconf.c
+++ b/src/auth/test/testcellconf.c
@@ -25,13 +25,12 @@ Creation date:
 #include <afsconfig.h>
 #include <afs/param.h>
 
-RCSID
-    ("$Header$");
 
 #include <sys/types.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
 #include <afs/afsutil.h>
 #ifdef AFS_NT40_ENV
 #include <winsock2.h>
@@ -39,62 +38,79 @@ RCSID
 #include <netinet/in.h>
 #endif
 #include <afs/cellconfig.h>
+#include <afs/cmd.h>
 
-int 
+int _afsconf_Touch(struct afsconf_dir *adir);
+
+enum optionsList {
+    OPT_confdir,
+    OPT_cell,
+    OPT_reload
+};
+
+static int
 PrintOneCell(struct afsconf_cell *ainfo, void *arock, struct afsconf_dir *adir)
 {
-    register int i;
+    int i;
     long temp;
 
     printf("Cell %s:\n", ainfo->name);
     for (i = 0; i < ainfo->numServers; i++) {
        memcpy(&temp, &ainfo->hostAddr[i].sin_addr, sizeof(long));
-       printf("    host %s at %x.%x\n", ainfo->hostName[i], temp,
-              ainfo->hostAddr[i].sin_port);
+       printf(" %d host %s at %lx port %x clone %s\n", i, ainfo->hostName[i], temp,
+              ainfo->hostAddr[i].sin_port, (ainfo->clone[i] ? "yes" : "no"));
     }
     return 0;
 }
 
-/*Main for testcellconfig*/
-main(argc, argv)
-     int argc;
-     char *argv[];
+static void
+PrintClones(char *clones, int numServers)
+{
+    int i;
+
+    printf("Clones:\n");
+    for (i = 0; i < numServers; i++) {
+       printf(" %d clone %s\n", i, (clones[i] ? "yes" : "no"));
+    }
+}
+
+static int
+TestCellConfig(struct cmd_syndesc *as, void *arock)
 {
     struct afsconf_dir *theDir;
     char tbuffer[1024];
     struct afsconf_cell theCell;
-    long i;
-    register long code;
-    char *dirName;
+    int code;
+    char *dirName = NULL;
+    char clones[MAXHOSTSPERCELL];
+    int reload = 0;
+    struct cmd_item *cells = NULL;
 
-#ifdef AFS_NT40_ENV
-    WSADATA WSAjunk;
-    /* Start up sockets */
-    WSAStartup(0x0101, &WSAjunk);
-#endif /* AFS_NT40_ENV */
+    memset(clones, 0, sizeof(clones));
 
-    if (argc < 2) {
-       printf
-           ("usage: testcellconfig <conf-dir-name> [<cell-to-display>]*\n");
-       exit(1);
-    }
+    cmd_OptionAsString(as, OPT_confdir, &dirName);
+    reload = cmd_OptionPresent(as, OPT_reload);
 
-    dirName = argv[1];
+    if (!dirName)
+       dirName = strdup(AFSDIR_SERVER_ETC_DIRPATH);
     theDir = afsconf_Open(dirName);
     if (!theDir) {
        printf("could not open configuration files in '%s'\n", dirName);
-       exit(1);
+       free(dirName);
+       return 1;
     }
 
     /* get the cell */
     code = afsconf_GetLocalCell(theDir, tbuffer, sizeof(tbuffer));
     if (code != 0) {
        printf("get local cell failed, code %d\n", code);
-       exit(1);
+       afsconf_Close(theDir);
+       free(dirName);
+       return 1;
     }
     printf("Local cell is '%s'\n\n", tbuffer);
 
-    if (argc == 2) {
+    if (cmd_OptionAsList(as, OPT_cell, &cells) != 0) {
        printf("About to print cell database contents:\n");
        afsconf_CellApply(theDir, PrintOneCell, 0);
        printf("Done.\n\n");
@@ -107,6 +123,14 @@ main(argc, argv)
            printf("AFSPROT service:\n");
            PrintOneCell(&theCell, NULL, theDir);
        }
+       code = afsconf_GetExtendedCellInfo(theDir, NULL, "afsprot", &theCell, clones);
+       if (code) {
+           printf("failed to find extended cell info (%d)\n", code);
+       } else {
+           printf("AFSPROT service extended info:\n");
+           PrintOneCell(&theCell, NULL, theDir);
+           PrintClones(clones, theCell.numServers);
+       }
        code = afsconf_GetCellInfo(theDir, 0, "bozotheclown", &theCell);
        if (code == 0)
            printf("unexpectedly found service 'bozotheclown'\n");
@@ -115,17 +139,69 @@ main(argc, argv)
        PrintOneCell(&theCell, NULL, theDir);
        printf("done with special test\n");
     } else {
-       /* now print out specified cell info */
-       for (i = 2; i < argc; i++) {
-           code = afsconf_GetCellInfo(theDir, argv[i], 0, &theCell);
+       /* Now print out specified cell info. */
+       for (; cells != NULL; cells = cells->next) {
+           char *cell = cells->data;
+           code = afsconf_GetCellInfo(theDir, cell, 0, &theCell);
            if (code) {
                printf("Could not find info for cell '%s', code %d\n",
-                      argv[i], code);
+                      cell, code);
            } else
                PrintOneCell(&theCell, NULL, theDir);
+
+           /* And print extended cell info. */
+           memset(clones, 0, sizeof(clones));
+           code = afsconf_GetExtendedCellInfo(theDir, cell, "afsprot", &theCell, clones);
+           if (code) {
+               printf("Could not find extended info for cell '%s', code %d\n",
+                      cell, code);
+           } else {
+               PrintOneCell(&theCell, NULL, theDir);
+               PrintClones(clones, theCell.numServers);
+           }
+       }
+    }
+
+    if (reload) {
+       printf("Forcing reload\n");
+       code = _afsconf_Touch(theDir);
+       if (code) {
+           printf("Unable to touch cellservdb file (%d)\n", code);
+       } else {
+           sleep(2);
+           code = afsconf_GetCellInfo(theDir, NULL, "afsprot", &theCell);
+           if (code)
+               printf("failed to find afsprot service (%d)\n", code);
+           else
+               PrintOneCell(&theCell, NULL, theDir);
        }
     }
 
     /* all done */
-    exit(0);
+    afsconf_Close(theDir);
+    free(dirName);
+    return 0;
+}
+
+
+int
+main(int argc, char *argv[])
+{
+    afs_int32 code;
+    struct cmd_syndesc *ts;
+
+#ifdef AFS_NT40_ENV
+    WSADATA WSAjunk;
+    /* Start up sockets */
+    WSAStartup(0x0101, &WSAjunk);
+#endif /* AFS_NT40_ENV */
+
+    ts = cmd_CreateSyntax("initcmd", TestCellConfig, NULL, 0, "Test cell configuration");
+    cmd_AddParmAtOffset(ts, OPT_confdir, "-confdir", CMD_SINGLE, CMD_OPTIONAL,
+               "Configuration directory pathname");
+    cmd_AddParmAtOffset(ts, OPT_cell, "-cell", CMD_LIST, CMD_OPTIONAL, "Cell to display");
+    cmd_AddParmAtOffset(ts, OPT_reload, "-reload", CMD_FLAG, CMD_OPTIONAL, "Perform reload test");
+
+    code = cmd_Dispatch(argc, argv);
+    return code;
 }