NTP Client for the mbed networking libraries. The small change to this version is that there can be only one cause for the return value zero.
Fork of NTPClient by
Diff: NTPClient.cpp
- Revision:
- 2:9a64a50df235
- Parent:
- 1:b221a8765b3f
- Child:
- 3:17d8bad407cc
--- a/NTPClient.cpp Fri Jul 27 08:49:34 2012 +0000 +++ b/NTPClient.cpp Sun Aug 05 15:36:47 2012 +0000 @@ -1,33 +1,39 @@ /* NTPClient.cpp */ -/* -Copyright (C) 2012 ARM Limited. - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +/* Copyright (C) 2012 mbed.org, MIT License + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software + * and associated documentation files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, publish, distribute, + * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or + * substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING + * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ +//Debug is disabled by default +#if +//Enable debug +#define __DEBUG__ +#include <cstdio> +#define DBG(x, ...) std::printf("[NTPClient : DBG]"x"\r\n", ##__VA_ARGS__); +#define WARN(x, ...) std::printf("[NTPClient : WARN]"x"\r\n", ##__VA_ARGS__); +#define ERR(x, ...) std::printf("[NTPClient : ERR]"x"\r\n", ##__VA_ARGS__); -#define __DEBUG__ 0 //Disabled -#ifndef __MODULE__ -#define __MODULE__ "NTPClient.cpp" +#else +//Disable debug +#define DBG(x, ...) +#define WARN(x, ...) +#define ERR(x, ...) + #endif -#include "core/fwk.h" - #include "NTPClient.h" #include "UDPSocket.h" @@ -36,27 +42,27 @@ #define NTP_PORT 123 #define NTP_CLIENT_PORT 0 //Random port -#define NTP_REQUEST_TIMEOUT 15000 #define NTP_TIMESTAMP_DELTA 2208988800ull //Diff btw a UNIX timestamp (Starting Jan, 1st 1970) and a NTP timestamp (Starting Jan, 1st 1900) -NTPClient::NTPClient() +NTPClient::NTPClient() : m_sock() { } -int NTPClient::setTime(const char* host, uint16_t port, uint32_t timeout) +NTPResult NTPClient::setTime(const char* host, uint16_t port, uint32_t timeout) { -#if __DEBUG__ >= 3 +#ifdef __DEBUG__ time_t ctTime; ctTime = time(NULL); - INFO("Time is set to (UTC): %s", ctime(&ctTime)); + DBG("Time is set to (UTC): %s", ctime(&ctTime)); #endif //Create & bind socket - DBG("Creating socket"); - UDPSocket sock; - sock.bind(0); //Bind to a random port + DBG("Binding socket"); + m_sock.bind(0); //Bind to a random port + + m_sock.set_blocking(true, timeout); //Set blocking struct NTPPacket pkt; @@ -81,41 +87,50 @@ pkt.refTm_f = pkt.origTm_f = pkt.rxTm_f = pkt.txTm_f = 0; + Endpoint outEndpoint; + + if( outEndpoint.set_address(host, port) < 0) + { + m_sock.close(); + return NTP_DNS; + } + //Set timeout, non-blocking and wait using select - if( sock.sendTo( (char*)&pkt, sizeof(NTPPacket), host, port, NTP_REQUEST_TIMEOUT ) < 0 ) + int ret = m_sock.sendTo( outEndpoint, (char*)&pkt, sizeof(NTPPacket) ); + if (ret < 0 ) { ERR("Could not send packet"); - sock.close(); - return NET_CONN; + m_sock.close(); + return NTP_CONN; } //Read response + Endpoint inEndpoint; + DBG("Pong"); - char* inHost; - int inPort; do { - ret = sock.receiveFrom( (char*)&pkt, sizeof(NTPPacket), &inHost, inPort); //FIXME need a DNS Resolver to actually compare the incoming address with the DNS name + ret = m_sock.receiveFrom( inEndpoint, (char*)&pkt, sizeof(NTPPacket) ); //FIXME need a DNS Resolver to actually compare the incoming address with the DNS name if(ret < 0) { ERR("Could not receive packet"); - sock.close(); - return NET_CONN; + m_sock.close(); + return NTP_CONN; } - } while( respAddr.sin_addr.s_addr != serverAddr.sin_addr.s_addr); + } while( strcmp(outEndpoint.get_address(), inEndpoint.get_address()) != 0 ); if(ret < sizeof(NTPPacket)) //TODO: Accept chunks { ERR("Receive packet size does not match"); - sock.close(); - return NET_PROTOCOL; + m_sock.close(); + return NTP_PRTCL; } if( pkt.stratum == 0) //Kiss of death message : Not good ! { ERR("Kissed to death!"); - sock.close(); - return NTP_PORT; + m_sock.close(); + return NTP_PRTCL; } //Correct Endianness @@ -132,17 +147,17 @@ uint32_t destTm_s = (NTP_TIMESTAMP_DELTA + time(NULL)); int64_t offset = ( (int64_t)( pkt.rxTm_s - pkt.origTm_s ) + (int64_t) ( pkt.txTm_s - destTm_s ) ) / 2; //Avoid overflow DBG("Sent @%ul", pkt.txTm_s); - DBG("Offset: %ul", offset); + DBG("Offset: %lld", offset); //Set time accordingly set_time( time(NULL) + offset ); -#if __DEBUG__ >= 3 +#ifdef __DEBUG__ ctTime = time(NULL); - INFO("Time is now (UTC): %s", ctime(&ctTime)); + DBG("Time is now (UTC): %s", ctime(&ctTime)); #endif - sock.close(); + m_sock.close(); - return OK; + return NTP_OK; }