Redo the server notification flag. Revert to having server notifications

enabled by default, and rename the flag to -client_polling which will
disable server notifications.

Update documentation to reflect this new flag.

diff --git a/ChangeLog b/ChangeLog
index f92e858e361d23b8265f863c41dbb72beced85b8..7944237a99bd7f700a6bb077b36ae65b1db3631c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-09  joe c  <marcus@marcuscom.com>
+       * etc/afpd/afp_options.c: Redo the -server_notif flag.  Now, server
+       notifications are enabled by default, and specifying the -client_polling
+       flag will disable them.
+
 2002-02-06  joe c  <marcus@marcuscom.com>
        * etc/afpd/globals.h, etc/afpd/afp_options.c, etc/afpd/status.c
        etc/afpd/volume.c: Add a new option -server_notif to specify that

diff --git a/config/afpd.conf.tmpl b/config/afpd.conf.tmpl
index 93065c8e152068dce7be6be0edcb61522cf18f37..16e4eeda0784b11756e3ff2fbbaddadf16044911 100644 (file)
--- a/config/afpd.conf.tmpl
+++ b/config/afpd.conf.tmpl
@@ -111,6 +111,10 @@
 #     -loginmesg "Message"  Client will display "Message" upon logging in
 #                         (no default, same as -l "Message" on commandline)
 #     -nodebug            Switch off debugging
+#     -client_polling     Disable server notifications.  This forces the 
+#                         clients to poll every 10 seconds for directory
+#                         updates.  Note, currently this is the only way to
+#                         get asynchronous updates.
 #     -tickleval <number> Specify the tickle timeout interval (in seconds).
 #                         Note, this defaults to 30 seconds, and really 
 #                         shouldn't be changed.  If you want to control

diff --git a/doc/CONFIGURE b/doc/CONFIGURE
index ee014523f8ffc8974621ac0f6eee2b8a42344076..5e8d230cd83c7e989febc531a0a75468b9376dd5 100644 (file)
--- a/doc/CONFIGURE
+++ b/doc/CONFIGURE
@@ -112,7 +112,12 @@ Miscellaneous:
                        (no default, same as -l "Message" on
                        command-line)
      -nodebug          Switch off debugging
+     -client_polling   Disable server notifications.  This forces the
+                       clients to poll every 10 seconds for directory updates.  Note, 
+                       currently this is the only way to get asynchronous updates.
      -ticklevel <number>       Specify the tickle timeout interval (in seconds)
+     -timeout <number>         Specify the number of tickles to miss before tearing
+                       down a client connection
      -icon                     Use the platform-specific icon.
 
 An example:

diff --git a/etc/afpd/afp_options.c b/etc/afpd/afp_options.c
index 26535e4301086b15f4720301d69e0c4a7ad04511..1ddfb38463afee86db91e99295be40b251b44b56 100644 (file)
--- a/etc/afpd/afp_options.c
+++ b/etc/afpd/afp_options.c
@@ -1,5 +1,5 @@
 /*
- * $Id: afp_options.c,v 1.18 2002-02-06 21:58:50 jmarcus Exp $
+ * $Id: afp_options.c,v 1.19 2002-02-09 17:13:53 jmarcus Exp $
  *
  * Copyright (c) 1997 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1993 Regents of The University of Michigan.
@@ -142,7 +142,7 @@ void afp_options_init(struct afp_options *options)
     options->passwdfile = _PATH_AFPDPWFILE;
     options->tickleval = 30;
     options->timeout = 4;
-    options->server_notif = 0;
+    options->server_notif = 1;
     options->authprintdir = NULL;
     options->umask = 0;
 #ifdef ADMIN_GRP
@@ -208,6 +208,8 @@ int afp_options_parseline(char *buf, struct afp_options *options)
         options->transports |= AFPTRANS_DDP;
     if (strstr(buf, " -noddp"))
         options->transports &= ~AFPTRANS_DDP;
+    if (strstr(buf, "-client_polling"))
+        options->server_notif = 0;
 
     /* figure out options w/ values. currently, this will ignore the setting
      * if memory is lacking. */
@@ -237,9 +239,6 @@ int afp_options_parseline(char *buf, struct afp_options *options)
             options->timeout = 4;
         }
     }
-    if ((c = getoption(buf, "-server_notif"))) {
-        options->server_notif = 1;
-    }
 
     if ((c = getoption(buf, "-server_quantum")))
         options->server_quantum = strtoul(c, NULL, 0);