nfs4: Send the server client's network address
This commit is contained in:
Pawel Dziepak
@@ -57,6 +57,93 @@ ServerAddress::ServerAddress()
|
||||
}
|
||||
|
||||
|
||||
const char*
|
||||
ServerAddress::ProtocolString() const
|
||||
{
|
||||
static const char* tcpName = "tcp";
|
||||
static const char* udpName = "udp";
|
||||
static const char* unknown = "";
|
||||
|
||||
switch (fProtocol) {
|
||||
case IPPROTO_TCP:
|
||||
return tcpName;
|
||||
case IPPROTO_UDP:
|
||||
return udpName;
|
||||
default:
|
||||
return unknown;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
char*
|
||||
ServerAddress::UniversalAddress() const
|
||||
{
|
||||
const sockaddr* address = reinterpret_cast<const sockaddr*>(&fAddress);
|
||||
|
||||
char* uAddr = reinterpret_cast<char*>(malloc(INET6_ADDRSTRLEN + 16));
|
||||
if (uAddr == NULL)
|
||||
return NULL;
|
||||
|
||||
if (inet_ntop(address->sa_family, InAddr(), uAddr, AddressSize()) == NULL)
|
||||
return NULL;
|
||||
|
||||
char port[16];
|
||||
sprintf(port, ".%d.%d", Port() >> 8, Port() & 0xff);
|
||||
strcat(uAddr, port);
|
||||
|
||||
return uAddr;
|
||||
}
|
||||
|
||||
|
||||
socklen_t
|
||||
ServerAddress::AddressSize() const
|
||||
{
|
||||
switch (reinterpret_cast<const sockaddr*>(&fAddress)->sa_family) {
|
||||
case AF_INET:
|
||||
return sizeof(sockaddr_in);
|
||||
case AF_INET6:
|
||||
return sizeof(sockaddr_in6);
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
uint16
|
||||
ServerAddress::Port() const
|
||||
{
|
||||
uint16 port;
|
||||
|
||||
switch (reinterpret_cast<const sockaddr*>(&fAddress)->sa_family) {
|
||||
case AF_INET:
|
||||
port = reinterpret_cast<const sockaddr_in*>(&fAddress)->sin_port;
|
||||
break;
|
||||
case AF_INET6:
|
||||
port = reinterpret_cast<const sockaddr_in6*>(&fAddress)->sin6_port;
|
||||
break;
|
||||
default:
|
||||
port = 0;
|
||||
}
|
||||
|
||||
return ntohs(port);
|
||||
}
|
||||
|
||||
|
||||
const void*
|
||||
ServerAddress::InAddr() const
|
||||
{
|
||||
switch (reinterpret_cast<const sockaddr*>(&fAddress)->sa_family) {
|
||||
case AF_INET:
|
||||
return &reinterpret_cast<const sockaddr_in*>(&fAddress)->sin_addr;
|
||||
case AF_INET6:
|
||||
return &reinterpret_cast<const sockaddr_in6*>(&fAddress)->sin6_addr;
|
||||
default:
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
status_t
|
||||
ServerAddress::ResolveName(const char* name, ServerAddress* address)
|
||||
{
|
||||
@@ -143,18 +230,7 @@ Connection::GetLocalAddress(ServerAddress* address)
|
||||
{
|
||||
address->fProtocol = fServerAddress.fProtocol;
|
||||
|
||||
socklen_t addressSize;
|
||||
switch (reinterpret_cast<const sockaddr*>(&fServerAddress)->sa_family) {
|
||||
case AF_INET:
|
||||
addressSize = sizeof(sockaddr_in);
|
||||
break;
|
||||
case AF_INET6:
|
||||
addressSize = sizeof(sockaddr_in6);
|
||||
break;
|
||||
default:
|
||||
return B_BAD_VALUE;
|
||||
}
|
||||
|
||||
socklen_t addressSize = fServerAddress.AddressSize();
|
||||
return getsockname(fSocket,
|
||||
(struct sockaddr*)&address->fAddress, &addressSize);
|
||||
}
|
||||
|
||||
@@ -26,6 +26,14 @@ struct ServerAddress {
|
||||
|
||||
ServerAddress();
|
||||
|
||||
const char* ProtocolString() const;
|
||||
char* UniversalAddress() const;
|
||||
|
||||
socklen_t AddressSize() const;
|
||||
|
||||
uint16 Port() const;
|
||||
const void* InAddr() const;
|
||||
|
||||
static status_t ResolveName(const char* name,
|
||||
ServerAddress* address);
|
||||
};
|
||||
|
||||
@@ -636,10 +636,16 @@ RequestBuilder::SetClientID(const RPC::Server* server)
|
||||
if (result != B_OK)
|
||||
return result;
|
||||
|
||||
// Callbacks are currently not supported
|
||||
fRequest->Stream().AddUInt(0);
|
||||
fRequest->Stream().AddOpaque(NULL, 0);
|
||||
fRequest->Stream().AddOpaque(NULL, 0);
|
||||
fRequest->Stream().AddUInt(0x40000000);
|
||||
|
||||
ServerAddress local = server->LocalID();
|
||||
fRequest->Stream().AddString(local.ProtocolString());
|
||||
char* uAddr = local.UniversalAddress();
|
||||
if (uAddr == NULL)
|
||||
return B_NO_MEMORY;
|
||||
fRequest->Stream().AddString(uAddr);
|
||||
free(uAddr);
|
||||
|
||||
fRequest->Stream().AddUInt(0);
|
||||
|
||||
fOpCount++;
|
||||
|
||||
@@ -6,6 +6,7 @@ KernelMergeObject kernel_util.o :
|
||||
AVLTreeBase.cpp
|
||||
hostname.cpp
|
||||
inet_addr.c
|
||||
inet_ntop.c
|
||||
kernel_cpp.cpp
|
||||
KernelReferenceable.cpp
|
||||
khash.cpp
|
||||
|
||||
@@ -0,0 +1,202 @@
|
||||
/*
|
||||
* Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
|
||||
* Copyright (c) 1996-1999 by Internet Software Consortium.
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
|
||||
* OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
static const char rcsid[] = "$Id: inet_ntop.c,v 1.5 2005/11/03 22:59:52 marka Exp $";
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <arpa/nameser.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef SPRINTF_CHAR
|
||||
# define SPRINTF(x) strlen(sprintf/**/x)
|
||||
#else
|
||||
# define SPRINTF(x) ((size_t)sprintf x)
|
||||
#endif
|
||||
|
||||
/*%
|
||||
* WARNING: Don't even consider trying to compile this on a system where
|
||||
* sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX.
|
||||
*/
|
||||
|
||||
static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size));
|
||||
static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size));
|
||||
|
||||
/* char *
|
||||
* inet_ntop(af, src, dst, size)
|
||||
* convert a network format address to presentation format.
|
||||
* return:
|
||||
* pointer to presentation format address (`dst'), or NULL (see errno).
|
||||
* author:
|
||||
* Paul Vixie, 1996.
|
||||
*/
|
||||
const char *
|
||||
inet_ntop(af, src, dst, size)
|
||||
int af;
|
||||
const void *src;
|
||||
char *dst;
|
||||
socklen_t size;
|
||||
{
|
||||
switch (af) {
|
||||
case AF_INET:
|
||||
return (inet_ntop4(src, dst, size));
|
||||
case AF_INET6:
|
||||
return (inet_ntop6(src, dst, size));
|
||||
default:
|
||||
errno = EAFNOSUPPORT;
|
||||
return (NULL);
|
||||
}
|
||||
/* NOTREACHED */
|
||||
}
|
||||
|
||||
/* const char *
|
||||
* inet_ntop4(src, dst, size)
|
||||
* format an IPv4 address
|
||||
* return:
|
||||
* `dst' (as a const)
|
||||
* notes:
|
||||
* (1) uses no statics
|
||||
* (2) takes a u_char* not an in_addr as input
|
||||
* author:
|
||||
* Paul Vixie, 1996.
|
||||
*/
|
||||
static const char *
|
||||
inet_ntop4(src, dst, size)
|
||||
const u_char *src;
|
||||
char *dst;
|
||||
size_t size;
|
||||
{
|
||||
static const char fmt[] = "%u.%u.%u.%u";
|
||||
char tmp[sizeof "255.255.255.255"];
|
||||
|
||||
if (SPRINTF((tmp, fmt, src[0], src[1], src[2], src[3])) >= size) {
|
||||
errno = ENOSPC;
|
||||
return (NULL);
|
||||
}
|
||||
strcpy(dst, tmp);
|
||||
return (dst);
|
||||
}
|
||||
|
||||
/* const char *
|
||||
* inet_ntop6(src, dst, size)
|
||||
* convert IPv6 binary address into presentation (printable) format
|
||||
* author:
|
||||
* Paul Vixie, 1996.
|
||||
*/
|
||||
static const char *
|
||||
inet_ntop6(src, dst, size)
|
||||
const u_char *src;
|
||||
char *dst;
|
||||
size_t size;
|
||||
{
|
||||
/*
|
||||
* Note that int32_t and int16_t need only be "at least" large enough
|
||||
* to contain a value of the specified size. On some systems, like
|
||||
* Crays, there is no such thing as an integer variable with 16 bits.
|
||||
* Keep this in mind if you think this function should have been coded
|
||||
* to use pointer overlays. All the world's not a VAX.
|
||||
*/
|
||||
char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
|
||||
struct { int base, len; } best, cur;
|
||||
u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
|
||||
int i;
|
||||
|
||||
/*
|
||||
* Preprocess:
|
||||
* Copy the input (bytewise) array into a wordwise array.
|
||||
* Find the longest run of 0x00's in src[] for :: shorthanding.
|
||||
*/
|
||||
memset(words, '\0', sizeof words);
|
||||
for (i = 0; i < NS_IN6ADDRSZ; i++)
|
||||
words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
|
||||
best.base = -1;
|
||||
best.len = 0;
|
||||
cur.base = -1;
|
||||
cur.len = 0;
|
||||
for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
|
||||
if (words[i] == 0) {
|
||||
if (cur.base == -1)
|
||||
cur.base = i, cur.len = 1;
|
||||
else
|
||||
cur.len++;
|
||||
} else {
|
||||
if (cur.base != -1) {
|
||||
if (best.base == -1 || cur.len > best.len)
|
||||
best = cur;
|
||||
cur.base = -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (cur.base != -1) {
|
||||
if (best.base == -1 || cur.len > best.len)
|
||||
best = cur;
|
||||
}
|
||||
if (best.base != -1 && best.len < 2)
|
||||
best.base = -1;
|
||||
|
||||
/*
|
||||
* Format the result.
|
||||
*/
|
||||
tp = tmp;
|
||||
for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
|
||||
/* Are we inside the best run of 0x00's? */
|
||||
if (best.base != -1 && i >= best.base &&
|
||||
i < (best.base + best.len)) {
|
||||
if (i == best.base)
|
||||
*tp++ = ':';
|
||||
continue;
|
||||
}
|
||||
/* Are we following an initial run of 0x00s or any real hex? */
|
||||
if (i != 0)
|
||||
*tp++ = ':';
|
||||
/* Is this address an encapsulated IPv4? */
|
||||
if (i == 6 && best.base == 0 && (best.len == 6 ||
|
||||
(best.len == 7 && words[7] != 0x0001) ||
|
||||
(best.len == 5 && words[5] == 0xffff))) {
|
||||
if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
|
||||
return (NULL);
|
||||
tp += strlen(tp);
|
||||
break;
|
||||
}
|
||||
tp += SPRINTF((tp, "%x", words[i]));
|
||||
}
|
||||
/* Was it a trailing run of 0x00's? */
|
||||
if (best.base != -1 && (best.base + best.len) ==
|
||||
(NS_IN6ADDRSZ / NS_INT16SZ))
|
||||
*tp++ = ':';
|
||||
*tp++ = '\0';
|
||||
|
||||
/*
|
||||
* Check for overflow, copy, and we're done.
|
||||
*/
|
||||
if ((size_t)(tp - tmp) > size) {
|
||||
errno = ENOSPC;
|
||||
return (NULL);
|
||||
}
|
||||
strcpy(dst, tmp);
|
||||
return (dst);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user