faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

util: add function for printing access subnets

Browse source
This commit is contained in:
Miroslav Lichvar 2022-11-16 15:57:46 +01:00
parent 7122321249
commit d0fd04c0a2
3 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/unit/util.c
View file

@ -470,6 +470,15 @@ test_unit(void)
s = UTI_IPSockAddrToString(&ip_saddr); s = UTI_IPSockAddrToString(&ip_saddr);
TEST_CHECK(strcmp(s, "1.2.3.4:12345") == 0); TEST_CHECK(strcmp(s, "1.2.3.4:12345") == 0);
ip = ip_saddr.ip_addr;
s = UTI_IPSubnetToString(&ip, 10);
TEST_CHECK(strcmp(s, "1.2.3.4/10") == 0);
s = UTI_IPSubnetToString(&ip, 32);
TEST_CHECK(strcmp(s, "1.2.3.4") == 0);
ip.family = IPADDR_UNSPEC;
s = UTI_IPSubnetToString(&ip, 0);
TEST_CHECK(strcmp(s, "any address") == 0);
s = UTI_TimeToLogForm(2000000000); s = UTI_TimeToLogForm(2000000000);
TEST_CHECK(strcmp(s, "2033-05-18 03:33:20") == 0); TEST_CHECK(strcmp(s, "2033-05-18 03:33:20") == 0);

20
util.c
View file

@ -551,6 +551,26 @@ UTI_IPSockAddrToString(const IPSockAddr *sa)
/* ================================================== */ /* ================================================== */
char *
UTI_IPSubnetToString(IPAddr *subnet, int bits)
{
char *result;
result = NEXT_BUFFER;
if (subnet->family == IPADDR_UNSPEC)
snprintf(result, BUFFER_LENGTH, "%s", "any address");
else if ((subnet->family == IPADDR_INET4 && bits == 32) ||
(subnet->family == IPADDR_INET6 && bits == 128))
snprintf(result, BUFFER_LENGTH, "%s", UTI_IPToString(subnet));
else
snprintf(result, BUFFER_LENGTH, "%s/%d", UTI_IPToString(subnet), bits);
return result;
}
/* ================================================== */
char * char *
UTI_TimeToLogForm(time_t t) UTI_TimeToLogForm(time_t t)
{ {

2
util.h
View file

@ -120,6 +120,8 @@ extern int UTI_CompareIPs(const IPAddr *a, const IPAddr *b, const IPAddr *mask);
extern char *UTI_IPSockAddrToString(const IPSockAddr *sa); extern char *UTI_IPSockAddrToString(const IPSockAddr *sa);
extern char *UTI_IPSubnetToString(IPAddr *subnet, int bits);
extern char *UTI_TimeToLogForm(time_t t); extern char *UTI_TimeToLogForm(time_t t);
/* Adjust time following a frequency/offset change */ /* Adjust time following a frequency/offset change */