From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753820AbcFPHA6 (ORCPT ); Thu, 16 Jun 2016 03:00:58 -0400 Received: from host-92-27-6-192.static.as13285.net ([92.27.6.192]:51996 "EHLO nabal.armitage.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753640AbcFPHAv (ORCPT ); Thu, 16 Jun 2016 03:00:51 -0400 From: Quentin Armitage To: Wensong Zhang , Simon Horman , Julian Anastasov , Pablo Neira Ayuso , Patrick McHardy , Jozsef Kadlecsik , "David S. Miller" , netdev@vger.kernel.org, lvs-devel@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, linux-kernel@vger.kernel.org Cc: Quentin Armitage Subject: [PATCH net-next v4 3/3] ipvs: log additional sync daemon parameters Date: Thu, 16 Jun 2016 08:00:27 +0100 Message-Id: <1466060427-12988-3-git-send-email-quentin@armitage.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1466060427-12988-1-git-send-email-quentin@armitage.org.uk> References: <1466060427-12988-1-git-send-email-quentin@armitage.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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