Skip to content

Commit

Permalink
bpf, selftests: use :: 1 for localhost in tcp_server.py
Browse files Browse the repository at this point in the history
Using localhost requires the host to have a /etc/hosts file with that
specific line in it. By default my dev box did not, they used
ip6-localhost, so the test was failing. To fix remove the need for any
/etc/hosts and use ::1.

I could just add the line, but this seems easier.

Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Song Liu <songliubraving@fb.com>
Acked-by: Andrii Nakryiko <andriin@fb.com>
Link: https://lore.kernel.org/bpf/159594714197.21431.10113693935099326445.stgit@john-Precision-5820-Tower
  • Loading branch information
John Fastabend authored and Daniel Borkmann committed Jul 28, 2020
1 parent 3c4f850 commit ca5cd35
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion tools/testing/selftests/bpf/tcp_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def send(sock, s):
# create active socket
sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
try:
sock.connect(('localhost', serverPort))
sock.connect(('::1', serverPort))
except socket.error as e:
sys.exit(1)

Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/bpf/tcp_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def send(sock, s):
# create passive socket
serverSocket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)

try: serverSocket.bind(('localhost', 0))
try: serverSocket.bind(('::1', 0))
except socket.error as msg:
print('bind fails: ' + str(msg))

Expand Down
4 changes: 2 additions & 2 deletions tools/testing/selftests/bpf/test_netcnt.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ int main(int argc, char **argv)
}

if (system("which ping6 &>/dev/null") == 0)
assert(!system("ping6 localhost -c 10000 -f -q > /dev/null"));
assert(!system("ping6 ::1 -c 10000 -f -q > /dev/null"));
else
assert(!system("ping -6 localhost -c 10000 -f -q > /dev/null"));
assert(!system("ping -6 ::1 -c 10000 -f -q > /dev/null"));

if (bpf_prog_query(cgroup_fd, BPF_CGROUP_INET_EGRESS, 0, NULL, NULL,
&prog_cnt)) {
Expand Down

0 comments on commit ca5cd35

Please sign in to comment.