X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=portmap%2Flibnfs-raw-portmap.c;h=1afcd63d375c8e34c4cae4cb64ad6c47d54069fd;hb=8e003243fbec4cff4af3e9ca01ea713065336970;hp=a07a1e62e025374b5d70b8d07a19d00853332ac1;hpb=c44c3ff3646f34deddf3ab7687aca1f6383e8585;p=deb_libnfs.git

diff --git a/portmap/libnfs-raw-portmap.c b/portmap/libnfs-raw-portmap.c
index a07a1e6..1afcd63 100644
--- a/portmap/libnfs-raw-portmap.c
+++ b/portmap/libnfs-raw-portmap.c
@@ -7,7 +7,7 @@
 #include "libnfs-raw-portmap.h"
 
 bool_t
-zdr_pmap_mapping (ZDR *zdrs, pmap_mapping *objp)
+zdr_pmap2_mapping (ZDR *zdrs, pmap2_mapping *objp)
 {
 	register int32_t *buf;
 	buf = NULL;
@@ -63,7 +63,7 @@ zdr_pmap_mapping (ZDR *zdrs, pmap_mapping *objp)
 }
 
 bool_t
-zdr_pmap_call_args (ZDR *zdrs, pmap_call_args *objp)
+zdr_pmap2_call_args (ZDR *zdrs, pmap2_call_args *objp)
 {
 	register int32_t *buf;
 	buf = NULL;
@@ -119,7 +119,7 @@ zdr_pmap_call_args (ZDR *zdrs, pmap_call_args *objp)
 }
 
 bool_t
-zdr_pmap_call_result (ZDR *zdrs, pmap_call_result *objp)
+zdr_pmap2_call_result (ZDR *zdrs, pmap2_call_result *objp)
 {
 	register int32_t *buf;
 	buf = NULL;
@@ -132,25 +132,161 @@ zdr_pmap_call_result (ZDR *zdrs, pmap_call_result *objp)
 }
 
 bool_t
-zdr_pmap_mapping_list (ZDR *zdrs, pmap_mapping_list *objp)
+zdr_pmap2_mapping_list (ZDR *zdrs, pmap2_mapping_list *objp)
 {
 	register int32_t *buf;
 	buf = NULL;
 
-	 if (!zdr_pmap_mapping (zdrs, &objp->map))
+	 if (!zdr_pmap2_mapping (zdrs, &objp->map))
 		 return FALSE;
-	 if (!zdr_pointer (zdrs, (char **)&objp->next, sizeof (pmap_mapping_list), (zdrproc_t) zdr_pmap_mapping_list))
+	 if (!zdr_pointer (zdrs, (char **)&objp->next, sizeof (pmap2_mapping_list), (zdrproc_t) zdr_pmap2_mapping_list))
 		 return FALSE;
 	return TRUE;
 }
 
 bool_t
-zdr_pmap_dump_result (ZDR *zdrs, pmap_dump_result *objp)
+zdr_pmap2_dump_result (ZDR *zdrs, pmap2_dump_result *objp)
 {
 	register int32_t *buf;
 	buf = NULL;
 
-	 if (!zdr_pointer (zdrs, (char **)&objp->list, sizeof (pmap_mapping_list), (zdrproc_t) zdr_pmap_mapping_list))
+	 if (!zdr_pointer (zdrs, (char **)&objp->list, sizeof (pmap2_mapping_list), (zdrproc_t) zdr_pmap2_mapping_list))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_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;
+}
+
+bool_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))
+		 return FALSE;
+	 if (!zdr_string (zdrs, &objp->netid, ~0))
+		 return FALSE;
+	 if (!zdr_string (zdrs, &objp->addr, ~0))
+		 return FALSE;
+	 if (!zdr_string (zdrs, &objp->owner, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_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))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_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;
+}
+
+bool_t
+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) {
+			 if (!zdr_u_int (zdrs, &objp->prog))
+				 return FALSE;
+			 if (!zdr_u_int (zdrs, &objp->vers))
+				 return FALSE;
+			 if (!zdr_u_int (zdrs, &objp->proc))
+				 return FALSE;
+
+		} else {
+		IZDR_PUT_U_LONG(buf, objp->prog);
+		IZDR_PUT_U_LONG(buf, objp->vers);
+		IZDR_PUT_U_LONG(buf, objp->proc);
+		}
+		 if (!zdr_bytes (zdrs, (char **)&objp->args.args_val, (u_int *) &objp->args.args_len, ~0))
+			 return FALSE;
+		return TRUE;
+	} else if (zdrs->x_op == ZDR_DECODE) {
+		buf = ZDR_INLINE (zdrs, 3 * BYTES_PER_ZDR_UNIT);
+		if (buf == NULL) {
+			 if (!zdr_u_int (zdrs, &objp->prog))
+				 return FALSE;
+			 if (!zdr_u_int (zdrs, &objp->vers))
+				 return FALSE;
+			 if (!zdr_u_int (zdrs, &objp->proc))
+				 return FALSE;
+
+		} else {
+		objp->prog = IZDR_GET_U_LONG(buf);
+		objp->vers = IZDR_GET_U_LONG(buf);
+		objp->proc = IZDR_GET_U_LONG(buf);
+		}
+		 if (!zdr_bytes (zdrs, (char **)&objp->args.args_val, (u_int *) &objp->args.args_len, ~0))
+			 return FALSE;
+	 return TRUE;
+	}
+
+	 if (!zdr_u_int (zdrs, &objp->prog))
+		 return FALSE;
+	 if (!zdr_u_int (zdrs, &objp->vers))
+		 return FALSE;
+	 if (!zdr_u_int (zdrs, &objp->proc))
+		 return FALSE;
+	 if (!zdr_bytes (zdrs, (char **)&objp->args.args_val, (u_int *) &objp->args.args_len, ~0))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_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))
+		 return FALSE;
+	return TRUE;
+}
+
+bool_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;
 }