Attachment #444124 for bug #589666

Lines 70-76 static struct fdlist fdhead; / Link li Link Here

(-)src/check_bound.c (-1 / +1 lines)
70	static struct fdlist *fdtail;	70	static struct fdlist *fdtail;
71	static char *nullstring = "";	71	static char *nullstring = "";
72		72
73	static bool_t check_bound __P((struct fdlist , char uaddr));	73	static bool_t check_bound(struct fdlist , char uaddr);
74		74
75	/*	75	/*
76	* Returns 1 if the given address is bound for the given addr & transport	76	* Returns 1 if the given address is bound for the given addr & transport

Lines 60-70 static char sccsid[] = "@(#)pmap_svc.c 1 Link Here

(-)src/pmap_svc.c (-5 / +5 lines)
60	#include "rpcbind.h"	60	#include "rpcbind.h"
61	#include "xlog.h"	61	#include "xlog.h"
62	#include <rpc/svc_soc.h> /* svc_getcaller routine definition */	62	#include <rpc/svc_soc.h> /* svc_getcaller routine definition */
63	static struct pmaplist *find_service_pmap __P((rpcprog_t, rpcvers_t,	63	static struct pmaplist *find_service_pmap(rpcprog_t, rpcvers_t,
64	rpcprot_t));	64	rpcprot_t);
65	static bool_t pmapproc_change __P((struct svc_req , SVCXPRT , u_long));	65	static bool_t pmapproc_change(struct svc_req , SVCXPRT , u_long);
66	static bool_t pmapproc_getport __P((struct svc_req , SVCXPRT ));	66	static bool_t pmapproc_getport(struct svc_req , SVCXPRT );
67	static bool_t pmapproc_dump __P((struct svc_req , SVCXPRT ));	67	static bool_t pmapproc_dump(struct svc_req , SVCXPRT );
68		68
69	/*	69	/*
70	* Called for all the version 2 inquiries.	70	* Called for all the version 2 inquiries.




#include "rpcbind.h"
#include "xlog.h"

static void *rpcbproc_getaddr_3_local(void *, struct svc_req *, SVCXPRT *,
					   rpcvers_t);
static void *rpcbproc_dump_3_local(void *, struct svc_req *, SVCXPRT *,
					rpcvers_t);

/*
 * Called by svc_getreqset. There is a separate server handle for

	} argument;
	char *result;
	xdrproc_t xdr_argument, xdr_result;
	void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
	rpcprog_t setprog = 0;

	rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc);




#include "rpcbind.h"
#include "xlog.h"

static void *rpcbproc_getaddr_4_local(void *, struct svc_req *, SVCXPRT *,
				      rpcvers_t);
static void *rpcbproc_getversaddr_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
static void *rpcbproc_getaddrlist_4_local
	(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
static void free_rpcb_entry_list(rpcb_entry_list_ptr *);
static void *rpcbproc_dump_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t);

/*
 * Called by svc_getreqset. There is a separate server handle for

	} argument;
	char *result;
	xdrproc_t xdr_argument, xdr_result;
	void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
	rpcprog_t setprog = 0;

	rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc);




static struct finfo     FINFO[NFORWARD];


static bool_t xdr_encap_parms(XDR *, struct encap_parms *);
static bool_t xdr_rmtcall_args(XDR *, struct r_rmtcall_args *);
static bool_t xdr_rmtcall_result(XDR *, struct r_rmtcall_args *);
static bool_t xdr_opaque_parms(XDR *, struct r_rmtcall_args *);
static int find_rmtcallfd_by_netid(char *);
static SVCXPRT *find_rmtcallxprt_by_fd(int);
static int forward_register(u_int32_t, struct netbuf *, int, char *,
    rpcproc_t, rpcvers_t, u_int32_t *);
static struct finfo *forward_find(u_int32_t);
static int free_slot_by_xid(u_int32_t);
static int free_slot_by_index(int);
static int netbufcmp(struct netbuf *, struct netbuf *);
static struct netbuf *netbufdup(struct netbuf *);
static void netbuffree(struct netbuf *);
static int check_rmtcalls(struct pollfd *, int);
static void xprt_set_caller(SVCXPRT *, struct finfo *);
static void send_svcsyserr(SVCXPRT *, struct finfo *);
static void handle_reply(int, SVCXPRT *);
static void find_versions(rpcprog_t, char *, rpcvers_t *, rpcvers_t *);
static rpcblist_ptr find_service(rpcprog_t, rpcvers_t, char *);
static char *getowner(SVCXPRT *, char *, size_t);
static int add_pmaplist(RPCB *);
static int del_pmaplist(RPCB *);

/*
 * Set a mapping of program, version, netid




static char servname[] = "rpcbind";
static char superuser[] = "superuser";

int main(int, char *[]);

static int init_transport(struct netconfig *);
static void rbllist_add(rpcprog_t, rpcvers_t, struct netconfig *,
			     struct netbuf *);
static void terminate(int);
static void parseargs(int, char *[]);

int
main(int argc, char *argv[])

Lines 70-76 static struct sockaddr_in *local_in4; Link Here

(-)src/util.c (-1 / +1 lines)
70	static struct sockaddr_in6 *local_in6;	70	static struct sockaddr_in6 *local_in6;
71	#endif	71	#endif
72		72
73	static int bitmaskcmp __P((void , void , void *, int));	73	static int bitmaskcmp(void , void , void *, int);
74		74
75	/*	75	/*
76	* For all bits set in "mask", compare the corresponding bits in	76	* For all bits set in "mask", compare the corresponding bits in

Lines 58-65 Link Here

(-)src/warmstart.c (-2 / +2 lines)
58	#define PMAPFILE RPCBIND_STATEDIR "/portmap.xdr"	58	#define PMAPFILE RPCBIND_STATEDIR "/portmap.xdr"
59	#endif	59	#endif
60		60
61	static bool_t write_struct __P((char , xdrproc_t, void ));	61	static bool_t write_struct(char , xdrproc_t, void );
62	static bool_t read_struct __P((char , xdrproc_t, void ));	62	static bool_t read_struct(char , xdrproc_t, void );
63		63
64	static bool_t	64	static bool_t
65	write_struct(char filename, xdrproc_t structproc, void list)	65	write_struct(char filename, xdrproc_t structproc, void list)

Return to bug 589666

Lines 100-128 struct finfo { Link Here

(-)src/rpcb_svc_com.c (-23 / +23 lines)
100	static struct finfo FINFO[NFORWARD];	100	static struct finfo FINFO[NFORWARD];
101		101
102		102
103	static bool_t xdr_encap_parms __P((XDR , struct encap_parms ));	103	static bool_t xdr_encap_parms(XDR , struct encap_parms );
104	static bool_t xdr_rmtcall_args __P((XDR , struct r_rmtcall_args ));	104	static bool_t xdr_rmtcall_args(XDR , struct r_rmtcall_args );
105	static bool_t xdr_rmtcall_result __P((XDR , struct r_rmtcall_args ));	105	static bool_t xdr_rmtcall_result(XDR , struct r_rmtcall_args );
106	static bool_t xdr_opaque_parms __P((XDR , struct r_rmtcall_args ));	106	static bool_t xdr_opaque_parms(XDR , struct r_rmtcall_args );
107	static int find_rmtcallfd_by_netid __P((char *));	107	static int find_rmtcallfd_by_netid(char *);
108	static SVCXPRT *find_rmtcallxprt_by_fd __P((int));	108	static SVCXPRT *find_rmtcallxprt_by_fd(int);
109	static int forward_register __P((u_int32_t, struct netbuf , int, char ,	109	static int forward_register(u_int32_t, struct netbuf , int, char ,
110	rpcproc_t, rpcvers_t, u_int32_t *));	110	rpcproc_t, rpcvers_t, u_int32_t *);
111	static struct finfo *forward_find __P((u_int32_t));	111	static struct finfo *forward_find(u_int32_t);
112	static int free_slot_by_xid __P((u_int32_t));	112	static int free_slot_by_xid(u_int32_t);
113	static int free_slot_by_index __P((int));	113	static int free_slot_by_index(int);
114	static int netbufcmp __P((struct netbuf , struct netbuf ));	114	static int netbufcmp(struct netbuf , struct netbuf );
115	static struct netbuf netbufdup __P((struct netbuf ));	115	static struct netbuf netbufdup(struct netbuf );
116	static void netbuffree __P((struct netbuf *));	116	static void netbuffree(struct netbuf *);
117	static int check_rmtcalls __P((struct pollfd *, int));	117	static int check_rmtcalls(struct pollfd *, int);
118	static void xprt_set_caller __P((SVCXPRT , struct finfo ));	118	static void xprt_set_caller(SVCXPRT , struct finfo );
119	static void send_svcsyserr __P((SVCXPRT , struct finfo ));	119	static void send_svcsyserr(SVCXPRT , struct finfo );
120	static void handle_reply __P((int, SVCXPRT *));	120	static void handle_reply(int, SVCXPRT *);
121	static void find_versions __P((rpcprog_t, char , rpcvers_t , rpcvers_t *));	121	static void find_versions(rpcprog_t, char , rpcvers_t , rpcvers_t *);
122	static rpcblist_ptr find_service __P((rpcprog_t, rpcvers_t, char *));	122	static rpcblist_ptr find_service(rpcprog_t, rpcvers_t, char *);
123	static char getowner __P((SVCXPRT , char *, size_t));	123	static char getowner(SVCXPRT , char *, size_t);
124	static int add_pmaplist __P((RPCB *));	124	static int add_pmaplist(RPCB *);
125	static int del_pmaplist __P((RPCB *));	125	static int del_pmaplist(RPCB *);
126		126
127	/*	127	/*
128	* Set a mapping of program, version, netid	128	* Set a mapping of program, version, netid

Lines 135-147 char tcp_uaddr; / Universal TCP addres Link Here

(-)src/rpcbind.c (-6 / +6 lines)
135	static char servname[] = "rpcbind";	135	static char servname[] = "rpcbind";
136	static char superuser[] = "superuser";	136	static char superuser[] = "superuser";
137		137
138	int main __P((int, char *[]));	138	int main(int, char *[]);
139		139
140	static int init_transport __P((struct netconfig *));	140	static int init_transport(struct netconfig *);
141	static void rbllist_add __P((rpcprog_t, rpcvers_t, struct netconfig *,	141	static void rbllist_add(rpcprog_t, rpcvers_t, struct netconfig *,
142	struct netbuf *));	142	struct netbuf *);
143	static void terminate __P((int));	143	static void terminate(int);
144	static void parseargs __P((int, char *[]));	144	static void parseargs(int, char *[]);
145		145
146	int	146	int
147	main(int argc, char *argv[])	147	main(int argc, char *argv[])

Lines 53-62 Link Here

(-)src/rpcb_svc.c (-5 / +5 lines)
53	#include "rpcbind.h"	53	#include "rpcbind.h"
54	#include "xlog.h"	54	#include "xlog.h"
55		55
56	static void rpcbproc_getaddr_3_local __P((void , struct svc_req , SVCXPRT ,	56	static void rpcbproc_getaddr_3_local(void , struct svc_req , SVCXPRT ,
57	rpcvers_t));	57	rpcvers_t);
58	static void rpcbproc_dump_3_local __P((void , struct svc_req , SVCXPRT ,	58	static void rpcbproc_dump_3_local(void , struct svc_req , SVCXPRT ,
59	rpcvers_t));	59	rpcvers_t);
60		60
61	/*	61	/*
62	* Called by svc_getreqset. There is a separate server handle for	62	* Called by svc_getreqset. There is a separate server handle for
Lines 75-81 rpcb_service_3(struct svc_req *rqstp, SV Link Here
75	} argument;	75	} argument;
76	char *result;	76	char *result;
77	xdrproc_t xdr_argument, xdr_result;	77	xdrproc_t xdr_argument, xdr_result;
78	void (local) __P((void , struct svc_req , SVCXPRT *, rpcvers_t));	78	void (local)(void , struct svc_req , SVCXPRT *, rpcvers_t);
79	rpcprog_t setprog = 0;	79	rpcprog_t setprog = 0;
80		80
81	rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc);	81	rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc);

Lines 54-66 Link Here

(-)src/rpcb_svc_4.c (-7 / +7 lines)
54	#include "rpcbind.h"	54	#include "rpcbind.h"
55	#include "xlog.h"	55	#include "xlog.h"
56		56
57	static void rpcbproc_getaddr_4_local __P((void , struct svc_req , SVCXPRT ,	57	static void rpcbproc_getaddr_4_local(void , struct svc_req , SVCXPRT ,
58	rpcvers_t));	58	rpcvers_t);
59	static void rpcbproc_getversaddr_4_local __P((void , struct svc_req , SVCXPRT , rpcvers_t));	59	static void rpcbproc_getversaddr_4_local(void , struct svc_req , SVCXPRT , rpcvers_t);
60	static void *rpcbproc_getaddrlist_4_local	60	static void *rpcbproc_getaddrlist_4_local
61	__P((void , struct svc_req , SVCXPRT *, rpcvers_t));	61	(void , struct svc_req , SVCXPRT *, rpcvers_t);
62	static void free_rpcb_entry_list __P((rpcb_entry_list_ptr *));	62	static void free_rpcb_entry_list(rpcb_entry_list_ptr *);
63	static void rpcbproc_dump_4_local __P((void , struct svc_req , SVCXPRT , rpcvers_t));	63	static void rpcbproc_dump_4_local(void , struct svc_req , SVCXPRT , rpcvers_t);
64		64
65	/*	65	/*
66	* Called by svc_getreqset. There is a separate server handle for	66	* Called by svc_getreqset. There is a separate server handle for
Lines 78-84 rpcb_service_4(struct svc_req *rqstp, SV Link Here
78	} argument;	78	} argument;
79	char *result;	79	char *result;
80	xdrproc_t xdr_argument, xdr_result;	80	xdrproc_t xdr_argument, xdr_result;
81	void (local) __P((void , struct svc_req , SVCXPRT *, rpcvers_t));	81	void (local)(void , struct svc_req , SVCXPRT *, rpcvers_t);
82	rpcprog_t setprog = 0;	82	rpcprog_t setprog = 0;
83		83
84	rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc);	84	rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc);