sockets: Print socket id as well

Also make output a bit more fancy, as

CR_FD_UNIXSK: unixsk-2440.img
----------------------------------------
fd    3 type  1 state  1 namelen    0 id  19406 peer  19407
fd    4 type  1 state  1 namelen    0 id  19407 peer  19406
fd    5 type  2 state  7 namelen    7 id  19408 peer      0	---> [tst-sk]
fd    6 type  2 state  7 namelen    0 id  19409 peer      0
fd    7 type  2 state  7 namelen    0 id  19410 peer  19411
fd    8 type  2 state  7 namelen    8 id  19411 peer      0	---> [tst-sk1]
----------------------------------------
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>

sockets.c

@@ -632,6 +632,7 @@ int prepare_sockets(int pid)
 void show_unixsk(char *name, int fd, bool show_header)
 {
 	struct unix_sk_entry ue;
+	int ret = 0;
 
 	if (show_header) {
 		pr_info("\n");
@@ -640,25 +641,27 @@ void show_unixsk(char *name, int fd, bool show_header)
 	}
 
 	while (1) {
-		int ret = read_ptr_safe_eof(fd, &ue, out);
+		ret = read_ptr_safe_eof(fd, &ue, out);
 		if (!ret)
 			goto out;
 
-		pr_info("fd %d type %d state %d namelen %d peer %d\n",
-				ue.fd, ue.type, ue.state, ue.namelen, ue.peer);
-		if (!ue.namelen)
-			continue;
-
-		ret = read_safe_eof(fd, buf, ue.namelen, out);
-		if (!ret)
-			goto out;
-
-		if (!buf[0])
-			buf[0] = '@';
-		pr_info("\tname [%s]\n", buf);
+		pr_info("fd %4d type %2d state %2d namelen %4d id %6d peer %6d",
+			ue.fd, ue.type, ue.state, ue.namelen, ue.id, ue.peer);
+
+		if (ue.namelen) {
+			ret = read_safe_eof(fd, buf, ue.namelen, out);
+			if (!ret)
+				goto out;
+			if (!buf[0])
+				buf[0] = '@';
+			pr_info("\t---> [%s]\n", buf);
+		} else
+			pr_info("\n");
 	}
 
 out:
+	if (ret)
+		pr_info("\n");
 	if (show_header)
 		pr_info("----------------------------------------\n");
 }