X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=portmap%2Fportmap.c;h=d1c1488ba616384337387d406e8032f479475882;hb=2452c57f9ba2d2e81f84111fae5b0cb1cf285bd4;hp=29f13d00b3d44a70db72b9c33dd7298e7f65ca70;hpb=a8a1b85846aab042cd410bf59caf617a0951380e;p=deb_libnfs.git

diff --git a/portmap/portmap.c b/portmap/portmap.c
index 29f13d0..d1c1488 100644
--- a/portmap/portmap.c
+++ b/portmap/portmap.c
@@ -18,13 +18,8 @@
 #include "win32_compat.h"
 #endif/*WIN32*/
 
-#if defined(WIN32)
-#include <winsock2.h>
-#endif
-
 #include <stdio.h>
-#include <rpc/rpc.h>
-#include <rpc/xdr.h>
+#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-private.h"
@@ -35,7 +30,7 @@ int rpc_pmap_null_async(struct rpc_context *rpc, rpc_cb cb, void *private_data)
 {
 	struct rpc_pdu *pdu;
 
-	pdu = rpc_allocate_pdu(rpc, PMAP_PROGRAM, PMAP_V2, PMAP_NULL, cb, private_data, (xdrproc_t)xdr_void, 0);
+	pdu = rpc_allocate_pdu(rpc, PMAP_PROGRAM, PMAP_V2, PMAP_NULL, cb, private_data, (zdrproc_t)zdr_void, 0);
 	if (pdu == NULL) {
 		rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for portmap/null call");
 		return -1;
@@ -50,12 +45,12 @@ int rpc_pmap_null_async(struct rpc_context *rpc, rpc_cb cb, void *private_data)
 	return 0;
 }
 
-int rpc_pmap_getport_async(struct rpc_context *rpc, int program, int version, rpc_cb cb, void *private_data)
+int rpc_pmap_getport_async(struct rpc_context *rpc, int program, int version, int protocol, rpc_cb cb, void *private_data)
 {
 	struct rpc_pdu *pdu;
 	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));
+	pdu = rpc_allocate_pdu(rpc, PMAP_PROGRAM, PMAP_V2, PMAP_GETPORT, cb, private_data, (zdrproc_t)zdr_int, sizeof(uint32_t));
 	if (pdu == NULL) {
 		rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for portmap/getport call");
 		return -1;
@@ -63,10 +58,10 @@ int rpc_pmap_getport_async(struct rpc_context *rpc, int program, int version, rp
 
 	m.prog = program;
 	m.vers = version;
-	m.prot = IPPROTO_TCP;
+	m.prot = protocol;
 	m.port = 0;
-	if (xdr_pmap_mapping(&pdu->xdr, &m) == 0) {
-		rpc_set_error(rpc, "XDR error: Failed to encode data for portmap/getport call");
+	if (zdr_pmap_mapping(&pdu->zdr, &m) == 0) {
+		rpc_set_error(rpc, "ZDR error: Failed to encode data for portmap/getport call");
 		rpc_free_pdu(rpc, pdu);
 		return -1;
 	}
@@ -80,12 +75,72 @@ int rpc_pmap_getport_async(struct rpc_context *rpc, int program, int version, rp
 	return 0;
 }
 
-int rpc_pmap_callit_async(struct rpc_context *rpc, int program, int version, int procedure, const char *data, int datalen, rpc_cb cb, void *private_data)
+int rpc_pmap_set_async(struct rpc_context *rpc, int program, int version, int protocol, int port, rpc_cb cb, void *private_data)
+{
+	struct rpc_pdu *pdu;
+	struct pmap_mapping m;
+
+	pdu = rpc_allocate_pdu(rpc, PMAP_PROGRAM, PMAP_V2, PMAP_SET, cb, private_data, (zdrproc_t)zdr_int, sizeof(uint32_t));
+	if (pdu == NULL) {
+		rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for portmap/set call");
+		return -1;
+	}
+
+	m.prog = program;
+	m.vers = version;
+	m.prot = protocol;
+	m.port = port;
+	if (zdr_pmap_mapping(&pdu->zdr, &m) == 0) {
+		rpc_set_error(rpc, "ZDR error: Failed to encode data for portmap/set call");
+		rpc_free_pdu(rpc, pdu);
+		return -1;
+	}
+
+	if (rpc_queue_pdu(rpc, pdu) != 0) {
+		rpc_set_error(rpc, "Failed to queue portmap/set pdu");
+		rpc_free_pdu(rpc, pdu);
+		return -1;
+	}
+
+	return 0;
+}
+
+int rpc_pmap_unset_async(struct rpc_context *rpc, int program, int version, int protocol, int port, rpc_cb cb, void *private_data)
+{
+	struct rpc_pdu *pdu;
+	struct pmap_mapping m;
+
+	pdu = rpc_allocate_pdu(rpc, PMAP_PROGRAM, PMAP_V2, PMAP_UNSET, cb, private_data, (zdrproc_t)zdr_int, sizeof(uint32_t));
+	if (pdu == NULL) {
+		rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for portmap/unset call");
+		return -1;
+	}
+
+	m.prog = program;
+	m.vers = version;
+	m.prot = protocol;
+	m.port = port;
+	if (zdr_pmap_mapping(&pdu->zdr, &m) == 0) {
+		rpc_set_error(rpc, "ZDR error: Failed to encode data for portmap/unset call");
+		rpc_free_pdu(rpc, pdu);
+		return -1;
+	}
+
+	if (rpc_queue_pdu(rpc, pdu) != 0) {
+		rpc_set_error(rpc, "Failed to queue portmap/unset pdu");
+		rpc_free_pdu(rpc, pdu);
+		return -1;
+	}
+
+	return 0;
+}
+
+int rpc_pmap_callit_async(struct rpc_context *rpc, int program, int version, int procedure, char *data, int datalen, rpc_cb cb, void *private_data)
 {
 	struct rpc_pdu *pdu;
 	struct pmap_call_args ca;
 
-	pdu = rpc_allocate_pdu(rpc, PMAP_PROGRAM, PMAP_V2, PMAP_CALLIT, cb, private_data, (xdrproc_t)xdr_pmap_call_result, sizeof(pmap_call_result));
+	pdu = rpc_allocate_pdu(rpc, PMAP_PROGRAM, PMAP_V2, PMAP_CALLIT, cb, private_data, (zdrproc_t)zdr_pmap_call_result, sizeof(pmap_call_result));
 	if (pdu == NULL) {
 		rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for portmap/callit call");
 		return -1;
@@ -97,8 +152,8 @@ int rpc_pmap_callit_async(struct rpc_context *rpc, int program, int version, int
 	ca.args.args_len = datalen;
 	ca.args.args_val = data;
 
-	if (xdr_pmap_call_args(&pdu->xdr, &ca) == 0) {
-		rpc_set_error(rpc, "XDR error: Failed to encode data for portmap/callit call");
+	if (zdr_pmap_call_args(&pdu->zdr, &ca) == 0) {
+		rpc_set_error(rpc, "ZDR error: Failed to encode data for portmap/callit call");
 		rpc_free_pdu(rpc, pdu);
 		return -1;
 	}