Add new multicast parameters to log messages when sync daemons start.
Commit e4ff67513096 ("ipvs: add sync_maxlen parameter for the sync
daemon") and commit d33288172e72 ("ipvs: add more mcast parameters for
the sync daemon") added additional multicast parameters, but didn't add
them to the log messages when the sync daemons started.
Signed-off-by: Quentin Armitage <quentin@xxxxxxxxxxxxxxx>
---
net/netfilter/ipvs/ip_vs_sync.c | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index 2be99b2..3d0fd99 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -1669,9 +1669,17 @@ static int sync_thread_master(void *data)
struct sock *sk = tinfo->sock->sk;
struct ip_vs_sync_buff *sb;
- pr_info("sync thread started: state = MASTER, mcast_ifn = %s, "
- "syncid = %d, id = %d\n",
- ipvs->mcfg.mcast_ifn, ipvs->mcfg.syncid, tinfo->id);
+ pr_info("sync thread started: state = MASTER, mcast_ifn = %s, syncid = %d, id = %d, maxlen = %u\n",
+ ipvs->mcfg.mcast_ifn, ipvs->mcfg.syncid,
+ tinfo->id, ipvs->mcfg.sync_maxlen);
+ if (ipvs->mcfg.mcast_af == AF_INET)
+ pr_info("group = %pI4, port = %u, ttl = %u\n",
+ &ipvs->mcfg.mcast_group.in, ipvs->mcfg.mcast_port,
+ ipvs->mcfg.mcast_ttl);
+ else
+ pr_info("group = %pI6c, port = %u, ttl = %u\n",
+ &ipvs->mcfg.mcast_group.in6, ipvs->mcfg.mcast_port,
+ ipvs->mcfg.mcast_ttl);
for (;;) {
sb = next_sync_buff(ipvs, ms);
@@ -1723,9 +1731,17 @@ static int sync_thread_backup(void *data)
struct netns_ipvs *ipvs = tinfo->ipvs;
int len;
- pr_info("sync thread started: state = BACKUP, mcast_ifn = %s, "
- "syncid = %d, id = %d\n",
- ipvs->bcfg.mcast_ifn, ipvs->bcfg.syncid, tinfo->id);
+ pr_info("sync thread started: state = BACKUP, mcast_ifn = %s, syncid = %d, id = %d, maxlen = %u\n",
+ ipvs->bcfg.mcast_ifn, ipvs->bcfg.syncid,
+ tinfo->id, ipvs->bcfg.sync_maxlen);
+ if (ipvs->bcfg.mcast_af == AF_INET)
+ pr_info("group = %pI4, port = %u, ttl = %u\n",
+ &ipvs->bcfg.mcast_group.in, ipvs->bcfg.mcast_port,
+ ipvs->bcfg.mcast_ttl);
+ else
+ pr_info("group = %pI6c, port = %u, ttl = %u\n",
+ &ipvs->bcfg.mcast_group.in6, ipvs->bcfg.mcast_port,
+ ipvs->bcfg.mcast_ttl);
while (!kthread_should_stop()) {
wait_event_interruptible(*sk_sleep(tinfo->sock->sk),
--
1.7.7.6
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
