Patch for localhost

feat: castai localhost socket support

Author: damejeras

criu/include/sk-inet.h

@@ -105,4 +105,7 @@ struct rst_tcp_sock {
 union libsoccr_addr;
 int restore_sockaddr(union libsoccr_addr *sa, int family, u32 pb_port, u32 *pb_addr, u32 ifindex);
 
+void show_one_inet_img(const char *act, const InetSkEntry *e);
+void show_one_inet(const char *act, const struct inet_sk_desc *sk);
+
 #endif /* __CR_SK_INET_H__ */

criu/sk-inet.c

@@ -85,7 +85,7 @@ static struct inet_port *port_add(struct inet_sk_info *ii, int port)
 	return e;
 }
 
-static void show_one_inet(const char *act, const struct inet_sk_desc *sk)
+void show_one_inet(const char *act, const struct inet_sk_desc *sk)
 {
 	char src_addr[INET_ADDR_LEN] = "<unknown>";
 
@@ -99,7 +99,7 @@ static void show_one_inet(const char *act, const struct inet_sk_desc *sk)
 		 ___tcp_state_name(sk->state), src_addr);
 }
 
-static void show_one_inet_img(const char *act, const InetSkEntry *e)
+void show_one_inet_img(const char *act, const InetSkEntry *e)
 {
 	char src_addr[INET_ADDR_LEN] = "<unknown>";
 

criu/sk-tcp.c

@@ -242,16 +242,21 @@ int dump_tcp_opts(int fd, TcpOptsEntry *toe)
 	return ret;
 }
 
+static bool is_localhost(uint32_t *src_addr, uint32_t *dst_addr)
+{
+	return src_addr[0] == htonl(INADDR_LOOPBACK) && dst_addr[0] == htonl(INADDR_LOOPBACK);
+}
+
 int dump_one_tcp(int fd, struct inet_sk_desc *sk, SkOptsEntry *soe)
 {
 	if (sk->dst_port == 0)
 		return 0;
 
-	if (opts.tcp_close) {
+	if (opts.tcp_close && !is_localhost(sk->src_addr, sk->dst_addr)) {
 		return 0;
 	}
 
-	pr_info("Dumping TCP connection\n");
+	show_one_inet("Dumping TCP connection", sk);
 
 	if (tcp_repair_established(fd, sk))
 		return -1;
@@ -459,15 +464,17 @@ int restore_one_tcp(int fd, struct inet_sk_info *ii)
 {
 	struct libsoccr_sk *sk;
 
-	pr_info("Restoring TCP connection\n");
+	if (opts.tcp_close && !is_localhost(ii->ie->src_addr, ii->ie->dst_addr)) {
+		show_one_inet_img("Shutdown TCP connection", ii->ie);
 
-	if (opts.tcp_close) {
 		if (shutdown(fd, SHUT_RDWR) && errno != ENOTCONN) {
 			pr_perror("Unable to shutdown the socket id %x ino %x", ii->ie->id, ii->ie->ino);
 		}
 		return 0;
 	}
 
+	show_one_inet_img("Restoring TCP connection", ii->ie);
+
 	sk = libsoccr_pause(fd);
 	if (!sk)
 		return -1;