From 6d8ba083230fa3c6f712b7a2baa11863e21bcc24 Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Sat, 20 Jul 2024 16:44:57 +0100 Subject: [PATCH] - code format updates --- .../r_sv_subscriber_example.c | 20 +++-- src/sntp/sntp_client.c | 78 ++++++++++++------- 2 files changed, 60 insertions(+), 38 deletions(-) diff --git a/examples/rsv_subscriber_example/r_sv_subscriber_example.c b/examples/rsv_subscriber_example/r_sv_subscriber_example.c index 7fdc591c..920a301d 100644 --- a/examples/rsv_subscriber_example/r_sv_subscriber_example.c +++ b/examples/rsv_subscriber_example/r_sv_subscriber_example.c @@ -50,8 +50,8 @@ main(int argc, char** argv) { RSession rSession = RSession_create(); - if (rSession) { - + if (rSession) + { RSession_setLocalAddress(rSession, "0.0.0.0", 102); RSession_addMulticastGroup(rSession, "230.0.10.10"); @@ -64,7 +64,8 @@ main(int argc, char** argv) SVReceiver receiver = SVReceiver_createRemote(rSession); - if (receiver) { + if (receiver) + { /* Create a subscriber listening to SV messages with APPID 4000h */ SVSubscriber subscriber = SVSubscriber_create(NULL, 0x4000); @@ -77,7 +78,8 @@ main(int argc, char** argv) /* Start listening to SV messages - starts a new receiver background thread */ SVReceiver_start(receiver); - if (SVReceiver_isRunning(receiver)) { + if (SVReceiver_isRunning(receiver)) + { signal(SIGINT, sigint_handler); while (running) @@ -86,21 +88,23 @@ main(int argc, char** argv) /* Stop listening to SV messages */ SVReceiver_stop(receiver); } - else { + else + { printf("Failed to start SV subscriber. Reason can be that the Ethernet interface doesn't exist or root permission are required.\n"); } /* Cleanup and free resources */ SVReceiver_destroy(receiver); } - else { + else + { printf("Failed to create SV receiver\n"); } RSession_destroy(rSession); } - else { + else + { printf("Failed to create remote session protocol\n"); } - } diff --git a/src/sntp/sntp_client.c b/src/sntp/sntp_client.c index 27e9d09c..1935b7e9 100644 --- a/src/sntp/sntp_client.c +++ b/src/sntp/sntp_client.c @@ -37,8 +37,8 @@ typedef struct sSNTPClient* SNTPClient; /* new time types */ - -typedef struct { +typedef struct +{ uint32_t coarse; uint32_t fine; } NtpTime; @@ -164,7 +164,8 @@ parseResponseMessage(SNTPClient self, uint8_t* buffer, int bufSize) int li = (header & 0xc0)>> 6; /* check for "clock-not-synchronized" */ - if (li == 3) { + if (li == 3) + { /* ignore time message */ if (SNTP_DEBUG) printf("WARNING: received clock-not-synchronized from server\n"); @@ -223,7 +224,8 @@ parseResponseMessage(SNTPClient self, uint8_t* buffer, int bufSize) uint64_t trnsTime = ntpTimeToNsTime(coarse, fine); /* set system time */ - if (Hal_setTimeInNs(trnsTime) == false) { + if (Hal_setTimeInNs(trnsTime) == false) + { if (SNTP_DEBUG) printf("SNTP: failed to set system clock!\n"); } @@ -231,11 +233,13 @@ parseResponseMessage(SNTPClient self, uint8_t* buffer, int bufSize) self->clockSynced = true; self->outStandingRequest = false; - if (self->userCallback) { + if (self->userCallback) + { self->userCallback(self->userCallbackParameter, true); } - if (SNTP_DEBUG) { + if (SNTP_DEBUG) + { printf("SNTP: reference time: %u.%.6u\n", nsTimeToSeconds(refTime), getUsPartFromNsTime(refTime)); printf("SNTP: original time: %u.%.9u\n", nsTimeToSeconds(origTime), getUsPartFromNsTime(origTime)); printf("SNTP: receive time: %u.%.6u\n", nsTimeToSeconds(recvTime), getUsPartFromNsTime(recvTime)); @@ -310,14 +314,17 @@ SNTPClient_create() { SNTPClient self = (SNTPClient) GLOBAL_CALLOC(1, sizeof(struct sSNTPClient)); - if (self) { + if (self) + { self->socket = UdpSocket_create(); - if (self->socket == NULL) { + if (self->socket == NULL) + { GLOBAL_FREEMEM(self); self = NULL; } - else { + else + { self->handleSet = Handleset_new(); Handleset_addSocket(self->handleSet, (Socket) self->socket); self->pollInterval = 30000000000UL; /* 30 s */ @@ -351,7 +358,8 @@ SNTPClient_isSynchronized(SNTPClient self) void SNTPClient_setUserCallback(SNTPClient self, SNTPClient_UserCallback callback, void* parameter) { - if (self) { + if (self) + { self->userCallback = callback; self->userCallbackParameter = parameter; } @@ -375,23 +383,28 @@ SNTPClient_tick(SNTPClient self) if (self->lastRequestTimestamp > now) self->lastRequestTimestamp = now; - if (self->lastRequestTimestamp > 0) { + if (self->lastRequestTimestamp > 0) + { /* check for timeout */ - if ((now - self->lastReceivedMessage) > 300000000000UL) { - - if (self->clockSynced) { + if ((now - self->lastReceivedMessage) > 300000000000UL) + { + if (self->clockSynced) + { self->clockSynced = false; printf("SNTP: request timeout\n"); - //TODO when to call user handler? - if (self->userCallback) { + + if (self->userCallback) + { self->userCallback(self->userCallbackParameter, false); } } } } - if (self->serverAddr) { - if ((now - self->lastRequestTimestamp) > self->pollInterval) { + if (self->serverAddr) + { + if ((now - self->lastRequestTimestamp) > self->pollInterval) + { sendRequestMessage(self, self->serverAddr, self->serverPort); } } @@ -405,17 +418,19 @@ SNTPClient_handleIncomingMessage(SNTPClient self) uint8_t buffer[200]; int rcvdBytes = UdpSocket_receiveFrom(self->socket, ipAddress, 200, buffer, sizeof(buffer)); - if (rcvdBytes > 0) { - + if (rcvdBytes > 0) + { if (SNTP_DEBUG) printf("SNTP: received response from %s\n", ipAddress); parseResponseMessage(self, buffer, rcvdBytes); } - else if (rcvdBytes == -1) { + else if (rcvdBytes == -1) + { printf("UDP socket error\n"); } - else { + else + { printf("No data!\n"); } } @@ -442,10 +457,12 @@ handleThread(void* parameter) void SNTPClient_start(SNTPClient self) { - if (self) { + if (self) + { int sntpPoirt = SNTP_DEFAULT_PORT; - if (UdpSocket_bind(self->socket, "0.0.0.0", SNTP_DEFAULT_PORT)) { + if (UdpSocket_bind(self->socket, "0.0.0.0", SNTP_DEFAULT_PORT)) + { printf("Start NTP thread\n"); self->thread = Thread_create(handleThread, self, false); @@ -453,7 +470,8 @@ SNTPClient_start(SNTPClient self) if (self->thread) Thread_start(self->thread); } - else { + else + { if (SNTP_DEBUG) printf("SNTP: Failed to bind to port %i\n", sntpPoirt); } @@ -463,7 +481,8 @@ SNTPClient_start(SNTPClient self) void SNTPClient_stop(SNTPClient self) { - if (self->thread) { + if (self->thread) + { self->running = false; Thread_destroy(self->thread); self->thread = NULL; @@ -473,16 +492,15 @@ SNTPClient_stop(SNTPClient self) void SNTPClient_destroy(SNTPClient self) { - if (self) { - + if (self) + { SNTPClient_stop(self); if (self->serverAddr) GLOBAL_FREEMEM(self->serverAddr); - if (self->socket) { + if (self->socket) Socket_destroy((Socket) self->socket); - } GLOBAL_FREEMEM(self); }