Add outlyer source status to cmdmon protocol

This is not used yet.

diff --git a/candm.h b/candm.h
index d79b00c1be58cda0349ad838e82ae8398cfe4437..75259cee51863b408e6289db8944805da802ff75 100644 (file)
--- a/candm.h
+++ b/candm.h
@@ -496,7 +496,8 @@ typedef struct {
 #define RPY_SD_ST_UNREACH 1
 #define RPY_SD_ST_FALSETICKER 2
 #define RPY_SD_ST_JITTERY 3
-#define RPY_SD_ST_OTHER 4
+#define RPY_SD_ST_CANDIDATE 4
+#define RPY_SD_ST_OUTLYER 5
 
 typedef struct {
   IPAddr ip_addr;

diff --git a/client.c b/client.c
index b671bef35ee8a5b6f45899f3909a5e44b35a84fe..0c9971cea53f371a7ff03296c48a3f7f0d1fd171 100644 (file)
--- a/client.c
+++ b/client.c
@@ -1739,6 +1739,8 @@ process_cmd_sources(char *line)
               printf("="); break;
             case RPY_SD_MD_REF:
               printf("#"); break;
+            default:
+              printf(" ");
           }
           switch (state) {
             case RPY_SD_ST_SYNC:
@@ -1749,8 +1751,12 @@ process_cmd_sources(char *line)
               printf("x"); break;
             case RPY_SD_ST_JITTERY:
               printf("~"); break;
-            case RPY_SD_ST_OTHER:
+            case RPY_SD_ST_CANDIDATE:
               printf("+"); break;
+            case RPY_SD_ST_OUTLYER:
+              printf("-"); break;
+            default:
+              printf(" ");
           }
 
           printf(" %-25s    %2d   %2d   ", hostname_buf, stratum, poll);

diff --git a/cmdmon.c b/cmdmon.c
index 4e753cb530cd53be8ed18b3e0a7d5cffea1e1b94..925cd217e8b2979768f6f59f65f7b1bbe5ab5fab 100644 (file)
--- a/cmdmon.c
+++ b/cmdmon.c
@@ -1077,8 +1077,8 @@ handle_source_data(CMD_Request *rx_message, CMD_Reply *tx_message)
       case RPT_JITTERY:
         tx_message->data.source_data.state   = htons(RPY_SD_ST_JITTERY);
         break;
-      case RPT_OTHER:
-        tx_message->data.source_data.state   = htons(RPY_SD_ST_OTHER);
+      case RPT_CANDIDATE:
+        tx_message->data.source_data.state   = htons(RPY_SD_ST_CANDIDATE);
         break;
     }
     switch (report.mode) {

diff --git a/reports.h b/reports.h
index e2f16822ba246945278d849d9c73671d119c20a3..5e54db23dc5fc624d94508d98795f5a411f64fca 100644 (file)
--- a/reports.h
+++ b/reports.h
@@ -41,7 +41,7 @@ typedef struct {
   int stratum;
   int poll;
   enum {RPT_NTP_CLIENT, RPT_NTP_PEER, RPT_LOCAL_REFERENCE} mode;
-  enum {RPT_SYNC, RPT_UNREACH, RPT_FALSETICKER, RPT_JITTERY, RPT_OTHER} state;
+  enum {RPT_SYNC, RPT_UNREACH, RPT_FALSETICKER, RPT_JITTERY, RPT_CANDIDATE} state;
 
   unsigned long latest_meas_ago; /* seconds */
   double orig_latest_meas; /* seconds */

diff --git a/sources.c b/sources.c
index 6c523fde47b89b1dded0aa3f9bd4d772e9bbbfe0..68d9bdbff60e782ce17face0632ba9be8b721c22 100644 (file)
--- a/sources.c
+++ b/sources.c
@@ -1089,7 +1089,7 @@ SRC_ReportSource(int index, RPT_SourceReport *report, struct timeval *now)
         report->state = RPT_FALSETICKER;
         break;
       case SRC_SELECTABLE:
-        report->state = RPT_OTHER;
+        report->state = RPT_CANDIDATE;
         break;
       default:
         assert(0);