sock: Add udp-lite sockets support

This is trivial. Just copy-n-paste pieces from the udp dumping
and restoring code. The zdtm test is also a compy of the _udp
test with respecitve changes.

Reuired for httpd, this one uses udplite sockets.
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

sockets.c

@@ -528,6 +528,11 @@ static int inet_udp_receive_one(struct nlmsghdr *h)
 	return inet_collect_one(h, SOCK_DGRAM, IPPROTO_UDP);
 }
 
+static int inet_udplite_receive_one(struct nlmsghdr *h)
+{
+	return inet_collect_one(h, SOCK_DGRAM, IPPROTO_UDPLITE);
+}
+
 static int unix_collect_one(const struct unix_diag_msg *m,
 		struct rtattr **tb)
 {
@@ -782,6 +787,15 @@ int collect_sockets(void)
 	if (tmp)
 		err = tmp;
 
+	/* Collect IPv4 UDP-lite sockets */
+	req.r.i.sdiag_family	= AF_INET;
+	req.r.i.sdiag_protocol	= IPPROTO_UDPLITE;
+	req.r.i.idiag_ext	= 0;
+	req.r.i.idiag_states	= -1; /* All */
+	tmp = collect_sockets_nl(nl, &req, sizeof(req), inet_udplite_receive_one);
+	if (tmp)
+		err = tmp;
+
 out:
 	close(nl);
 	return err;
@@ -991,7 +1005,7 @@ static int open_inet_sk(struct file_desc *d)
 	}
 
 	if (ii->ie.state == TCP_ESTABLISHED) {
-		if (ii->ie.proto != IPPROTO_UDP) {
+		if (ii->ie.proto == IPPROTO_TCP) {
 			pr_err("Connected TCP socket in image\n");
 			goto err;
 		}
@@ -1046,6 +1060,8 @@ static inline char *skproto2s(u32 p)
 {
 	if (p == IPPROTO_UDP)
 		return "udp";
+	else if (p == IPPROTO_UDPLITE)
+		return "udpl";
 	else if (p == IPPROTO_TCP)
 		return "tcp";
 	else

test/zdtm.sh

@@ -35,6 +35,7 @@ static/caps00
 static/cmdlinenv00
 static/socket_listen
 static/socket_udp
+static/socket_udplite
 static/selfexe00
 static/file_fown
 "

test/zdtm/live/static/Makefile

@@ -20,6 +20,7 @@ TST_NOFILE	=				\
 		unbound_sock			\
 		socket_listen			\
 		socket_udp			\
+		socket_udplite			\
 		socket_aio			\
 		msgque				\
 		inotify_system			\

test/zdtm/live/static/socket_udplite.c

+#include "zdtmtst.h"
+
+const char *test_doc = "static test for UDP socket\n";
+const char *test_author = "Pavel Emelyanov <xemul@parallels.com<>\n";
+
+/* Description:
+ * Create two tcp socket, server send asynchronous request on
+ * read data and clietn write data after migration
+ */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>  /* for sockaddr_in and inet_ntoa() */
+#include <wait.h>
+
+static int port = 8890;
+static char buf[8];
+
+#define MSG1 "msg1"
+#define MSG2 "msg_2"
+
+int main(int argc, char **argv)
+{
+	int ret, sk1, sk2;
+	socklen_t len = sizeof(struct sockaddr_in);
+	struct sockaddr_in addr1, addr2, addr;
+
+	test_init(argc, argv);
+
+	sk1 = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDPLITE);
+	if (sk1 < 0) {
+		err("Can't create socket");
+		return 1;
+	}
+
+	memset(&addr1, 0, sizeof(addr1));
+	addr1.sin_family = AF_INET;
+	addr1.sin_addr.s_addr = inet_addr("127.0.0.1");
+	addr1.sin_port = htons(port);
+
+	ret = bind(sk1, (struct sockaddr *)&addr1, len);
+	if (ret < 0) {
+		err("Can't bind socket");
+		return 1;
+	}
+
+	sk2 = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDPLITE);
+	if (sk2 < 0) {
+		err("Can't create socket");
+		return 1;
+	}
+
+	memset(&addr2, 0, sizeof(addr1));
+	addr2.sin_family = AF_INET;
+	addr2.sin_addr.s_addr = inet_addr("127.0.0.1");
+	addr2.sin_port = htons(port + 1);
+
+	ret = bind(sk2, (struct sockaddr *)&addr2, len);
+	if (ret < 0) {
+		err("Can't bind socket");
+		return 1;
+	}
+
+	ret = connect(sk2, (struct sockaddr *)&addr1, len);
+	if (ret < 0) {
+		err("Can't connect");
+		return 1;
+	}
+
+	test_daemon();
+	test_waitsig();
+
+	ret = sendto(sk1, MSG1, sizeof(MSG1), 0,
+			(struct sockaddr *)&addr2, len);
+	if (ret < 0) {
+		fail("Can't send");
+		return 1;
+	}
+
+	ret = send(sk2, MSG2, sizeof(MSG2), 0);
+	if (ret < 0) {
+		fail("Can't send C");
+		return 1;
+	}
+
+	ret = recvfrom(sk1, buf, sizeof(buf), MSG_DONTWAIT,
+			(struct sockaddr *)&addr, &len);
+	if (ret <= 0) {
+		fail("Can't recv C");
+		return 1;
+	}
+
+	if (len != sizeof(struct sockaddr_in) || memcmp(&addr2, &addr, len)) {
+		fail("Wrong peer C");
+		return 1;
+	}
+
+	if (ret != sizeof(MSG2) || memcmp(buf, MSG2, ret)) {
+		fail("Wrong message C");
+		return 1;
+	}
+
+	ret = recvfrom(sk2, buf, sizeof(buf), MSG_DONTWAIT,
+			(struct sockaddr *)&addr, &len);
+	if (ret <= 0) {
+		fail("Can't recv");
+		return 1;
+	}
+
+	if (len != sizeof(struct sockaddr_in) || memcmp(&addr1, &addr, len)) {
+		fail("Wrong peer");
+		return 1;
+	}
+
+	if (ret != sizeof(MSG1) || memcmp(buf, MSG1, ret)) {
+		fail("Wrong message");
+		return 1;
+	}
+
+	pass();
+	return 0;
+}