vitalif
/
libnfs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change the portmapper structure 'mapping' to 'pmap_mapping' 

so we dont pollute the namespace when not needed
libnfs-4.0.0-vitalif
Ronnie Sahlberg 2011-06-26 18:35:01 +10:00
parent 070287e516
commit 870b3764ac
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
portmap/portmap.c
View File

@ -46,7 +46,7 @@ int rpc_pmap_null_async(struct rpc_context *rpc, rpc_cb cb, void *private_data)
int rpc_pmap_getport_async(struct rpc_context *rpc, int program, int version, rpc_cb cb, void *private_data)
{
struct rpc_pdu *pdu;
struct mapping m;
struct pmap_mapping m;
pdu = rpc_allocate_pdu(rpc, PMAP_PROGRAM, PMAP_V2, PMAP_GETPORT, cb, private_data, (xdrproc_t)xdr_int, sizeof(uint32_t));
if (pdu == NULL) {
@ -58,7 +58,7 @@ int rpc_pmap_getport_async(struct rpc_context *rpc, int program, int version, rp
m.vers = version;
m.prot = IPPROTO_TCP;
m.port = 0;
if (xdr_mapping(&pdu->xdr, &m) == 0) {
if (xdr_pmap_mapping(&pdu->xdr, &m) == 0) {
rpc_set_error(rpc, "XDR error: Failed to encode data for portmap/getport call");
rpc_free_pdu(rpc, pdu);
return -1;

8
portmap/portmap.x
View File

@ -4,7 +4,7 @@
const PMAP_PORT = 111; /* portmapper port number */
struct mapping {
struct pmap_mapping {
unsigned int prog;
unsigned int vers;
unsigned int prot;
@ -29,13 +29,13 @@ program PMAP_PROGRAM {
PMAP_NULL(void) = 0;
bool
PMAP_SET(mapping) = 1;
PMAP_SET(pmap_mapping) = 1;
bool
PMAP_UNSET(mapping) = 2;
PMAP_UNSET(pmap_mapping) = 2;
unsigned int
PMAP_GETPORT(mapping) = 3;
PMAP_GETPORT(pmap_mapping) = 3;
call_result
PMAP_CALLIT(call_args) = 5;