From 6488a9a76f63557f9388d0f30edab268c1431249 Mon Sep 17 00:00:00 2001 From: Evgeny Zinoviev Date: Tue, 8 Dec 2020 14:02:16 +0300 Subject: test: replace tabs with spaces --- test/testclient.c | 42 ++++++++++---------- test/testserver.c | 116 +++++++++++++++++++++++++++--------------------------- 2 files changed, 79 insertions(+), 79 deletions(-) (limited to 'test') diff --git a/test/testclient.c b/test/testclient.c index 19db1c1..9bfdb3e 100644 --- a/test/testclient.c +++ b/test/testclient.c @@ -9,36 +9,36 @@ #include "utils.h" #define ERROR_EXIT(f_, ...) { \ - fprintf(stderr, (f_), ##__VA_ARGS__); \ - return 1; \ - } + fprintf(stderr, (f_), ##__VA_ARGS__); \ + return 1; \ + } int main() { - struct sockaddr_un addr = {0}; - int sock; + struct sockaddr_un addr = {0}; + int sock; - // Create and connect a unix domain socket - sock = socket(AF_UNIX, SOCK_STREAM, 0); - if (sock == -1) - ERROR_EXIT("socket: %s\n", strerror(errno)); + // Create and connect a unix domain socket + sock = socket(AF_UNIX, SOCK_STREAM, 0); + if (sock == -1) + ERROR_EXIT("socket: %s\n", strerror(errno)); - addr.sun_family = AF_UNIX; - strcpy(&addr.sun_path[1], "/tmp/voidnsrun-test.sock"); + addr.sun_family = AF_UNIX; + strcpy(&addr.sun_path[1], "/tmp/voidnsrun-test.sock"); - if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == -1) - ERROR_EXIT("connect: %s\n", strerror(errno)); + if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == -1) + ERROR_EXIT("connect: %s\n", strerror(errno)); - int fd = recv_fd(sock); - close(sock); + int fd = recv_fd(sock); + close(sock); - assert(fd != 0); + assert(fd != 0); - struct stat st; - if (fstat(fd, &st) == -1) - ERROR_EXIT("stat: %s\n", strerror(errno)); + struct stat st; + if (fstat(fd, &st) == -1) + ERROR_EXIT("stat: %s\n", strerror(errno)); - printf("st_ino: %lu\n", st.st_ino); + printf("st_ino: %lu\n", st.st_ino); - return 0; + return 0; } \ No newline at end of file diff --git a/test/testserver.c b/test/testserver.c index 091d580..c8052f4 100644 --- a/test/testserver.c +++ b/test/testserver.c @@ -13,84 +13,84 @@ #define ERROR(f_, ...) fprintf(stderr, (f_), ##__VA_ARGS__) #define UNUSED(x) (void)(x) #define ERROR_EXIT(f_, ...) { \ - fprintf(stderr, (f_), ##__VA_ARGS__); \ - return 1; \ - } + fprintf(stderr, (f_), ##__VA_ARGS__); \ + return 1; \ + } volatile sig_atomic_t term_caught = 0; void onterm(int sig) { - printf("sigterm caught\n"); - UNUSED(sig); - term_caught = 1; + printf("sigterm caught\n"); + UNUSED(sig); + term_caught = 1; } int main() { - int result; - int sock_fd, sock_conn; - int nsfd; + int result; + int sock_fd, sock_conn; + int nsfd; - /* Get current namespace's file descriptor. */ - nsfd = open("/proc/self/ns/mnt", O_RDONLY); - if (nsfd == -1) - ERROR_EXIT("error: failed to acquire mount namespace's fd.%s\n", - strerror(errno)); + /* Get current namespace's file descriptor. */ + nsfd = open("/proc/self/ns/mnt", O_RDONLY); + if (nsfd == -1) + ERROR_EXIT("error: failed to acquire mount namespace's fd.%s\n", + strerror(errno)); - /* Fork. */ - pid_t ppid_before_fork = getpid(); - pid_t pid = fork(); - if (pid == -1) - ERROR_EXIT("fork: %s\n", strerror(errno)); + /* Fork. */ + pid_t ppid_before_fork = getpid(); + pid_t pid = fork(); + if (pid == -1) + ERROR_EXIT("fork: %s\n", strerror(errno)); - if (pid == 0) { - /* Catch SIGTERM. */ - struct sigaction sa = {0}; - sa.sa_handler = onterm; - sigaction(SIGTERM, &sa, NULL); + if (pid == 0) { + /* Catch SIGTERM. */ + struct sigaction sa = {0}; + sa.sa_handler = onterm; + sigaction(SIGTERM, &sa, NULL); /* Ignore SIGINT. */ signal(SIGINT, SIG_IGN); - /* Set the child to die when parent thread dies. */ - int r = prctl(PR_SET_PDEATHSIG, SIGTERM); - if (r == -1) - ERROR_EXIT("prctl: %s\n", strerror(errno)); - if (getppid() != ppid_before_fork) - ERROR_EXIT("error: parent has died already.\n"); + /* Set the child to die when parent thread dies. */ + int r = prctl(PR_SET_PDEATHSIG, SIGTERM); + if (r == -1) + ERROR_EXIT("prctl: %s\n", strerror(errno)); + if (getppid() != ppid_before_fork) + ERROR_EXIT("error: parent has died already.\n"); - /* Create unix socket. */ - sock_fd = socket(AF_UNIX, SOCK_STREAM, 0); - if (sock_fd == -1) - ERROR_EXIT("socket: %s.\n", strerror(errno)); + /* Create unix socket. */ + sock_fd = socket(AF_UNIX, SOCK_STREAM, 0); + if (sock_fd == -1) + ERROR_EXIT("socket: %s.\n", strerror(errno)); - struct sockaddr_un sock_addr = {0}; - sock_addr.sun_family = AF_UNIX; - strcpy(&sock_addr.sun_path[1], "/tmp/voidnsrun-test.sock"); + struct sockaddr_un sock_addr = {0}; + sock_addr.sun_family = AF_UNIX; + strcpy(&sock_addr.sun_path[1], "/tmp/voidnsrun-test.sock"); - if (bind(sock_fd, (struct sockaddr *)&sock_addr, sizeof(sock_addr)) == -1) - ERROR_EXIT("bind: %s\n", strerror(errno)); + if (bind(sock_fd, (struct sockaddr *)&sock_addr, sizeof(sock_addr)) == -1) + ERROR_EXIT("bind: %s\n", strerror(errno)); - listen(sock_fd, 1); + listen(sock_fd, 1); - while (!term_caught) { - sock_conn = accept(sock_fd, NULL, 0); - if (sock_conn == -1) { - ERROR("accept: %s\n", strerror(errno)); - continue; - } - printf("accepted\n"); - send_fd(sock_conn, nsfd); - } - printf("exiting\n"); - } else { - /* This is parent. Launch a program. */ - char *argv[2] = {"/bin/sh", NULL}; + while (!term_caught) { + sock_conn = accept(sock_fd, NULL, 0); + if (sock_conn == -1) { + ERROR("accept: %s\n", strerror(errno)); + continue; + } + printf("accepted\n"); + send_fd(sock_conn, nsfd); + } + printf("exiting\n"); + } else { + /* This is parent. Launch a program. */ + char *argv[2] = {"/bin/sh", NULL}; - result = execvp(argv[0], (char *const *)argv); - if (result == -1) - ERROR_EXIT("execvp: %s\n", strerror(errno)); - } + result = execvp(argv[0], (char *const *)argv); + if (result == -1) + ERROR_EXIT("execvp: %s\n", strerror(errno)); + } - return 0; + return 0; } \ No newline at end of file -- cgit v1.2.3