SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

basic: convert ifname_valid_full() to take flags and allow numeric interfaces

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2020-09-10 00:46:44 +02:00
parent 25b2d602b9
commit 2313524aa0
5 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-socket-util.c
+11 -7
View File
@@ -26,13 +26,13 @@ assert_cc(SUN_PATH_LEN == 108);
static void test_ifname_valid(void) {
log_info("/* %s */", __func__);
assert(ifname_valid("foo"));
assert(ifname_valid("eth0"));
assert( ifname_valid("foo"));
assert( ifname_valid("eth0"));
assert(!ifname_valid("0"));
assert(!ifname_valid("99"));
assert(ifname_valid("a99"));
assert(ifname_valid("99a"));
assert( ifname_valid("a99"));
assert( ifname_valid("99a"));
assert(!ifname_valid(NULL));
assert(!ifname_valid(""));
@@ -44,9 +44,13 @@ static void test_ifname_valid(void) {
assert(ifname_valid("foo.bar"));
assert(!ifname_valid("x:y"));
assert(ifname_valid("xxxxxxxxxxxxxxx"));
assert(!ifname_valid("xxxxxxxxxxxxxxxx"));
assert(ifname_valid_full("xxxxxxxxxxxxxxxx", true));
assert( ifname_valid_full("xxxxxxxxxxxxxxx", 0));
assert(!ifname_valid_full("xxxxxxxxxxxxxxxx", 0));
assert( ifname_valid_full("xxxxxxxxxxxxxxxx", IFNAME_VALID_ALTERNATIVE));
assert( ifname_valid_full("xxxxxxxxxxxxxxxx", IFNAME_VALID_ALTERNATIVE));
assert(!ifname_valid_full("999", IFNAME_VALID_ALTERNATIVE));
assert( ifname_valid_full("999", IFNAME_VALID_ALTERNATIVE | IFNAME_VALID_NUMERIC));
assert(!ifname_valid_full("0", IFNAME_VALID_ALTERNATIVE | IFNAME_VALID_NUMERIC));
}
static void test_socket_print_unix_one(const char *in, size_t len_in, const char *expected) {