selftests: Add options to set network namespace to nettest
Add options to specify server and client network namespace to use before running respective functions. Signed-off-by: Seth David Schoen <schoen@loyalty.org> Signed-off-by: David Ahern <dsahern@gmail.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
parent
f2f575840a
commit
092e0ceb12
@ -9,6 +9,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/wait.h>
|
||||
#include <linux/tcp.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <net/if.h>
|
||||
@ -17,6 +18,7 @@
|
||||
#include <fcntl.h>
|
||||
#include <libgen.h>
|
||||
#include <limits.h>
|
||||
#include <sched.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@ -34,6 +36,8 @@
|
||||
|
||||
#define DEFAULT_PORT 12345
|
||||
|
||||
#define NS_PREFIX "/run/netns/"
|
||||
|
||||
#ifndef MAX
|
||||
#define MAX(a, b) ((a) > (b) ? (a) : (b))
|
||||
#endif
|
||||
@ -77,6 +81,9 @@ struct sock_args {
|
||||
const char *dev;
|
||||
int ifindex;
|
||||
|
||||
const char *clientns;
|
||||
const char *serverns;
|
||||
|
||||
const char *password;
|
||||
/* prefix for MD5 password */
|
||||
const char *md5_prefix_str;
|
||||
@ -213,6 +220,27 @@ static void log_address(const char *desc, struct sockaddr *sa)
|
||||
fflush(stdout);
|
||||
}
|
||||
|
||||
static int switch_ns(const char *ns)
|
||||
{
|
||||
char path[PATH_MAX];
|
||||
int fd, ret;
|
||||
|
||||
if (geteuid())
|
||||
log_error("warning: likely need root to set netns %s!\n", ns);
|
||||
|
||||
snprintf(path, sizeof(path), "%s%s", NS_PREFIX, ns);
|
||||
fd = open(path, 0);
|
||||
if (fd < 0) {
|
||||
log_err_errno("Failed to open netns path; can not switch netns");
|
||||
return 1;
|
||||
}
|
||||
|
||||
ret = setns(fd, CLONE_NEWNET);
|
||||
close(fd);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int tcp_md5sig(int sd, void *addr, socklen_t alen, struct sock_args *args)
|
||||
{
|
||||
int keylen = strlen(args->password);
|
||||
@ -1377,6 +1405,15 @@ static int do_server(struct sock_args *args)
|
||||
fd_set rfds;
|
||||
int rc;
|
||||
|
||||
if (args->serverns) {
|
||||
if (switch_ns(args->serverns)) {
|
||||
log_error("Could not set server netns to %s\n",
|
||||
args->serverns);
|
||||
return 1;
|
||||
}
|
||||
log_msg("Switched server netns\n");
|
||||
}
|
||||
|
||||
if (resolve_devices(args) || validate_addresses(args))
|
||||
return 1;
|
||||
|
||||
@ -1565,6 +1602,15 @@ static int do_client(struct sock_args *args)
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (args->clientns) {
|
||||
if (switch_ns(args->clientns)) {
|
||||
log_error("Could not set client netns to %s\n",
|
||||
args->clientns);
|
||||
return 1;
|
||||
}
|
||||
log_msg("Switched client netns\n");
|
||||
}
|
||||
|
||||
if (resolve_devices(args) || validate_addresses(args))
|
||||
return 1;
|
||||
|
||||
@ -1642,7 +1688,7 @@ static char *random_msg(int len)
|
||||
return m;
|
||||
}
|
||||
|
||||
#define GETOPT_STR "sr:l:p:t:g:P:DRn:M:m:d:SCi6L:0:1:2:Fbq"
|
||||
#define GETOPT_STR "sr:l:p:t:g:P:DRn:M:m:d:N:O:SCi6L:0:1:2:Fbq"
|
||||
|
||||
static void print_usage(char *prog)
|
||||
{
|
||||
@ -1656,6 +1702,8 @@ static void print_usage(char *prog)
|
||||
" -t timeout seconds (default: none)\n"
|
||||
"\n"
|
||||
"Optional:\n"
|
||||
" -N ns set client to network namespace ns (requires root)\n"
|
||||
" -O ns set server to network namespace ns (requires root)\n"
|
||||
" -F Restart server loop\n"
|
||||
" -6 IPv6 (default is IPv4)\n"
|
||||
" -P proto protocol for socket: icmp, ospf (default: none)\n"
|
||||
@ -1757,6 +1805,12 @@ int main(int argc, char *argv[])
|
||||
case 'n':
|
||||
iter = atoi(optarg);
|
||||
break;
|
||||
case 'N':
|
||||
args.clientns = optarg;
|
||||
break;
|
||||
case 'O':
|
||||
args.serverns = optarg;
|
||||
break;
|
||||
case 'L':
|
||||
msg = random_msg(atoi(optarg));
|
||||
break;
|
||||
|
Loading…
x
Reference in New Issue
Block a user