From be2c87c2cd3985257da356df0e821d7d377aa4e5 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Sat, 3 Dec 2016 12:11:21 -0800 Subject: [PATCH] Update portmap.x to use nicer names for procedure arguments and responses Signed-off-by: Ronnie Sahlberg --- portmap/libnfs-raw-portmap.c | 212 ++++++++++++++++++++++++++++++++++- portmap/libnfs-raw-portmap.h | 154 +++++++++++++++++-------- portmap/portmap.x | 63 +++++++---- 3 files changed, 359 insertions(+), 70 deletions(-) diff --git a/portmap/libnfs-raw-portmap.c b/portmap/libnfs-raw-portmap.c index 1701cfc..2f3b8ab 100644 --- a/portmap/libnfs-raw-portmap.c +++ b/portmap/libnfs-raw-portmap.c @@ -1,3 +1,4 @@ +/* -*- mode:c; tab-width:8; c-basic-offset:8; indent-tabs-mode:nil; -*- */ /* Copyright (c) 2014, Ronnie Sahlberg All rights reserved. @@ -6,7 +7,7 @@ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. + list of conditions and the following disclaimer. 2. 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. @@ -23,10 +24,9 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The views and conclusions contained in the software and documentation are those -of the authors and should not be interpreted as representing official policies, +of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ - /* * Please do not edit this file. * It was generated using rpcgen. @@ -41,6 +41,7 @@ zdr_pmap2_mapping (ZDR *zdrs, pmap2_mapping *objp) register int32_t *buf; buf = NULL; + if (zdrs->x_op == ZDR_ENCODE) { buf = ZDR_INLINE (zdrs, 4 * BYTES_PER_ZDR_UNIT); if (buf == NULL) { @@ -96,6 +97,7 @@ zdr_pmap2_call_args (ZDR *zdrs, pmap2_call_args *objp) register int32_t *buf; buf = NULL; + if (zdrs->x_op == ZDR_ENCODE) { buf = ZDR_INLINE (zdrs, 3 * BYTES_PER_ZDR_UNIT); if (buf == NULL) { @@ -148,6 +150,9 @@ zdr_pmap2_call_args (ZDR *zdrs, pmap2_call_args *objp) uint32_t zdr_pmap2_call_result (ZDR *zdrs, pmap2_call_result *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_u_int (zdrs, &objp->port)) return FALSE; if (!zdr_bytes (zdrs, (char **)&objp->res.res_val, (u_int *) &objp->res.res_len, ~0)) @@ -158,6 +163,9 @@ zdr_pmap2_call_result (ZDR *zdrs, pmap2_call_result *objp) uint32_t zdr_pmap2_mapping_list (ZDR *zdrs, pmap2_mapping_list *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_pmap2_mapping (zdrs, &objp->map)) return FALSE; if (!zdr_pointer (zdrs, (char **)&objp->next, sizeof (pmap2_mapping_list), (zdrproc_t) zdr_pmap2_mapping_list)) @@ -168,6 +176,9 @@ zdr_pmap2_mapping_list (ZDR *zdrs, pmap2_mapping_list *objp) uint32_t zdr_pmap2_dump_result (ZDR *zdrs, pmap2_dump_result *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_pointer (zdrs, (char **)&objp->list, sizeof (pmap2_mapping_list), (zdrproc_t) zdr_pmap2_mapping_list)) return FALSE; return TRUE; @@ -176,6 +187,9 @@ zdr_pmap2_dump_result (ZDR *zdrs, pmap2_dump_result *objp) uint32_t zdr_pmap3_string_result (ZDR *zdrs, pmap3_string_result *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_string (zdrs, &objp->addr, ~0)) return FALSE; return TRUE; @@ -184,6 +198,9 @@ zdr_pmap3_string_result (ZDR *zdrs, pmap3_string_result *objp) uint32_t zdr_pmap3_mapping (ZDR *zdrs, pmap3_mapping *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_u_int (zdrs, &objp->prog)) return FALSE; if (!zdr_u_int (zdrs, &objp->vers)) @@ -200,6 +217,9 @@ zdr_pmap3_mapping (ZDR *zdrs, pmap3_mapping *objp) uint32_t zdr_pmap3_mapping_list (ZDR *zdrs, pmap3_mapping_list *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_pmap3_mapping (zdrs, &objp->map)) return FALSE; if (!zdr_pointer (zdrs, (char **)&objp->next, sizeof (pmap3_mapping_list), (zdrproc_t) zdr_pmap3_mapping_list)) @@ -210,6 +230,9 @@ zdr_pmap3_mapping_list (ZDR *zdrs, pmap3_mapping_list *objp) uint32_t zdr_pmap3_dump_result (ZDR *zdrs, pmap3_dump_result *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_pointer (zdrs, (char **)&objp->list, sizeof (pmap3_mapping_list), (zdrproc_t) zdr_pmap3_mapping_list)) return FALSE; return TRUE; @@ -221,6 +244,7 @@ zdr_pmap3_call_args (ZDR *zdrs, pmap3_call_args *objp) register int32_t *buf; buf = NULL; + if (zdrs->x_op == ZDR_ENCODE) { buf = ZDR_INLINE (zdrs, 3 * BYTES_PER_ZDR_UNIT); if (buf == NULL) { @@ -273,6 +297,9 @@ zdr_pmap3_call_args (ZDR *zdrs, pmap3_call_args *objp) uint32_t zdr_pmap3_call_result (ZDR *zdrs, pmap3_call_result *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_u_int (zdrs, &objp->port)) return FALSE; if (!zdr_bytes (zdrs, (char **)&objp->res.res_val, (u_int *) &objp->res.res_len, ~0)) @@ -283,9 +310,188 @@ zdr_pmap3_call_result (ZDR *zdrs, pmap3_call_result *objp) uint32_t zdr_pmap3_netbuf (ZDR *zdrs, pmap3_netbuf *objp) { + register int32_t *buf; + buf = NULL; + if (!zdr_u_int (zdrs, &objp->maxlen)) return FALSE; if (!zdr_bytes (zdrs, (char **)&objp->buf.buf_val, (u_int *) &objp->buf.buf_len, ~0)) return FALSE; return TRUE; } + +uint32_t +zdr_PMAP2SETargs (ZDR *zdrs, PMAP2SETargs *objp) +{ + register int32_t *buf; + buf = NULL; + + if (!zdr_pmap2_mapping (zdrs, objp)) + return FALSE; + return TRUE; +} + +uint32_t +zdr_PMAP2UNSETargs (ZDR *zdrs, PMAP2UNSETargs *objp) +{ + register int32_t *buf; + buf = NULL; + + if (!zdr_pmap2_mapping (zdrs, objp)) + return FALSE; + return TRUE; +} + +uint32_t +zdr_PMAP2GETPORTargs (ZDR *zdrs, PMAP2GETPORTargs *objp) +{ + register int32_t *buf; + buf = NULL; + + if (!zdr_pmap2_mapping (zdrs, objp)) + return FALSE; + return TRUE; +} + +uint32_t +zdr_PMAP2CALLITargs (ZDR *zdrs, PMAP2CALLITargs *objp) +{ + register int32_t *buf; + buf = NULL; + + if (!zdr_pmap2_call_args (zdrs, objp)) + return FALSE; + return TRUE; +} + +uint32_t +zdr_PMAP2CALLITres (ZDR *zdrs, PMAP2CALLITres *objp) +{ + register int32_t *buf; + buf = NULL; + + if (!zdr_pmap2_call_result (zdrs, objp)) + return FALSE; + return TRUE; +} + +uint32_t +zdr_PMAP2DUMPres (ZDR *zdrs, PMAP2DUMPres *objp) +{ + register int32_t *buf; + buf = NULL; + + if (!zdr_pmap2_dump_result (zdrs, objp)) + return FALSE; + return TRUE; +} + +uint32_t +zdr_PMAP3SETargs (ZDR *zdrs, PMAP3SETargs *objp) +{ + register int32_t *buf; + buf = NULL; + + if (!zdr_pmap3_mapping (zdrs, objp)) + return FALSE; + return TRUE; +} + +uint32_t +zdr_PMAP3UNSETargs (ZDR *zdrs, PMAP3UNSETargs *objp) +{ + register int32_t *buf; + buf = NULL; + + if (!zdr_pmap3_mapping (zdrs, objp)) + return FALSE; + return TRUE; +} + +uint32_t +zdr_PMAP3GETADDRargs (ZDR *zdrs, PMAP3GETADDRargs *objp) +{ + register int32_t *buf; + buf = NULL; + + if (!zdr_pmap3_mapping (zdrs, objp)) + return FALSE; + return TRUE; +} + +uint32_t +zdr_PMAP3GETADDRres (ZDR *zdrs, PMAP3GETADDRres *objp) +{ + register int32_t *buf; + buf = NULL; + + if (!zdr_pmap3_string_result (zdrs, objp)) + return FALSE; + return TRUE; +} + +uint32_t +zdr_PMAP3DUMPres (ZDR *zdrs, PMAP3DUMPres *objp) +{ + register int32_t *buf; + buf = NULL; + + if (!zdr_pmap3_dump_result (zdrs, objp)) + return FALSE; + return TRUE; +} + +uint32_t +zdr_PMAP3CALLITargs (ZDR *zdrs, PMAP3CALLITargs *objp) +{ + register int32_t *buf; + buf = NULL; + + if (!zdr_pmap3_call_result (zdrs, objp)) + return FALSE; + return TRUE; +} + +uint32_t +zdr_PMAP3CALLITres (ZDR *zdrs, PMAP3CALLITres *objp) +{ + register int32_t *buf; + buf = NULL; + + if (!zdr_pmap3_call_result (zdrs, objp)) + return FALSE; + return TRUE; +} + +uint32_t +zdr_PMAP3UADDR2TADDRres (ZDR *zdrs, PMAP3UADDR2TADDRres *objp) +{ + register int32_t *buf; + buf = NULL; + + if (!zdr_pmap3_netbuf (zdrs, objp)) + return FALSE; + return TRUE; +} + +uint32_t +zdr_PMAP3TADDR2UADDRargs (ZDR *zdrs, PMAP3TADDR2UADDRargs *objp) +{ + register int32_t *buf; + buf = NULL; + + if (!zdr_pmap3_netbuf (zdrs, objp)) + return FALSE; + return TRUE; +} + +uint32_t +zdr_PMAP3TADDR2UADDRres (ZDR *zdrs, PMAP3TADDR2UADDRres *objp) +{ + register int32_t *buf; + buf = NULL; + + if (!zdr_pmap3_string_result (zdrs, objp)) + return FALSE; + return TRUE; +} diff --git a/portmap/libnfs-raw-portmap.h b/portmap/libnfs-raw-portmap.h index 6036de9..cbb7af4 100644 --- a/portmap/libnfs-raw-portmap.h +++ b/portmap/libnfs-raw-portmap.h @@ -1,3 +1,4 @@ +/* -*- mode:c; tab-width:8; c-basic-offset:8; indent-tabs-mode:nil; -*- */ /* Copyright (c) 2014, Ronnie Sahlberg All rights reserved. @@ -26,7 +27,6 @@ The views and conclusions contained in the software and documentation are those of the authors and should not be interpreted as representing official policies, either expressed or implied, of the FreeBSD Project. */ - /* * Please do not edit this file. * It was generated using rpcgen. @@ -137,6 +137,38 @@ struct pmap3_netbuf { }; typedef struct pmap3_netbuf pmap3_netbuf; +typedef pmap2_mapping PMAP2SETargs; + +typedef pmap2_mapping PMAP2UNSETargs; + +typedef pmap2_mapping PMAP2GETPORTargs; + +typedef pmap2_call_args PMAP2CALLITargs; + +typedef pmap2_call_result PMAP2CALLITres; + +typedef pmap2_dump_result PMAP2DUMPres; + +typedef pmap3_mapping PMAP3SETargs; + +typedef pmap3_mapping PMAP3UNSETargs; + +typedef pmap3_mapping PMAP3GETADDRargs; + +typedef pmap3_string_result PMAP3GETADDRres; + +typedef pmap3_dump_result PMAP3DUMPres; + +typedef pmap3_call_result PMAP3CALLITargs; + +typedef pmap3_call_result PMAP3CALLITres; + +typedef pmap3_netbuf PMAP3UADDR2TADDRres; + +typedef pmap3_netbuf PMAP3TADDR2UADDRargs; + +typedef pmap3_string_result PMAP3TADDR2UADDRres; + #define PMAP_PROGRAM 100000 #define PMAP_V2 2 @@ -145,20 +177,20 @@ typedef struct pmap3_netbuf pmap3_netbuf; extern void * pmap2_null_2(void *, void *); extern void * pmap2_null_2_svc(void *, struct svc_req *); #define PMAP2_SET 1 -extern uint32_t * pmap2_set_2(pmap2_mapping *, void *); -extern uint32_t * pmap2_set_2_svc(pmap2_mapping *, struct svc_req *); +extern uint32_t * pmap2_set_2(PMAP2SETargs *, void *); +extern uint32_t * pmap2_set_2_svc(PMAP2SETargs *, struct svc_req *); #define PMAP2_UNSET 2 -extern uint32_t * pmap2_unset_2(pmap2_mapping *, void *); -extern uint32_t * pmap2_unset_2_svc(pmap2_mapping *, struct svc_req *); +extern uint32_t * pmap2_unset_2(PMAP2UNSETargs *, void *); +extern uint32_t * pmap2_unset_2_svc(PMAP2UNSETargs *, struct svc_req *); #define PMAP2_GETPORT 3 -extern u_int * pmap2_getport_2(pmap2_mapping *, void *); -extern u_int * pmap2_getport_2_svc(pmap2_mapping *, struct svc_req *); +extern uint32_t * pmap2_getport_2(PMAP2GETPORTargs *, void *); +extern uint32_t * pmap2_getport_2_svc(PMAP2GETPORTargs *, struct svc_req *); #define PMAP2_DUMP 4 -extern pmap2_dump_result * pmap2_dump_2(void *, void *); -extern pmap2_dump_result * pmap2_dump_2_svc(void *, struct svc_req *); +extern PMAP2DUMPres * pmap2_dump_2(void *, void *); +extern PMAP2DUMPres * pmap2_dump_2_svc(void *, struct svc_req *); #define PMAP2_CALLIT 5 -extern pmap2_call_result * pmap2_callit_2(pmap2_call_args *, void *); -extern pmap2_call_result * pmap2_callit_2_svc(pmap2_call_args *, struct svc_req *); +extern PMAP2CALLITres * pmap2_callit_2(PMAP2CALLITargs *, void *); +extern PMAP2CALLITres * pmap2_callit_2_svc(PMAP2CALLITargs *, struct svc_req *); extern int pmap_program_2_freeresult (void *, zdrproc_t, caddr_t); #else /* K&R C */ @@ -172,14 +204,14 @@ extern uint32_t * pmap2_set_2_svc(); extern uint32_t * pmap2_unset_2(); extern uint32_t * pmap2_unset_2_svc(); #define PMAP2_GETPORT 3 -extern u_int * pmap2_getport_2(); -extern u_int * pmap2_getport_2_svc(); +extern uint32_t * pmap2_getport_2(); +extern uint32_t * pmap2_getport_2_svc(); #define PMAP2_DUMP 4 -extern pmap2_dump_result * pmap2_dump_2(); -extern pmap2_dump_result * pmap2_dump_2_svc(); +extern PMAP2DUMPres * pmap2_dump_2(); +extern PMAP2DUMPres * pmap2_dump_2_svc(); #define PMAP2_CALLIT 5 -extern pmap2_call_result * pmap2_callit_2(); -extern pmap2_call_result * pmap2_callit_2_svc(); +extern PMAP2CALLITres * pmap2_callit_2(); +extern PMAP2CALLITres * pmap2_callit_2_svc(); extern int pmap_program_2_freeresult (); #endif /* K&R C */ #define PMAP_V3 3 @@ -189,29 +221,29 @@ extern int pmap_program_2_freeresult (); extern void * pmap3_null_3(void *, void *); extern void * pmap3_null_3_svc(void *, struct svc_req *); #define PMAP3_SET 1 -extern uint32_t * pmap3_set_3(pmap3_mapping *, void *); -extern uint32_t * pmap3_set_3_svc(pmap3_mapping *, struct svc_req *); +extern uint32_t * pmap3_set_3(PMAP3SETargs *, void *); +extern uint32_t * pmap3_set_3_svc(PMAP3SETargs *, struct svc_req *); #define PMAP3_UNSET 2 -extern uint32_t * pmap3_unset_3(pmap3_mapping *, void *); -extern uint32_t * pmap3_unset_3_svc(pmap3_mapping *, struct svc_req *); +extern uint32_t * pmap3_unset_3(PMAP3UNSETargs *, void *); +extern uint32_t * pmap3_unset_3_svc(PMAP3UNSETargs *, struct svc_req *); #define PMAP3_GETADDR 3 -extern pmap3_string_result * pmap3_getaddr_3(pmap3_mapping *, void *); -extern pmap3_string_result * pmap3_getaddr_3_svc(pmap3_mapping *, struct svc_req *); +extern PMAP3GETADDRres * pmap3_getaddr_3(PMAP3GETADDRargs *, void *); +extern PMAP3GETADDRres * pmap3_getaddr_3_svc(PMAP3GETADDRargs *, struct svc_req *); #define PMAP3_DUMP 4 -extern pmap3_dump_result * pmap3_dump_3(void *, void *); -extern pmap3_dump_result * pmap3_dump_3_svc(void *, struct svc_req *); +extern PMAP3DUMPres * pmap3_dump_3(void *, void *); +extern PMAP3DUMPres * pmap3_dump_3_svc(void *, struct svc_req *); #define PMAP3_CALLIT 5 -extern pmap3_call_result * pmap3_callit_3(pmap3_call_args *, void *); -extern pmap3_call_result * pmap3_callit_3_svc(pmap3_call_args *, struct svc_req *); +extern PMAP3CALLITres * pmap3_callit_3(PMAP3CALLITargs *, void *); +extern PMAP3CALLITres * pmap3_callit_3_svc(PMAP3CALLITargs *, struct svc_req *); #define PMAP3_GETTIME 6 -extern u_int * pmap3_gettime_3(void *, void *); -extern u_int * pmap3_gettime_3_svc(void *, struct svc_req *); +extern uint32_t * pmap3_gettime_3(void *, void *); +extern uint32_t * pmap3_gettime_3_svc(void *, struct svc_req *); #define PMAP3_UADDR2TADDR 7 -extern pmap3_netbuf * pmap3_uaddr2taddr_3(char **, void *); -extern pmap3_netbuf * pmap3_uaddr2taddr_3_svc(char **, struct svc_req *); +extern PMAP3UADDR2TADDRres * pmap3_uaddr2taddr_3(char **, void *); +extern PMAP3UADDR2TADDRres * pmap3_uaddr2taddr_3_svc(char **, struct svc_req *); #define PMAP3_TADDR2UADDR 8 -extern struct pmap3_string_result * pmap3_taddr2uaddr_3(pmap3_netbuf *, void *); -extern struct pmap3_string_result * pmap3_taddr2uaddr_3_svc(pmap3_netbuf *, struct svc_req *); +extern PMAP3TADDR2UADDRres * pmap3_taddr2uaddr_3(PMAP3TADDR2UADDRargs *, void *); +extern PMAP3TADDR2UADDRres * pmap3_taddr2uaddr_3_svc(PMAP3TADDR2UADDRargs *, struct svc_req *); extern int pmap_program_3_freeresult (void *, zdrproc_t, caddr_t); #else /* K&R C */ @@ -225,23 +257,23 @@ extern uint32_t * pmap3_set_3_svc(); extern uint32_t * pmap3_unset_3(); extern uint32_t * pmap3_unset_3_svc(); #define PMAP3_GETADDR 3 -extern pmap3_string_result * pmap3_getaddr_3(); -extern pmap3_string_result * pmap3_getaddr_3_svc(); +extern PMAP3GETADDRres * pmap3_getaddr_3(); +extern PMAP3GETADDRres * pmap3_getaddr_3_svc(); #define PMAP3_DUMP 4 -extern pmap3_dump_result * pmap3_dump_3(); -extern pmap3_dump_result * pmap3_dump_3_svc(); +extern PMAP3DUMPres * pmap3_dump_3(); +extern PMAP3DUMPres * pmap3_dump_3_svc(); #define PMAP3_CALLIT 5 -extern pmap3_call_result * pmap3_callit_3(); -extern pmap3_call_result * pmap3_callit_3_svc(); +extern PMAP3CALLITres * pmap3_callit_3(); +extern PMAP3CALLITres * pmap3_callit_3_svc(); #define PMAP3_GETTIME 6 -extern u_int * pmap3_gettime_3(); -extern u_int * pmap3_gettime_3_svc(); +extern uint32_t * pmap3_gettime_3(); +extern uint32_t * pmap3_gettime_3_svc(); #define PMAP3_UADDR2TADDR 7 -extern pmap3_netbuf * pmap3_uaddr2taddr_3(); -extern pmap3_netbuf * pmap3_uaddr2taddr_3_svc(); +extern PMAP3UADDR2TADDRres * pmap3_uaddr2taddr_3(); +extern PMAP3UADDR2TADDRres * pmap3_uaddr2taddr_3_svc(); #define PMAP3_TADDR2UADDR 8 -extern struct pmap3_string_result * pmap3_taddr2uaddr_3(); -extern struct pmap3_string_result * pmap3_taddr2uaddr_3_svc(); +extern PMAP3TADDR2UADDRres * pmap3_taddr2uaddr_3(); +extern PMAP3TADDR2UADDRres * pmap3_taddr2uaddr_3_svc(); extern int pmap_program_3_freeresult (); #endif /* K&R C */ @@ -260,6 +292,22 @@ extern uint32_t zdr_pmap3_dump_result (ZDR *, pmap3_dump_result*); extern uint32_t zdr_pmap3_call_args (ZDR *, pmap3_call_args*); extern uint32_t zdr_pmap3_call_result (ZDR *, pmap3_call_result*); extern uint32_t zdr_pmap3_netbuf (ZDR *, pmap3_netbuf*); +extern uint32_t zdr_PMAP2SETargs (ZDR *, PMAP2SETargs*); +extern uint32_t zdr_PMAP2UNSETargs (ZDR *, PMAP2UNSETargs*); +extern uint32_t zdr_PMAP2GETPORTargs (ZDR *, PMAP2GETPORTargs*); +extern uint32_t zdr_PMAP2CALLITargs (ZDR *, PMAP2CALLITargs*); +extern uint32_t zdr_PMAP2CALLITres (ZDR *, PMAP2CALLITres*); +extern uint32_t zdr_PMAP2DUMPres (ZDR *, PMAP2DUMPres*); +extern uint32_t zdr_PMAP3SETargs (ZDR *, PMAP3SETargs*); +extern uint32_t zdr_PMAP3UNSETargs (ZDR *, PMAP3UNSETargs*); +extern uint32_t zdr_PMAP3GETADDRargs (ZDR *, PMAP3GETADDRargs*); +extern uint32_t zdr_PMAP3GETADDRres (ZDR *, PMAP3GETADDRres*); +extern uint32_t zdr_PMAP3DUMPres (ZDR *, PMAP3DUMPres*); +extern uint32_t zdr_PMAP3CALLITargs (ZDR *, PMAP3CALLITargs*); +extern uint32_t zdr_PMAP3CALLITres (ZDR *, PMAP3CALLITres*); +extern uint32_t zdr_PMAP3UADDR2TADDRres (ZDR *, PMAP3UADDR2TADDRres*); +extern uint32_t zdr_PMAP3TADDR2UADDRargs (ZDR *, PMAP3TADDR2UADDRargs*); +extern uint32_t zdr_PMAP3TADDR2UADDRres (ZDR *, PMAP3TADDR2UADDRres*); #else /* K&R C */ extern uint32_t zdr_pmap2_mapping (); @@ -274,6 +322,22 @@ extern uint32_t zdr_pmap3_dump_result (); extern uint32_t zdr_pmap3_call_args (); extern uint32_t zdr_pmap3_call_result (); extern uint32_t zdr_pmap3_netbuf (); +extern uint32_t zdr_PMAP2SETargs (); +extern uint32_t zdr_PMAP2UNSETargs (); +extern uint32_t zdr_PMAP2GETPORTargs (); +extern uint32_t zdr_PMAP2CALLITargs (); +extern uint32_t zdr_PMAP2CALLITres (); +extern uint32_t zdr_PMAP2DUMPres (); +extern uint32_t zdr_PMAP3SETargs (); +extern uint32_t zdr_PMAP3UNSETargs (); +extern uint32_t zdr_PMAP3GETADDRargs (); +extern uint32_t zdr_PMAP3GETADDRres (); +extern uint32_t zdr_PMAP3DUMPres (); +extern uint32_t zdr_PMAP3CALLITargs (); +extern uint32_t zdr_PMAP3CALLITres (); +extern uint32_t zdr_PMAP3UADDR2TADDRres (); +extern uint32_t zdr_PMAP3TADDR2UADDRargs (); +extern uint32_t zdr_PMAP3TADDR2UADDRres (); #endif /* K&R C */ diff --git a/portmap/portmap.x b/portmap/portmap.x index 5ceb436..fd4ada3 100644 --- a/portmap/portmap.x +++ b/portmap/portmap.x @@ -1,3 +1,4 @@ +/* -*- mode:c; tab-width:8; c-basic-offset:8; indent-tabs-mode:nil; -*- */ /* Copyright (c) 2014, Ronnie Sahlberg All rights reserved. @@ -99,53 +100,71 @@ struct pmap3_netbuf { opaque buf<>; }; +typedef pmap2_mapping PMAP2SETargs; +typedef pmap2_mapping PMAP2UNSETargs; +typedef pmap2_mapping PMAP2GETPORTargs; +typedef pmap2_call_args PMAP2CALLITargs; +typedef pmap2_call_result PMAP2CALLITres; +typedef pmap2_dump_result PMAP2DUMPres; + +typedef pmap3_mapping PMAP3SETargs; +typedef pmap3_mapping PMAP3UNSETargs; +typedef pmap3_mapping PMAP3GETADDRargs; +typedef pmap3_string_result PMAP3GETADDRres; +typedef pmap3_dump_result PMAP3DUMPres; +typedef pmap3_call_result PMAP3CALLITargs; +typedef pmap3_call_result PMAP3CALLITres; +typedef pmap3_netbuf PMAP3UADDR2TADDRres; +typedef pmap3_netbuf PMAP3TADDR2UADDRargs; +typedef pmap3_string_result PMAP3TADDR2UADDRres; + program PMAP_PROGRAM { version PMAP_V2 { void PMAP2_NULL(void) = 0; - bool - PMAP2_SET(pmap2_mapping) = 1; + uint32_t + PMAP2_SET(PMAP2SETargs) = 1; - bool - PMAP2_UNSET(pmap2_mapping) = 2; + uint32_t + PMAP2_UNSET(PMAP2UNSETargs) = 2; - unsigned int - PMAP2_GETPORT(pmap2_mapping) = 3; + uint32_t + PMAP2_GETPORT(PMAP2GETPORTargs) = 3; - pmap2_dump_result + PMAP2DUMPres PMAP2_DUMP(void) = 4; - pmap2_call_result - PMAP2_CALLIT(pmap2_call_args) = 5; + PMAP2CALLITres + PMAP2_CALLIT(PMAP2CALLITargs) = 5; } = 2; version PMAP_V3 { void PMAP3_NULL(void) = 0; - bool - PMAP3_SET(pmap3_mapping) = 1; + uint32_t + PMAP3_SET(PMAP3SETargs) = 1; - bool - PMAP3_UNSET(pmap3_mapping) = 2; + uint32_t + PMAP3_UNSET(PMAP3UNSETargs) = 2; - pmap3_string_result - PMAP3_GETADDR(pmap3_mapping) = 3; + PMAP3GETADDRres + PMAP3_GETADDR(PMAP3GETADDRargs) = 3; - pmap3_dump_result + PMAP3DUMPres PMAP3_DUMP(void) = 4; - pmap3_call_result - PMAP3_CALLIT(pmap3_call_args) = 5; + PMAP3CALLITres + PMAP3_CALLIT(PMAP3CALLITargs) = 5; - unsigned int + uint32_t PMAP3_GETTIME(void) = 6; - pmap3_netbuf + PMAP3UADDR2TADDRres PMAP3_UADDR2TADDR(string) = 7; - struct pmap3_string_result - PMAP3_TADDR2UADDR(pmap3_netbuf) = 8; + PMAP3TADDR2UADDRres + PMAP3_TADDR2UADDR(PMAP3TADDR2UADDRargs) = 8; } = 3; } = 100000;