Skip to content

Commit 5a92c07

Browse files
authored
Merge pull request #4 from bridadan/style_fixes
Fixing up style
2 parents b16ba07 + 8016ec3 commit 5a92c07

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
lines changed

NTPClient.cpp

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,35 @@
11
#include "ntp-client/NTPClient.h"
22
#include "mbed.h"
33

4-
NTPClient::NTPClient(NetworkInterface *iface) {
5-
this->iface = iface;
6-
7-
_nist_server_address = NTP_DEFULT_NIST_SERVER_ADDRESS;
8-
_nist_server_port = NTP_DEFULT_NIST_SERVER_PORT;
4+
NTPClient::NTPClient(NetworkInterface *iface)
5+
: iface(iface), nist_server_address(NTP_DEFULT_NIST_SERVER_ADDRESS), nist_server_port(NTP_DEFULT_NIST_SERVER_PORT) {
96
}
107

118
void NTPClient::set_server(char* server, int port){
12-
_nist_server_address = server;
13-
_nist_server_port = port;
9+
nist_server_address = server;
10+
nist_server_port = port;
1411
}
1512

1613
time_t NTPClient::get_timestamp(int timeout) {
1714
const time_t TIME1970 = 2208988800L;
1815
int ntp_send_values[12] = {0};
1916
int ntp_recv_values[12] = {0};
20-
17+
2118
SocketAddress nist;
22-
int ret_gethostbyname = iface->gethostbyname(_nist_server_address, &nist);
23-
19+
int ret_gethostbyname = iface->gethostbyname(nist_server_address, &nist);
20+
2421
if (ret_gethostbyname < 0) {
2522
// Network error on DNS lookup
2623
return ret_gethostbyname;
2724
}
28-
29-
nist.set_port(_nist_server_port);
30-
25+
26+
nist.set_port(nist_server_port);
27+
3128
memset(ntp_send_values, 0x00, sizeof(ntp_send_values));
3229
ntp_send_values[0] = '\x1b';
3330

3431
memset(ntp_recv_values, 0x00, sizeof(ntp_recv_values));
35-
32+
3633
UDPSocket sock;
3734
sock.open(iface);
3835
sock.set_timeout(timeout);
@@ -41,7 +38,7 @@ time_t NTPClient::get_timestamp(int timeout) {
4138

4239
SocketAddress source;
4340
const int n = sock.recvfrom(&source, (void*)ntp_recv_values, sizeof(ntp_recv_values));
44-
41+
4542
if (n > 10) {
4643
return ntohl(ntp_recv_values[10]) - TIME1970;
4744
} else {
@@ -61,4 +58,4 @@ uint32_t NTPClient::ntohl(uint32_t x) {
6158
ret |= (x & 0xff0000UL) >> 8;
6259
ret |= (x & 0xff000000UL) >> 24;
6360
return ret;
64-
}
61+
}

NTPClient.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ class NTPClient {
88
NTPClient(NetworkInterface *iface);
99
void set_server(char* server, int port);
1010
time_t get_timestamp(int timeout = 15000);
11-
11+
1212
private:
1313
NetworkInterface *iface;
14+
char* nist_server_address;
15+
int nist_server_port;
16+
1417
uint32_t ntohl(uint32_t num);
15-
char* _nist_server_address;
16-
int _nist_server_port;
17-
};
18+
};

0 commit comments

Comments
 (0)