a85f12322c
Fix a bug in rpcbind for multihomed hosts. If the server had interfaces on two separate subnets, and a client on the first subnet contacted rpcbind at the address on the second subnet, rpcbind would advertise addresses on the first subnet. This is a bug, because it should prefer to advertise the address where it was contacted. The requested service might be firewalled off from the address on the first subnet, for example. usr.sbin/rpcbind/check_bound.c If the address on which a request was received is known, pass that to addrmerge as the clnt_uaddr parameter. That is what addrmerge's comment indicates the parameter is supposed to mean. The previous behavior is that clnt_uaddr would contain the address from which the client sent the request. usr.sbin/rpcbind/util.c Modify addrmerge to prefer to use an IP that is equal to clnt_uaddr, if one is found. Refactor the relevant portion of the function for clarity, and to reduce the number of ifdefs. etc/mtree/BSD.tests.dist usr.sbin/rpcbind/tests/Makefile usr.sbin/rpcbind/tests/addrmerge_test.c Add unit tests for usr.sbin/rpcbind/util.c:addrmerge. usr.sbin/rpcbind/check_bound.c usr.sbin/rpcbind/rpcbind.h usr.sbin/rpcbind/util.c Constify some function arguments Reviewed by: imp MFC after: 4 weeks Sponsored by: Spectra Logic Corp Differential Revision: https://reviews.freebsd.org/D4690
156 lines
5.2 KiB
C
156 lines
5.2 KiB
C
/* $NetBSD: rpcbind.h,v 1.1 2000/06/03 00:47:21 fvdl Exp $ */
|
|
/* $FreeBSD$ */
|
|
|
|
/*-
|
|
* Copyright (c) 2009, Sun Microsystems, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
* - Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* - Redistributions in binary form must reproduce the above copyright notice,
|
|
* this list of conditions and the following disclaimer in the documentation
|
|
* and/or other materials provided with the distribution.
|
|
* - Neither the name of Sun Microsystems, Inc. nor the names of its
|
|
* contributors may be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
/*
|
|
* Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
|
|
*/
|
|
|
|
/* #ident "@(#)rpcbind.h 1.4 90/04/12 SMI" */
|
|
|
|
/*
|
|
* rpcbind.h
|
|
* The common header declarations
|
|
*/
|
|
|
|
#ifndef rpcbind_h
|
|
#define rpcbind_h
|
|
|
|
#ifdef PORTMAP
|
|
#include <rpc/pmap_prot.h>
|
|
#endif
|
|
#include <rpc/rpcb_prot.h>
|
|
|
|
/*
|
|
* Stuff for the rmtcall service
|
|
*/
|
|
struct encap_parms {
|
|
u_int32_t arglen;
|
|
char *args;
|
|
};
|
|
|
|
struct r_rmtcall_args {
|
|
u_int32_t rmt_prog;
|
|
u_int32_t rmt_vers;
|
|
u_int32_t rmt_proc;
|
|
int rmt_localvers; /* whether to send port # or uaddr */
|
|
char *rmt_uaddr;
|
|
struct encap_parms rmt_args;
|
|
};
|
|
|
|
extern int debugging;
|
|
extern int doabort;
|
|
#ifdef LIBWRAP
|
|
extern int libwrap;
|
|
#endif
|
|
extern int verboselog;
|
|
extern int insecure;
|
|
extern int oldstyle_local;
|
|
extern rpcblist_ptr list_rbl; /* A list of version 3 & 4 rpcbind services */
|
|
|
|
#ifdef PORTMAP
|
|
extern struct pmaplist *list_pml; /* A list of version 2 rpcbind services */
|
|
extern char *udptrans; /* Name of UDP transport */
|
|
extern char *tcptrans; /* Name of TCP transport */
|
|
extern char *udp_uaddr; /* Universal UDP address */
|
|
extern char *tcp_uaddr; /* Universal TCP address */
|
|
#endif
|
|
|
|
int add_bndlist(struct netconfig *, struct netbuf *);
|
|
bool_t is_bound(char *, char *);
|
|
char *mergeaddr(SVCXPRT *, char *, char *, char *);
|
|
struct netconfig *rpcbind_get_conf(const char *);
|
|
|
|
void rpcbs_init(void);
|
|
void rpcbs_procinfo(rpcvers_t, rpcproc_t);
|
|
void rpcbs_set(rpcvers_t, bool_t);
|
|
void rpcbs_unset(rpcvers_t, bool_t);
|
|
void rpcbs_getaddr(rpcvers_t, rpcprog_t, rpcvers_t, char *, char *);
|
|
void rpcbs_rmtcall(rpcvers_t, rpcproc_t, rpcprog_t, rpcvers_t, rpcproc_t,
|
|
char *, rpcblist_ptr);
|
|
void *rpcbproc_getstat(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
|
|
|
|
void rpcb_service_3(struct svc_req *, SVCXPRT *);
|
|
void rpcb_service_4(struct svc_req *, SVCXPRT *);
|
|
|
|
/* Common functions shared between versions */
|
|
void *rpcbproc_set_com(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
|
|
void *rpcbproc_unset_com(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
|
|
bool_t map_set(RPCB *, char *);
|
|
bool_t map_unset(RPCB *, char *);
|
|
void delete_prog(unsigned int);
|
|
void *rpcbproc_getaddr_com(RPCB *, struct svc_req *, SVCXPRT *, rpcvers_t,
|
|
rpcvers_t);
|
|
void *rpcbproc_gettime_com(void *, struct svc_req *, SVCXPRT *,
|
|
rpcvers_t);
|
|
void *rpcbproc_uaddr2taddr_com(void *, struct svc_req *,
|
|
SVCXPRT *, rpcvers_t);
|
|
void *rpcbproc_taddr2uaddr_com(void *, struct svc_req *, SVCXPRT *,
|
|
rpcvers_t);
|
|
int create_rmtcall_fd(struct netconfig *);
|
|
void rpcbproc_callit_com(struct svc_req *, SVCXPRT *, rpcvers_t,
|
|
rpcvers_t);
|
|
void my_svc_run(void);
|
|
|
|
void rpcbind_abort(void);
|
|
void reap(int);
|
|
void toggle_verboselog(int);
|
|
|
|
int check_access(SVCXPRT *, rpcproc_t, void *, unsigned int);
|
|
int check_callit(SVCXPRT *, struct r_rmtcall_args *, int);
|
|
void logit(int, struct sockaddr *, rpcproc_t, rpcprog_t, const char *);
|
|
int is_loopback(struct netbuf *);
|
|
|
|
#ifdef PORTMAP
|
|
extern void pmap_service(struct svc_req *, SVCXPRT *);
|
|
#endif
|
|
|
|
void write_warmstart(void);
|
|
void read_warmstart(void);
|
|
|
|
char *addrmerge(struct netbuf *caller, const char *serv_uaddr,
|
|
const char *clnt_uaddr, char const *netid);
|
|
int listen_addr(const struct sockaddr *sa);
|
|
void network_init(void);
|
|
struct sockaddr *local_sa(int);
|
|
|
|
/* For different getaddr semantics */
|
|
#define RPCB_ALLVERS 0
|
|
#define RPCB_ONEVERS 1
|
|
|
|
/* To convert a struct sockaddr to IPv4 or IPv6 address */
|
|
#define SA2SIN(sa) ((struct sockaddr_in *)(sa))
|
|
#define SA2SINADDR(sa) (SA2SIN(sa)->sin_addr)
|
|
#ifdef INET6
|
|
#define SA2SIN6(sa) ((struct sockaddr_in6 *)(sa))
|
|
#define SA2SIN6ADDR(sa) (SA2SIN6(sa)->sin6_addr)
|
|
#endif
|
|
|
|
#endif /* rpcbind_h */
|