From 180238a295c1a8127953c96f0b462688d0f57a09 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Thu, 27 Sep 2007 06:53:58 -0400 Subject: rpc.mountd: create client_resolve and change client_compose to take a hostent arg This moves the resolution of IP address to hostent into a helper function and has other functions call it. Having client_compose take a hostent arg allows us to avoid an extra hostname lookup in the auth_authenticate codepath as well. Instead of redoing this lookup in client_compose, we can simply reuse the hostent that was already generated in auth_authenticate. Signed-off-by: Jeff Layton Acked-by: Steve Dickson Signed-off-by: Neil Brown --- support/export/client.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'support/export/client.c') diff --git a/support/export/client.c b/support/export/client.c index 1754aa0..1cb242f 100644 --- a/support/export/client.c +++ b/support/export/client.c @@ -233,6 +233,19 @@ client_find(struct hostent *hp) return NULL; } +struct hostent * +client_resolve(struct in_addr addr) +{ + struct hostent *he = NULL; + + if (clientlist[MCL_WILDCARD] || clientlist[MCL_NETGROUP]) + he = get_reliable_hostbyaddr((const char*)&addr, sizeof(addr), AF_INET); + if (he == NULL) + he = get_hostent((const char*)&addr, sizeof(addr), AF_INET); + + return he; +} + /* * Find client name given an IP address * This is found by gathering all known names that match that IP address, @@ -242,17 +255,11 @@ client_find(struct hostent *hp) static char *add_name(char *old, char *add); char * -client_compose(struct in_addr addr) +client_compose(struct hostent *he) { - struct hostent *he = NULL; char *name = NULL; int i; - if (clientlist[MCL_WILDCARD] || clientlist[MCL_NETGROUP]) - he = get_reliable_hostbyaddr((const char*)&addr, sizeof(addr), AF_INET); - if (he == NULL) - he = get_hostent((const char*)&addr, sizeof(addr), AF_INET); - for (i = 0 ; i < MCL_MAXTYPES; i++) { nfs_client *clp; for (clp = clientlist[i]; clp ; clp = clp->m_next) { @@ -261,7 +268,6 @@ client_compose(struct in_addr addr) name = add_name(name, clp->m_hostname); } } - free(he); return name; } -- cgit