From: "J. Bruce Fields" <bfields@fieldses.org>
To: Neil Brown <neilb@cse.unsw.edu.au>
Cc: nfs@lists.sourceforge.net, Trond Myklebust <trond.myklebust@fys.uio.no>
Subject: [PATCH 2 of 6] svcrpc: share code duplicated between auth_unix and auth_null
Date: Thu, 16 Sep 2004 19:16:24 -0400 [thread overview]
Message-ID: <1095375544.839c1c96.2@fieldses.org> (raw)
In-Reply-To: <1095375544.839c1c96.1@fieldses.org>
Call a helper function from svcauth_unix_accept() and svcauth_null_accept()
instead of duplicating code.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
---
linux-2.6.9-rc2-bfields/net/sunrpc/svcauth_unix.c | 89 +++++++++-------------
1 files changed, 37 insertions(+), 52 deletions(-)
diff -puN net/sunrpc/svcauth_unix.c~svcrpc_unix_ip_mapping_cleanup net/sunrpc/svcauth_unix.c
--- linux-2.6.9-rc2/net/sunrpc/svcauth_unix.c~svcrpc_unix_ip_mapping_cleanup 2004-09-16 16:40:49.000000000 -0400
+++ linux-2.6.9-rc2-bfields/net/sunrpc/svcauth_unix.c 2004-09-16 16:40:49.000000000 -0400
@@ -329,6 +329,39 @@ void svcauth_unix_purge(void)
cache_purge(&auth_domain_cache);
}
+int
+svcauth_unix_set_client(struct svc_rqst *rqstp)
+{
+ struct ip_map key, *ipm;
+
+ rqstp->rq_client = NULL;
+ if (rqstp->rq_proc == 0)
+ return SVC_OK;
+
+ strcpy(key.m_class, rqstp->rq_server->sv_program->pg_class);
+ key.m_addr = rqstp->rq_addr.sin_addr;
+
+ ipm = ip_map_lookup(&key, 0);
+
+ if (ipm == NULL)
+ return SVC_DENIED;
+
+ switch (cache_check(&ip_map_cache, &ipm->h, &rqstp->rq_chandle)) {
+ case -EAGAIN:
+ return SVC_DROP;
+ case -ENOENT:
+ return SVC_DENIED;
+ case 0:
+ rqstp->rq_client = &ipm->m_client->h;
+ cache_get(&rqstp->rq_client->h);
+ ip_map_put(&ipm->h, &ip_map_cache);
+ return SVC_OK;
+ default:
+ BUG();
+ }
+ /* shut up gcc: */
+ return -1;
+}
static int
svcauth_null_accept(struct svc_rqst *rqstp, u32 *authp)
@@ -337,7 +370,6 @@ svcauth_null_accept(struct svc_rqst *rqs
struct kvec *resv = &rqstp->rq_res.head[0];
struct svc_cred *cred = &rqstp->rq_cred;
int rv=0;
- struct ip_map key, *ipm;
cred->cr_group_info = NULL;
rqstp->rq_client = NULL;
@@ -363,30 +395,8 @@ svcauth_null_accept(struct svc_rqst *rqs
if (cred->cr_group_info == NULL)
return SVC_DROP; /* kmalloc failure - client must retry */
- strcpy(key.m_class, rqstp->rq_server->sv_program->pg_class);
- key.m_addr = rqstp->rq_addr.sin_addr;
-
- ipm = ip_map_lookup(&key, 0);
-
- if (ipm)
- switch (cache_check(&ip_map_cache, &ipm->h, &rqstp->rq_chandle)) {
- case -EAGAIN:
- rv = SVC_DROP;
- break;
- case -ENOENT:
- rv = SVC_OK; /* rq_client is NULL */
- break;
- case 0:
- rqstp->rq_client = &ipm->m_client->h;
- cache_get(&rqstp->rq_client->h);
- ip_map_put(&ipm->h, &ip_map_cache);
- rv = SVC_OK;
- break;
- default: BUG();
- }
- else rv = SVC_DROP;
-
- if (rv == SVC_OK && rqstp->rq_client == NULL && rqstp->rq_proc != 0)
+ rv = svcauth_unix_set_client(rqstp);
+ if (rv == SVC_DENIED)
goto badcred;
/* Put NULL verifier */
@@ -432,7 +442,6 @@ svcauth_unix_accept(struct svc_rqst *rqs
u32 slen, i;
int len = argv->iov_len;
int rv=0;
- struct ip_map key, *ipm;
cred->cr_group_info = NULL;
rqstp->rq_client = NULL;
@@ -464,32 +473,8 @@ svcauth_unix_accept(struct svc_rqst *rqs
return SVC_DENIED;
}
-
- strcpy(key.m_class, rqstp->rq_server->sv_program->pg_class);
- key.m_addr = rqstp->rq_addr.sin_addr;
-
-
- ipm = ip_map_lookup(&key, 0);
-
- if (ipm)
- switch (cache_check(&ip_map_cache, &ipm->h, &rqstp->rq_chandle)) {
- case -EAGAIN:
- rv = SVC_DROP;
- break;
- case -ENOENT:
- rv = SVC_OK; /* rq_client is NULL */
- break;
- case 0:
- rqstp->rq_client = &ipm->m_client->h;
- cache_get(&rqstp->rq_client->h);
- ip_map_put(&ipm->h, &ip_map_cache);
- rv = SVC_OK;
- break;
- default: BUG();
- }
- else rv = SVC_DROP;
-
- if (rv == SVC_OK && rqstp->rq_client == NULL && rqstp->rq_proc != 0)
+ rv = svcauth_unix_set_client(rqstp);
+ if (rv == SVC_DENIED)
goto badcred;
/* Put NULL verifier */
_
-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 24. Go here: http://sf.net/ppc_contest.php
_______________________________________________
NFS maillist - NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs
next prev parent reply other threads:[~2004-09-16 23:16 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20040916230555.GA13415@fieldses.org>
2004-09-16 23:07 ` 6 svcauth_unix patches to make export table lookups optional J. Bruce Fields
2004-09-16 23:16 ` [PATCH 1 of 6] svcrpc: auth_null fixes J. Bruce Fields
2004-09-16 23:16 ` J. Bruce Fields [this message]
2004-09-16 23:16 ` [PATCH 3 of 6] svcrpc: move export table checks to a per-program pg_add_client method J. Bruce Fields
2004-09-16 23:16 ` [PATCH 4 of 6] nfs4: use new pg_set_client method to simplify nfs4 callback authentication J. Bruce Fields
2004-09-16 23:16 ` [PATCH 5 of 6] lockd: don't try to match callback requests against export table J. Bruce Fields
2004-09-16 23:16 ` [PATCH 6 of 6] nfsd: remove pg_authenticate field J. Bruce Fields
2004-09-16 23:34 ` [PATCH 5 of 6] lockd: don't try to match callback requests against export table Trond Myklebust
2004-09-24 3:55 ` Neil Brown
2004-09-16 23:38 ` [PATCH 3 of 6] svcrpc: move export table checks to a per-program pg_add_client method Trond Myklebust
2004-09-17 1:11 ` J. Bruce Fields
2004-09-17 1:18 ` Trond Myklebust
2004-09-17 2:20 ` J. Bruce Fields
2004-09-22 6:54 ` Neil Brown
2004-09-22 10:10 ` Olaf Kirch
2004-09-23 21:46 ` J. Bruce Fields
2004-09-24 4:04 ` Neil Brown
2004-09-24 7:42 ` Olaf Kirch
2004-09-24 20:58 ` J. Bruce Fields
2004-09-28 22:00 ` J. Bruce Fields
2004-09-28 22:11 ` Trond Myklebust
2004-09-28 22:37 ` Trond Myklebust
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1095375544.839c1c96.2@fieldses.org \
--to=bfields@fieldses.org \
--cc=neilb@cse.unsw.edu.au \
--cc=nfs@lists.sourceforge.net \
--cc=trond.myklebust@fys.uio.no \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.