tools: labs: Update setup for QEMU image and Linux kernel 4.15 for networking lab

tools/labs/templates/networking/1-2-netfilter/user/test-1.sh

@@ -6,17 +6,17 @@
 #
 
 # insert module
-insmod filter.ko || exit 1
+insmod ../kernel/filter.ko || exit 1
 
 # listen for connections on localhost, port 60000 (run in background)
-nc -l -p 60000 &
+../../netcat -l -p 60000 &
 
 # wait for netcat to start listening
 sleep 1
 
 # connect to localhost, port 60000, starting a connection using local
 # port number 600001;
-echo "Should show up in filter." | nc 127.0.0.1 60000
+echo "Should show up in filter." | ../../netcat -q 2 127.0.0.1 60000
 
 # look for filter message in dmesg output
 echo "Check dmesg output."

tools/labs/templates/networking/1-2-netfilter/user/test-2.sh

@@ -6,33 +6,33 @@
 #
 
 # insert module
-insmod filter.ko || exit 1
+insmod ../kernel/filter.ko || exit 1
 
 # set filter IP address to 127.0.0.1
 ./test 127.0.0.1
 
 # listen for connections on localhost, port 60000 (run in background)
-nc -l -p 60000 &
+../../netcat -l -p 60000 &
 
 # wait for netcat to start listening
 sleep 1
 
 # connect to localhost, port 60000, starting a connection using local
 # port number 600001;
-echo "Should show up in filter." | nc 127.0.0.1 60000
+echo "Should show up in filter." | ../../netcat -q 2 127.0.0.1 60000
 
 # set filter IP address to 127.0.0.2
 ./test 127.0.0.2
 
 # listen for connections on localhost, port 60000 (run in background)
-nc -l -p 60000 &
+../../netcat -l -p 60000 &
 
 # wait for netcat to start listening
 sleep 1
 
 # connect to localhost, port 60000, starting a connection using local
 # port number 600001;
-echo "Should NOT show up in filter." | nc 127.0.0.1 60000
+echo "Should NOT show up in filter." | ../../netcat -q 2 127.0.0.1 60000
 
 # look for filter message in dmesg output
 echo "Check dmesg output."

tools/labs/templates/networking/3-4-tcp-sock/tcp_sock.c

@@ -82,12 +82,13 @@ int __init my_tcp_sock_init(void)
 		goto out_release;
 	}
 
-	/* TODO 2/5: create new socket for the accepted connection */
-	err = sock_create_kern(&init_net, PF_INET, SOCK_STREAM, IPPROTO_TCP, &new_sock);
+	/* TODO 2/6: create new socket for the accepted connection */
+	err = sock_create_lite(PF_INET, SOCK_STREAM, IPPROTO_TCP, &new_sock);
 	if (err < 0) {
 		printk(LOG_LEVEL "can't create new socket\n");
 		goto out;
 	}
+	new_sock->ops = sock->ops;
 
 	/* TODO 2/5: accept a connection */
 	err = sock->ops->accept(sock, new_sock, 0, true);
@@ -96,13 +97,14 @@ int __init my_tcp_sock_init(void)
 		goto out_release_new_sock;
 	}
 
-	/* TODO 2/6: get the address of the peer and print it */
+	/* TODO 2/7: get the address of the peer and print it */
 	err = sock->ops->getname(new_sock, (struct sockaddr *) &raddr,
 			&raddrlen, 1);
 	if (err < 0) {
 		printk(LOG_LEVEL "can't find peer name\n");
 		goto out_release_new_sock;
 	}
+	print_sock_address(raddr);
 
 	return 0;
 

tools/labs/templates/networking/3-4-tcp-sock/test-4.sh

@@ -19,7 +19,7 @@ netstat -tuan
 
 # connect to localhost, port 60000, starting a connection using local
 # port number 600001;
-echo "Should connect." | nc 127.0.0.1 60000 -p 60001 &
+echo "Should connect." | ../netcat -q 4 127.0.0.1 60000 -p 60001 &
 
 # wait for connection to be established then remove module
 # (and close connection)

tools/labs/templates/networking/5-udp-sock/test-5.sh

@@ -8,7 +8,7 @@
 set -x
 
 # listen for UDP packets on localhost, port 60001 (run in background)
-nc -l -u -p 60001 &
+../../netcat -l -u -p 60001 &
 
 # get pid of netcat
 pid=$!