PMAP: allow to ask for tcp/udp port, dont assume users only ever want the tcp port

[deb_libnfs.git] / portmap / portmap.c

diff --git a/portmap/portmap.c b/portmap/portmap.c
index d8015d968d6e396f775fd94dd420cf646d68db6e..d2ec4b883cba60c7401379a1faa2012c96451829 100644 (file)
--- a/portmap/portmap.c
+++ b/portmap/portmap.c
@@ -14,6 +14,9 @@
    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>
@@ -43,7 +46,7 @@ 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;
@@ -56,7 +59,7 @@ 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");
@@ -72,3 +75,34 @@ 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)
+{
+       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 -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;
+}