diff options
author | Enji Cooper <ngie@FreeBSD.org> | 2016-01-15 21:59:18 +0000 |
---|---|---|
committer | Enji Cooper <ngie@FreeBSD.org> | 2016-01-15 21:59:18 +0000 |
commit | 0e47853e879d675cdbabcd2ae67192469efa75ee (patch) | |
tree | 776d0417d2a1e16d257b977f882d9babb15aff84 /tools/regression | |
parent | 9516209bf2e1aa84e72e7337cbdd7f2145d3d0b5 (diff) | |
download | src-0e47853e879d675cdbabcd2ae67192469efa75ee.tar.gz src-0e47853e879d675cdbabcd2ae67192469efa75ee.zip |
- Check for accf_filter before running the tests, otherwise it will always
fail at subtest 9/11
- Use strncpy instead of strcpy with afa.af_name
Notes
Notes:
svn path=/head/; revision=294103
Diffstat (limited to 'tools/regression')
-rw-r--r-- | tools/regression/sockets/accf_data_attach/accf_data_attach.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tools/regression/sockets/accf_data_attach/accf_data_attach.c b/tools/regression/sockets/accf_data_attach/accf_data_attach.c index 59ea68cceba6..bfcda1a03349 100644 --- a/tools/regression/sockets/accf_data_attach/accf_data_attach.c +++ b/tools/regression/sockets/accf_data_attach/accf_data_attach.c @@ -27,6 +27,7 @@ */ #include <sys/types.h> +#include <sys/module.h> #include <sys/socket.h> #include <netinet/in.h> @@ -65,6 +66,16 @@ main(void) socklen_t len; int lso, ret; + /* XXX: PLAIN_TEST_REQUIRE_MODULE "backport" for stable/9 */ + const char *_mod_name = "accf_data"; + + if (modfind(_mod_name) == -1) { + printf("1..0 # SKIP - module %s could not be resolved: %s\n", + _mod_name, strerror(errno)); + _exit(0); + } + /* XXX: PLAIN_TEST_REQUIRE_MODULE for stable/9 */ + printf("1..11\n"); /* @@ -119,7 +130,7 @@ main(void) * yet a listen() socket. */ bzero(&afa, sizeof(afa)); - strcpy(afa.af_name, ACCF_NAME); + strncpy(afa.af_name, ACCF_NAME, sizeof(afa.af_name)); ret = setsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, sizeof(afa)); if (ret == 0) errx(-1, "not ok 5 - setsockopt() before listen() succeeded"); @@ -164,7 +175,7 @@ main(void) * Step 8: After listen(). This call to setsockopt() should succeed. */ bzero(&afa, sizeof(afa)); - strcpy(afa.af_name, ACCF_NAME); + strncpy(afa.af_name, ACCF_NAME, sizeof(afa.af_name)); ret = setsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, sizeof(afa)); if (ret != 0) errx(-1, "not ok 9 - setsockopt() after listen() failed with %d " |