Change ERR response to FAIL for consistency with other programs.

diff --git a/admin.c b/admin.c
index 5c71e9f8136861286e9124a0c3535f62222d0ada..353501b11c769429d54b0f5850cdefa87efe5c69 100644 (file)
--- a/admin.c
+++ b/admin.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: admin.c,v 1.3 2001/02/04 01:17:12 mdw Exp $
+ * $Id: admin.c,v 1.4 2001/02/06 09:34:53 mdw Exp $
  *
  * Admin interface for configuration
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: admin.c,v $
+ * Revision 1.4  2001/02/06 09:34:53  mdw
+ * Change ERR response to FAIL for consistency with other programs.
+ *
  * Revision 1.3  2001/02/04 01:17:12  mdw
  * The `DAEMON' notification to stdout is replaced by a warning.  The
  * `DAEMON' and `QUIT' command send `OK' on successful completion.  Put
@@ -239,13 +242,13 @@ static void a_resolve(struct hostent *h, void *v)
   TIMER;
   sel_rmtimer(&a->t);
   if (!h)
-    a_write(a, "ERR couldn't resolve hostname `%s'\n", a->paddr);
+    a_write(a, "FAIL couldn't resolve hostname `%s'\n", a->paddr);
   else if (p_find(a->pname))
-    a_write(a, "ERR peer `%s' already registered\n", a->pname);
+    a_write(a, "FAIL peer `%s' already registered\n", a->pname);
   else {
     memcpy(&a->peer.sin.sin_addr, h->h_addr, sizeof(struct in_addr));
     if (!p_create(a->pname, &a->peer.sa, a->sasz))
-      a_write(a, "ERR couldn't create peer\n");
+      a_write(a, "FAIL couldn't create peer\n");
     else
       a_write(a, "OK\n");
   }
@@ -270,7 +273,7 @@ static void a_timer(struct timeval *tv, void *v)
   admin *a = v;
   T( trace(T_ADMIN, "admin: %u resolver timeout", a->seq); )
   bres_abort(&a->r);
-  a_write(a, "ERR timeout resolving `%s'\n", a->paddr);
+  a_write(a, "FAIL timeout resolving `%s'\n", a->paddr);
   xfree(a->pname);
   xfree(a->paddr);
   a->pname = 0;
@@ -297,7 +300,7 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
   /* --- Make sure someone's not got there already --- */
 
   if (p_find(av[0])) {
-    a_write(a, "ERR peer `%s' already registered\n", av[0]);
+    a_write(a, "FAIL peer `%s' already registered\n", av[0]);
     return;
   }
 
@@ -310,13 +313,13 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
   if (*p) {
     struct servent *s = getservbyname(av[2], "udp");
     if (!s) {
-      a_write(a, "ERR service `%s' not known\n", av[2]);
+      a_write(a, "FAIL service `%s' not known\n", av[2]);
       return;
     }
     pt = ntohs(s->s_port);
   }
   if (pt == 0 || pt >= 65536) {
-    a_write(a, "ERR bad port number %lu\n", pt);
+    a_write(a, "FAIL bad port number %lu\n", pt);
     return;
   }
   a->peer.sin.sin_port = htons(pt);
@@ -325,7 +328,7 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
   
   if (inet_aton(av[1], &a->peer.sin.sin_addr)) {
     if (!p_create(av[0], &a->peer.sa, a->sasz))
-      a_write(a, "ERR couldn't create peer\n");
+      a_write(a, "FAIL couldn't create peer\n");
     else
       a_write(a, "OK\n");
     return;
@@ -382,7 +385,7 @@ static void acmd_trace(admin *a, unsigned ac, char *av[])
              goto tropt_ok;
            }
          }
-         a_write(a, "ERR unknown trace option `%c'\n", *p);
+         a_write(a, "FAIL unknown trace option `%c'\n", *p);
          return;
         tropt_ok:;
          break;
@@ -407,13 +410,13 @@ static void a_destroy(admin */*a*/);
 static void acmd_daemon(admin *a, unsigned ac, char *av[])
 {
   if (flags & F_DAEMON)
-    a_write(a, "ERR already running as a daemon\n");
+    a_write(a, "FAIL already running as a daemon\n");
   else {
     a_warn("becoming a daemon");
     if (a_stdin)
       a_destroy(a_stdin);
     if (u_daemon())
-      a_write(a, "ERR error becoming a daemon: %s", strerror(errno));
+      a_write(a, "FAIL error becoming a daemon: %s", strerror(errno));
     else {
       flags |= F_DAEMON;
       a_write(a, "OK\n");
@@ -434,7 +437,7 @@ static void acmd_ifname(admin *a, unsigned ac, char *av[])
   peer *p;
 
   if ((p = p_find(av[0])) == 0)
-    a_write(a, "ERR peer `%s' not found\n", av[0]);
+    a_write(a, "FAIL peer `%s' not found\n", av[0]);
   else
     a_write(a, "INFO %s\nOK\n", p_ifname(p));
 }
@@ -445,7 +448,7 @@ static void acmd_addr(admin *a, unsigned ac, char *av[])
   const addr *ad;
 
   if ((p = p_find(av[0])) == 0)
-    a_write(a, "ERR peer `%s' not found\n", av[0]);
+    a_write(a, "FAIL peer `%s' not found\n", av[0]);
   else {
     ad = p_addr(p);
     assert(ad->sa.sa_family == AF_INET);
@@ -459,7 +462,7 @@ static void acmd_kill(admin *a, unsigned ac, char *av[])
 {
   peer *p;
   if ((p = p_find(av[0])) == 0)
-    a_write(a, "ERR peer `%s' not found\n", av[0]);
+    a_write(a, "FAIL peer `%s' not found\n", av[0]);
   else {
     p_destroy(p);
     a_write(a, "OK\n");
@@ -573,13 +576,13 @@ static void a_line(char *p, void *vp)
     if (strcmp(av[0], c->name) == 0) {
       ac--;
       if (c->argmin > ac || ac > c->argmax)
-       a_write(a, "ERR syntax: %s\n", c->help);
+       a_write(a, "FAIL syntax: %s\n", c->help);
       else
        c->func(a, ac, av + 1);
       return;
     }
   }
-  a_write(a, "ERR unknown command `%s'\n", av[0]);
+  a_write(a, "FAIL unknown command `%s'\n", av[0]);
 }
 
 /* --- @a_create@ --- *

diff --git a/client.c b/client.c
index ce1acb6520ab9f294c23ab571119e88f5dded4e6..270bbc23f7e70b717939846d53c05bf79eb08bc1 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: client.c,v 1.3 2001/02/04 17:10:15 mdw Exp $
+ * $Id: client.c,v 1.4 2001/02/06 09:34:53 mdw Exp $
  *
  * Client for TrIPE
  *
@@ -29,6 +29,9 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: client.c,v $
+ * Revision 1.4  2001/02/06 09:34:53  mdw
+ * Change ERR response to FAIL for consistency with other programs.
+ *
  * Revision 1.3  2001/02/04 17:10:15  mdw
  * Reopen logfiles on receipt of @SIGHUP@ (not done very well).  Don't
  * change directory -- just mangle pathnames instead.
@@ -161,7 +164,7 @@ static void cline(char *p, void *b)
       writelog("error", d.buf);
       dstr_destroy(&d);
     }
-  } else if (strcmp(q, "ERR") == 0)
+  } else if (strcmp(q, "FAIL") == 0)
     die(EXIT_FAILURE, "%s", p);
   else if (strcmp(q, "INFO") == 0)
     puts(p);