Skip to content

C
criu
Commit 00413cb5 authored by Andrei Vagin's avatar Andrei Vagin
Browse files
Options

test: check ipv6 sockets which handle ipv4 connections 

A server socket is created with AF_INET6, but a client
socket is create with AF_INET.
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 6e770e50
Hide whitespace changes
Inline Side-by-side
Showing with 116 additions and 20 deletions
test/zdtm/static/Makefile
View file @ 00413cb5
...@@ -26,6 +26,7 @@ TST_NOFILE := \ ...@@ -26,6 +26,7 @@ TST_NOFILE := \
sched_policy00 \ sched_policy00 \
socket_listen \ socket_listen \
socket_listen6 \ socket_listen6 \
socket_listen4v6 \
socket_udp \ socket_udp \
socket6_udp \ socket6_udp \
socket_udp_shutdown \ socket_udp_shutdown \
...@@ -65,27 +66,35 @@ TST_NOFILE := \ ...@@ -65,27 +66,35 @@ TST_NOFILE := \
socket-tcp \ socket-tcp \
socket-tcp-reseted \ socket-tcp-reseted \
socket-tcp6 \ socket-tcp6 \
socket-tcp4v6 \
socket-tcp-local \ socket-tcp-local \
socket-tcp-reuseport \ socket-tcp-reuseport \
socket-tcp-nfconntrack \ socket-tcp-nfconntrack \
socket-tcp6-local \ socket-tcp6-local \
socket-tcp4v6-local \
socket-tcpbuf \ socket-tcpbuf \
socket-tcpbuf-local \ socket-tcpbuf-local \
socket-tcpbuf6-local \ socket-tcpbuf6-local \
socket-tcpbuf6 \ socket-tcpbuf6 \
socket-tcp-fin-wait1 \ socket-tcp-fin-wait1 \
socket-tcp6-fin-wait1 \ socket-tcp6-fin-wait1 \
socket-tcp4v6-fin-wait1 \
socket-tcp-fin-wait2 \ socket-tcp-fin-wait2 \
socket-tcp6-fin-wait2 \ socket-tcp6-fin-wait2 \
socket-tcp4v6-fin-wait2 \
socket-tcp-close-wait \ socket-tcp-close-wait \
socket-tcp6-close-wait \ socket-tcp6-close-wait \
socket-tcp4v6-close-wait \
socket-tcp-last-ack \ socket-tcp-last-ack \
socket-tcp6-last-ack \ socket-tcp6-last-ack \
socket-tcp4v6-last-ack \
socket-tcp-closing \ socket-tcp-closing \
socket-tcp6-closing \ socket-tcp6-closing \
socket-tcp4v6-closing \
socket-tcp-closed \ socket-tcp-closed \
socket-tcp-closed-last-ack \ socket-tcp-closed-last-ack \
socket-tcp6-closed \ socket-tcp6-closed \
socket-tcp4v6-closed \
socket-tcp-close0 \ socket-tcp-close0 \
socket-tcp-close1 \ socket-tcp-close1 \
socket-tcp-unconn \ socket-tcp-unconn \
...@@ -435,14 +444,18 @@ sem: CFLAGS += -DNEW_IPC_NS ...@@ -435,14 +444,18 @@ sem: CFLAGS += -DNEW_IPC_NS
posix_timers: LDLIBS += -lrt -pthread posix_timers: LDLIBS += -lrt -pthread
remap_dead_pid_root: CFLAGS += -DREMAP_PID_ROOT remap_dead_pid_root: CFLAGS += -DREMAP_PID_ROOT
socket-tcp6: CFLAGS += -D ZDTM_IPV6 socket-tcp6: CFLAGS += -D ZDTM_IPV6
socket-tcp4v6: CFLAGS += -D ZDTM_IPV4V6
socket-tcpbuf6: CFLAGS += -D ZDTM_IPV6 socket-tcpbuf6: CFLAGS += -D ZDTM_IPV6
socket-tcpbuf-local: CFLAGS += -D ZDTM_TCP_LOCAL socket-tcpbuf-local: CFLAGS += -D ZDTM_TCP_LOCAL
socket-tcpbuf6-local: CFLAGS += -D ZDTM_TCP_LOCAL -D ZDTM_IPV6 socket-tcpbuf6-local: CFLAGS += -D ZDTM_TCP_LOCAL -D ZDTM_IPV6
socket-tcp6-local: CFLAGS += -D ZDTM_TCP_LOCAL -D ZDTM_IPV6 socket-tcp6-local: CFLAGS += -D ZDTM_TCP_LOCAL -D ZDTM_IPV6
socket-tcp4v6-local: CFLAGS += -D ZDTM_TCP_LOCAL -D ZDTM_IPV4V6
socket-tcp-local: CFLAGS += -D ZDTM_TCP_LOCAL socket-tcp-local: CFLAGS += -D ZDTM_TCP_LOCAL
socket-tcp-nfconntrack: CFLAGS += -D ZDTM_TCP_LOCAL -DZDTM_CONNTRACK socket-tcp-nfconntrack: CFLAGS += -D ZDTM_TCP_LOCAL -DZDTM_CONNTRACK
socket_listen6: CFLAGS += -D ZDTM_IPV6 socket_listen6: CFLAGS += -D ZDTM_IPV6
socket_listen4v6: CFLAGS += -D ZDTM_IPV4V6
socket-tcp6-closed: CFLAGS += -D ZDTM_IPV6 socket-tcp6-closed: CFLAGS += -D ZDTM_IPV6
socket-tcp6-closed: CFLAGS += -D ZDTM_IPV4V6
socket-tcp-closed-last-ack: CFLAGS += -D ZDTM_TCP_LAST_ACK socket-tcp-closed-last-ack: CFLAGS += -D ZDTM_TCP_LAST_ACK
mnt_ext_manual: CFLAGS += -D ZDTM_EXTMAP_MANUAL mnt_ext_manual: CFLAGS += -D ZDTM_EXTMAP_MANUAL
sigpending: LDLIBS += -lrt sigpending: LDLIBS += -lrt
...@@ -474,12 +487,17 @@ socket-tcp-fin-wait1: CFLAGS += -D ZDTM_TCP_FIN_WAIT1 ...@@ -474,12 +487,17 @@ socket-tcp-fin-wait1: CFLAGS += -D ZDTM_TCP_FIN_WAIT1
socket-tcp-fin-wait2: CFLAGS += -D ZDTM_TCP_FIN_WAIT2 socket-tcp-fin-wait2: CFLAGS += -D ZDTM_TCP_FIN_WAIT2
socket-tcp6-fin-wait1: CFLAGS += -D ZDTM_TCP_FIN_WAIT1 -D ZDTM_IPV6 socket-tcp6-fin-wait1: CFLAGS += -D ZDTM_TCP_FIN_WAIT1 -D ZDTM_IPV6
socket-tcp6-fin-wait2: CFLAGS += -D ZDTM_TCP_FIN_WAIT2 -D ZDTM_IPV6 socket-tcp6-fin-wait2: CFLAGS += -D ZDTM_TCP_FIN_WAIT2 -D ZDTM_IPV6
socket-tcp4v6-fin-wait1: CFLAGS += -D ZDTM_TCP_FIN_WAIT1 -D ZDTM_IPV4V6
socket-tcp4v6-fin-wait2: CFLAGS += -D ZDTM_TCP_FIN_WAIT2 -D ZDTM_IPV4V6
socket-tcp-close-wait: CFLAGS += -D ZDTM_TCP_CLOSE_WAIT socket-tcp-close-wait: CFLAGS += -D ZDTM_TCP_CLOSE_WAIT
socket-tcp6-close-wait: CFLAGS += -D ZDTM_TCP_CLOSE_WAIT -D ZDTM_IPV6 socket-tcp6-close-wait: CFLAGS += -D ZDTM_TCP_CLOSE_WAIT -D ZDTM_IPV6
socket-tcp4v6-close-wait: CFLAGS += -D ZDTM_TCP_CLOSE_WAIT -D ZDTM_IPV4V6
socket-tcp-last-ack: CFLAGS += -D ZDTM_TCP_LAST_ACK socket-tcp-last-ack: CFLAGS += -D ZDTM_TCP_LAST_ACK
socket-tcp6-last-ack: CFLAGS += -D ZDTM_TCP_LAST_ACK -D ZDTM_IPV6 socket-tcp6-last-ack: CFLAGS += -D ZDTM_TCP_LAST_ACK -D ZDTM_IPV6
socket-tcp6-closing: CFLAGS += -D ZDTM_IPV6 socket-tcp6-closing: CFLAGS += -D ZDTM_IPV6
socket-tcp6-unconn: CFLAGS += -D ZDTM_IPV6 socket-tcp6-unconn: CFLAGS += -D ZDTM_IPV6
socket-tcp4v6-last-ack: CFLAGS += -D ZDTM_TCP_LAST_ACK -D ZDTM_IPV4V6
socket-tcp4v6-closing: CFLAGS += -D ZDTM_IPV4V6
pty-console: CFLAGS += -D ZDTM_DEV_CONSOLE pty-console: CFLAGS += -D ZDTM_DEV_CONSOLE
......
test/zdtm/static/socket-tcp-close-wait.c
View file @ 00413cb5
#include "zdtmtst.h" #include "zdtmtst.h"
#ifdef ZDTM_IPV6 #ifdef ZDTM_IPV4V6
#define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET6
#elif defined(ZDTM_IPV6)
#define ZDTM_FAMILY AF_INET6 #define ZDTM_FAMILY AF_INET6
#define ZDTM_SRV_FAMILY AF_INET6
#else #else
#define ZDTM_FAMILY AF_INET #define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET
#endif #endif
const char *test_doc = "Check sockets in TCP_WAIT_STOP and TCP_LAST_ACK states\n"; const char *test_doc = "Check sockets in TCP_WAIT_STOP and TCP_LAST_ACK states\n";
...@@ -186,7 +191,7 @@ int main(int argc, char **argv) ...@@ -186,7 +191,7 @@ int main(int argc, char **argv)
if (!newns) if (!newns)
test_init(argc, argv); test_init(argc, argv);
if ((fd_s = tcp_init_server(ZDTM_FAMILY, &port)) < 0) { if ((fd_s = tcp_init_server(ZDTM_SRV_FAMILY, &port)) < 0) {
pr_err("initializing server failed"); pr_err("initializing server failed");
return 1; return 1;
} }
......
test/zdtm/static/socket-tcp-closed.c
View file @ 00413cb5
#include "zdtmtst.h" #include "zdtmtst.h"
#ifdef ZDTM_IPV6 #ifdef ZDTM_IPV4V6
#define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET6
#elif defined(ZDTM_IPV6)
#define ZDTM_FAMILY AF_INET6 #define ZDTM_FAMILY AF_INET6
#define ZDTM_SRV_FAMILY AF_INET6
#else #else
#define ZDTM_FAMILY AF_INET #define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET
#endif #endif
const char *test_doc = "Check closed tcp sockets\n"; const char *test_doc = "Check closed tcp sockets\n";
...@@ -45,7 +50,7 @@ int main(int argc, char **argv) ...@@ -45,7 +50,7 @@ int main(int argc, char **argv)
return 1; return 1;
} }
if ((fd_s = tcp_init_server(ZDTM_FAMILY, &port)) < 0) { if ((fd_s = tcp_init_server(ZDTM_SRV_FAMILY, &port)) < 0) {
pr_err("initializing server failed\n"); pr_err("initializing server failed\n");
return 1; return 1;
} }
......
test/zdtm/static/socket-tcp-closing.c
View file @ 00413cb5
#include "zdtmtst.h" #include "zdtmtst.h"
#ifdef ZDTM_IPV6 #ifdef ZDTM_IPV4V6
#define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET6
#elif defined(ZDTM_IPV6)
#define ZDTM_FAMILY AF_INET6 #define ZDTM_FAMILY AF_INET6
#define ZDTM_SRV_FAMILY AF_INET6
#else #else
#define ZDTM_FAMILY AF_INET #define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET
#endif #endif
const char *test_doc = "Check sockets in the TCP_CLOSING state\n"; const char *test_doc = "Check sockets in the TCP_CLOSING state\n";
...@@ -160,7 +165,7 @@ int main(int argc, char **argv) ...@@ -160,7 +165,7 @@ int main(int argc, char **argv)
if (!newns) if (!newns)
test_init(argc, argv); test_init(argc, argv);
if ((fd_s = tcp_init_server(ZDTM_FAMILY, &port)) < 0) { if ((fd_s = tcp_init_server(ZDTM_SRV_FAMILY, &port)) < 0) {
pr_err("initializing server failed"); pr_err("initializing server failed");
return 1; return 1;
} }
......
test/zdtm/static/socket-tcp-fin-wait1.c
View file @ 00413cb5
#include "zdtmtst.h" #include "zdtmtst.h"
#ifdef ZDTM_IPV6 #ifdef ZDTM_IPV4V6
#define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET6
#elif defined(ZDTM_IPV6)
#define ZDTM_FAMILY AF_INET6 #define ZDTM_FAMILY AF_INET6
#define ZDTM_SRV_FAMILY AF_INET6
#else #else
#define ZDTM_FAMILY AF_INET #define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET
#endif #endif
const char *test_doc = "Check sockets in TCP_FIN_WAIT* states\n"; const char *test_doc = "Check sockets in TCP_FIN_WAIT* states\n";
...@@ -159,7 +164,7 @@ int main(int argc, char **argv) ...@@ -159,7 +164,7 @@ int main(int argc, char **argv)
if (!newns) if (!newns)
test_init(argc, argv); test_init(argc, argv);
if ((fd_s = tcp_init_server(ZDTM_FAMILY, &port)) < 0) { if ((fd_s = tcp_init_server(ZDTM_SRV_FAMILY, &port)) < 0) {
pr_err("initializing server failed"); pr_err("initializing server failed");
return 1; return 1;
} }
......
test/zdtm/static/socket-tcp-last-ack.desc
View file @ 00413cb5
{'flavor': 'h', 'opts': '--tcp-established', 'flags': 'nouser samens', 'feature' : 'tcp_half_closed'} {'flavor': 'h ns uns', 'opts': '--tcp-established', 'flags': 'nouser samens', 'feature' : 'tcp_half_closed'}
test/zdtm/static/socket-tcp-reseted.c
View file @ 00413cb5
...@@ -6,11 +6,15 @@ ...@@ -6,11 +6,15 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/wait.h> #include <sys/wait.h>
#ifdef ZDTM_IPV4V6
#ifdef ZDTM_IPV6 #define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET6
#elif defined(ZDTM_IPV6)
#define ZDTM_FAMILY AF_INET6 #define ZDTM_FAMILY AF_INET6
#define ZDTM_SRV_FAMILY AF_INET6
#else #else
#define ZDTM_FAMILY AF_INET #define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET
#endif #endif
const char *test_doc = "Check, that a reseted TCP connection can be restored\n"; const char *test_doc = "Check, that a reseted TCP connection can be restored\n";
...@@ -35,7 +39,7 @@ int main(int argc, char **argv) ...@@ -35,7 +39,7 @@ int main(int argc, char **argv)
test_init(argc, argv); test_init(argc, argv);
if ((fd_s = tcp_init_server(ZDTM_FAMILY, &port)) < 0) { if ((fd_s = tcp_init_server(ZDTM_SRV_FAMILY, &port)) < 0) {
pr_err("initializing server failed\n"); pr_err("initializing server failed\n");
return 1; return 1;
} }
......
test/zdtm/static/socket-tcp-syn-sent.c
View file @ 00413cb5
#include "zdtmtst.h" #include "zdtmtst.h"
#ifdef ZDTM_IPV6 #ifdef ZDTM_IPV4V6
#define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET6
#elif defined(ZDTM_IPV6)
#define ZDTM_FAMILY AF_INET6 #define ZDTM_FAMILY AF_INET6
#define ZDTM_SRV_FAMILY AF_INET6
#else #else
#define ZDTM_FAMILY AF_INET #define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET
#endif #endif
const char *test_doc = "Check unconnected tcp sockets\n"; const char *test_doc = "Check unconnected tcp sockets\n";
...@@ -42,7 +47,7 @@ int main(int argc, char **argv) ...@@ -42,7 +47,7 @@ int main(int argc, char **argv)
return 1; return 1;
} }
if ((fd_s = tcp_init_server(ZDTM_FAMILY, &port)) < 0) { if ((fd_s = tcp_init_server(ZDTM_SRV_FAMILY, &port)) < 0) {
pr_err("initializing server failed\n"); pr_err("initializing server failed\n");
return 1; return 1;
} }
......
test/zdtm/static/socket-tcp-unconn.c
View file @ 00413cb5
#include "zdtmtst.h" #include "zdtmtst.h"
#ifdef ZDTM_IPV6 #ifdef ZDTM_IPV4V6
#define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET6
#elif defined(ZDTM_IPV6)
#define ZDTM_FAMILY AF_INET6 #define ZDTM_FAMILY AF_INET6
#define ZDTM_SRV_FAMILY AF_INET6
#else #else
#define ZDTM_FAMILY AF_INET #define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET
#endif #endif
const char *test_doc = "Check unconnected tcp sockets\n"; const char *test_doc = "Check unconnected tcp sockets\n";
...@@ -41,7 +46,7 @@ int main(int argc, char **argv) ...@@ -41,7 +46,7 @@ int main(int argc, char **argv)
return 1; return 1;
} }
if ((fd_s = tcp_init_server(ZDTM_FAMILY, &port)) < 0) { if ((fd_s = tcp_init_server(ZDTM_SRV_FAMILY, &port)) < 0) {
pr_err("initializing server failed\n"); pr_err("initializing server failed\n");
return 1; return 1;
} }
......
test/zdtm/static/socket-tcp.c
View file @ 00413cb5
#include "zdtmtst.h" #include "zdtmtst.h"
#ifdef ZDTM_IPV6 #ifdef ZDTM_IPV4V6
#define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET6
#elif defined(ZDTM_IPV6)
#define ZDTM_FAMILY AF_INET6 #define ZDTM_FAMILY AF_INET6
#define ZDTM_SRV_FAMILY AF_INET6
#else #else
#define ZDTM_FAMILY AF_INET #define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET
#endif #endif
const char *test_doc = "Check, that a TCP connection can be restored\n"; const char *test_doc = "Check, that a TCP connection can be restored\n";
...@@ -135,7 +140,7 @@ int main(int argc, char **argv) ...@@ -135,7 +140,7 @@ int main(int argc, char **argv)
test_init(argc, argv); test_init(argc, argv);
#endif #endif
if ((fd_s = tcp_init_server(ZDTM_FAMILY, &port)) < 0) { if ((fd_s = tcp_init_server(ZDTM_SRV_FAMILY, &port)) < 0) {
pr_err("initializing server failed\n"); pr_err("initializing server failed\n");
return 1; return 1;
} }
......
test/zdtm/static/socket-tcp4v6-close-wait.c 0 → 120000
View file @ 00413cb5
socket-tcp-close-wait.c
\ No newline at end of file
test/zdtm/static/socket-tcp4v6-close-wait.desc 0 → 120000
View file @ 00413cb5
socket-tcp6-close-wait.desc
\ No newline at end of file
test/zdtm/static/socket-tcp4v6-closed.c 0 → 120000
View file @ 00413cb5
socket-tcp-closed.c
\ No newline at end of file
test/zdtm/static/socket-tcp4v6-closed.desc 0 → 120000
View file @ 00413cb5
socket-tcp6-closed.desc
\ No newline at end of file
test/zdtm/static/socket-tcp4v6-closing.c 0 → 120000
View file @ 00413cb5
socket-tcp-closing.c
\ No newline at end of file
test/zdtm/static/socket-tcp4v6-closing.desc 0 → 120000
View file @ 00413cb5
socket-tcp6-closing.desc
\ No newline at end of file
test/zdtm/static/socket-tcp4v6-fin-wait1.c 0 → 120000
View file @ 00413cb5
socket-tcp-fin-wait1.c
\ No newline at end of file
test/zdtm/static/socket-tcp4v6-fin-wait1.desc 0 → 120000
View file @ 00413cb5
socket-tcp6-fin-wait1.desc
\ No newline at end of file
test/zdtm/static/socket-tcp4v6-fin-wait2.c 0 → 120000
View file @ 00413cb5
socket-tcp-fin-wait2.c
\ No newline at end of file
test/zdtm/static/socket-tcp4v6-fin-wait2.desc 0 → 120000
View file @ 00413cb5
socket-tcp6-fin-wait2.desc
\ No newline at end of file
test/zdtm/static/socket-tcp4v6-last-ack.c 0 → 120000
View file @ 00413cb5
socket-tcp-last-ack.c
\ No newline at end of file
test/zdtm/static/socket-tcp4v6-last-ack.desc 0 → 120000
View file @ 00413cb5
socket-tcp6-last-ack.desc
\ No newline at end of file
test/zdtm/static/socket-tcp4v6-local.c 0 → 120000
View file @ 00413cb5
socket-tcp.c
\ No newline at end of file
test/zdtm/static/socket-tcp4v6-local.desc 0 → 120000
View file @ 00413cb5
socket-tcp6-local.desc
\ No newline at end of file
test/zdtm/static/socket-tcp4v6.c 0 → 120000
View file @ 00413cb5
socket-tcp.c
\ No newline at end of file
test/zdtm/static/socket-tcp4v6.desc 0 → 120000
View file @ 00413cb5
socket-tcp6.desc
\ No newline at end of file
test/zdtm/static/socket_listen.c
View file @ 00413cb5
#include "zdtmtst.h" #include "zdtmtst.h"
#ifdef ZDTM_IPV6 #ifdef ZDTM_IPV4V6
#define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET6
#elif defined(ZDTM_IPV6)
#define ZDTM_FAMILY AF_INET6 #define ZDTM_FAMILY AF_INET6
#define ZDTM_SRV_FAMILY AF_INET6
#else #else
#define ZDTM_FAMILY AF_INET #define ZDTM_FAMILY AF_INET
#define ZDTM_SRV_FAMILY AF_INET
#endif #endif
const char *test_doc = "static test for listening socket\n"; const char *test_doc = "static test for listening socket\n";
...@@ -43,7 +48,7 @@ int main(int argc, char **argv) ...@@ -43,7 +48,7 @@ int main(int argc, char **argv)
test_init(argc, argv); test_init(argc, argv);
if ((fd_s = tcp_init_server(ZDTM_FAMILY, &port)) < 0) { if ((fd_s = tcp_init_server(ZDTM_SRV_FAMILY, &port)) < 0) {
pr_err("initializing server failed\n"); pr_err("initializing server failed\n");
return 1; return 1;
} }
......
test/zdtm/static/socket_listen4v6.c 0 → 120000
View file @ 00413cb5
socket_listen.c
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment