enable/disable calibrate.

Flags cleanup for ntpdc and friends.

From Dave Mills.

bk: 3bf9c00eN8C_8vG0TnYjjcxJDUAnPA

diff --git a/include/ntp_request.h b/include/ntp_request.h
index a64094a2d49c2617e76937cab87f03a844ca6b75..37144330b9661215ee35c4a081e5626a1345a813 100644 (file)
--- a/include/ntp_request.h
+++ b/include/ntp_request.h
@@ -285,7 +285,7 @@ struct resp_pkt {
 #define INFO_FLAG_KERNEL       0x8
 #define INFO_FLAG_MONITOR      0x40
 #define INFO_FLAG_FILEGEN      0x80
-#define INFO_FLAG_PLL_SYNC     0x10
+#define INFO_FLAG_CAL          0x10
 #define INFO_FLAG_PPS_SYNC     0x20
 
 /*
@@ -560,12 +560,14 @@ struct conf_sys_flags {
 /*
  * System flags we can set/clear
  */
-#define        SYS_FLAG_BCLIENT        0x1
-#define        SYS_FLAG_PPS            0x2
-#define SYS_FLAG_NTP           0x4
-#define SYS_FLAG_KERNEL                0x8
+#define        SYS_FLAG_BCLIENT        0x01
+#define        SYS_FLAG_PPS            0x02
+#define SYS_FLAG_NTP           0x04
+#define SYS_FLAG_KERNEL                0x08
 #define SYS_FLAG_MONITOR       0x10
 #define SYS_FLAG_FILEGEN       0x20
+#define SYS_FLAG_AUTH          0x40
+#define SYS_FLAG_CAL           0x80
 
 /*
  * Structure used for returning restrict entries

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 8a53d6f83924391fb56a30902247630e0a708d8a..660d2c531d5b8fd6ff932e67a8caa2dc6f080e90 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -81,8 +81,8 @@ extern int priority_done;
  * setvar [ ]
  * logfile logfile
  * logconfig [+|-|=][{sync|sys|peer|clock}{{,all}{info|statistics|events|status}}]...
- * enable auth|bclient|pll|kernel|monitor|stats
- * disable auth|bclient|pll|kernel|monitor|stats
+ * enable auth|bclient|pll|kernel|monitor|stats|calibrate
+ * disable auth|bclient|pll|kernel|monitor|stats|calibrate
  * phone ...
  * pps device [assert|clear] [hardpps]
  * priority high|normal
@@ -242,12 +242,12 @@ static    struct keyword fgen_types[] = {
 static struct keyword flags_keywords[] = {
        { "auth",               PROTO_AUTHENTICATE },
        { "bclient",            PROTO_BROADCLIENT },
+       { "calibrate",          PROTO_CAL },
        { "kernel",             PROTO_KERNEL },
        { "monitor",            PROTO_MONITOR },
        { "ntp",                PROTO_NTP },
-       { "stats",              PROTO_FILEGEN },
        { "pps",                PROTO_PPS },
-       { "calibrate",          PROTO_CAL },
+       { "stats",              PROTO_FILEGEN },
        { "",                   CONFIG_UNKNOWN }
 };
 

diff --git a/ntpd/ntp_request.c b/ntpd/ntp_request.c
index 6f5e1530328047f174908f1bc844eded5e87530a..1ce6c650e6c76632bdbb1af4f548162829e3e151 100644 (file)
--- a/ntpd/ntp_request.c
+++ b/ntpd/ntp_request.c
@@ -903,22 +903,22 @@ sys_info(
        is->poll = sys_poll;
        
        is->flags = 0;
-       if (sys_bclient)
-           is->flags |= INFO_FLAG_BCLIENT;
        if (sys_authenticate)
-           is->flags |= INFO_FLAG_AUTHENTICATE;
+               is->flags |= INFO_FLAG_AUTHENTICATE;
+       if (sys_bclient)
+               is->flags |= INFO_FLAG_BCLIENT;
+       if (cal_enable)
+               is->flags |= INFO_FLAG_CAL;
        if (kern_enable)
-           is->flags |= INFO_FLAG_KERNEL;
-       if (ntp_enable)
-           is->flags |= INFO_FLAG_NTP;
-       if (pll_control)
-           is->flags |= INFO_FLAG_PLL_SYNC;
-       if (pps_control)
-           is->flags |= INFO_FLAG_PPS_SYNC;
+               is->flags |= INFO_FLAG_KERNEL;
        if (mon_enabled != MON_OFF)
-           is->flags |= INFO_FLAG_MONITOR;
+               is->flags |= INFO_FLAG_MONITOR;
+       if (ntp_enable)
+               is->flags |= INFO_FLAG_NTP;
+       if (pps_enable)
+               is->flags |= INFO_FLAG_PPS_SYNC;
        if (stats_control)
-           is->flags |= INFO_FLAG_FILEGEN;
+               is->flags |= INFO_FLAG_FILEGEN;
        is->bdelay = HTONS_FP(DTOFP(sys_bdelay));
        HTONL_UF(sys_authdelay.l_f, &is->authdelay);
 
@@ -1433,27 +1433,32 @@ setclr_flags(
 
        if (flags & ~(SYS_FLAG_BCLIENT | SYS_FLAG_PPS |
                      SYS_FLAG_NTP | SYS_FLAG_KERNEL | SYS_FLAG_MONITOR |
-                     SYS_FLAG_FILEGEN)) {
+                     SYS_FLAG_FILEGEN | SYS_FLAG_AUTH | SYS_FLAG_CAL)) {
                msyslog(LOG_ERR, "setclr_flags: extra flags: %#x",
                        flags & ~(SYS_FLAG_BCLIENT | SYS_FLAG_PPS | 
                                  SYS_FLAG_NTP | SYS_FLAG_KERNEL |
-                                 SYS_FLAG_MONITOR | SYS_FLAG_FILEGEN));
+                                 SYS_FLAG_MONITOR | SYS_FLAG_FILEGEN |
+                                 SYS_FLAG_AUTH | SYS_FLAG_CAL));
                req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
                return;
        }
 
        if (flags & SYS_FLAG_BCLIENT)
-           proto_config(PROTO_BROADCLIENT, set, 0.);
+               proto_config(PROTO_BROADCLIENT, set, 0.);
        if (flags & SYS_FLAG_PPS)
-           proto_config(PROTO_PPS, set, 0.);
+               proto_config(PROTO_PPS, set, 0.);
        if (flags & SYS_FLAG_NTP)
-           proto_config(PROTO_NTP, set, 0.);
+               proto_config(PROTO_NTP, set, 0.);
        if (flags & SYS_FLAG_KERNEL)
-           proto_config(PROTO_KERNEL, set, 0.);
+               proto_config(PROTO_KERNEL, set, 0.);
        if (flags & SYS_FLAG_MONITOR)
-           proto_config(PROTO_MONITOR, set, 0.);
+               proto_config(PROTO_MONITOR, set, 0.);
        if (flags & SYS_FLAG_FILEGEN)
-           proto_config(PROTO_FILEGEN, set, 0.);
+               proto_config(PROTO_FILEGEN, set, 0.);
+       if (flags & SYS_FLAG_AUTH)
+               proto_config(PROTO_AUTHENTICATE, set, 0.);
+       if (flags & SYS_FLAG_CAL)
+               proto_config(PROTO_CAL, set, 0.);
        req_ack(srcadr, inter, inpkt, INFO_OKAY);
 }
 

diff --git a/ntpdc/ntpdc_ops.c b/ntpdc/ntpdc_ops.c
index 0661d5319cf279f916e6cb03381a9306bcd11ded..d9d061d3f125c4628512c9915b4942f4258eb8ce 100644 (file)
--- a/ntpdc/ntpdc_ops.c
+++ b/ntpdc/ntpdc_ops.c
@@ -786,7 +786,7 @@ sysinfo(
 
        (void) fprintf(fp, "system flags:         ");
        if ((is->flags & (INFO_FLAG_BCLIENT | INFO_FLAG_AUTHENABLE |
-           INFO_FLAG_NTP | INFO_FLAG_KERNEL| INFO_FLAG_PLL_SYNC |
+           INFO_FLAG_NTP | INFO_FLAG_KERNEL| INFO_FLAG_CAL |
            INFO_FLAG_PPS_SYNC | INFO_FLAG_MONITOR | INFO_FLAG_FILEGEN)) == 0) {
                (void) fprintf(fp, "none\n");
        } else {
@@ -802,10 +802,10 @@ sysinfo(
                    (void) fprintf(fp, "kernel ");
                if (is->flags & INFO_FLAG_FILEGEN)
                    (void) fprintf(fp, "stats ");
-               if (is->flags & INFO_FLAG_PLL_SYNC)
-                   (void) fprintf(fp, "kernel_sync ");
+               if (is->flags & INFO_FLAG_CAL)
+                   (void) fprintf(fp, "calibrate ");
                if (is->flags & INFO_FLAG_PPS_SYNC)
-                   (void) fprintf(fp, "pps_sync ");
+                   (void) fprintf(fp, "pps ");
                (void) fprintf(fp, "\n");
        }
        (void) fprintf(fp, "jitter:               %s s\n",
@@ -1256,21 +1256,25 @@ doset(
        sys.flags = 0;
        res = 0;
        for (items = 0; items < pcmd->nargs; items++) {
-               if (STREQ(pcmd->argval[items].string, "pps"))
-                   sys.flags |= SYS_FLAG_PPS;
+               if (STREQ(pcmd->argval[items].string, "auth"))
+                       sys.flags |= SYS_FLAG_AUTH;
                else if (STREQ(pcmd->argval[items].string, "bclient"))
-                   sys.flags |= SYS_FLAG_BCLIENT;
+                       sys.flags |= SYS_FLAG_BCLIENT;
+               else if (STREQ(pcmd->argval[items].string, "calibrate"))
+                       sys.flags |= SYS_FLAG_CAL;
+               else if (STREQ(pcmd->argval[items].string, "kernel"))
+                       sys.flags |= SYS_FLAG_KERNEL;
                else if (STREQ(pcmd->argval[items].string, "monitor"))
-                   sys.flags |= SYS_FLAG_MONITOR;
+                       sys.flags |= SYS_FLAG_MONITOR;
                else if (STREQ(pcmd->argval[items].string, "ntp"))
-                   sys.flags |= SYS_FLAG_NTP;
-               else if (STREQ(pcmd->argval[items].string, "kernel"))
-                   sys.flags |= SYS_FLAG_KERNEL;
+                       sys.flags |= SYS_FLAG_NTP;
+               else if (STREQ(pcmd->argval[items].string, "pps"))
+                       sys.flags |= SYS_FLAG_PPS;
                else if (STREQ(pcmd->argval[items].string, "stats"))
-                   sys.flags |= SYS_FLAG_FILEGEN;
+                       sys.flags |= SYS_FLAG_FILEGEN;
                else {
                        (void) fprintf(fp, "Unknown flag %s\n",
-                                      pcmd->argval[items].string);
+                           pcmd->argval[items].string);
                        res = 1;
                }
        }