A port and bug fix of Alix955/code/ntp-client. The socket would hang as it was defined both with a timeout and as blocking.

NTPClient.cpp

Committer:
Alix955
Date:
2018-12-07
Revision:
1:099750f42b02
Parent:
0:3c1170035e2b
Child:
2:a3aec199dc7c

File content as of revision 1:099750f42b02:

#include "ntp-client/NTPClient.h"
#include "mbed.h"

NTPClient::NTPClient(NetworkInterface *iface)
: iface(iface), nist_server_address((char *)NTP_DEFULT_NIST_SERVER_ADDRESS), nist_server_port(NTP_DEFULT_NIST_SERVER_PORT) {
}

void NTPClient::set_server(char* server, int port){
    nist_server_address = server;
    nist_server_port = port;
}

time_t NTPClient::get_timestamp(int timeout) {
    const time_t TIME1970 = (time_t)2208988800UL;
    int ntp_send_values[12] = {0};
    int ntp_recv_values[12] = {0};

    SocketAddress nist;
    int ret_gethostbyname = iface->gethostbyname(nist_server_address, &nist);

    if (ret_gethostbyname < 0) {
        // Network error on DNS lookup
        printf("Error on DNS lookup : %d\n" , ret_gethostbyname);
        return ret_gethostbyname;
    }

    nist.set_port(nist_server_port);

    memset(ntp_send_values, 0x00, sizeof(ntp_send_values));
    ntp_send_values[0] = '\x1b';

    memset(ntp_recv_values, 0x00, sizeof(ntp_recv_values));

    UDPSocket sock;
    sock.open(iface);
    sock.set_timeout(timeout);

    sock.sendto(nist, (void*)ntp_send_values, sizeof(ntp_send_values));

    SocketAddress source;
    const int n = sock.recvfrom(&source, (void*)ntp_recv_values, sizeof(ntp_recv_values));

    if (n > 10) {
        return ntohl(ntp_recv_values[10]) - TIME1970;
    } else {
        if (n < 0) {
            // Network error
            printf("Network error: %d\n", n);
            return n;
        } else {
            // No or partial data returned
            printf("No or partial data returned: -1");
            return -1;
        }
    }
}

uint32_t NTPClient::ntohl(uint32_t x) {
    uint32_t ret = (x & 0xff) << 24;
    ret |= (x & 0xff00) << 8;
    ret |= (x & 0xff0000UL) >> 8;
    ret |= (x & 0xff000000UL) >> 24;
    return ret;
}