From 18cb72ac0c1a232a9aaaf4bdfb2d8fa10cd9943b Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Thu, 13 Sep 2018 22:57:56 +0300
Subject: [PATCH] net: Add prefixes for better logging

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Andrei Vagin <avagin@gmail.com>
---
 criu/sk-inet.c    | 3 +++
 criu/sk-netlink.c | 3 +++
 criu/sk-packet.c  | 3 +++
 criu/sk-queue.c   | 3 +++
 criu/sk-tcp.c     | 2 ++
 criu/sockets.c    | 3 +++
 6 files changed, 17 insertions(+)

diff --git a/criu/sk-inet.c b/criu/sk-inet.c
index a5a092bc7..fcc242644 100644
--- a/criu/sk-inet.c
+++ b/criu/sk-inet.c
@@ -28,6 +28,9 @@
 #include "util.h"
 #include "namespaces.h"
 
+#undef  LOG_PREFIX
+#define LOG_PREFIX "inet: "
+
 #define PB_ALEN_INET	1
 #define PB_ALEN_INET6	4
 
diff --git a/criu/sk-netlink.c b/criu/sk-netlink.c
index f26c4dec0..e4163f538 100644
--- a/criu/sk-netlink.c
+++ b/criu/sk-netlink.c
@@ -14,6 +14,9 @@
 #include "libnetlink.h"
 #include "namespaces.h"
 
+#undef  LOG_PREFIX
+#define LOG_PREFIX "netlink: "
+
 struct netlink_sk_desc {
 	struct socket_desc	sd;
 	u32			portid;
diff --git a/criu/sk-packet.c b/criu/sk-packet.c
index 796aa6e83..0abe84071 100644
--- a/criu/sk-packet.c
+++ b/criu/sk-packet.c
@@ -22,6 +22,9 @@
 #include "images/fdinfo.pb-c.h"
 #include "namespaces.h"
 
+#undef  LOG_PREFIX
+#define LOG_PREFIX "packet: "
+
 struct packet_sock_info {
 	PacketSockEntry *pse;
 	struct file_desc d;
diff --git a/criu/sk-queue.c b/criu/sk-queue.c
index 4ce8ccf45..d19de7504 100644
--- a/criu/sk-queue.c
+++ b/criu/sk-queue.c
@@ -24,6 +24,9 @@
 #include "protobuf.h"
 #include "images/sk-packet.pb-c.h"
 
+#undef  LOG_PREFIX
+#define LOG_PREFIX "skqueue: "
+
 struct sk_packet {
 	struct list_head	list;
 	SkPacketEntry		*entry;
diff --git a/criu/sk-tcp.c b/criu/sk-tcp.c
index 353125f2b..4fd2eb8e6 100644
--- a/criu/sk-tcp.c
+++ b/criu/sk-tcp.c
@@ -27,6 +27,8 @@
 #include "protobuf.h"
 #include "images/tcp-stream.pb-c.h"
 
+#undef  LOG_PREFIX
+#define LOG_PREFIX "tcp: "
 
 static LIST_HEAD(cpt_tcp_repair_sockets);
 static LIST_HEAD(rst_tcp_repair_sockets);
diff --git a/criu/sockets.c b/criu/sockets.c
index bda5e445b..574d83b8e 100644
--- a/criu/sockets.c
+++ b/criu/sockets.c
@@ -29,6 +29,9 @@
 #include "util.h"
 #include "fdstore.h"
 
+#undef  LOG_PREFIX
+#define LOG_PREFIX "sockets: "
+
 #ifndef SOCK_DIAG_BY_FAMILY
 #define SOCK_DIAG_BY_FAMILY 20
 #endif