Add code to tag clock IPs that belong to the clock itself.

diff --git a/general-utilities.c b/general-utilities.c
index 21acc56247eeb03207695cc55783767b38b7f170..ba79621331b86320d3b24c9ecb7295dd2876dfa9 100644 (file)
--- a/general-utilities.c
+++ b/general-utilities.c
@@ -17,9 +17,10 @@
  * Commercial licensing is also available.
  */
 
-#include <string.h>
 #include <arpa/inet.h>
+#include <string.h>
 #include "general-utilities.h"
+#include "debug.h"
 
 uint32_t nctohl(const uint8_t *p) { // read 4 characters from *p and do ntohl on them
   // this is to avoid possible aliasing violations

diff --git a/general-utilities.h b/general-utilities.h
index 0662445d81fba34c591568fb9c08c2d1c6e40941..4995d2afee10ac7e6a842a281ace9b8b037c962e 100644 (file)
--- a/general-utilities.h
+++ b/general-utilities.h
@@ -27,6 +27,15 @@
 #include <inttypes.h>
 #include <time.h>
 
+// struct sockaddr_in6 is bigger than struct sockaddr. derp
+#ifdef AF_INET6
+#define SOCKADDR struct sockaddr_storage
+#define SAFAMILY ss_family
+#else
+#define SOCKADDR struct sockaddr
+#define SAFAMILY sa_family
+#endif
+
 uint32_t nctohl(const uint8_t *p); // read 4 characters from *p and do ntohl on them, avoiding aliasing
 uint16_t nctohs(const uint8_t *p);
 uint64_t timespec_to_ns(struct timespec *tn);

diff --git a/nqptp-clock-sources.c b/nqptp-clock-sources.c
index 13c31a627c78441d397ab23f1515c421ac0afc98..6e2cbddb62287bbf1cd3eab65a4ace0466d2498c 100644 (file)
--- a/nqptp-clock-sources.c
+++ b/nqptp-clock-sources.c
@@ -18,6 +18,9 @@
  */
 
 #include <string.h>
+#include <sys/types.h>
+#include <ifaddrs.h>
+#include <arpa/inet.h>
 #include "nqptp-clock-sources.h"
 #include "nqptp-ptp-definitions.h"
 #include "debug.h"
@@ -115,3 +118,48 @@ void manage_clock_sources(uint64_t reception_time, clock_source *clocks_shared_i
   }
 }
 
+// check all the entries in the clock array and mark all those that
+// belong to ourselves
+
+void update_clock_self_identifications(clock_source *clocks_shared_info,
+                            clock_source_private_data *clocks_private_info) {
+  // first, turn off all the self-id flags
+  int i;
+  for (i = 0; i < MAX_CLOCKS ; i++) {
+    clocks_private_info[i].is_one_of_ours = 0;
+  }
+
+  struct ifaddrs *ifap, *ifa;
+  void *addr = NULL;
+  short family;
+  getifaddrs(&ifap);
+  for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
+    family = ifa->ifa_addr->sa_family;
+#ifdef AF_INET6
+      if (ifa->ifa_addr && family==AF_INET6) {
+          struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *) ifa->ifa_addr;
+          addr = &(sa6->sin6_addr);
+      }
+#endif
+      if (ifa->ifa_addr && family==AF_INET) {
+          struct sockaddr_in *sa4 = (struct sockaddr_in *) ifa->ifa_addr;
+          addr = &(sa4->sin_addr);
+       }
+      char ip_string[64];
+      memset(ip_string,0,sizeof(ip_string));
+      if (addr != NULL)
+        inet_ntop(family, addr, ip_string, sizeof(ip_string));
+      if (strlen(ip_string) != 0) {
+        // now set the is_one_of_ours flag of any clock with this ip
+         for (i = 0; i < MAX_CLOCKS ; i++) {
+            if (strcasecmp(ip_string,clocks_shared_info[i].ip) == 0) {
+              debug(2,"found an entry for one of our clocks");
+              clocks_private_info[i].is_one_of_ours = 1;
+            }
+          }
+
+      }
+   }
+  freeifaddrs(ifap);
+}
+

diff --git a/nqptp-clock-sources.h b/nqptp-clock-sources.h
index 07f398c935c796df240e17cf3d783d1ebb88644b..5c73cd6bdd185a214df30502686e38e09399f99e 100644 (file)
--- a/nqptp-clock-sources.h
+++ b/nqptp-clock-sources.h
@@ -34,9 +34,11 @@ typedef struct {
   uint16_t in_use;
   enum stage current_stage;
   uint64_t t2;
+
   // for Announce Qualification
   uint64_t announce_times[4];  // we'll check qualification and currency using these
   int announce_is_valid; // this may mean it's a master clock_source
+  int is_one_of_ours; // true if it is one of our own clocks
 } clock_source_private_data;
 
 int find_clock_source_record(char *sender_string, uint64_t packet_clock_id,
@@ -47,6 +49,9 @@ int create_clock_source_record(char *sender_string, uint64_t packet_clock_id,
                   clock_source *clocks_shared_info,
                   clock_source_private_data *clocks_private_info);
 
+void update_clock_self_identifications(clock_source *clocks_shared_info,
+                            clock_source_private_data *clocks_private_info);
+
 void manage_clock_sources(uint64_t reception_time, clock_source *clocks_shared_info,
                             clock_source_private_data *clocks_private_info);
 

diff --git a/nqptp-message-handlers.c b/nqptp-message-handlers.c
index a9422460c9a72f26e07e87ac34dfa4943c419fbd..a92434e33dbe6c7bd1eba8d8a08bd8ef433563d9 100644 (file)
--- a/nqptp-message-handlers.c
+++ b/nqptp-message-handlers.c
@@ -25,6 +25,8 @@
 #include "debug.h"
 
 void handle_announce(char *buf, ssize_t recv_len, clock_source* clock_info, clock_source_private_data *clock_private_info, uint64_t reception_time) {
+  // reject Announce messages from self
+  if (clock_private_info->is_one_of_ours == 0) {
   // debug_print_buffer(1, buf, (size_t) recv_len);
   // make way for the new time
   if ((size_t)recv_len >= sizeof(struct ptp_announce_message)) {
@@ -73,7 +75,7 @@ void handle_announce(char *buf, ssize_t recv_len, clock_source* clock_info, cloc
       uint16_t offsetScaledLogVariance = clockQuality & 0xffff;
       debug(1, "    grandmasterIdentity:     %" PRIx64 ".", grandmaster_clock_id);
       debug(1, "    grandmasterPriority1:    %u.", msg->announce.grandmasterPriority1);
-      debug(1, "    grandmasterClockQuality,: 0x%x.", msg->announce.grandmasterClockQuality);
+      debug(1, "    grandmasterClockQuality: 0x%x.", msg->announce.grandmasterClockQuality);
       debug(1, "        clockClass:              %u.", clockClass); // See 7.6.2.4 clockClass
       debug(1, "        clockAccuracy:           0x%x.", clockAccuracy); // See 7.6.2.5 clockAccuracy
       debug(1, "        offsetScaledLogVariance: %x.", offsetScaledLogVariance); // See 7.6.3 PTP variance
@@ -87,4 +89,5 @@ void handle_announce(char *buf, ssize_t recv_len, clock_source* clock_info, cloc
     clock_private_info->announce_is_valid = 0;
   }
   }
+  }
 }

diff --git a/nqptp-utilities.c b/nqptp-utilities.c
index 8ceb125d7e34cb2134541d79662ddcb7ce047250..515935c461a51e79e67ca7b461daa3ffe2fb03e7 100644 (file)
--- a/nqptp-utilities.c
+++ b/nqptp-utilities.c
@@ -27,6 +27,8 @@
 #include <errno.h>
 #include <linux/net_tstamp.h>
 #include "nqptp-utilities.h"
+#include "general-utilities.h"
+
 #include "debug.h"
 
 #ifndef SO_TIMESTAMPING

diff --git a/nqptp.c b/nqptp.c
index 322accc1890bb8e2b1076ab0276612e1f8955be4..881357e2459cb263f72c6050180a597a0ba86d6e 100644 (file)
--- a/nqptp.c
+++ b/nqptp.c
@@ -73,15 +73,6 @@ clock_source_private_data clocks_private[MAX_CLOCKS];
 struct shm_structure *shared_memory = NULL; // this is where public clock info is available
 int epoll_fd;
 
-// struct sockaddr_in6 is bigger than struct sockaddr.
-#ifdef AF_INET6
-#define SOCKADDR struct sockaddr_storage
-#define SAFAMILY ss_family
-#else
-#define SOCKADDR struct sockaddr
-#define SAFAMILY sa_family
-#endif
-
 void goodbye(void) {
   // close any open sockets
   unsigned int i;
@@ -220,6 +211,7 @@ int main(void) {
     while (1) {
 
       struct epoll_event events[MAX_EVENTS];
+      // the timeout is in seconds
       int event_count = epoll_wait(epoll_fd, events, MAX_EVENTS, 1000);
       uint64_t reception_time = get_time_now(); // use this if other methods fail
 
@@ -349,6 +341,9 @@ int main(void) {
               if (the_clock != -1) {
                 switch (buf[0] & 0xF) {
                 case Announce:
+                  // needed to reject messages coming from self
+                  update_clock_self_identifications((clock_source *)&shared_memory->clocks,
+                     (clock_source_private_data *)&clocks_private);
                   handle_announce(buf, recv_len, &shared_memory->clocks[the_clock],&clocks_private[the_clock], reception_time);
                   break;
                 case Sync: { // if it's a sync