From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424017AbcFNB40 (ORCPT ); Mon, 13 Jun 2016 21:56:26 -0400 Received: from rslrsmtp2.opaltelecom.net ([62.24.128.202]:16134 "EHLO iprslrsmtp2msp.cpwnetworks.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1161388AbcFNByS (ORCPT ); Mon, 13 Jun 2016 21:54:18 -0400 X-Greylist: delayed 597 seconds by postgrey-1.27 at vger.kernel.org; Mon, 13 Jun 2016 21:54:15 EDT X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2CeBAAeYV9X//6AGD5cHQGEc7kjhAiGFwKBfwEBAQEBAWYnhEwCBCdSEEARVwYBEog0ulkBAQEBBgIBJI59hhIFmGKOKmSIX4Vcj28CVIIHHIFMbYoIAQEB X-IPAS-Result: A2CeBAAeYV9X//6AGD5cHQGEc7kjhAiGFwKBfwEBAQEBAWYnhEwCBCdSEEARVwYBEog0ulkBAQEBBgIBJI59hhIFmGKOKmSIX4Vcj28CVIIHHIFMbYoIAQEB X-IronPort-AV: E=Sophos;i="5.26,469,1459810800"; d="scan'208";a="738753151" 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 5/5] ipvs: log additional sync daemon parameters Date: Tue, 14 Jun 2016 02:43:33 +0100 Message-Id: <1465868613-26146-6-git-send-email-quentin@armitage.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1465868613-26146-1-git-send-email-quentin@armitage.org.uk> References: <1465868613-26146-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. Commits ("ipvs: add sync_maxlen parameter for the sync daemon") and ("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 | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c index dfac9ef..e5f6739 100644 --- a/net/netfilter/ipvs/ip_vs_sync.c +++ b/net/netfilter/ipvs/ip_vs_sync.c @@ -1670,8 +1670,17 @@ static int sync_thread_master(void *data) 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); + "syncid = %d, id = %d, maxlen = %d\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 = %d, ttl = %d\n", + &ipvs->mcfg.mcast_group.in, ipvs->mcfg.mcast_port, + ipvs->mcfg.mcast_ttl); + else + pr_info(" : group = %pI6c, port = %d, ttl = %d\n", + &ipvs->mcfg.mcast_group.in6, ipvs->mcfg.mcast_port, + ipvs->mcfg.mcast_ttl); for (;;) { sb = next_sync_buff(ipvs, ms); @@ -1724,8 +1733,17 @@ static int sync_thread_backup(void *data) 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); + "syncid = %d, id = %d, maxlen = %d\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 = %d, ttl = %d\n", + &ipvs->bcfg.mcast_group.in, ipvs->bcfg.mcast_port, + ipvs->bcfg.mcast_ttl); + else + pr_info(" : group = %pI6c, port = %d, ttl = %d\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