X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=portmap%2Fportmap.c;h=f8c434d19950e449c0f7bb701c6b32cb992eba8b;hb=71f480591aa3dd80c19b71cfaa1fb3b1a93e4d6f;hp=4c10bd8546438ee8458407bf5b259a5ba35aafc1;hpb=84004dbf9bb2ab8a7f8b968affc53ee3065fa911;p=deb_libnfs.git

diff --git a/portmap/portmap.c b/portmap/portmap.c
index 4c10bd8..f8c434d 100644
--- a/portmap/portmap.c
+++ b/portmap/portmap.c
@@ -14,8 +14,12 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef WIN32
+#include "win32_compat.h"
+#endif/*WIN32*/
 
 #include <stdio.h>
+#include <rpc/rpc.h>
 #include <rpc/xdr.h>
 #include "libnfs.h"
 #include "libnfs-raw.h"
@@ -36,7 +40,7 @@ int rpc_pmap_null_async(struct rpc_context *rpc, rpc_cb cb, void *private_data)
 	if (rpc_queue_pdu(rpc, pdu) != 0) {
 		rpc_set_error(rpc, "Out of memory. Failed to queue pdu for portmap/null call");
 		rpc_free_pdu(rpc, pdu);
-		return -2;
+		return -1;
 	}
 
 	return 0;
@@ -45,7 +49,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) {
@@ -57,16 +61,47 @@ 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 -2;
+		return -1;
 	}
 
 	if (rpc_queue_pdu(rpc, pdu) != 0) {
-		printf("Failed to queue portmap/getport pdu\n");
+		rpc_set_error(rpc, "Failed to queue portmap/getport 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, const 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));
+	if (pdu == NULL) {
+		rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for portmap/callit call");
+		return -1;
+	}
+
+	ca.prog = program;
+	ca.vers = version;
+	ca.proc = procedure;
+	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");
 		rpc_free_pdu(rpc, pdu);
-		return -2;
+		return -1;
+	}
+
+	if (rpc_queue_pdu(rpc, pdu) != 0) {
+		rpc_set_error(rpc, "Failed to queue portmap/callit pdu: %s", rpc_get_error(rpc));
+		return -1;
 	}
 
 	return 0;