From patchwork Thu Oct 24 18:17:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Dickson X-Patchwork-Id: 3093101 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0748D9F2B8 for ; Thu, 24 Oct 2013 18:16:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F40CB201F7 for ; Thu, 24 Oct 2013 18:16:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D2B05201E4 for ; Thu, 24 Oct 2013 18:16:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755371Ab3JXSQd (ORCPT ); Thu, 24 Oct 2013 14:16:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18459 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755338Ab3JXSQd (ORCPT ); Thu, 24 Oct 2013 14:16:33 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r9OIGVxK023020 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 24 Oct 2013 14:16:32 -0400 Received: from smallhat.boston.devel.redhat.com.org (vpn-62-59.rdu2.redhat.com [10.10.62.59]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r9OIGSRA030193 for ; Thu, 24 Oct 2013 14:16:31 -0400 From: Steve Dickson To: Linux NFS Mailing list Subject: [PATCH 3/3] mountd: Add the ability to disable UDP listeners. Date: Thu, 24 Oct 2013 14:17:13 -0400 Message-Id: <1382638633-6710-4-git-send-email-steved@redhat.com> In-Reply-To: <1382638633-6710-1-git-send-email-steved@redhat.com> References: <1382638633-6710-1-git-send-email-steved@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add the ability to turn off UDP listeners with the new "-u | --no-udp" flag. Signed-off-by: Steve Dickson --- support/nfs/svc_create.c | 2 +- utils/mountd/mountd.c | 8 ++++++-- utils/mountd/mountd.man | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/support/nfs/svc_create.c b/support/nfs/svc_create.c index 9ae2965..dac17d9 100644 --- a/support/nfs/svc_create.c +++ b/support/nfs/svc_create.c @@ -419,7 +419,7 @@ nfs_svc_create(char *name, const rpcprog_t program, const rpcvers_t version, continue; visible++; - if (!strcmp(nconf->nc_proto, NC_TCP) && !NFSCTL_TCPISSET(_rpcprotobits)) + if (!strcmp(nconf->nc_proto, NC_UDP) && !NFSCTL_UDPISSET(_rpcprotobits)) continue; if (port == 0) diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c index b762301..fa6cf80 100644 --- a/utils/mountd/mountd.c +++ b/utils/mountd/mountd.c @@ -68,6 +68,7 @@ static struct option longopts[] = { "num-threads", 1, 0, 't' }, { "reverse-lookup", 0, 0, 'r' }, { "manage-gids", 0, 0, 'g' }, + { "no-udp", 0, 0, 'u' }, { NULL, 0, 0, 0 } }; @@ -708,7 +709,7 @@ main(int argc, char **argv) /* Parse the command line options and arguments. */ opterr = 0; - while ((c = getopt_long(argc, argv, "o:nFd:f:p:P:hH:N:V:vrs:t:g", longopts, NULL)) != EOF) + while ((c = getopt_long(argc, argv, "o:nFd:f:p:P:hH:N:V:vurs:t:g", longopts, NULL)) != EOF) switch (c) { case 'g': manage_gids = 1; @@ -785,6 +786,9 @@ main(int argc, char **argv) case 'v': printf("%s version " VERSION "\n", progname); exit(0); + case 'u': + NFSCTL_UDPUNSET(_rpcprotobits); + break; case 0: break; case '?': @@ -910,6 +914,6 @@ usage(const char *prog, int n) " [-p|--port port] [-V version|--nfs-version version]\n" " [-N version|--no-nfs-version version] [-H ha-callout-prog]\n" " [-s|--state-directory-path path][-g|--manage-gids] \n" -" [-t num|--num-threads=num]\n", prog); +" [-t num|--num-threads=num] [-u|--no-udp]\n", prog); exit(n); } diff --git a/utils/mountd/mountd.man b/utils/mountd/mountd.man index c049e35..5d99659 100644 --- a/utils/mountd/mountd.man +++ b/utils/mountd/mountd.man @@ -178,6 +178,9 @@ threads are usually only needed for NFS servers which need to handle mount storms of hundreds of NFS mounts in a few seconds, or when your DNS server is slow or unreliable. .TP +.B \-u " or " \-\-no-udp +Don't advertise UDP for mounting +.TP .B \-V " or " \-\-nfs-version This option can be used to request that .B rpc.mountd