"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "tests/libntp/decodenetnum.c" between
ntp-4.2.8p14.tar.gz and ntp-4.2.8p15.tar.gz

About: NTP is the the Official Reference Implementation of the Network Time Protocol (NTP) that synchronize the clocks of computers over a network.

[ To the main ntp source changes report ]

decodenetnum.c  (ntp-4.2.8p14):decodenetnum.c  (ntp-4.2.8p15)
skipping to change at line 12 skipping to change at line 12
#include "ntp_stdlib.h" #include "ntp_stdlib.h"
#include "sockaddrtest.h" #include "sockaddrtest.h"
#include "unity.h" #include "unity.h"
void setUp(void); void setUp(void);
extern void test_IPv4AddressOnly(void); extern void test_IPv4AddressOnly(void);
extern void test_IPv4AddressWithPort(void); extern void test_IPv4AddressWithPort(void);
extern void test_IPv6AddressOnly(void); extern void test_IPv6AddressOnly(void);
extern void test_IPv6AddressWithPort(void); extern void test_IPv6AddressWithPort(void);
extern void test_IPv6AddressWithScope(void);
extern void test_IPv6AddressWithPortAndScope(void);
extern void test_IllegalAddress(void); extern void test_IllegalAddress(void);
extern void test_IllegalCharInPort(void); extern void test_IllegalCharInPort(void);
extern void test_NameBufOverflow(void);
/* /*
* NOTE: The IPv6 specific tests are reduced to stubs when IPv6 is * NOTE: The IPv6 specific tests are reduced to stubs when IPv6 is
* disabled. * disabled.
* *
* ISC_PLATFORM_HAVEIPV6 checks if system has IPV6 capabilies. WANTIPV6 * ISC_PLATFORM_HAVEIPV6 checks if system has IPV6 capabilies. WANTIPV6
* ISC_PLATFORM_WANTIPV6 can be changed with build --disable-ipv6. * ISC_PLATFORM_WANTIPV6 can be changed with build --disable-ipv6.
* *
* If we want IPv6 but don't have it, the tests should fail, I think. * If we want IPv6 but don't have it, the tests should fail, I think.
*/ */
skipping to change at line 37 skipping to change at line 40
init_lib(); init_lib();
} }
void void
test_IPv4AddressOnly(void) test_IPv4AddressOnly(void)
{ {
const char *str = "192.0.2.1"; const char *str = "192.0.2.1";
sockaddr_u actual; sockaddr_u actual;
sockaddr_u expected; sockaddr_u expected;
memset(&expected, 0, sizeof(expected));
expected.sa4.sin_family = AF_INET; expected.sa4.sin_family = AF_INET;
expected.sa4.sin_addr.s_addr = inet_addr("192.0.2.1"); expected.sa4.sin_addr.s_addr = inet_addr("192.0.2.1");
SET_PORT(&expected, NTP_PORT); SET_PORT(&expected, NTP_PORT);
TEST_ASSERT_TRUE(decodenetnum(str, &actual)); TEST_ASSERT_TRUE(decodenetnum(str, &actual));
TEST_ASSERT_TRUE(IsEqual(expected, actual)); TEST_ASSERT_TRUE(IsEqual(expected, actual));
} }
void void
test_IPv4AddressWithPort(void) test_IPv4AddressWithPort(void)
{ {
const char *str = "192.0.2.2:2000"; const char *str = "192.0.2.2:2000";
sockaddr_u actual; sockaddr_u actual;
sockaddr_u expected; sockaddr_u expected;
memset(&expected, 0, sizeof(expected));
expected.sa4.sin_family = AF_INET; expected.sa4.sin_family = AF_INET;
expected.sa4.sin_addr.s_addr = inet_addr("192.0.2.2"); expected.sa4.sin_addr.s_addr = inet_addr("192.0.2.2");
SET_PORT(&expected, 2000); SET_PORT(&expected, 2000);
TEST_ASSERT_TRUE(decodenetnum(str, &actual)); TEST_ASSERT_TRUE(decodenetnum(str, &actual));
TEST_ASSERT_TRUE(IsEqual(expected, actual)); TEST_ASSERT_TRUE(IsEqual(expected, actual));
} }
void void
test_IPv6AddressOnly(void) test_IPv6AddressOnly(void)
{ {
#if defined(ISC_PLATFORM_HAVEIPV6) && defined(WANT_IPV6) #if defined(ISC_PLATFORM_HAVEIPV6) && defined(WANT_IPV6)
const struct in6_addr address = { const struct in6_addr address = {
0x20, 0x01, 0x0d, 0xb8, 0x20, 0x01, 0x0d, 0xb8,
0x85, 0xa3, 0x08, 0xd3, 0x85, 0xa3, 0x08, 0xd3,
0x13, 0x19, 0x8a, 0x2e, 0x13, 0x19, 0x8a, 0x2e,
0x03, 0x70, 0x73, 0x34 0x03, 0x70, 0x73, 0x34
}; };
const char *str = "2001:0db8:85a3:08d3:1319:8a2e:0370:7334"; const char *str1 = "2001:0db8:85a3:08d3:1319:8a2e:0370:7334";
const char *str2 = "[2001:0db8:85a3:08d3:1319:8a2e:0370:7334]";
sockaddr_u actual; sockaddr_u actual;
sockaddr_u expected; sockaddr_u expected;
memset(&expected, 0, sizeof(expected));
expected.sa6.sin6_family = AF_INET6; expected.sa6.sin6_family = AF_INET6;
expected.sa6.sin6_addr = address; expected.sa6.sin6_addr = address;
SET_PORT(&expected, NTP_PORT); SET_PORT(&expected, NTP_PORT);
TEST_ASSERT_TRUE(decodenetnum(str, &actual)); TEST_ASSERT_TRUE(decodenetnum(str1, &actual));
TEST_ASSERT_TRUE(IsEqual(expected, actual));
TEST_ASSERT_TRUE(decodenetnum(str2, &actual));
TEST_ASSERT_TRUE(IsEqual(expected, actual)); TEST_ASSERT_TRUE(IsEqual(expected, actual));
#else #else
TEST_IGNORE_MESSAGE("IPV6 disabled in build"); TEST_IGNORE_MESSAGE("IPV6 disabled in build");
#endif #endif
} }
void void
skipping to change at line 106 skipping to change at line 116
0x20, 0x01, 0x0d, 0xb8, 0x20, 0x01, 0x0d, 0xb8,
0x85, 0xa3, 0x08, 0xd3, 0x85, 0xa3, 0x08, 0xd3,
0x13, 0x19, 0x8a, 0x2e, 0x13, 0x19, 0x8a, 0x2e,
0x03, 0x70, 0x73, 0x34 0x03, 0x70, 0x73, 0x34
}; };
const char *str = "[2001:0db8:85a3:08d3:1319:8a2e:0370:7334]:3000"; const char *str = "[2001:0db8:85a3:08d3:1319:8a2e:0370:7334]:3000";
sockaddr_u actual; sockaddr_u actual;
sockaddr_u expected; sockaddr_u expected;
memset(&expected, 0, sizeof(expected));
expected.sa6.sin6_family = AF_INET6; expected.sa6.sin6_family = AF_INET6;
expected.sa6.sin6_addr = address; expected.sa6.sin6_addr = address;
SET_PORT(&expected, 3000); SET_PORT(&expected, 3000);
TEST_ASSERT_TRUE(decodenetnum(str, &actual)); TEST_ASSERT_TRUE(decodenetnum(str, &actual));
TEST_ASSERT_TRUE(IsEqual(expected, actual)); TEST_ASSERT_TRUE(IsEqual(expected, actual));
#else #else
TEST_IGNORE_MESSAGE("IPV6 disabled in build"); TEST_IGNORE_MESSAGE("IPV6 disabled in build");
#endif #endif
} }
void test_IPv6AddressWithScope(void)
{
#if defined(ISC_PLATFORM_HAVEIPV6) && defined(WANT_IPV6)
const struct in6_addr address = {
0x20, 0x01, 0x0d, 0xb8,
0x85, 0xa3, 0x08, 0xd3,
0x13, 0x19, 0x8a, 0x2e,
0x03, 0x70, 0x73, 0x34
};
const char *str1 = "2001:0db8:85a3:08d3:1319:8a2e:0370:7334%42";
const char *str2 = "[2001:0db8:85a3:08d3:1319:8a2e:0370:7334%42]";
sockaddr_u actual;
sockaddr_u expected;
memset(&expected, 0, sizeof(expected));
expected.sa6.sin6_family = AF_INET6;
expected.sa6.sin6_addr = address;
expected.sa6.sin6_scope_id = 42;
SET_PORT(&expected, NTP_PORT);
TEST_ASSERT_TRUE(decodenetnum(str1, &actual));
TEST_ASSERT_TRUE(IsEqual(expected, actual));
TEST_ASSERT_TRUE(decodenetnum(str2, &actual));
TEST_ASSERT_TRUE(IsEqual(expected, actual));
#else
TEST_IGNORE_MESSAGE("IPV6 disabled in build");
#endif
}
void test_IPv6AddressWithPortAndScope(void)
{
#if defined(ISC_PLATFORM_HAVEIPV6) && defined(WANT_IPV6)
const struct in6_addr address = {
0x20, 0x01, 0x0d, 0xb8,
0x85, 0xa3, 0x08, 0xd3,
0x13, 0x19, 0x8a, 0x2e,
0x03, 0x70, 0x73, 0x34
};
const char *str = "[2001:0db8:85a3:08d3:1319:8a2e:0370:7334%42]:3000";
sockaddr_u actual;
sockaddr_u expected;
memset(&expected, 0, sizeof(expected));
expected.sa6.sin6_family = AF_INET6;
expected.sa6.sin6_addr = address;
expected.sa6.sin6_scope_id = 42;
SET_PORT(&expected, 3000);
TEST_ASSERT_TRUE(decodenetnum(str, &actual));
TEST_ASSERT_TRUE(IsEqual(expected, actual));
#else
TEST_IGNORE_MESSAGE("IPV6 disabled in build");
#endif
}
void void
test_IllegalAddress(void) test_IllegalAddress(void)
{ {
const char *str = "192.0.2.270:2000"; const char *str = "192.0.2.270:2000";
sockaddr_u actual; sockaddr_u actual;
TEST_ASSERT_FALSE(decodenetnum(str, &actual)); TEST_ASSERT_FALSE(decodenetnum(str, &actual));
} }
void void
test_IllegalCharInPort(void) test_IllegalCharInPort(void)
{ {
/* An illegal port does not make the decodenetnum fail, but instead /* An illegal port does not make the decodenetnum fail, but instead
* makes it use the standard port. * makes it use the standard port.
*/ */
const char *str = "192.0.2.1:a700"; const char *str = "192.0.2.1:a700";
sockaddr_u actual; sockaddr_u actual;
sockaddr_u expected; sockaddr_u expected;
memset(&expected, 0, sizeof(expected));
expected.sa4.sin_family = AF_INET; expected.sa4.sin_family = AF_INET;
expected.sa4.sin_addr.s_addr = inet_addr("192.0.2.1"); expected.sa4.sin_addr.s_addr = inet_addr("192.0.2.1");
SET_PORT(&expected, NTP_PORT); SET_PORT(&expected, NTP_PORT);
TEST_ASSERT_TRUE(decodenetnum(str, &actual)); TEST_ASSERT_TRUE(decodenetnum(str, &actual));
TEST_ASSERT_TRUE(IsEqual(expected, actual)); TEST_ASSERT_TRUE(IsEqual(expected, actual));
} }
void
test_NameBufOverflow(void)
{
const char *str =
"loremipsumloremipsumloremipsumloremipsumloremipsum"
"loremipsumloremipsumloremipsumloremipsum";
sockaddr_u actual;
TEST_ASSERT_FALSE(decodenetnum(str, &actual));
}
 End of changes. 11 change blocks. 
2 lines changed or deleted 80 lines changed or added
To the C Programs section of the ntp source changes report or the top of this page
Mainly generated by pkgdiff using rfcdiff
Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)