From: Mike Brady <4265913+mikebrady@users.noreply.github.com>
Date: Thu, 9 Dec 2021 17:36:53 +0000 (+0000)
Subject: Fix some issues suggested by clang-tidy.
X-Git-Tag: 1.2~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da75f6a9c7c5af532626a58b7c9760915eaf16bf;p=thirdparty%2Fnqptp.git

Fix some issues suggested by clang-tidy.
---

diff --git a/nqptp-message-handlers.h b/nqptp-message-handlers.h
index a0e2865..fee9403 100644
--- a/nqptp-message-handlers.h
+++ b/nqptp-message-handlers.h
@@ -20,6 +20,8 @@
 #ifndef NQPTP_MESSAGE_HANDLERS_H
 #define NQPTP_MESSAGE_HANDLERS_H
 
+#include <sys/types.h>
+#include "general-utilities.h"
 #include "nqptp-clock-sources.h"
 
 void handle_announce(char *buf, ssize_t recv_len, clock_source_private_data *clock_private_info,
diff --git a/nqptp-utilities.c b/nqptp-utilities.c
index 0629614..e23ebc3 100644
--- a/nqptp-utilities.c
+++ b/nqptp-utilities.c
@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <fcntl.h>   // fcntl etc.
 #include <ifaddrs.h> // getifaddrs
+#include <netinet/in.h>
 
 #ifdef CONFIG_FOR_LINUX
 #include <linux/if_packet.h> // sockaddr_ll
@@ -30,7 +31,6 @@
 #ifdef CONFIG_FOR_FREEBSD
 #include <net/if_dl.h>
 #include <net/if_types.h>
-#include <netinet/in.h>
 #include <sys/socket.h>
 #include <unistd.h>
 #endif
diff --git a/nqptp.c b/nqptp.c
index 64f85c6..31202f3 100644
--- a/nqptp.c
+++ b/nqptp.c
@@ -527,10 +527,12 @@ uint64_t broadcasting_task(uint64_t call_time, __attribute__((unused)) void *pri
     }
   }
 
+/*
   uint64_t announce_interval = 1;
   announce_interval = announce_interval << (8 + aPTPinitialLogAnnounceInterval);
   announce_interval = announce_interval * 1000000000;
   announce_interval = announce_interval >> 8; // nanoseconds
+  return call_time + announce_interval;
+*/
   return call_time + 50000000;
-  // return call_time + announce_interval;
 }